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
89f71326
Commit
89f71326
authored
Nov 09, 2020
by
Frédéric Leroy
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(config): set S1AP_PORT_NUMBER as default value for mme port
parent
78fa6df3
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
7 deletions
+3
-7
openair2/ENB_APP/enb_config.c
openair2/ENB_APP/enb_config.c
+1
-6
openair2/ENB_APP/enb_paramdef.h
openair2/ENB_APP/enb_paramdef.h
+2
-1
No files found.
openair2/ENB_APP/enb_config.c
View file @
89f71326
...
@@ -57,7 +57,6 @@
...
@@ -57,7 +57,6 @@
#include "enb_paramdef.h"
#include "enb_paramdef.h"
#include "proto_agent.h"
#include "proto_agent.h"
#include "executables/thread-common.h"
#include "executables/thread-common.h"
#include "s1ap_eNB_default_values.h"
extern
uint32_t
to_earfcn_DL
(
int
eutra_bandP
,
uint32_t
dl_CarrierFreq
,
uint32_t
bw
);
extern
uint32_t
to_earfcn_DL
(
int
eutra_bandP
,
uint32_t
dl_CarrierFreq
,
uint32_t
bw
);
extern
uint32_t
to_earfcn_UL
(
int
eutra_bandP
,
uint32_t
ul_CarrierFreq
,
uint32_t
bw
);
extern
uint32_t
to_earfcn_UL
(
int
eutra_bandP
,
uint32_t
ul_CarrierFreq
,
uint32_t
bw
);
...
@@ -2513,11 +2512,7 @@ int RCconfig_S1(
...
@@ -2513,11 +2512,7 @@ int RCconfig_S1(
}
}
/* set S1-mme port (sctp) */
/* set S1-mme port (sctp) */
if
(
S1ParamList
.
paramarray
[
l
][
ENB_MME_PORT_IDX
].
u16ptr
)
{
S1AP_REGISTER_ENB_REQ
(
msg_p
).
mme_port
[
l
]
=
*
S1ParamList
.
paramarray
[
l
][
ENB_MME_PORT_IDX
].
u16ptr
;
S1AP_REGISTER_ENB_REQ
(
msg_p
).
mme_port
[
l
]
=
*
S1ParamList
.
paramarray
[
l
][
ENB_MME_PORT_IDX
].
u16ptr
;
}
else
{
S1AP_REGISTER_ENB_REQ
(
msg_p
).
mme_port
[
l
]
=
S1AP_PORT_NUMBER
;
}
AssertFatal
(
S1AP_REGISTER_ENB_REQ
(
msg_p
).
broadcast_plmn_num
[
l
]
<=
S1AP_REGISTER_ENB_REQ
(
msg_p
).
num_plmn
,
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 "
"List of broadcast PLMN to be sent to MME can not be longer than actual "
...
...
openair2/ENB_APP/enb_paramdef.h
View file @
89f71326
...
@@ -34,6 +34,7 @@
...
@@ -34,6 +34,7 @@
#define ENB_PARAMDEF_H_
#define ENB_PARAMDEF_H_
#include "common/config/config_paramdesc.h"
#include "common/config/config_paramdesc.h"
#include "RRC_paramsvalues.h"
#include "RRC_paramsvalues.h"
#include "s1ap_eNB_default_values.h"
#define ENB_CONFIG_STRING_CC_NODE_FUNCTION "node_function"
#define ENB_CONFIG_STRING_CC_NODE_FUNCTION "node_function"
#define ENB_CONFIG_STRING_CC_NODE_TIMING "node_timing"
#define ENB_CONFIG_STRING_CC_NODE_TIMING "node_timing"
...
@@ -923,7 +924,7 @@ typedef struct srb1_params_s {
...
@@ -923,7 +924,7 @@ typedef struct srb1_params_s {
{ENB_CONFIG_STRING_MME_IP_ADDRESS_ACTIVE, 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_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}, \
{ENB_CONFIG_STRING_MME_BROADCAST_PLMN_INDEX, NULL, 0, uptr:NULL, defintarrayval:NULL, TYPE_UINTARRAY, 6}, \
{ENB_CONFIG_STRING_MME_PORT, NULL, 0, u16ptr:NULL, defuintval:
0, TYPE_UINT16,
0}, \
{ENB_CONFIG_STRING_MME_PORT, NULL, 0, u16ptr:NULL, defuintval:
S1AP_PORT_NUMBER, TYPE_UINT16,
0}, \
}
}
...
...
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