Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
OpenXG UE
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
Michael Black
OpenXG UE
Commits
82beb54f
Commit
82beb54f
authored
Apr 29, 2019
by
frtabu
Browse files
Options
Browse Files
Download
Plain Diff
Rebase fixes
parents
278d3b36
c5cc3270
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
15 additions
and
7 deletions
+15
-7
openair2/ENB_APP/flexran_agent_common.c
openair2/ENB_APP/flexran_agent_common.c
+15
-7
No files found.
openair2/ENB_APP/flexran_agent_common.c
View file @
82beb54f
...
@@ -295,8 +295,10 @@ int flexran_agent_destroy_enb_config_reply(Protocol__FlexranMessage *msg) {
...
@@ -295,8 +295,10 @@ int flexran_agent_destroy_enb_config_reply(Protocol__FlexranMessage *msg) {
for
(
int
i
=
0
;
i
<
reply
->
n_cell_config
;
i
++
)
{
for
(
int
i
=
0
;
i
<
reply
->
n_cell_config
;
i
++
)
{
if
(
reply
->
cell_config
[
i
]
->
mbsfn_subframe_config_rfoffset
)
if
(
reply
->
cell_config
[
i
]
->
mbsfn_subframe_config_rfoffset
)
free
(
reply
->
cell_config
[
i
]
->
mbsfn_subframe_config_rfoffset
);
free
(
reply
->
cell_config
[
i
]
->
mbsfn_subframe_config_rfoffset
);
if
(
reply
->
cell_config
[
i
]
->
mbsfn_subframe_config_rfperiod
)
if
(
reply
->
cell_config
[
i
]
->
mbsfn_subframe_config_rfperiod
)
free
(
reply
->
cell_config
[
i
]
->
mbsfn_subframe_config_rfperiod
);
free
(
reply
->
cell_config
[
i
]
->
mbsfn_subframe_config_rfperiod
);
if
(
reply
->
cell_config
[
i
]
->
mbsfn_subframe_config_sfalloc
)
if
(
reply
->
cell_config
[
i
]
->
mbsfn_subframe_config_sfalloc
)
free
(
reply
->
cell_config
[
i
]
->
mbsfn_subframe_config_sfalloc
);
free
(
reply
->
cell_config
[
i
]
->
mbsfn_subframe_config_sfalloc
);
...
@@ -304,6 +306,7 @@ int flexran_agent_destroy_enb_config_reply(Protocol__FlexranMessage *msg) {
...
@@ -304,6 +306,7 @@ int flexran_agent_destroy_enb_config_reply(Protocol__FlexranMessage *msg) {
for
(
int
j
=
0
;
j
<
reply
->
cell_config
[
i
]
->
si_config
->
n_si_message
;
j
++
)
{
for
(
int
j
=
0
;
j
<
reply
->
cell_config
[
i
]
->
si_config
->
n_si_message
;
j
++
)
{
free
(
reply
->
cell_config
[
i
]
->
si_config
->
si_message
[
j
]);
free
(
reply
->
cell_config
[
i
]
->
si_config
->
si_message
[
j
]);
}
}
free
(
reply
->
cell_config
[
i
]
->
si_config
->
si_message
);
free
(
reply
->
cell_config
[
i
]
->
si_config
->
si_message
);
free
(
reply
->
cell_config
[
i
]
->
si_config
);
free
(
reply
->
cell_config
[
i
]
->
si_config
);
}
}
...
@@ -318,6 +321,7 @@ int flexran_agent_destroy_enb_config_reply(Protocol__FlexranMessage *msg) {
...
@@ -318,6 +321,7 @@ int flexran_agent_destroy_enb_config_reply(Protocol__FlexranMessage *msg) {
}
}
free
(
reply
->
cell_config
[
i
]
->
slice_config
->
dl
);
free
(
reply
->
cell_config
[
i
]
->
slice_config
->
dl
);
for
(
int
j
=
0
;
j
<
reply
->
cell_config
[
i
]
->
slice_config
->
n_ul
;
++
j
)
{
for
(
int
j
=
0
;
j
<
reply
->
cell_config
[
i
]
->
slice_config
->
n_ul
;
++
j
)
{
if
(
reply
->
cell_config
[
i
]
->
slice_config
->
ul
[
j
]
->
n_sorting
>
0
)
if
(
reply
->
cell_config
[
i
]
->
slice_config
->
ul
[
j
]
->
n_sorting
>
0
)
free
(
reply
->
cell_config
[
i
]
->
slice_config
->
ul
[
j
]
->
sorting
);
free
(
reply
->
cell_config
[
i
]
->
slice_config
->
ul
[
j
]
->
sorting
);
...
@@ -491,7 +495,6 @@ int flexran_agent_lc_config_reply(mid_t mod_id, const void *params, Protocol__Fl
...
@@ -491,7 +495,6 @@ int flexran_agent_lc_config_reply(mid_t mod_id, const void *params, Protocol__Fl
goto
error
;
goto
error
;
lc_config_reply_msg
->
header
=
header
;
lc_config_reply_msg
->
header
=
header
;
/* the lc_config_reply entirely depends on MAC except for the
/* the lc_config_reply entirely depends on MAC except for the
* mac_eNB_get_rrc_status() function (which in the current OAI implementation
* mac_eNB_get_rrc_status() function (which in the current OAI implementation
* is reachable if F1 is present). Therefore we check here wether MAC CM is
* is reachable if F1 is present). Therefore we check here wether MAC CM is
...
@@ -499,8 +502,8 @@ int flexran_agent_lc_config_reply(mid_t mod_id, const void *params, Protocol__Fl
...
@@ -499,8 +502,8 @@ int flexran_agent_lc_config_reply(mid_t mod_id, const void *params, Protocol__Fl
* not */
* not */
lc_config_reply_msg
->
n_lc_ue_config
=
lc_config_reply_msg
->
n_lc_ue_config
=
flexran_agent_get_mac_xface
(
mod_id
)
?
flexran_get_mac_num_ues
(
mod_id
)
:
0
;
flexran_agent_get_mac_xface
(
mod_id
)
?
flexran_get_mac_num_ues
(
mod_id
)
:
0
;
Protocol__FlexLcUeConfig
**
lc_ue_config
=
NULL
;
Protocol__FlexLcUeConfig
**
lc_ue_config
=
NULL
;
if
(
lc_config_reply_msg
->
n_lc_ue_config
>
0
)
{
if
(
lc_config_reply_msg
->
n_lc_ue_config
>
0
)
{
lc_ue_config
=
malloc
(
sizeof
(
Protocol__FlexLcUeConfig
*
)
*
lc_config_reply_msg
->
n_lc_ue_config
);
lc_ue_config
=
malloc
(
sizeof
(
Protocol__FlexLcUeConfig
*
)
*
lc_config_reply_msg
->
n_lc_ue_config
);
...
@@ -511,6 +514,7 @@ int flexran_agent_lc_config_reply(mid_t mod_id, const void *params, Protocol__Fl
...
@@ -511,6 +514,7 @@ int flexran_agent_lc_config_reply(mid_t mod_id, const void *params, Protocol__Fl
// Fill the config for each UE
// Fill the config for each UE
for
(
int
i
=
0
;
i
<
lc_config_reply_msg
->
n_lc_ue_config
;
i
++
)
{
for
(
int
i
=
0
;
i
<
lc_config_reply_msg
->
n_lc_ue_config
;
i
++
)
{
lc_ue_config
[
i
]
=
malloc
(
sizeof
(
Protocol__FlexLcUeConfig
));
lc_ue_config
[
i
]
=
malloc
(
sizeof
(
Protocol__FlexLcUeConfig
));
if
(
!
lc_ue_config
[
i
])
goto
error
;
if
(
!
lc_ue_config
[
i
])
goto
error
;
protocol__flex_lc_ue_config__init
(
lc_ue_config
[
i
]);
protocol__flex_lc_ue_config__init
(
lc_ue_config
[
i
]);
...
@@ -553,8 +557,7 @@ error:
...
@@ -553,8 +557,7 @@ error:
* ************************************
* ************************************
*/
*/
int
sort_ue_config
(
const
void
*
a
,
const
void
*
b
)
int
sort_ue_config
(
const
void
*
a
,
const
void
*
b
)
{
{
const
Protocol__FlexUeConfig
*
fa
=
a
;
const
Protocol__FlexUeConfig
*
fa
=
a
;
const
Protocol__FlexUeConfig
*
fb
=
b
;
const
Protocol__FlexUeConfig
*
fb
=
b
;
...
@@ -562,6 +565,7 @@ int sort_ue_config(const void *a, const void *b)
...
@@ -562,6 +565,7 @@ int sort_ue_config(const void *a, const void *b)
return
-
1
;
return
-
1
;
else
if
(
fa
->
rnti
<
fb
->
rnti
)
else
if
(
fa
->
rnti
<
fb
->
rnti
)
return
1
;
return
1
;
return
0
;
return
0
;
}
}
...
@@ -583,8 +587,8 @@ int flexran_agent_ue_config_reply(mid_t mod_id, const void *params, Protocol__Fl
...
@@ -583,8 +587,8 @@ int flexran_agent_ue_config_reply(mid_t mod_id, const void *params, Protocol__Fl
goto
error
;
goto
error
;
ue_config_reply_msg
->
header
=
header
;
ue_config_reply_msg
->
header
=
header
;
ue_config_reply_msg
->
n_ue_config
=
0
;
ue_config_reply_msg
->
n_ue_config
=
0
;
if
(
flexran_agent_get_rrc_xface
(
mod_id
))
if
(
flexran_agent_get_rrc_xface
(
mod_id
))
ue_config_reply_msg
->
n_ue_config
=
flexran_get_rrc_num_ues
(
mod_id
);
ue_config_reply_msg
->
n_ue_config
=
flexran_get_rrc_num_ues
(
mod_id
);
else
if
(
flexran_agent_get_mac_xface
(
mod_id
))
else
if
(
flexran_agent_get_mac_xface
(
mod_id
))
...
@@ -607,8 +611,10 @@ int flexran_agent_ue_config_reply(mid_t mod_id, const void *params, Protocol__Fl
...
@@ -607,8 +611,10 @@ int flexran_agent_ue_config_reply(mid_t mod_id, const void *params, Protocol__Fl
if
(
ue_config
==
NULL
)
{
if
(
ue_config
==
NULL
)
{
goto
error
;
goto
error
;
}
}
rnti_t
rntis
[
ue_config_reply_msg
->
n_ue_config
];
rnti_t
rntis
[
ue_config_reply_msg
->
n_ue_config
];
flexran_get_rrc_rnti_list
(
mod_id
,
rntis
,
ue_config_reply_msg
->
n_ue_config
);
flexran_get_rrc_rnti_list
(
mod_id
,
rntis
,
ue_config_reply_msg
->
n_ue_config
);
for
(
int
i
=
0
;
i
<
ue_config_reply_msg
->
n_ue_config
;
i
++
)
{
for
(
int
i
=
0
;
i
<
ue_config_reply_msg
->
n_ue_config
;
i
++
)
{
const
rnti_t
rnti
=
rntis
[
i
];
const
rnti_t
rnti
=
rntis
[
i
];
ue_config
[
i
]
=
malloc
(
sizeof
(
Protocol__FlexUeConfig
));
ue_config
[
i
]
=
malloc
(
sizeof
(
Protocol__FlexUeConfig
));
...
@@ -616,11 +622,13 @@ int flexran_agent_ue_config_reply(mid_t mod_id, const void *params, Protocol__Fl
...
@@ -616,11 +622,13 @@ int flexran_agent_ue_config_reply(mid_t mod_id, const void *params, Protocol__Fl
if
(
flexran_agent_get_rrc_xface
(
mod_id
))
if
(
flexran_agent_get_rrc_xface
(
mod_id
))
flexran_agent_fill_rrc_ue_config
(
mod_id
,
rnti
,
ue_config
[
i
]);
flexran_agent_fill_rrc_ue_config
(
mod_id
,
rnti
,
ue_config
[
i
]);
if
(
flexran_agent_get_mac_xface
(
mod_id
))
{
if
(
flexran_agent_get_mac_xface
(
mod_id
))
{
const
int
UE_id
=
flexran_get_mac_ue_id_rnti
(
mod_id
,
rnti
);
const
int
UE_id
=
flexran_get_mac_ue_id_rnti
(
mod_id
,
rnti
);
flexran_agent_fill_mac_ue_config
(
mod_id
,
UE_id
,
ue_config
[
i
]);
flexran_agent_fill_mac_ue_config
(
mod_id
,
UE_id
,
ue_config
[
i
]);
}
}
}
}
ue_config_reply_msg
->
ue_config
=
ue_config
;
ue_config_reply_msg
->
ue_config
=
ue_config
;
}
}
...
...
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