Follow-up on #1729
This commit is contained in:
parent
af1f8d4f4a
commit
d87d61e851
|
@ -412,6 +412,7 @@ int amf_nsmf_pdusession_handle_update_sm_context(
|
||||||
}
|
}
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
|
SmContextUpdatedData = recvmsg->SmContextUpdatedData;
|
||||||
|
|
||||||
if (state == AMF_UPDATE_SM_CONTEXT_ACTIVATED) {
|
if (state == AMF_UPDATE_SM_CONTEXT_ACTIVATED) {
|
||||||
/*
|
/*
|
||||||
|
|
|
@ -151,8 +151,18 @@ int ngap_handle_pdu_session_resource_setup_response_transfer(
|
||||||
sess, stream, OGS_PFCP_MODIFY_DL_ONLY|OGS_PFCP_MODIFY_ACTIVATE,
|
sess, stream, OGS_PFCP_MODIFY_DL_ONLY|OGS_PFCP_MODIFY_ACTIVATE,
|
||||||
0));
|
0));
|
||||||
} else {
|
} else {
|
||||||
|
#if 0 /* Modified by pull request #1729 */
|
||||||
/* ACTIVATED Is NOT Included in RESPONSE */
|
/* ACTIVATED Is NOT Included in RESPONSE */
|
||||||
ogs_assert(true == ogs_sbi_send_http_status_no_content(stream));
|
ogs_assert(true == ogs_sbi_send_http_status_no_content(stream));
|
||||||
|
#else
|
||||||
|
if (sess->up_cnx_state == OpenAPI_up_cnx_state_ACTIVATING) {
|
||||||
|
sess->up_cnx_state = OpenAPI_up_cnx_state_ACTIVATED;
|
||||||
|
smf_sbi_send_sm_context_updated_data_up_cnx_state(
|
||||||
|
sess, stream, OpenAPI_up_cnx_state_ACTIVATED);
|
||||||
|
} else {
|
||||||
|
ogs_assert(true == ogs_sbi_send_http_status_no_content(stream));
|
||||||
|
}
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
rv = OGS_OK;
|
rv = OGS_OK;
|
||||||
|
|
|
@ -350,6 +350,8 @@ bool smf_nsmf_handle_update_sm_context(
|
||||||
|
|
||||||
} else if (SmContextUpdateData->up_cnx_state) {
|
} else if (SmContextUpdateData->up_cnx_state) {
|
||||||
|
|
||||||
|
sess->up_cnx_state = SmContextUpdateData->up_cnx_state;
|
||||||
|
|
||||||
if (SmContextUpdateData->up_cnx_state ==
|
if (SmContextUpdateData->up_cnx_state ==
|
||||||
OpenAPI_up_cnx_state_DEACTIVATED) {
|
OpenAPI_up_cnx_state_DEACTIVATED) {
|
||||||
|
|
||||||
|
@ -432,7 +434,6 @@ bool smf_nsmf_handle_update_sm_context(
|
||||||
|
|
||||||
memset(&SmContextUpdatedData, 0, sizeof(SmContextUpdatedData));
|
memset(&SmContextUpdatedData, 0, sizeof(SmContextUpdatedData));
|
||||||
SmContextUpdatedData.up_cnx_state = OpenAPI_up_cnx_state_ACTIVATING;
|
SmContextUpdatedData.up_cnx_state = OpenAPI_up_cnx_state_ACTIVATING;
|
||||||
sess->up_cnx_state = OpenAPI_up_cnx_state_ACTIVATING;
|
|
||||||
SmContextUpdatedData.n2_sm_info_type =
|
SmContextUpdatedData.n2_sm_info_type =
|
||||||
OpenAPI_n2_sm_info_type_PDU_RES_SETUP_REQ;
|
OpenAPI_n2_sm_info_type_PDU_RES_SETUP_REQ;
|
||||||
SmContextUpdatedData.n2_sm_info = &n2SmInfo;
|
SmContextUpdatedData.n2_sm_info = &n2SmInfo;
|
||||||
|
|
Loading…
Reference in New Issue