acouzens
/
open5gs
1
0
Fork 1
Code Issues Pull Requests 1 Projects Releases Wiki Activity

ErrorIndication is added

This commit is contained in:
Sukchan Lee 2018-03-12 23:06:14 +09:00
parent 5172d2034a
commit 8e52447a53
5 changed files with 98 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

110
src/mme/s1ap_build.c
View File

@ -941,8 +941,7 @@ status_t s1ap_build_ue_context_release_command(
ie->id = S1AP_ProtocolIE_ID_id_UE_S1AP_IDs;
ie->criticality = S1AP_Criticality_reject;
ie->value.present =
S1AP_UEContextReleaseCommand_IEs__value_PR_UE_S1AP_IDs;
ie->value.present = S1AP_UEContextReleaseCommand_IEs__value_PR_UE_S1AP_IDs;
UE_S1AP_IDs = &ie->value.choice.UE_S1AP_IDs;
@ -951,8 +950,7 @@ status_t s1ap_build_ue_context_release_command(
ie->id = S1AP_ProtocolIE_ID_id_Cause;
ie->criticality = S1AP_Criticality_ignore;
ie->value.present =
S1AP_UEContextReleaseCommand_IEs__value_PR_Cause;
ie->value.present = S1AP_UEContextReleaseCommand_IEs__value_PR_Cause;
Cause = &ie->value.choice.Cause;
@ -1666,41 +1664,93 @@ status_t s1ap_build_mme_status_transfer(pkbuf_t **s1apbuf,
}
status_t s1ap_build_error_indication(
pkbuf_t **s1apbuf, c_uint16_t presenceMask,
c_uint32_t enb_ue_s1ap_id, c_uint32_t mme_ue_s1ap_id,
S1AP_Cause_PR group, long cause)
pkbuf_t **s1apbuf,
S1AP_MME_UE_S1AP_ID_t *mme_ue_s1ap_id,
S1AP_ENB_UE_S1AP_ID_t *enb_ue_s1ap_id,
S1AP_Cause_t *cause)
{
#if 0
int encoded;
s1ap_message_t message;
S1AP_ErrorIndicationIEs_t *ies = &message.s1ap_ErrorIndicationIEs;
status_t rv;
S1AP_S1AP_PDU_t pdu;
S1AP_InitiatingMessage_t *initiatingMessage = NULL;
S1AP_ErrorIndication_t *ErrorIndication = NULL;
S1AP_ErrorIndicationIEs_t *ie = NULL;
S1AP_MME_UE_S1AP_ID_t *MME_UE_S1AP_ID = NULL;
S1AP_ENB_UE_S1AP_ID_t *ENB_UE_S1AP_ID = NULL;
S1AP_Cause_t *Cause = NULL;
d_assert(presenceMask, return CORE_ERROR,
"Invalid PresenceMask[0x%x]", presenceMask);
d_trace(3, "[MME] Error Indication\n");
memset(&message, 0, sizeof(s1ap_message_t));
memset(&pdu, 0, sizeof (S1AP_S1AP_PDU_t));
pdu.present = S1AP_S1AP_PDU_PR_initiatingMessage;
pdu.choice.initiatingMessage =
core_calloc(1, sizeof(S1AP_InitiatingMessage_t));
ies->presenceMask = presenceMask;
ies->mme_ue_s1ap_id = mme_ue_s1ap_id;
ies->eNB_UE_S1AP_ID = enb_ue_s1ap_id;
ies->cause.present = group;
ies->cause.choice.radioNetwork = cause;
initiatingMessage = pdu.choice.initiatingMessage;
initiatingMessage->procedureCode = S1AP_ProcedureCode_id_ErrorIndication;
initiatingMessage->criticality = S1AP_Criticality_ignore;
initiatingMessage->value.present =
S1AP_InitiatingMessage__value_PR_ErrorIndication;
d_trace(5, " PresenceMask[0x%x]\n", presenceMask);
d_trace(5, " ENB_UE_S1AP_ID[%d] MME_UE_S1AP_ID[%d]\n",
enb_ue_s1ap_id, mme_ue_s1ap_id);
d_trace(5, " Group[%d] Cause[%d]\n", group, cause);
ErrorIndication = &initiatingMessage->value.choice.ErrorIndication;
message.procedureCode = S1AP_ProcedureCode_id_ErrorIndication;
message.direction = S1AP_PDU_PR_initiatingMessage;
if (mme_ue_s1ap_id)
{
ie = core_calloc(1, sizeof(S1AP_ErrorIndicationIEs_t));
ASN_SEQUENCE_ADD(&ErrorIndication->protocolIEs, ie);
encoded = s1ap_encode_pdu(s1apbuf, &message);
s1ap_free_pdu(&message);
ie->id = S1AP_ProtocolIE_ID_id_MME_UE_S1AP_ID;
ie->criticality = S1AP_Criticality_ignore;
ie->value.present = S1AP_ErrorIndicationIEs__value_PR_MME_UE_S1AP_ID;
d_assert(s1apbuf && encoded >= 0,return CORE_ERROR,);
#endif
MME_UE_S1AP_ID = &ie->value.choice.MME_UE_S1AP_ID;
*MME_UE_S1AP_ID = *mme_ue_s1ap_id;
d_trace(5, " MME_UE_S1AP_ID[%d]\n", mme_ue_s1ap_id);
}
if (enb_ue_s1ap_id)
{
ie = core_calloc(1, sizeof(S1AP_ErrorIndicationIEs_t));
ASN_SEQUENCE_ADD(&ErrorIndication->protocolIEs, ie);
ie->id = S1AP_ProtocolIE_ID_id_eNB_UE_S1AP_ID;
ie->criticality = S1AP_Criticality_ignore;
ie->value.present = S1AP_ErrorIndicationIEs__value_PR_ENB_UE_S1AP_ID;
ENB_UE_S1AP_ID = &ie->value.choice.ENB_UE_S1AP_ID;
*ENB_UE_S1AP_ID = *enb_ue_s1ap_id;
d_trace(5, " ENB_UE_S1AP_ID[%d]\n", enb_ue_s1ap_id);
}
if (cause)
{
ie = core_calloc(1, sizeof(S1AP_ErrorIndicationIEs_t));
ASN_SEQUENCE_ADD(&ErrorIndication->protocolIEs, ie);
ie->id = S1AP_ProtocolIE_ID_id_Cause;
ie->criticality = S1AP_Criticality_ignore;
ie->value.present = S1AP_ErrorIndicationIEs__value_PR_Cause;
Cause = &ie->value.choice.Cause;
Cause->present = cause->present;
Cause->choice.radioNetwork = cause->choice.radioNetwork;
d_trace(5, " Group[%d] Cause[%d]\n",
Cause->present, Cause->choice.radioNetwork);
}
rv = s1ap_encode_pdu(s1apbuf, &pdu);
s1ap_free_pdu(&pdu);
if (rv != CORE_OK)
{
d_error("s1ap_encode_pdu() failed");
return CORE_ERROR;
}
return CORE_OK;
}

7
src/mme/s1ap_build.h
View File

@ -47,9 +47,10 @@ CORE_DECLARE(status_t) s1ap_build_mme_status_transfer(pkbuf_t **s1apbuf,
enb_ue_t *target_ue, S1AP_ENBStatusTransferIEs_t *enb_ies);
CORE_DECLARE(status_t) s1ap_build_error_indication(
pkbuf_t **s1apbuf, c_uint16_t presenceMask,
c_uint32_t enb_ue_s1ap_id, c_uint32_t mme_ue_s1ap_id,
S1AP_Cause_PR group, long cause);
pkbuf_t **s1apbuf,
S1AP_MME_UE_S1AP_ID_t *mme_ue_s1ap_id,
S1AP_ENB_UE_S1AP_ID_t *enb_ue_s1ap_id,
S1AP_Cause_t *cause);
#ifdef __cplusplus
}

14
src/mme/s1ap_handler.c
View File

@ -813,6 +813,7 @@ void s1ap_handle_ue_context_release_request(
S1AP_UEContextReleaseRequest_IEs_t *ie = NULL;
S1AP_MME_UE_S1AP_ID_t *MME_UE_S1AP_ID = NULL;
S1AP_ENB_UE_S1AP_ID_t *ENB_UE_S1AP_ID = NULL;
S1AP_Cause_t *Cause = NULL;
enb_ue_t *enb_ue = NULL;
@ -838,6 +839,9 @@ void s1ap_handle_ue_context_release_request(
case S1AP_ProtocolIE_ID_id_MME_UE_S1AP_ID:
MME_UE_S1AP_ID = &ie->value.choice.MME_UE_S1AP_ID;
break;
case S1AP_ProtocolIE_ID_id_eNB_UE_S1AP_ID:
ENB_UE_S1AP_ID = &ie->value.choice.ENB_UE_S1AP_ID;
break;
case S1AP_ProtocolIE_ID_id_Cause:
Cause = &ie->value.choice.Cause;
break;
@ -854,17 +858,9 @@ void s1ap_handle_ue_context_release_request(
if (!enb_ue)
{
d_warn("No ENB UE Context : MME_UE_S1AP_ID[%d]", *MME_UE_S1AP_ID);
#if 0
rv = s1ap_send_error_indication(enb,
S1AP_ERRORINDICATIONIES_MME_UE_S1AP_ID_PRESENT |
S1AP_ERRORINDICATIONIES_ENB_UE_S1AP_ID_PRESENT |
S1AP_ERRORINDICATIONIES_CAUSE_PRESENT,
enb_ue->enb_ue_s1ap_id,
enb_ue->mme_ue_s1ap_id,
S1AP_Cause_PR_radioNetwork,
S1AP_CauseRadioNetwork_unknown_mme_ue_s1ap_id);
MME_UE_S1AP_ID, ENB_UE_S1AP_ID, Cause);
d_assert(rv == CORE_OK, return, "s1ap send error");
#endif
return;
}

9
src/mme/s1ap_path.c
View File

@ -482,9 +482,10 @@ status_t s1ap_send_mme_configuration_transfer(
}
status_t s1ap_send_error_indication(
mme_enb_t *enb, c_uint16_t presenceMask,
c_uint32_t enb_ue_s1ap_id, c_uint32_t mme_ue_s1ap_id,
S1AP_Cause_PR group, long cause)
mme_enb_t *enb,
S1AP_MME_UE_S1AP_ID_t *mme_ue_s1ap_id,
S1AP_ENB_UE_S1AP_ID_t *enb_ue_s1ap_id,
S1AP_Cause_t *cause)
{
status_t rv;
pkbuf_t *s1apbuf = NULL;
@ -492,7 +493,7 @@ status_t s1ap_send_error_indication(
d_assert(enb, return CORE_ERROR,);
rv = s1ap_build_error_indication(&s1apbuf,
presenceMask, enb_ue_s1ap_id, mme_ue_s1ap_id, group, cause);
mme_ue_s1ap_id, enb_ue_s1ap_id, cause);
d_assert(rv == CORE_OK && s1apbuf, return CORE_ERROR, "s1ap build error");
rv = s1ap_send_to_enb(enb, s1apbuf);

7
src/mme/s1ap_path.h
View File

@ -56,9 +56,10 @@ CORE_DECLARE(status_t) s1ap_send_handover_cancel_ack(enb_ue_t *source_ue);
CORE_DECLARE(status_t) s1ap_send_mme_status_transfer(
enb_ue_t *target_ue, S1AP_ENBStatusTransferIEs_t *ies);
CORE_DECLARE(status_t) s1ap_send_error_indication(
mme_enb_t *enb, c_uint16_t presenceMask,
c_uint32_t enb_ue_s1ap_id, c_uint32_t mme_ue_s1ap_id,
S1AP_Cause_PR group, long cause);
mme_enb_t *enb,
S1AP_MME_UE_S1AP_ID_t *mme_ue_s1ap_id,
S1AP_ENB_UE_S1AP_ID_t *enb_ue_s1ap_id,
S1AP_Cause_t *cause);
#ifdef __cplusplus
}