Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
OpenXG-RAN
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wangwenhui
OpenXG-RAN
Commits
9d5d78f5
Commit
9d5d78f5
authored
Oct 23, 2017
by
David Price
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Stack smashing error reported. Fixed by parameter changing int to uint16_t. Not obvious!
parent
f7670c4b
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
7 deletions
+7
-7
nfapi/nfapi_pnf.c
nfapi/nfapi_pnf.c
+1
-1
nfapi/nfapi_vnf.c
nfapi/nfapi_vnf.c
+2
-2
openair2/LAYER2/MAC/eNB_scheduler_RA.c
openair2/LAYER2/MAC/eNB_scheduler_RA.c
+4
-4
No files found.
nfapi/nfapi_pnf.c
View file @
9d5d78f5
...
@@ -1109,7 +1109,7 @@ int pnf_phy_tx_req(nfapi_pnf_p7_config_t* pnf_p7, nfapi_tx_request_t* req)
...
@@ -1109,7 +1109,7 @@ int pnf_phy_tx_req(nfapi_pnf_p7_config_t* pnf_p7, nfapi_tx_request_t* req)
return
0
;
return
0
;
}
}
extern
void
subtract_subframe
(
int
*
frameP
,
in
t
*
subframeP
,
int
offset
);
extern
void
subtract_subframe
(
uint16_t
*
frameP
,
uint16_
t
*
subframeP
,
int
offset
);
int
pnf_phy_ul_config_req
(
nfapi_pnf_p7_config_t
*
pnf_p7
,
nfapi_ul_config_request_t
*
req
)
int
pnf_phy_ul_config_req
(
nfapi_pnf_p7_config_t
*
pnf_p7
,
nfapi_ul_config_request_t
*
req
)
{
{
...
...
nfapi/nfapi_vnf.c
View file @
9d5d78f5
...
@@ -291,8 +291,8 @@ int vnf_unpack_vendor_extension_tlv(nfapi_tl_t* tl, uint8_t **ppReadPackedMessag
...
@@ -291,8 +291,8 @@ int vnf_unpack_vendor_extension_tlv(nfapi_tl_t* tl, uint8_t **ppReadPackedMessag
void
install_schedule_handlers
(
IF_Module_t
*
if_inst
);
void
install_schedule_handlers
(
IF_Module_t
*
if_inst
);
extern
int
single_thread_flag
;
extern
int
single_thread_flag
;
extern
void
init_eNB_afterRU
(
void
);
extern
void
init_eNB_afterRU
(
void
);
extern
void
add_subframe
(
int
*
frameP
,
in
t
*
subframeP
,
int
offset
);
extern
void
add_subframe
(
uint16_t
*
frameP
,
uint16_
t
*
subframeP
,
int
offset
);
extern
void
subtract_subframe
(
int
*
frameP
,
in
t
*
subframeP
,
int
offset
);
extern
void
subtract_subframe
(
uint16_t
*
frameP
,
uint16_
t
*
subframeP
,
int
offset
);
void
oai_create_enb
(
void
)
void
oai_create_enb
(
void
)
{
{
...
...
openair2/LAYER2/MAC/eNB_scheduler_RA.c
View file @
9d5d78f5
...
@@ -63,20 +63,20 @@
...
@@ -63,20 +63,20 @@
#include "T.h"
#include "T.h"
void
add_subframe
(
int
*
frameP
,
in
t
*
subframeP
,
int
offset
)
void
add_subframe
(
uint16_t
*
frameP
,
uint16_
t
*
subframeP
,
int
offset
)
{
{
*
frameP
=
*
frameP
+
((
*
subframeP
+
offset
)
/
10
);
*
frameP
=
*
frameP
+
((
*
subframeP
+
offset
)
/
10
);
*
subframeP
=
((
*
subframeP
+
offset
)
%
10
);
*
subframeP
=
((
*
subframeP
+
offset
)
%
10
);
}
}
uint16_t
sfnsf_add_subframe
(
int
frameP
,
in
t
subframeP
,
int
offset
)
uint16_t
sfnsf_add_subframe
(
uint16_t
frameP
,
uint16_
t
subframeP
,
int
offset
)
{
{
add_subframe
(
&
frameP
,
&
subframeP
,
offset
);
add_subframe
(
&
frameP
,
&
subframeP
,
offset
);
return
frameP
<<
4
|
subframeP
;
return
frameP
<<
4
|
subframeP
;
}
}
void
subtract_subframe
(
int
*
frameP
,
in
t
*
subframeP
,
int
offset
)
void
subtract_subframe
(
uint16_t
*
frameP
,
uint16_
t
*
subframeP
,
int
offset
)
{
{
if
(
*
subframeP
<
offset
)
if
(
*
subframeP
<
offset
)
{
{
...
@@ -85,7 +85,7 @@ void subtract_subframe(int *frameP, int *subframeP, int offset)
...
@@ -85,7 +85,7 @@ void subtract_subframe(int *frameP, int *subframeP, int offset)
*
subframeP
=
(
*
subframeP
+
10
-
offset
)
%
10
;
*
subframeP
=
(
*
subframeP
+
10
-
offset
)
%
10
;
}
}
uint16_t
sfnsf_subtrac
e_subframe
(
int
frameP
,
in
t
subframeP
,
int
offset
)
uint16_t
sfnsf_subtrac
t_subframe
(
uint16_t
frameP
,
uint16_
t
subframeP
,
int
offset
)
{
{
subtract_subframe
(
&
frameP
,
&
subframeP
,
offset
);
subtract_subframe
(
&
frameP
,
&
subframeP
,
offset
);
return
frameP
<<
4
|
subframeP
;
return
frameP
<<
4
|
subframeP
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment