From 477388560ed3d7e54460655ccb76750a28a98770 Mon Sep 17 00:00:00 2001 From: Lionel Gauthier <lionel.gauthier@eurecom.fr> Date: Mon, 20 Oct 2014 15:57:37 +0000 Subject: [PATCH] S1AP port git-svn-id: http://svn.eurecom.fr/openair4G/trunk@5916 818b1a75-f10b-46b9-bf7c-635c3b92a50f --- openair-cn/UTILS/mme_config.c | 7 +++++-- openair-cn/UTILS/mme_config.h | 1 + 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/openair-cn/UTILS/mme_config.c b/openair-cn/UTILS/mme_config.c index 53cbac63a8..2d4eb4ff7e 100644 --- a/openair-cn/UTILS/mme_config.c +++ b/openair-cn/UTILS/mme_config.c @@ -269,8 +269,8 @@ static int config_parse_file(mme_config_t *mme_config_p) if( (config_setting_lookup_int( setting, MME_CONFIG_STRING_S1AP_OUTCOME_TIMER, &alongint) )) { mme_config_p->s1ap_config.outcome_drop_timer_sec = (uint8_t)alongint; } - if( (config_setting_lookup_int( setting, MME_CONFIG_STRING_SCTP_OUTSTREAMS, &alongint) )) { - mme_config_p->sctp_config.out_streams = (uint16_t)alongint; + if( (config_setting_lookup_int( setting, MME_CONFIG_STRING_S1AP_PORT, &alongint) )) { + mme_config_p->s1ap_config.port_number = (uint16_t)alongint; } } @@ -428,6 +428,7 @@ static int config_parse_file(mme_config_t *mme_config_p) (const char **)&sgw_ip_address_for_S1u_S12_S4_up) && config_setting_lookup_string( subsetting, SGW_CONFIG_STRING_SGW_IPV4_ADDRESS_FOR_S11, (const char **)&sgw_ip_address_for_S11) + && config_setting_lookup_int( setting, SGW_CONFIG_STRING_SGW_PORT_FOR_S1U_S12_S4_UP, &alongint) ) ) { cidr = strdup(sgw_ip_address_for_S1u_S12_S4_up); @@ -439,6 +440,8 @@ static int config_parse_file(mme_config_t *mme_config_p) address = strtok(cidr, "/"); IPV4_STR_ADDR_TO_INT_NWBO ( address, mme_config_p->ipv4.sgw_ip_address_for_S11, "BAD IP ADDRESS FORMAT FOR SGW S11 !\n" ) free(cidr); + + mme_config_p->gtpv1u_config.port_number = (uint16_t) alongint; } } } diff --git a/openair-cn/UTILS/mme_config.h b/openair-cn/UTILS/mme_config.h index d68f423432..b61a87e57a 100644 --- a/openair-cn/UTILS/mme_config.h +++ b/openair-cn/UTILS/mme_config.h @@ -56,6 +56,7 @@ #define MME_CONFIG_STRING_S1AP_CONFIG "S1AP" #define MME_CONFIG_STRING_S1AP_OUTCOME_TIMER "S1AP_OUTCOME_TIMER" +#define MME_CONFIG_STRING_S1AP_PORT "S1AP_PORT" #define MME_CONFIG_STRING_GUMMEI_CONFIG "GUMMEI" #define MME_CONFIG_STRING_MME_CODE "MME_CODE" -- GitLab