Skip to content

O
OpenXG-RAN
Commit 4666cddb authored by Robert Schmidt's avatar Robert Schmidt
Browse files
Options

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

Same reasoning as in previous commit.
parent 3596955f
Hide whitespace changes
Inline Side-by-side
Showing with 14 additions and 49 deletions
ci-scripts/conf_files/enb.band7.tm1.25prb.rfsim.mbms.conf
View file @ 4666cddb
...@@ -245,12 +245,7 @@ MCEs = ( ...@@ -245,12 +245,7 @@ MCEs = (
//M3 //M3
enable_mce_m3 = "yes"; enable_mce_m3 = "yes";
target_mme_m3_ip_address = ( { ipv4 = "127.0.0.18"; target_mme_m3_ip_address = ({ ipv4 = "127.0.0.18"; });
ipv6 = "192:168:30::17";
active = "yes";
preference = "ipv4";
}
);
......
ci-scripts/conf_files/untested/enb.band17.tm1.mbms.25PRB.usrpb210.conf
View file @ 4666cddb
...@@ -231,12 +231,7 @@ MCEs = ( ...@@ -231,12 +231,7 @@ MCEs = (
//M3 //M3
enable_mce_m3 = "yes"; enable_mce_m3 = "yes";
target_mme_m3_ip_address = ( { ipv4 = "127.0.0.18"; target_mme_m3_ip_address = ({ ipv4 = "127.0.0.18"; });
ipv6 = "192:168:30::17";
active = "yes";
preference = "ipv4";
}
);
NETWORK_INTERFACES : NETWORK_INTERFACES :
......
ci-scripts/conf_files/untested/rcc.band7.tm1.mbms-s1ap.if4p5.50PRB.lo.conf
View file @ 4666cddb
...@@ -200,12 +200,7 @@ MCEs = ( ...@@ -200,12 +200,7 @@ MCEs = (
//M3 //M3
enable_mce_m3 = "yes"; enable_mce_m3 = "yes";
target_mme_m3_ip_address = ( { ipv4 = "127.0.0.18"; target_mme_m3_ip_address = ({ ipv4 = "127.0.0.18"; });
ipv6 = "192:168:30::17";
active = "yes";
preference = "ipv4";
}
);
......
ci-scripts/conf_files/untested/rcc.band7.tm1.mbms.if4p5.50PRB.lo.conf
View file @ 4666cddb
...@@ -200,12 +200,7 @@ MCEs = ( ...@@ -200,12 +200,7 @@ MCEs = (
//M3 //M3
enable_mce_m3 = "yes"; enable_mce_m3 = "yes";
target_mme_m3_ip_address = ( { ipv4 = "127.0.0.18"; target_mme_m3_ip_address = ({ ipv4 = "127.0.0.18"; });
ipv6 = "192:168:30::17";
active = "yes";
preference = "ipv4";
}
);
......
openair2/ENB_APP/enb_paramdef_mce.h
View file @ 4666cddb
...@@ -96,18 +96,12 @@ ...@@ -96,18 +96,12 @@
#define MCE_CONFIG_STRING_TARGET_MME_M3_IP_ADDRESS "target_mme_m3_ip_address" #define MCE_CONFIG_STRING_TARGET_MME_M3_IP_ADDRESS "target_mme_m3_ip_address"
/* M3 configuration parameters names */ /* M3 configuration parameters names */
#define MCE_CONFIG_STRING_TARGET_MME_M3_IPV4_ADDRESS "ipv4" #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 */ /* optname helpstr paramflags XXXptr defXXXval type numelt */
#define M3PARAMS_DESC { \ #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_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}, \
} }
#define MCE2_M3_IPV4_ADDRESS_IDX 0 #define MCE2_M3_IPV4_ADDRESS_IDX 0
#define MCE2_M3_IPV6_ADDRESS_IDX 1
#define MCE2_M3_IP_ADDRESS_PREFERENCE_IDX 2
/*-----------------------------------------------------------------------------------------------------------------------------------*/ /*-----------------------------------------------------------------------------------------------------------------------------------*/
......
openair2/MCE_APP/mce_config.c
View file @ 4666cddb
...@@ -150,24 +150,15 @@ int RCconfig_M3(MessageDef *msg_p, uint32_t i) { ...@@ -150,24 +150,15 @@ int RCconfig_M3(MessageDef *msg_p, uint32_t i) {
//printf("M3ParamList.numelt %d\n",M3ParamList.numelt); //printf("M3ParamList.numelt %d\n",M3ParamList.numelt);
M3AP_REGISTER_MCE_REQ (msg_p).nb_m3 = 0; M3AP_REGISTER_MCE_REQ (msg_p).nb_m3 = 0;
for (l = 0; l < M3ParamList.numelt; l++) { for (l = 0; l < M3ParamList.numelt; l++) {
M3AP_REGISTER_MCE_REQ (msg_p).nb_m3 += 1; 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).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].ipv4_address,
strcpy(M3AP_REGISTER_MCE_REQ (msg_p).target_mme_m3_ip_address[l].ipv6_address,*(M3ParamList.paramarray[l][MCE2_M3_IPV6_ADDRESS_IDX].strptr)); *(M3ParamList.paramarray[l][MCE2_M3_IPV4_ADDRESS_IDX].strptr));
M3AP_REGISTER_MCE_REQ(msg_p).target_mme_m3_ip_address[l].ipv4 = 1;
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].ipv6 = 0;
M3AP_REGISTER_MCE_REQ (msg_p).target_mme_m3_ip_address[l].ipv4 = 1; M3AP_REGISTER_MCE_REQ(msg_p).sctp_out_streams = 2;
M3AP_REGISTER_MCE_REQ (msg_p).target_mme_m3_ip_address[l].ipv6 = 0; M3AP_REGISTER_MCE_REQ(msg_p).sctp_in_streams = 2;
} 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;
} }
sprintf(aprefix,"%s.[%i].%s","MCEs",0,MCE_CONFIG_STRING_NETWORK_INTERFACES_CONFIG); sprintf(aprefix,"%s.[%i].%s","MCEs",0,MCE_CONFIG_STRING_NETWORK_INTERFACES_CONFIG);
......
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