Skip to content

O
OpenXG-RAN
Commit 3596955f authored by Robert Schmidt's avatar Robert Schmidt
Browse files
Options

Remove IPv6/active/preference fields from eNBs.[0].target_mce_m2_ip_address array 

Same reasoning as in the previous commit.
parent 27447f94
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 42 deletions
ci-scripts/conf_files/enb.band7.tm1.25prb.rfsim.mbms.conf
View file @ 3596955f
...@@ -180,12 +180,7 @@ eNBs = ...@@ -180,12 +180,7 @@ eNBs =
t_dc_overall = 2000; /* unit: millisecond */ t_dc_overall = 2000; /* unit: millisecond */
////////// MCE parameters: ////////// MCE parameters:
target_mce_m2_ip_address = ( { ipv4 = "127.0.0.7"; target_mce_m2_ip_address = ({ ipv4 = "127.0.0.7"; });
ipv6 = "192:168:30::17";
active = "yes";
preference = "ipv4";
}
);
///M2 ///M2
enable_enb_m2 = "yes"; enable_enb_m2 = "yes";
......
ci-scripts/conf_files/untested/enb.band17.tm1.mbms.25PRB.usrpb210.conf
View file @ 3596955f
...@@ -188,12 +188,7 @@ eNBs = ...@@ -188,12 +188,7 @@ eNBs =
t_dc_overall = 2000; /* unit: millisecond */ t_dc_overall = 2000; /* unit: millisecond */
///M2 ///M2
target_mce_m2_ip_address = ( { ipv4 = "127.0.0.7"; target_mce_m2_ip_address = ({ ipv4 = "127.0.0.7"; });
ipv6 = "192:168:30::17";
active = "yes";
preference = "ipv4";
}
);
enable_enb_m2 = "yes"; enable_enb_m2 = "yes";
......
ci-scripts/conf_files/untested/rcc.band7.tm1.mbms-s1ap.if4p5.50PRB.lo.conf
View file @ 3596955f
...@@ -155,12 +155,7 @@ eNBs = ...@@ -155,12 +155,7 @@ eNBs =
////////// MCE parameters: ////////// MCE parameters:
target_mce_m2_ip_address = ( { ipv4 = "127.0.0.7"; target_mce_m2_ip_address = ({ ipv4 = "127.0.0.7"; });
ipv6 = "192:168:30::17";
active = "yes";
preference = "ipv4";
}
);
///M2 ///M2
enable_enb_m2 = "yes"; enable_enb_m2 = "yes";
......
ci-scripts/conf_files/untested/rcc.band7.tm1.mbms.if4p5.50PRB.lo.conf
View file @ 3596955f
...@@ -155,12 +155,7 @@ eNBs = ...@@ -155,12 +155,7 @@ eNBs =
////////// MCE parameters: ////////// MCE parameters:
target_mce_m2_ip_address = ( { ipv4 = "127.0.0.7"; target_mce_m2_ip_address = ({ ipv4 = "127.0.0.7"; });
ipv6 = "192:168:30::17";
active = "yes";
preference = "ipv4";
}
);
///M2 ///M2
enable_enb_m2 = "yes"; enable_enb_m2 = "yes";
......
openair2/ENB_APP/enb_config.c
View file @ 3596955f
...@@ -2046,18 +2046,8 @@ int RCconfig_M2(MessageDef *msg_p, uint32_t i) { ...@@ -2046,18 +2046,8 @@ int RCconfig_M2(MessageDef *msg_p, uint32_t i) {
for (l = 0; l < M2ParamList.numelt; l++) { for (l = 0; l < M2ParamList.numelt; l++) {
M2AP_REGISTER_ENB_REQ (msg_p).nb_m2 += 1; 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].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)); 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;
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;
}
} }
// timers // timers
//{ //{
......
openair2/ENB_APP/enb_paramdef.h
View file @ 3596955f
...@@ -1050,8 +1050,6 @@ typedef struct srb1_params_s { ...@@ -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_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 { ...@@ -1064,14 +1062,10 @@ typedef struct srb1_params_s {
// clang-format off // clang-format off
#define M2PARAMS_DESC { \ #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_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 // clang-format on
#define ENB_M2_IPV4_ADDRESS_IDX 0 #define ENB_M2_IPV4_ADDRESS_IDX 0
#define ENB_M2_IPV6_ADDRESS_IDX 1
#define ENB_M2_IP_ADDRESS_PREFERENCE_IDX 2
/*---------------------------------------------------------------------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------------------------------------------------------------------*/
/*---------------------------------------------------------------------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------------------------------------------------------------------*/
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment