Merge remote-tracking branch 'origin/flexran-repair-mme-mgmt' into integration_2021_wk04_b

openair3/S1AP/s1ap_eNB.c

@@ -127,6 +127,7 @@ static void s1ap_eNB_register_mme(s1ap_eNB_instance_t *instance_p,
     memcpy(&s1ap_mme_data_p->mme_s1_ip,
     	   mme_ip_address,
     	   sizeof(*mme_ip_address));
+    s1ap_mme_data_p->mme_port = mme_port;
     for (int i = 0; i < broadcast_plmn_num; ++i)
       s1ap_mme_data_p->broadcast_plmn_index[i] = broadcast_plmn_index[i];
 

openair3/S1AP/s1ap_eNB_defs.h

@@ -124,8 +124,9 @@ typedef struct s1ap_eNB_mme_data_s {
   /* This is the optional name provided by the MME */
   char *mme_name;
 
-  /* MME S1AP IP address */
+  /* MME S1AP IP address and port */
   net_ip_address_t mme_s1_ip;
+  uint16_t         mme_port;
 
   /* List of served GUMMEI per MME. There is one GUMMEI per RAT with a max
    * number of 8 RATs but in our case only one is used. The LTE related pool