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
canghaiwuhen
OpenXG-RAN
Commits
12ac8b18
Commit
12ac8b18
authored
Feb 12, 2018
by
Robert Schmidt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
prevent warnings: init Protocol__FlexHeader to NULL
parent
c33e184d
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
16 additions
and
16 deletions
+16
-16
openair2/ENB_APP/CONTROL_MODULES/MAC/flexran_agent_mac.c
openair2/ENB_APP/CONTROL_MODULES/MAC/flexran_agent_mac.c
+4
-4
openair2/ENB_APP/CONTROL_MODULES/MAC/flexran_agent_mac_internal.c
.../ENB_APP/CONTROL_MODULES/MAC/flexran_agent_mac_internal.c
+1
-1
openair2/ENB_APP/CONTROL_MODULES/RRC/flexran_agent_rrc.c
openair2/ENB_APP/CONTROL_MODULES/RRC/flexran_agent_rrc.c
+2
-2
openair2/ENB_APP/flexran_agent_common.c
openair2/ENB_APP/flexran_agent_common.c
+7
-7
openair2/ENB_APP/flexran_agent_handler.c
openair2/ENB_APP/flexran_agent_handler.c
+2
-2
No files found.
openair2/ENB_APP/CONTROL_MODULES/MAC/flexran_agent_mac.c
View file @
12ac8b18
...
@@ -670,7 +670,7 @@ int flexran_agent_mac_destroy_stats_reply(Protocol__FlexranMessage *msg) {
...
@@ -670,7 +670,7 @@ int flexran_agent_mac_destroy_stats_reply(Protocol__FlexranMessage *msg) {
}
}
int
flexran_agent_mac_sr_info
(
mid_t
mod_id
,
const
void
*
params
,
Protocol__FlexranMessage
**
msg
)
{
int
flexran_agent_mac_sr_info
(
mid_t
mod_id
,
const
void
*
params
,
Protocol__FlexranMessage
**
msg
)
{
Protocol__FlexHeader
*
header
;
Protocol__FlexHeader
*
header
=
NULL
;
int
i
;
int
i
;
const
int
xid
=
*
((
int
*
)
params
);
const
int
xid
=
*
((
int
*
)
params
);
...
@@ -738,7 +738,7 @@ int flexran_agent_mac_destroy_sr_info(Protocol__FlexranMessage *msg) {
...
@@ -738,7 +738,7 @@ int flexran_agent_mac_destroy_sr_info(Protocol__FlexranMessage *msg) {
}
}
int
flexran_agent_mac_sf_trigger
(
mid_t
mod_id
,
const
void
*
params
,
Protocol__FlexranMessage
**
msg
)
{
int
flexran_agent_mac_sf_trigger
(
mid_t
mod_id
,
const
void
*
params
,
Protocol__FlexranMessage
**
msg
)
{
Protocol__FlexHeader
*
header
;
Protocol__FlexHeader
*
header
=
NULL
;
int
i
,
j
,
UE_id
;
int
i
,
j
,
UE_id
;
int
available_harq
[
NUMBER_OF_UE_MAX
];
int
available_harq
[
NUMBER_OF_UE_MAX
];
...
@@ -954,7 +954,7 @@ int flexran_agent_mac_destroy_sf_trigger(Protocol__FlexranMessage *msg) {
...
@@ -954,7 +954,7 @@ int flexran_agent_mac_destroy_sf_trigger(Protocol__FlexranMessage *msg) {
int
flexran_agent_mac_create_empty_dl_config
(
mid_t
mod_id
,
Protocol__FlexranMessage
**
msg
)
{
int
flexran_agent_mac_create_empty_dl_config
(
mid_t
mod_id
,
Protocol__FlexranMessage
**
msg
)
{
int
xid
=
0
;
int
xid
=
0
;
Protocol__FlexHeader
*
header
;
Protocol__FlexHeader
*
header
=
NULL
;
if
(
flexran_create_header
(
xid
,
PROTOCOL__FLEX_TYPE__FLPT_DL_MAC_CONFIG
,
&
header
)
!=
0
)
if
(
flexran_create_header
(
xid
,
PROTOCOL__FLEX_TYPE__FLPT_DL_MAC_CONFIG
,
&
header
)
!=
0
)
goto
error
;
goto
error
;
...
@@ -1049,7 +1049,7 @@ int flexran_agent_mac_destroy_dl_config(Protocol__FlexranMessage *msg) {
...
@@ -1049,7 +1049,7 @@ int flexran_agent_mac_destroy_dl_config(Protocol__FlexranMessage *msg) {
int
flexran_agent_mac_create_empty_ul_config
(
mid_t
mod_id
,
Protocol__FlexranMessage
**
msg
)
{
int
flexran_agent_mac_create_empty_ul_config
(
mid_t
mod_id
,
Protocol__FlexranMessage
**
msg
)
{
int
xid
=
0
;
int
xid
=
0
;
Protocol__FlexHeader
*
header
;
Protocol__FlexHeader
*
header
=
NULL
;
if
(
flexran_create_header
(
xid
,
PROTOCOL__FLEX_TYPE__FLPT_UL_MAC_CONFIG
,
&
header
)
!=
0
)
if
(
flexran_create_header
(
xid
,
PROTOCOL__FLEX_TYPE__FLPT_UL_MAC_CONFIG
,
&
header
)
!=
0
)
goto
error
;
goto
error
;
...
...
openair2/ENB_APP/CONTROL_MODULES/MAC/flexran_agent_mac_internal.c
View file @
12ac8b18
...
@@ -101,7 +101,7 @@ Protocol__FlexranMessage * flexran_agent_generate_diff_mac_stats_report(Protocol
...
@@ -101,7 +101,7 @@ Protocol__FlexranMessage * flexran_agent_generate_diff_mac_stats_report(Protocol
if
(
n_cell_report
>
0
||
n_ue_report
>
0
)
{
if
(
n_cell_report
>
0
||
n_ue_report
>
0
)
{
/*Create header*/
/*Create header*/
int
xid
=
old_report
->
header
->
xid
;
int
xid
=
old_report
->
header
->
xid
;
Protocol__FlexHeader
*
header
;
Protocol__FlexHeader
*
header
=
NULL
;
if
(
flexran_create_header
(
xid
,
PROTOCOL__FLEX_TYPE__FLPT_STATS_REPLY
,
&
header
)
!=
0
)
{
if
(
flexran_create_header
(
xid
,
PROTOCOL__FLEX_TYPE__FLPT_STATS_REPLY
,
&
header
)
!=
0
)
{
goto
error
;
goto
error
;
}
}
...
...
openair2/ENB_APP/CONTROL_MODULES/RRC/flexran_agent_rrc.c
View file @
12ac8b18
...
@@ -45,8 +45,8 @@ AGENT_RRC_xface *agent_rrc_xface[NUM_MAX_ENB];
...
@@ -45,8 +45,8 @@ AGENT_RRC_xface *agent_rrc_xface[NUM_MAX_ENB];
void
flexran_agent_ue_state_change
(
mid_t
mod_id
,
uint32_t
rnti
,
uint8_t
state_change
)
{
void
flexran_agent_ue_state_change
(
mid_t
mod_id
,
uint32_t
rnti
,
uint8_t
state_change
)
{
int
size
;
int
size
;
Protocol__FlexranMessage
*
msg
;
Protocol__FlexranMessage
*
msg
=
NULL
;
Protocol__FlexHeader
*
header
;
Protocol__FlexHeader
*
header
=
NULL
;
void
*
data
;
void
*
data
;
int
priority
=
0
;
int
priority
=
0
;
err_code_t
err_code
;
err_code_t
err_code
;
...
...
openair2/ENB_APP/flexran_agent_common.c
View file @
12ac8b18
...
@@ -106,7 +106,7 @@ int flexran_create_header(xid_t xid, Protocol__FlexType type, Protocol__FlexHea
...
@@ -106,7 +106,7 @@ int flexran_create_header(xid_t xid, Protocol__FlexType type, Protocol__FlexHea
int
flexran_agent_hello
(
mid_t
mod_id
,
const
void
*
params
,
Protocol__FlexranMessage
**
msg
)
{
int
flexran_agent_hello
(
mid_t
mod_id
,
const
void
*
params
,
Protocol__FlexranMessage
**
msg
)
{
Protocol__FlexHeader
*
header
;
Protocol__FlexHeader
*
header
=
NULL
;
/*TODO: Need to set random xid or xid from received hello message*/
/*TODO: Need to set random xid or xid from received hello message*/
xid_t
xid
=
1
;
xid_t
xid
=
1
;
...
@@ -161,7 +161,7 @@ int flexran_agent_destroy_hello(Protocol__FlexranMessage *msg) {
...
@@ -161,7 +161,7 @@ int flexran_agent_destroy_hello(Protocol__FlexranMessage *msg) {
int
flexran_agent_echo_request
(
mid_t
mod_id
,
const
void
*
params
,
Protocol__FlexranMessage
**
msg
)
{
int
flexran_agent_echo_request
(
mid_t
mod_id
,
const
void
*
params
,
Protocol__FlexranMessage
**
msg
)
{
Protocol__FlexHeader
*
header
;
Protocol__FlexHeader
*
header
=
NULL
;
/*TODO: Need to set a random xid*/
/*TODO: Need to set a random xid*/
xid_t
xid
=
1
;
xid_t
xid
=
1
;
...
@@ -216,6 +216,7 @@ int flexran_agent_destroy_echo_request(Protocol__FlexranMessage *msg) {
...
@@ -216,6 +216,7 @@ int flexran_agent_destroy_echo_request(Protocol__FlexranMessage *msg) {
int
flexran_agent_echo_reply
(
mid_t
mod_id
,
const
void
*
params
,
Protocol__FlexranMessage
**
msg
)
{
int
flexran_agent_echo_reply
(
mid_t
mod_id
,
const
void
*
params
,
Protocol__FlexranMessage
**
msg
)
{
xid_t
xid
;
xid_t
xid
;
Protocol__FlexHeader
*
header
=
NULL
;
Protocol__FlexranMessage
*
input
=
(
Protocol__FlexranMessage
*
)
params
;
Protocol__FlexranMessage
*
input
=
(
Protocol__FlexranMessage
*
)
params
;
Protocol__FlexEchoRequest
*
echo_req
=
input
->
echo_request_msg
;
Protocol__FlexEchoRequest
*
echo_req
=
input
->
echo_request_msg
;
xid
=
(
echo_req
->
header
)
->
xid
;
xid
=
(
echo_req
->
header
)
->
xid
;
...
@@ -226,7 +227,6 @@ int flexran_agent_echo_reply(mid_t mod_id, const void *params, Protocol__Flexran
...
@@ -226,7 +227,6 @@ int flexran_agent_echo_reply(mid_t mod_id, const void *params, Protocol__Flexran
goto
error
;
goto
error
;
protocol__flex_echo_reply__init
(
echo_reply_msg
);
protocol__flex_echo_reply__init
(
echo_reply_msg
);
Protocol__FlexHeader
*
header
;
if
(
flexran_create_header
(
xid
,
PROTOCOL__FLEX_TYPE__FLPT_ECHO_REPLY
,
&
header
)
!=
0
)
if
(
flexran_create_header
(
xid
,
PROTOCOL__FLEX_TYPE__FLPT_ECHO_REPLY
,
&
header
)
!=
0
)
goto
error
;
goto
error
;
...
@@ -429,6 +429,7 @@ int flexran_agent_destroy_agent_reconfiguration(Protocol__FlexranMessage *msg) {
...
@@ -429,6 +429,7 @@ int flexran_agent_destroy_agent_reconfiguration(Protocol__FlexranMessage *msg) {
int
flexran_agent_lc_config_reply
(
mid_t
mod_id
,
const
void
*
params
,
Protocol__FlexranMessage
**
msg
)
{
int
flexran_agent_lc_config_reply
(
mid_t
mod_id
,
const
void
*
params
,
Protocol__FlexranMessage
**
msg
)
{
xid_t
xid
;
xid_t
xid
;
Protocol__FlexHeader
*
header
=
NULL
;
Protocol__FlexranMessage
*
input
=
(
Protocol__FlexranMessage
*
)
params
;
Protocol__FlexranMessage
*
input
=
(
Protocol__FlexranMessage
*
)
params
;
Protocol__FlexLcConfigRequest
*
lc_config_request_msg
=
input
->
lc_config_request_msg
;
Protocol__FlexLcConfigRequest
*
lc_config_request_msg
=
input
->
lc_config_request_msg
;
xid
=
(
lc_config_request_msg
->
header
)
->
xid
;
xid
=
(
lc_config_request_msg
->
header
)
->
xid
;
...
@@ -441,7 +442,6 @@ int flexran_agent_lc_config_reply(mid_t mod_id, const void *params, Protocol__Fl
...
@@ -441,7 +442,6 @@ int flexran_agent_lc_config_reply(mid_t mod_id, const void *params, Protocol__Fl
goto
error
;
goto
error
;
protocol__flex_lc_config_reply__init
(
lc_config_reply_msg
);
protocol__flex_lc_config_reply__init
(
lc_config_reply_msg
);
Protocol__FlexHeader
*
header
;
if
(
flexran_create_header
(
xid
,
PROTOCOL__FLEX_TYPE__FLPT_GET_LC_CONFIG_REPLY
,
&
header
)
!=
0
)
if
(
flexran_create_header
(
xid
,
PROTOCOL__FLEX_TYPE__FLPT_GET_LC_CONFIG_REPLY
,
&
header
)
!=
0
)
goto
error
;
goto
error
;
...
@@ -557,6 +557,7 @@ int flexran_agent_lc_config_reply(mid_t mod_id, const void *params, Protocol__Fl
...
@@ -557,6 +557,7 @@ int flexran_agent_lc_config_reply(mid_t mod_id, const void *params, Protocol__Fl
int
flexran_agent_ue_config_reply
(
mid_t
mod_id
,
const
void
*
params
,
Protocol__FlexranMessage
**
msg
)
{
int
flexran_agent_ue_config_reply
(
mid_t
mod_id
,
const
void
*
params
,
Protocol__FlexranMessage
**
msg
)
{
xid_t
xid
;
xid_t
xid
;
Protocol__FlexHeader
*
header
=
NULL
;
Protocol__FlexranMessage
*
input
=
(
Protocol__FlexranMessage
*
)
params
;
Protocol__FlexranMessage
*
input
=
(
Protocol__FlexranMessage
*
)
params
;
Protocol__FlexUeConfigRequest
*
ue_config_request_msg
=
input
->
ue_config_request_msg
;
Protocol__FlexUeConfigRequest
*
ue_config_request_msg
=
input
->
ue_config_request_msg
;
xid
=
(
ue_config_request_msg
->
header
)
->
xid
;
xid
=
(
ue_config_request_msg
->
header
)
->
xid
;
...
@@ -569,7 +570,6 @@ int flexran_agent_ue_config_reply(mid_t mod_id, const void *params, Protocol__Fl
...
@@ -569,7 +570,6 @@ int flexran_agent_ue_config_reply(mid_t mod_id, const void *params, Protocol__Fl
goto
error
;
goto
error
;
protocol__flex_ue_config_reply__init
(
ue_config_reply_msg
);
protocol__flex_ue_config_reply__init
(
ue_config_reply_msg
);
Protocol__FlexHeader
*
header
;
if
(
flexran_create_header
(
xid
,
PROTOCOL__FLEX_TYPE__FLPT_GET_UE_CONFIG_REPLY
,
&
header
)
!=
0
)
if
(
flexran_create_header
(
xid
,
PROTOCOL__FLEX_TYPE__FLPT_GET_UE_CONFIG_REPLY
,
&
header
)
!=
0
)
goto
error
;
goto
error
;
...
@@ -762,7 +762,7 @@ int flexran_agent_ue_config_reply(mid_t mod_id, const void *params, Protocol__Fl
...
@@ -762,7 +762,7 @@ int flexran_agent_ue_config_reply(mid_t mod_id, const void *params, Protocol__Fl
int
flexran_agent_enb_config_request
(
mid_t
mod_id
,
const
void
*
params
,
Protocol__FlexranMessage
**
msg
)
{
int
flexran_agent_enb_config_request
(
mid_t
mod_id
,
const
void
*
params
,
Protocol__FlexranMessage
**
msg
)
{
Protocol__FlexHeader
*
header
;
Protocol__FlexHeader
*
header
=
NULL
;
xid_t
xid
=
1
;
xid_t
xid
=
1
;
Protocol__FlexEnbConfigRequest
*
enb_config_request_msg
;
Protocol__FlexEnbConfigRequest
*
enb_config_request_msg
;
...
@@ -801,6 +801,7 @@ int flexran_agent_enb_config_request(mid_t mod_id, const void* params, Protocol_
...
@@ -801,6 +801,7 @@ int flexran_agent_enb_config_request(mid_t mod_id, const void* params, Protocol_
int
flexran_agent_enb_config_reply
(
mid_t
mod_id
,
const
void
*
params
,
Protocol__FlexranMessage
**
msg
)
{
int
flexran_agent_enb_config_reply
(
mid_t
mod_id
,
const
void
*
params
,
Protocol__FlexranMessage
**
msg
)
{
xid_t
xid
;
xid_t
xid
;
Protocol__FlexHeader
*
header
=
NULL
;
Protocol__FlexranMessage
*
input
=
(
Protocol__FlexranMessage
*
)
params
;
Protocol__FlexranMessage
*
input
=
(
Protocol__FlexranMessage
*
)
params
;
Protocol__FlexEnbConfigRequest
*
enb_config_req_msg
=
input
->
enb_config_request_msg
;
Protocol__FlexEnbConfigRequest
*
enb_config_req_msg
=
input
->
enb_config_request_msg
;
xid
=
(
enb_config_req_msg
->
header
)
->
xid
;
xid
=
(
enb_config_req_msg
->
header
)
->
xid
;
...
@@ -814,7 +815,6 @@ int flexran_agent_enb_config_reply(mid_t mod_id, const void *params, Protocol__F
...
@@ -814,7 +815,6 @@ int flexran_agent_enb_config_reply(mid_t mod_id, const void *params, Protocol__F
goto
error
;
goto
error
;
protocol__flex_enb_config_reply__init
(
enb_config_reply_msg
);
protocol__flex_enb_config_reply__init
(
enb_config_reply_msg
);
Protocol__FlexHeader
*
header
;
if
(
flexran_create_header
(
xid
,
PROTOCOL__FLEX_TYPE__FLPT_GET_ENB_CONFIG_REPLY
,
&
header
)
!=
0
)
if
(
flexran_create_header
(
xid
,
PROTOCOL__FLEX_TYPE__FLPT_GET_ENB_CONFIG_REPLY
,
&
header
)
!=
0
)
goto
error
;
goto
error
;
...
...
openair2/ENB_APP/flexran_agent_handler.c
View file @
12ac8b18
...
@@ -393,7 +393,7 @@ int flexran_agent_handle_stats(mid_t mod_id, const void *params, Protocol__Flexr
...
@@ -393,7 +393,7 @@ int flexran_agent_handle_stats(mid_t mod_id, const void *params, Protocol__Flexr
int
flexran_agent_stats_reply
(
mid_t
enb_id
,
xid_t
xid
,
const
report_config_t
*
report_config
,
Protocol__FlexranMessage
**
msg
){
int
flexran_agent_stats_reply
(
mid_t
enb_id
,
xid_t
xid
,
const
report_config_t
*
report_config
,
Protocol__FlexranMessage
**
msg
){
Protocol__FlexHeader
*
header
;
Protocol__FlexHeader
*
header
=
NULL
;
err_code_t
err_code
;
err_code_t
err_code
;
int
i
;
int
i
;
...
@@ -514,7 +514,7 @@ int flexran_agent_stats_request(mid_t mod_id,
...
@@ -514,7 +514,7 @@ int flexran_agent_stats_request(mid_t mod_id,
xid_t
xid
,
xid_t
xid
,
const
stats_request_config_t
*
report_config
,
const
stats_request_config_t
*
report_config
,
Protocol__FlexranMessage
**
msg
)
{
Protocol__FlexranMessage
**
msg
)
{
Protocol__FlexHeader
*
header
;
Protocol__FlexHeader
*
header
=
NULL
;
int
i
;
int
i
;
Protocol__FlexStatsRequest
*
stats_request_msg
;
Protocol__FlexStatsRequest
*
stats_request_msg
;
...
...
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