From 3596955fb0bcdf61b981d87a46b1f330756591da Mon Sep 17 00:00:00 2001
From: Robert Schmidt <robert.schmidt@openairinterface.org>
Date: Mon, 25 Mar 2024 09:58:28 +0100
Subject: [PATCH] Remove IPv6/active/preference fields from
 eNBs.[0].target_mce_m2_ip_address array

Same reasoning as in the previous commit.
---
 .../conf_files/enb.band7.tm1.25prb.rfsim.mbms.conf |  7 +------
 .../enb.band17.tm1.mbms.25PRB.usrpb210.conf        |  7 +------
 .../rcc.band7.tm1.mbms-s1ap.if4p5.50PRB.lo.conf    |  7 +------
 .../rcc.band7.tm1.mbms.if4p5.50PRB.lo.conf         |  7 +------
 openair2/ENB_APP/enb_config.c                      | 14 ++------------
 openair2/ENB_APP/enb_paramdef.h                    |  6 ------
 6 files changed, 6 insertions(+), 42 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 911a1f9b9f..8bdbd4acad 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
@@ -180,12 +180,7 @@ eNBs =
     t_dc_overall      = 2000;      /* unit: millisecond */
 
  ////////// MCE parameters:
-    target_mce_m2_ip_address      = ( { ipv4       = "127.0.0.7";
-                              ipv6       = "192:168:30::17";
-                              active     = "yes";
-                              preference = "ipv4";
-                            }
-                          );
+    target_mce_m2_ip_address = ({ ipv4 = "127.0.0.7"; });
 
     ///M2
     enable_enb_m2 = "yes";
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 4b46553778..5557e9f7f3 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
@@ -188,12 +188,7 @@ eNBs =
     t_dc_overall      = 2000;      /* unit: millisecond */
 
     ///M2
-    target_mce_m2_ip_address      = ( { ipv4       = "127.0.0.7";
-                              ipv6       = "192:168:30::17";
-                              active     = "yes";
-                              preference = "ipv4";
-                            }
-                          );
+    target_mce_m2_ip_address = ({ ipv4 = "127.0.0.7"; });
 
     enable_enb_m2 = "yes";
     
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 bc508c3851..d5eaf02f68 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
@@ -155,12 +155,7 @@ eNBs =
 
 
     ////////// MCE parameters:
-    target_mce_m2_ip_address      = ( { ipv4       = "127.0.0.7";
-                              ipv6       = "192:168:30::17";
-                              active     = "yes";
-                              preference = "ipv4";
-                            }
-                          );
+    target_mce_m2_ip_address = ({ ipv4 = "127.0.0.7"; });
 
     ///M2
     enable_enb_m2 = "yes";
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 2563381ff3..17ca9567a4 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
@@ -155,12 +155,7 @@ eNBs =
 
 
     ////////// MCE parameters:
-    target_mce_m2_ip_address      = ( { ipv4       = "127.0.0.7";
-                              ipv6       = "192:168:30::17";
-                              active     = "yes";
-                              preference = "ipv4";
-                            }
-                          );
+    target_mce_m2_ip_address = ({ ipv4 = "127.0.0.7"; });
 
     ///M2
     enable_enb_m2 = "yes";
diff --git a/openair2/ENB_APP/enb_config.c b/openair2/ENB_APP/enb_config.c
index 272f81f988..2f775f504e 100644
--- a/openair2/ENB_APP/enb_config.c
+++ b/openair2/ENB_APP/enb_config.c
@@ -2046,18 +2046,8 @@ int RCconfig_M2(MessageDef *msg_p, uint32_t i) {
             for (l = 0; l < M2ParamList.numelt; l++) {
               M2AP_REGISTER_ENB_REQ (msg_p).nb_m2 += 1;
               strcpy(M2AP_REGISTER_ENB_REQ (msg_p).target_mce_m2_ip_address[l].ipv4_address,*(M2ParamList.paramarray[l][ENB_M2_IPV4_ADDRESS_IDX].strptr));
-              strcpy(M2AP_REGISTER_ENB_REQ (msg_p).target_mce_m2_ip_address[l].ipv6_address,*(M2ParamList.paramarray[l][ENB_M2_IPV6_ADDRESS_IDX].strptr));
-
-              if (strcmp(*(M2ParamList.paramarray[l][ENB_M2_IP_ADDRESS_PREFERENCE_IDX].strptr), "ipv4") == 0) {
-                M2AP_REGISTER_ENB_REQ (msg_p).target_mce_m2_ip_address[l].ipv4 = 1;
-                M2AP_REGISTER_ENB_REQ (msg_p).target_mce_m2_ip_address[l].ipv6 = 0;
-              } else if (strcmp(*(M2ParamList.paramarray[l][ENB_M2_IP_ADDRESS_PREFERENCE_IDX].strptr), "ipv6") == 0) {
-                M2AP_REGISTER_ENB_REQ (msg_p).target_mce_m2_ip_address[l].ipv4 = 0;
-                M2AP_REGISTER_ENB_REQ (msg_p).target_mce_m2_ip_address[l].ipv6 = 1;
-              } else if (strcmp(*(M2ParamList.paramarray[l][ENB_M2_IP_ADDRESS_PREFERENCE_IDX].strptr), "no") == 0) {
-                M2AP_REGISTER_ENB_REQ (msg_p).target_mce_m2_ip_address[l].ipv4 = 1;
-                M2AP_REGISTER_ENB_REQ (msg_p).target_mce_m2_ip_address[l].ipv6 = 1;
-              }
+              M2AP_REGISTER_ENB_REQ (msg_p).target_mce_m2_ip_address[l].ipv4 = 1;
+              M2AP_REGISTER_ENB_REQ (msg_p).target_mce_m2_ip_address[l].ipv6 = 0;
             }
             // timers
             //{
diff --git a/openair2/ENB_APP/enb_paramdef.h b/openair2/ENB_APP/enb_paramdef.h
index b2e261252a..ff594608ac 100644
--- a/openair2/ENB_APP/enb_paramdef.h
+++ b/openair2/ENB_APP/enb_paramdef.h
@@ -1050,8 +1050,6 @@ typedef struct srb1_params_s {
 
 
 #define ENB_CONFIG_STRING_TARGET_MCE_M2_IPV4_ADDRESS              "ipv4"
-#define ENB_CONFIG_STRING_TARGET_MCE_M2_IPV6_ADDRESS              "ipv6"
-#define ENB_CONFIG_STRING_TARGET_MCE_M2_IP_ADDRESS_PREFERENCE     "preference"
 
 /*---------------------------------------------------------------------------------------------------------------------------------------*/
 
@@ -1064,14 +1062,10 @@ typedef struct srb1_params_s {
 // clang-format off
 #define M2PARAMS_DESC {  \
   {ENB_CONFIG_STRING_TARGET_MCE_M2_IPV4_ADDRESS,                   NULL,      0,         .uptr=NULL,   .defstrval=NULL,   TYPE_STRING,   0},          \
-  {ENB_CONFIG_STRING_TARGET_MCE_M2_IPV6_ADDRESS,                   NULL,      0,         .uptr=NULL,   .defstrval=NULL,   TYPE_STRING,   0},          \
-  {ENB_CONFIG_STRING_TARGET_MCE_M2_IP_ADDRESS_PREFERENCE,          NULL,      0,         .uptr=NULL,   .defstrval=NULL,   TYPE_STRING,   0},          \
 }
 // clang-format on
 
 #define ENB_M2_IPV4_ADDRESS_IDX          0
-#define ENB_M2_IPV6_ADDRESS_IDX          1
-#define ENB_M2_IP_ADDRESS_PREFERENCE_IDX 2
 /*---------------------------------------------------------------------------------------------------------------------------------------*/
 
 /*---------------------------------------------------------------------------------------------------------------------------------------*/
-- 
2.26.2