Skip to content

GitLab

Commit d46dd64f authored by Cedric Roux's avatar Cedric Roux
Browse files

bugfix: fix mme address initialization 

this and some cleanup, duplicate defs in .h file
parent f2e20c80
Hide whitespace changes
Inline Side-by-side
openair2/ENB_APP/enb_config.c
View file @ d46dd64f
...@@ -2539,7 +2539,7 @@ int RCconfig_S1(MessageDef *msg_p, uint32_t i) { ...@@ -2539,7 +2539,7 @@ int RCconfig_S1(MessageDef *msg_p, uint32_t i) {
config_get( NETParams,sizeof(NETParams)/sizeof(paramdef_t),aprefix); config_get( NETParams,sizeof(NETParams)/sizeof(paramdef_t),aprefix);
// S1AP_REGISTER_ENB_REQ (msg_p).enb_interface_name_for_S1U = strdup(enb_interface_name_for_S1U); // S1AP_REGISTER_ENB_REQ (msg_p).enb_interface_name_for_S1U = strdup(enb_interface_name_for_S1U);
cidr = *(NETParams[ENB_INTERFACE_NAME_FOR_S1U_IDX].strptr); cidr = *(NETParams[ENB_IPV4_ADDRESS_FOR_S1_MME_IDX].strptr);
address = strtok(cidr, "/"); address = strtok(cidr, "/");
S1AP_REGISTER_ENB_REQ (msg_p).enb_ip_address.ipv6 = 0; S1AP_REGISTER_ENB_REQ (msg_p).enb_ip_address.ipv6 = 0;
......
openair2/ENB_APP/enb_paramdef.h
View file @ d46dd64f
...@@ -573,11 +573,6 @@ static int DEFENBS[] = {0}; ...@@ -573,11 +573,6 @@ static int DEFENBS[] = {0};
{ENB_CONFIG_STRING_ENB_IPV4_ADDR_FOR_S1U, NULL, 0, strptr:NULL, defstrval:NULL, TYPE_STRING, 0}, \ {ENB_CONFIG_STRING_ENB_IPV4_ADDR_FOR_S1U, NULL, 0, strptr:NULL, defstrval:NULL, TYPE_STRING, 0}, \
{ENB_CONFIG_STRING_ENB_PORT_FOR_S1U, NULL, 0, uptr:NULL, defintval:2152L, TYPE_UINT, 0} \ {ENB_CONFIG_STRING_ENB_PORT_FOR_S1U, NULL, 0, uptr:NULL, defintval:2152L, TYPE_UINT, 0} \
} }
#define ENB_INTERFACE_NAME_FOR_S1_MME_IDX 0
#define ENB_IPV4_ADDRESS_FOR_S1_MME_IDX 1
#define ENB_INTERFACE_NAME_FOR_S1U_IDX 2
#define ENB_IPV4_ADDR_FOR_S1U_IDX 3
#define ENB_PORT_FOR_S1U_IDX 4
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment