From d46dd64f7e89fdb865925577810dca16f5d26532 Mon Sep 17 00:00:00 2001
From: Cedric Roux <cedric.roux@eurecom.fr>
Date: Wed, 27 Sep 2017 13:49:45 +0200
Subject: [PATCH] bugfix: fix mme address initialization
this and some cleanup, duplicate defs in .h file
---
openair2/ENB_APP/enb_config.c | 2 +-
openair2/ENB_APP/enb_paramdef.h | 5 -----
2 files changed, 1 insertion(+), 6 deletions(-)
diff --git a/openair2/ENB_APP/enb_config.c b/openair2/ENB_APP/enb_config.c
index 55a99ef03e..c62339082e 100644
--- a/openair2/ENB_APP/enb_config.c
+++ b/openair2/ENB_APP/enb_config.c
@@ -2539,7 +2539,7 @@ int RCconfig_S1(MessageDef *msg_p, uint32_t i) {
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);
- cidr = *(NETParams[ENB_INTERFACE_NAME_FOR_S1U_IDX].strptr);
+ cidr = *(NETParams[ENB_IPV4_ADDRESS_FOR_S1_MME_IDX].strptr);
address = strtok(cidr, "/");
S1AP_REGISTER_ENB_REQ (msg_p).enb_ip_address.ipv6 = 0;
diff --git a/openair2/ENB_APP/enb_paramdef.h b/openair2/ENB_APP/enb_paramdef.h
index 86424cd560..547eee6a35 100755
--- a/openair2/ENB_APP/enb_paramdef.h
+++ b/openair2/ENB_APP/enb_paramdef.h
@@ -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_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
--
GitLab