pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/43811?usp=email ) Change subject: sigtran: N-NOTICE.ind: Use proper SCCP-User return reason ...................................................................... sigtran: N-NOTICE.ind: Use proper SCCP-User return reason Until recently, libosmo-sigtran was incorrectly expecting low-level wire-format cause in N-NOTICE.ind. Nowadays it supports specific reason values in the SCCP-User SAP, so use those instead. This change is backward-compatible since the value for both enums are the same as per specs. Change-Id: Ic27a7f2e62d3392668e6ffc3b37ab278f343e128 Related: OS#2601 --- M TODO-RELEASE M src/sgsn/sccp.c 2 files changed, 5 insertions(+), 5 deletions(-) Approvals: osmith: Looks good to me, but someone else must approve lynxis lazus: Looks good to me, approved Jenkins Builder: Verified diff --git a/TODO-RELEASE b/TODO-RELEASE index 40cc353..3fa5840 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -14,3 +14,4 @@ osmo-iuh >1.7.0 ranap multiple params are constified, see osmo-iuh Change-Id I667dc2ef377c1ceb5b11315458f00b282c143c81 osmo-iuh >1.8.1 ranap_new_msg_rab_assign_data2() / ranap_new_msg_rab_assign_voice2() libosmo-sigtran >2.3.0 OSMO_SCCP_REL_REASON_NSU_* +libosmo-sigtran >2.3.0 OSMO_SCCP_RETURN_REASON_*, osmo_sccp_return_reason_name() diff --git a/src/sgsn/sccp.c b/src/sgsn/sccp.c index 83aa19f..d1a3a1f 100644 --- a/src/sgsn/sccp.c +++ b/src/sgsn/sccp.c @@ -28,7 +28,6 @@ #include <osmocom/sigtran/sccp_sap.h> #include <osmocom/sigtran/sccp_helpers.h> -#include <osmocom/sccp/sccp_types.h> #include <osmocom/sgsn/debug.h> #include <osmocom/sgsn/iu_client.h> @@ -154,19 +153,19 @@ LOGP(DSUA, LOGL_DEBUG, "(calling_addr=%s) N-NOTICE.ind cause=%u='%s' importance=%u didn't match any RNC, ignoring\n", osmo_sccp_addr_dump(&ni->calling_addr), - ni->cause, osmo_sccp_return_cause_name(ni->cause), + ni->cause, osmo_sccp_return_reason_name(ni->cause), ni->importance); return; } LOG_RNC(rnc, LOGL_NOTICE, "N-NOTICE.ind cause=%u='%s' importance=%u\n", - ni->cause, osmo_sccp_return_cause_name(ni->cause), + ni->cause, osmo_sccp_return_reason_name(ni->cause), ni->importance); switch (ni->cause) { - case SCCP_RETURN_CAUSE_SUBSYSTEM_CONGESTION: - case SCCP_RETURN_CAUSE_NETWORK_CONGESTION: + case OSMO_SCCP_RETURN_REASON_SUBSYSTEM_CONGESTION: + case OSMO_SCCP_RETURN_REASON_NETWORK_CONGESTION: /* Transient failures (hopefully), keep going. */ return; default: -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/43811?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Ic27a7f2e62d3392668e6ffc3b37ab278f343e128 Gerrit-Change-Number: 43811 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin@sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus <lynxis@fe80.eu> Gerrit-Reviewer: osmith <osmith@sysmocom.de> Gerrit-Reviewer: pespin <pespin@sysmocom.de>