pespin has uploaded this change for review.
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.
Related: OS#2601
Change-Id: Icc0d3582c9d7cef72b490bfb1fdb877032673cb5
---
M TODO-RELEASE
M src/osmo-smlc/sccp_lb_inst.c
2 files changed, 5 insertions(+), 5 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-smlc refs/changes/12/43812/1
diff --git a/TODO-RELEASE b/TODO-RELEASE
index b6d61b1..5e970b9 100644
--- a/TODO-RELEASE
+++ b/TODO-RELEASE
@@ -8,3 +8,4 @@
# If any interfaces have been removed or changed since the last public release: c:r:0.
#library what description / commit summary line
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/osmo-smlc/sccp_lb_inst.c b/src/osmo-smlc/sccp_lb_inst.c
index 3238b9d..b4fb4d5 100644
--- a/src/osmo-smlc/sccp_lb_inst.c
+++ b/src/osmo-smlc/sccp_lb_inst.c
@@ -22,7 +22,6 @@
#include <osmocom/core/logging.h>
-#include <osmocom/sccp/sccp_types.h>
#include <osmocom/sigtran/sccp_sap.h>
#include <osmocom/sigtran/sccp_helpers.h>
@@ -93,18 +92,18 @@
if (!lbp) {
LOG_SCCP_LB(sli, LOGL_DEBUG, "(calling_addr=%s) N-NOTICE.ind cause=%u='%s' importance=%u didn't match any lb_peer, 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_LB_PEER(lbp, 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 change 43812. To unsubscribe, or for help writing mail filters, visit settings.