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
zzha zzha
OpenXG-RAN
Commits
5f4432a3
Commit
5f4432a3
authored
Jul 03, 2018
by
Robert Schmidt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Read configuration parameter `Broadcast PLMN index` for MME
parent
77b9ad2b
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
27 additions
and
0 deletions
+27
-0
openair2/ENB_APP/enb_config.c
openair2/ENB_APP/enb_config.c
+24
-0
openair2/ENB_APP/enb_paramdef.h
openair2/ENB_APP/enb_paramdef.h
+3
-0
No files found.
openair2/ENB_APP/enb_config.c
View file @
5f4432a3
...
...
@@ -2349,6 +2349,30 @@ int RCconfig_S1(MessageDef *msg_p, uint32_t i) {
S1AP_REGISTER_ENB_REQ
(
msg_p
).
mme_ip_address
[
l
].
ipv4
=
1
;
S1AP_REGISTER_ENB_REQ
(
msg_p
).
mme_ip_address
[
l
].
ipv6
=
1
;
}
if
(
S1ParamList
.
paramarray
[
l
][
ENB_MME_BROADCAST_PLMN_INDEX
].
iptr
)
S1AP_REGISTER_ENB_REQ
(
msg_p
).
broadcast_plmn_num
[
l
]
=
S1ParamList
.
paramarray
[
l
][
ENB_MME_BROADCAST_PLMN_INDEX
].
numelt
;
else
S1AP_REGISTER_ENB_REQ
(
msg_p
).
broadcast_plmn_num
[
l
]
=
0
;
AssertFatal
(
S1AP_REGISTER_ENB_REQ
(
msg_p
).
broadcast_plmn_num
[
l
]
<=
S1AP_REGISTER_ENB_REQ
(
msg_p
).
num_plmn
,
"List of broadcast PLMN to be sent to MME can not be longer than actual "
"PLMN list (max %d, but is %d)
\n
"
,
S1AP_REGISTER_ENB_REQ
(
msg_p
).
num_plmn
,
S1AP_REGISTER_ENB_REQ
(
msg_p
).
broadcast_plmn_num
[
l
]);
for
(
int
el
=
0
;
el
<
S1AP_REGISTER_ENB_REQ
(
msg_p
).
broadcast_plmn_num
[
l
];
++
el
)
{
/* UINTARRAY gets mapped to int, see config_libconfig.c:223 */
S1AP_REGISTER_ENB_REQ
(
msg_p
).
broadcast_plmn_index
[
l
][
el
]
=
S1ParamList
.
paramarray
[
l
][
ENB_MME_BROADCAST_PLMN_INDEX
].
iptr
[
el
];
AssertFatal
(
S1AP_REGISTER_ENB_REQ
(
msg_p
).
broadcast_plmn_index
[
l
][
el
]
>=
0
&&
S1AP_REGISTER_ENB_REQ
(
msg_p
).
broadcast_plmn_index
[
l
][
el
]
<
S1AP_REGISTER_ENB_REQ
(
msg_p
).
num_plmn
,
"index for MME's MCC/MNC (%d) is an invalid index for the registered PLMN IDs (%d)
\n
"
,
S1AP_REGISTER_ENB_REQ
(
msg_p
).
broadcast_plmn_index
[
l
][
el
],
S1AP_REGISTER_ENB_REQ
(
msg_p
).
num_plmn
);
}
/* if no broadcasst_plmn array is defined, fill default values */
if
(
S1AP_REGISTER_ENB_REQ
(
msg_p
).
broadcast_plmn_num
[
l
]
==
0
)
{
S1AP_REGISTER_ENB_REQ
(
msg_p
).
broadcast_plmn_num
[
l
]
=
S1AP_REGISTER_ENB_REQ
(
msg_p
).
num_plmn
;
for
(
int
el
=
0
;
el
<
S1AP_REGISTER_ENB_REQ
(
msg_p
).
num_plmn
;
++
el
)
S1AP_REGISTER_ENB_REQ
(
msg_p
).
broadcast_plmn_index
[
l
][
el
]
=
el
;
}
}
...
...
openair2/ENB_APP/enb_paramdef.h
View file @
5f4432a3
...
...
@@ -728,6 +728,7 @@ typedef enum {
#define ENB_CONFIG_STRING_MME_IPV6_ADDRESS "ipv6"
#define ENB_CONFIG_STRING_MME_IP_ADDRESS_ACTIVE "active"
#define ENB_CONFIG_STRING_MME_IP_ADDRESS_PREFERENCE "preference"
#define ENB_CONFIG_STRING_MME_BROADCAST_PLMN_INDEX "broadcast_plmn_index"
/*-------------------------------------------------------------------------------------------------------------------------------------*/
...
...
@@ -739,12 +740,14 @@ typedef enum {
{ENB_CONFIG_STRING_MME_IPV6_ADDRESS, NULL, 0, uptr:NULL, defstrval:NULL, TYPE_STRING, 0}, \
{ENB_CONFIG_STRING_MME_IP_ADDRESS_ACTIVE, NULL, 0, uptr:NULL, defstrval:NULL, TYPE_STRING, 0}, \
{ENB_CONFIG_STRING_MME_IP_ADDRESS_PREFERENCE, NULL, 0, uptr:NULL, defstrval:NULL, TYPE_STRING, 0}, \
{ENB_CONFIG_STRING_MME_BROADCAST_PLMN_INDEX, NULL, 0, uptr:NULL, defintarrayval:NULL,TYPE_UINTARRAY, 6} \
}
#define ENB_MME_IPV4_ADDRESS_IDX 0
#define ENB_MME_IPV6_ADDRESS_IDX 1
#define ENB_MME_IP_ADDRESS_ACTIVE_IDX 2
#define ENB_MME_IP_ADDRESS_PREFERENCE_IDX 3
#define ENB_MME_BROADCAST_PLMN_INDEX 4
/*---------------------------------------------------------------------------------------------------------------------------------------*/
/* X2 configuration parameters section name */
...
...
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