diff --git a/src/mme/s1ap_build.c b/src/mme/s1ap_build.c index d5c00dadc..a6a76bbee 100644 --- a/src/mme/s1ap_build.c +++ b/src/mme/s1ap_build.c @@ -489,29 +489,6 @@ status_t s1ap_build_initial_context_setup_request( memcpy(SecurityKey->buf, mme_ue->kenb, SecurityKey->size); /* Set UeRadioCapability if exists */ -#if 0 - if (mme_ue->radio_capa) - { - S1AP_UERadioCapability_t *UERadioCapability = NULL; - S1AP_UERadioCapability_t *radio_capa = - (S1AP_UERadioCapability_t *)mme_ue->radio_capa; - - ie = core_calloc(1, sizeof(S1AP_InitialContextSetupRequestIEs_t)); - ASN_SEQUENCE_ADD(&InitialContextSetupRequest->protocolIEs, ie); - - ie->id = S1AP_ProtocolIE_ID_id_UERadioCapability; - ie->criticality = S1AP_Criticality_ignore; - ie->value.present = - S1AP_InitialContextSetupRequestIEs__value_PR_UERadioCapability; - - UERadioCapability = &ie->value.choice.UERadioCapability; - - UERadioCapability->size = radio_capa->size; - UERadioCapability->buf = - core_calloc(UERadioCapability->size, sizeof(c_uint8_t)); - memcpy(UERadioCapability->buf, radio_capa->buf, radio_capa->size); - } -#else if (mme_ue->ueRadioCapability.buf && mme_ue->ueRadioCapability.size) { S1AP_UERadioCapability_t *UERadioCapability = NULL; @@ -531,7 +508,6 @@ status_t s1ap_build_initial_context_setup_request( mme_ue->ueRadioCapability.buf, mme_ue->ueRadioCapability.size, UERadioCapability); } -#endif rv = s1ap_encode_pdu(s1apbuf, &pdu); s1ap_free_pdu(&pdu); diff --git a/src/mme/s1ap_usrsctp.c b/src/mme/s1ap_usrsctp.c index 5bc95a4aa..986efe929 100644 --- a/src/mme/s1ap_usrsctp.c +++ b/src/mme/s1ap_usrsctp.c @@ -500,9 +500,9 @@ static int s1ap_usrsctp_recv_handler(struct socket *sock, case SCTP_SEND_FAILED : { d_error("SCTP_SEND_FAILED:[T:%d, F:0x%x, S:%d]\n", - not->sn_send_failed.ssf_type, - not->sn_send_failed.ssf_flags, - not->sn_send_failed.ssf_error); + not->sn_send_failed_event.ssfe_type, + not->sn_send_failed_event.ssfe_flags, + not->sn_send_failed_event.ssfe_error); break; } default : diff --git a/src/pgw/pgw_context.c b/src/pgw/pgw_context.c index 0029be6ab..9bc354a40 100644 --- a/src/pgw/pgw_context.c +++ b/src/pgw/pgw_context.c @@ -924,6 +924,8 @@ pgw_sess_t *pgw_sess_add( c_uint8_t *imsi, int imsi_len, c_int8_t *apn, c_uint8_t pdn_type, c_uint8_t ebi) { + char buf1[CORE_ADDRSTRLEN]; + char buf2[CORE_ADDRSTRLEN]; pgw_sess_t *sess = NULL; pgw_bearer_t *bearer = NULL; pgw_subnet_t *subnet6 = NULL; @@ -993,6 +995,10 @@ pgw_sess_t *pgw_sess_add( else d_assert(0, return NULL, "Unsupported PDN Type(%d)", pdn_type); + d_trace(1, "UE IPv4:[%s] IPv6:[%s]\n", + sess->ipv4 ? INET_NTOP(&sess->ipv4->addr, buf1) : "", + sess->ipv6 ? INET6_NTOP(&sess->ipv6->addr, buf2) : ""); + /* Generate Hash Key : IMSI + APN */ sess_hash_keygen(sess->hash_keybuf, &sess->hash_keylen, imsi, imsi_len, apn);