From 4666cddb1a0a9318c90ee3134c0c37d7879514e5 Mon Sep 17 00:00:00 2001 From: Robert Schmidt Date: Mon, 25 Mar 2024 09:59:05 +0100 Subject: [PATCH] Remove IPv6/active/preference fields from eNBs.[0].target_mme_m3_ip_address array Same reasoning as in previous commit. --- .../enb.band7.tm1.25prb.rfsim.mbms.conf | 7 +----- .../enb.band17.tm1.mbms.25PRB.usrpb210.conf | 7 +----- ...cc.band7.tm1.mbms-s1ap.if4p5.50PRB.lo.conf | 7 +----- .../rcc.band7.tm1.mbms.if4p5.50PRB.lo.conf | 7 +----- openair2/ENB_APP/enb_paramdef_mce.h | 8 +----- openair2/MCE_APP/mce_config.c | 25 ++++++------------- 6 files changed, 13 insertions(+), 48 deletions(-) diff --git a/ci-scripts/conf_files/enb.band7.tm1.25prb.rfsim.mbms.conf b/ci-scripts/conf_files/enb.band7.tm1.25prb.rfsim.mbms.conf index 8bdbd4acad..4e0b0fa089 100644 --- a/ci-scripts/conf_files/enb.band7.tm1.25prb.rfsim.mbms.conf +++ b/ci-scripts/conf_files/enb.band7.tm1.25prb.rfsim.mbms.conf @@ -245,12 +245,7 @@ MCEs = ( //M3 enable_mce_m3 = "yes"; - target_mme_m3_ip_address = ( { ipv4 = "127.0.0.18"; - ipv6 = "192:168:30::17"; - active = "yes"; - preference = "ipv4"; - } - ); + target_mme_m3_ip_address = ({ ipv4 = "127.0.0.18"; }); diff --git a/ci-scripts/conf_files/untested/enb.band17.tm1.mbms.25PRB.usrpb210.conf b/ci-scripts/conf_files/untested/enb.band17.tm1.mbms.25PRB.usrpb210.conf index 5557e9f7f3..2fa185121f 100644 --- a/ci-scripts/conf_files/untested/enb.band17.tm1.mbms.25PRB.usrpb210.conf +++ b/ci-scripts/conf_files/untested/enb.band17.tm1.mbms.25PRB.usrpb210.conf @@ -231,12 +231,7 @@ MCEs = ( //M3 enable_mce_m3 = "yes"; - target_mme_m3_ip_address = ( { ipv4 = "127.0.0.18"; - ipv6 = "192:168:30::17"; - active = "yes"; - preference = "ipv4"; - } - ); + target_mme_m3_ip_address = ({ ipv4 = "127.0.0.18"; }); NETWORK_INTERFACES : diff --git a/ci-scripts/conf_files/untested/rcc.band7.tm1.mbms-s1ap.if4p5.50PRB.lo.conf b/ci-scripts/conf_files/untested/rcc.band7.tm1.mbms-s1ap.if4p5.50PRB.lo.conf index d5eaf02f68..2465b96ef1 100644 --- a/ci-scripts/conf_files/untested/rcc.band7.tm1.mbms-s1ap.if4p5.50PRB.lo.conf +++ b/ci-scripts/conf_files/untested/rcc.band7.tm1.mbms-s1ap.if4p5.50PRB.lo.conf @@ -200,12 +200,7 @@ MCEs = ( //M3 enable_mce_m3 = "yes"; - target_mme_m3_ip_address = ( { ipv4 = "127.0.0.18"; - ipv6 = "192:168:30::17"; - active = "yes"; - preference = "ipv4"; - } - ); + target_mme_m3_ip_address = ({ ipv4 = "127.0.0.18"; }); diff --git a/ci-scripts/conf_files/untested/rcc.band7.tm1.mbms.if4p5.50PRB.lo.conf b/ci-scripts/conf_files/untested/rcc.band7.tm1.mbms.if4p5.50PRB.lo.conf index 17ca9567a4..ba45e1dec3 100644 --- a/ci-scripts/conf_files/untested/rcc.band7.tm1.mbms.if4p5.50PRB.lo.conf +++ b/ci-scripts/conf_files/untested/rcc.band7.tm1.mbms.if4p5.50PRB.lo.conf @@ -200,12 +200,7 @@ MCEs = ( //M3 enable_mce_m3 = "yes"; - target_mme_m3_ip_address = ( { ipv4 = "127.0.0.18"; - ipv6 = "192:168:30::17"; - active = "yes"; - preference = "ipv4"; - } - ); + target_mme_m3_ip_address = ({ ipv4 = "127.0.0.18"; }); diff --git a/openair2/ENB_APP/enb_paramdef_mce.h b/openair2/ENB_APP/enb_paramdef_mce.h index 5b61bc3d6e..c93fb4097e 100644 --- a/openair2/ENB_APP/enb_paramdef_mce.h +++ b/openair2/ENB_APP/enb_paramdef_mce.h @@ -96,18 +96,12 @@ #define MCE_CONFIG_STRING_TARGET_MME_M3_IP_ADDRESS "target_mme_m3_ip_address" /* M3 configuration parameters names */ #define MCE_CONFIG_STRING_TARGET_MME_M3_IPV4_ADDRESS "ipv4" -#define MCE_CONFIG_STRING_TARGET_MME_M3_IPV6_ADDRESS "ipv6" -#define MCE_CONFIG_STRING_TARGET_MME_M3_IP_ADDRESS_PREFERENCE "preference" /* optname helpstr paramflags XXXptr defXXXval type numelt */ #define M3PARAMS_DESC { \ -{MCE_CONFIG_STRING_TARGET_MME_M3_IPV4_ADDRESS, NULL, 0, .uptr=NULL, .defstrval=NULL, TYPE_STRING, 0}, \ -{MCE_CONFIG_STRING_TARGET_MME_M3_IPV6_ADDRESS, NULL, 0, .uptr=NULL, .defstrval=NULL, TYPE_STRING, 0}, \ -{MCE_CONFIG_STRING_TARGET_MME_M3_IP_ADDRESS_PREFERENCE, NULL, 0, .uptr=NULL, .defstrval=NULL, TYPE_STRING, 0}, \ + {MCE_CONFIG_STRING_TARGET_MME_M3_IPV4_ADDRESS, NULL, 0, .uptr=NULL, .defstrval=NULL, TYPE_STRING, 0}, \ } #define MCE2_M3_IPV4_ADDRESS_IDX 0 -#define MCE2_M3_IPV6_ADDRESS_IDX 1 -#define MCE2_M3_IP_ADDRESS_PREFERENCE_IDX 2 /*-----------------------------------------------------------------------------------------------------------------------------------*/ diff --git a/openair2/MCE_APP/mce_config.c b/openair2/MCE_APP/mce_config.c index 7d52908b76..755bb42b4a 100644 --- a/openair2/MCE_APP/mce_config.c +++ b/openair2/MCE_APP/mce_config.c @@ -150,24 +150,15 @@ int RCconfig_M3(MessageDef *msg_p, uint32_t i) { //printf("M3ParamList.numelt %d\n",M3ParamList.numelt); M3AP_REGISTER_MCE_REQ (msg_p).nb_m3 = 0; for (l = 0; l < M3ParamList.numelt; l++) { - M3AP_REGISTER_MCE_REQ (msg_p).nb_m3 += 1; - M3AP_REGISTER_MCE_REQ (msg_p).MCE_name = strdup(*(M3ParamList.paramarray[l][MCE_MCE_NAME_IDX].strptr)); + M3AP_REGISTER_MCE_REQ(msg_p).nb_m3 += 1; + M3AP_REGISTER_MCE_REQ(msg_p).MCE_name = strdup(*(M3ParamList.paramarray[l][MCE_MCE_NAME_IDX].strptr)); - strcpy(M3AP_REGISTER_MCE_REQ (msg_p).target_mme_m3_ip_address[l].ipv4_address,*(M3ParamList.paramarray[l][MCE2_M3_IPV4_ADDRESS_IDX].strptr)); - strcpy(M3AP_REGISTER_MCE_REQ (msg_p).target_mme_m3_ip_address[l].ipv6_address,*(M3ParamList.paramarray[l][MCE2_M3_IPV6_ADDRESS_IDX].strptr)); - - if (strcmp(*(M3ParamList.paramarray[l][MCE2_M3_IP_ADDRESS_PREFERENCE_IDX].strptr), "ipv4") == 0) { - M3AP_REGISTER_MCE_REQ (msg_p).target_mme_m3_ip_address[l].ipv4 = 1; - M3AP_REGISTER_MCE_REQ (msg_p).target_mme_m3_ip_address[l].ipv6 = 0; - } else if (strcmp(*(M3ParamList.paramarray[l][MCE2_M3_IP_ADDRESS_PREFERENCE_IDX].strptr), "ipv6") == 0) { - M3AP_REGISTER_MCE_REQ (msg_p).target_mme_m3_ip_address[l].ipv4 = 0; - M3AP_REGISTER_MCE_REQ (msg_p).target_mme_m3_ip_address[l].ipv6 = 1; - } else if (strcmp(*(M3ParamList.paramarray[l][MCE2_M3_IP_ADDRESS_PREFERENCE_IDX].strptr), "no") == 0) { - M3AP_REGISTER_MCE_REQ (msg_p).target_mme_m3_ip_address[l].ipv4 = 1; - M3AP_REGISTER_MCE_REQ (msg_p).target_mme_m3_ip_address[l].ipv6 = 1; - } - M3AP_REGISTER_MCE_REQ (msg_p).sctp_out_streams = 2; - M3AP_REGISTER_MCE_REQ (msg_p).sctp_in_streams = 2; + strcpy(M3AP_REGISTER_MCE_REQ(msg_p).target_mme_m3_ip_address[l].ipv4_address, + *(M3ParamList.paramarray[l][MCE2_M3_IPV4_ADDRESS_IDX].strptr)); + M3AP_REGISTER_MCE_REQ(msg_p).target_mme_m3_ip_address[l].ipv4 = 1; + M3AP_REGISTER_MCE_REQ(msg_p).target_mme_m3_ip_address[l].ipv6 = 0; + M3AP_REGISTER_MCE_REQ(msg_p).sctp_out_streams = 2; + M3AP_REGISTER_MCE_REQ(msg_p).sctp_in_streams = 2; } sprintf(aprefix,"%s.[%i].%s","MCEs",0,MCE_CONFIG_STRING_NETWORK_INTERFACES_CONFIG);