sysmocom
/
open5gs
forked from acouzens/open5gs
11
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

merge master branch

This commit is contained in:
Sukchan Lee 2018-03-14 17:59:56 +09:00
parent 0414f19684
commit 9434c751cb
5 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/mme/s1ap_build.c
View File

@ -2016,7 +2016,7 @@ status_t s1ap_build_error_indication(
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)
S1AP_Cause_PR group, long cause)
{
status_t rv;
@ -2074,23 +2074,20 @@ status_t s1ap_build_error_indication(
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 = 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;
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 = &ie->value.choice.Cause;
Cause->present = cause->present;
Cause->choice.radioNetwork = cause->choice.radioNetwork;
Cause->present = group;
Cause->choice.radioNetwork = cause;
d_trace(5, " Group[%d] Cause[%d]\n",
Cause->present, 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);

2
src/mme/s1ap_build.h
View File

@ -58,7 +58,7 @@ CORE_DECLARE(status_t) s1ap_build_error_indication(
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);
S1AP_Cause_PR group, long cause);
#ifdef __cplusplus
}

4
src/mme/s1ap_handler.c
View File

@ -859,7 +859,9 @@ void s1ap_handle_ue_context_release_request(
{
d_warn("No ENB UE Context : MME_UE_S1AP_ID[%d]", *MME_UE_S1AP_ID);
rv = s1ap_send_error_indication(enb,
MME_UE_S1AP_ID, ENB_UE_S1AP_ID, Cause);
MME_UE_S1AP_ID, ENB_UE_S1AP_ID,
S1AP_Cause_PR_radioNetwork,
S1AP_CauseRadioNetwork_unknown_mme_ue_s1ap_id);
d_assert(rv == CORE_OK, return, "s1ap send error");
return;
}

4
src/mme/s1ap_path.c
View File

@ -492,7 +492,7 @@ status_t s1ap_send_error_indication(
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)
S1AP_Cause_PR group, long cause)
{
status_t rv;
pkbuf_t *s1apbuf = NULL;
@ -500,7 +500,7 @@ status_t s1ap_send_error_indication(
d_assert(enb, return CORE_ERROR,);
rv = s1ap_build_error_indication(&s1apbuf,
mme_ue_s1ap_id, enb_ue_s1ap_id, cause);
mme_ue_s1ap_id, enb_ue_s1ap_id, group, cause);
d_assert(rv == CORE_OK && s1apbuf, return CORE_ERROR, "s1ap build error");
rv = s1ap_send_to_enb(enb, s1apbuf);

2
src/mme/s1ap_path.h
View File

@ -71,7 +71,7 @@ CORE_DECLARE(status_t) s1ap_send_error_indication(
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);
S1AP_Cause_PR group, long cause);
#ifdef __cplusplus
}