fix(config): set S1AP_PORT_NUMBER as default value for mme port

openair2/ENB_APP/enb_config.c

@@ -57,7 +57,6 @@
 #include "enb_paramdef.h"
 #include "proto_agent.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_UL(int eutra_bandP, uint32_t ul_CarrierFreq, uint32_t bw);
@@ -2513,11 +2512,7 @@ int RCconfig_S1(
               }
 
               /* 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;
-              } 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,
                           "List of broadcast PLMN to be sent to MME can not be longer than actual "

openair2/ENB_APP/enb_paramdef.h

@@ -34,6 +34,7 @@
 #define ENB_PARAMDEF_H_
 #include "common/config/config_paramdesc.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_TIMING    "node_timing"
@@ -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_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_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},    \
 }