pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/43808?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.
Related: OS#2601
Change-Id: I38c218f4595af0be9a17cff436b2beaabd6f8487
---
M TODO-RELEASE
M src/osmo-hnbgw/hnbgw_sccp.c
2 files changed, 5 insertions(+), 5 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/08/43808/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-hnbgw/hnbgw_sccp.c b/src/osmo-hnbgw/hnbgw_sccp.c
index 2e9b79a..2e97269 100644
--- a/src/osmo-hnbgw/hnbgw_sccp.c
+++ b/src/osmo-hnbgw/hnbgw_sccp.c
@@ -32,7 +32,6 @@
#include <osmocom/sigtran/sccp_sap.h>
#include <osmocom/sigtran/sccp_helpers.h>
#include <osmocom/sigtran/protocol/sua.h>
-#include <osmocom/sccp/sccp_types.h>
#include <osmocom/hnbgw/hnbgw_cn.h>
#include <osmocom/hnbgw/context_map.h>
@@ -122,18 +121,18 @@
if (!cnlink) {
LOGP(DCN, LOGL_DEBUG, "(calling_addr=%s) N-NOTICE.ind cause=%u='%s' importance=%u didn't match any cnlink, ignoring\n",
osmo_sccp_addr_dump(¶m->calling_addr),
- param->cause, osmo_sccp_return_cause_name(param->cause),
+ param->cause, osmo_sccp_return_reason_name(param->cause),
param->importance);
return;
}
LOG_CNLINK(cnlink, DCN, LOGL_NOTICE, "N-NOTICE.ind cause=%u='%s' importance=%u\n",
- param->cause, osmo_sccp_return_cause_name(param->cause),
+ param->cause, osmo_sccp_return_reason_name(param->cause),
param->importance);
CNLINK_CTR_INC(cnlink, CNLINK_CTR_SCCP_N_NOTICE_IND);
switch (param->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-hnbgw/+/43808?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: osmo-hnbgw
Gerrit-Branch: master
Gerrit-Change-Id: I38c218f4595af0be9a17cff436b2beaabd6f8487
Gerrit-Change-Number: 43808
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/43807?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: I4b412dcc95df6566a3ec1bb91fa93b4115406b0f
Related: OS#2601
---
M TODO-RELEASE
M src/osmo-bsc/lb.c
M src/osmo-bsc/osmo_bsc_sigtran.c
3 files changed, 10 insertions(+), 10 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/07/43807/1
diff --git a/TODO-RELEASE b/TODO-RELEASE
index b6d61b1..510eed7 100644
--- a/TODO-RELEASE
+++ b/TODO-RELEASE
@@ -7,4 +7,5 @@
# If any interfaces have been added since the last public release: c:r:a + 1.
# 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_REL_REASON_NSU_*,
+libosmo-sigtran >2.3.0 OSMO_SCCP_RETURN_REASON_*, osmo_sccp_return_reason_name()
diff --git a/src/osmo-bsc/lb.c b/src/osmo-bsc/lb.c
index 33cc548..6f79502 100644
--- a/src/osmo-bsc/lb.c
+++ b/src/osmo-bsc/lb.c
@@ -160,19 +160,19 @@
if (!smlc) {
LOGP(DLCS, LOGL_DEBUG, "(calling_addr=%s) N-NOTICE.ind cause=%u='%s' importance=%u didn't match SMLC, 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 -EINVAL;
}
LOGP(DLCS, LOGL_NOTICE, "(calling_addr=%s) N-NOTICE.ind cause=%u='%s' importance=%u\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);
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 rc;
default:
diff --git a/src/osmo-bsc/osmo_bsc_sigtran.c b/src/osmo-bsc/osmo_bsc_sigtran.c
index c96aebf..c91b725 100644
--- a/src/osmo-bsc/osmo_bsc_sigtran.c
+++ b/src/osmo-bsc/osmo_bsc_sigtran.c
@@ -24,7 +24,6 @@
#include <osmocom/sigtran/sccp_sap.h>
#include <osmocom/sigtran/protocol/mtp.h>
#include <osmocom/sigtran/mtp_sap.h>
-#include <osmocom/sccp/sccp_types.h>
#include <osmocom/core/linuxlist.h>
#include <osmocom/gsm/gsm0808.h>
#include <osmocom/gsm/protocol/ipaccess.h>
@@ -160,19 +159,19 @@
if (!msc) {
LOGP(DMSC, LOGL_DEBUG, "(calling_addr=%s) N-NOTICE.ind cause=%u='%s' importance=%u didn't match any MSC, 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 rc;
}
LOG_MSC(msc, LOGL_NOTICE, "(calling_addr=%s) N-NOTICE.ind cause=%u='%s' importance=%u\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);
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 rc;
default:
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/43807?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: I4b412dcc95df6566a3ec1bb91fa93b4115406b0f
Gerrit-Change-Number: 43807
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Hello Jenkins Builder,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/libosmo-sigtran/+/43806?usp=email
to look at the new patch set (#2).
The following approvals got outdated and were removed:
Verified+1 by Jenkins Builder
Change subject: sccp: Introduce N-NOTICE.ind Reason for return
......................................................................
sccp: Introduce N-NOTICE.ind Reason for return
The SCCP-User SAP primitive N-NOTICE.ind carries a "Reason for return"
field, described in ITU Q.711 6.2.2.2.4 Reason for return.
According to Q.713 A.5 Return cause:
"There is a one-to-one mapping between the return cause of UDTS, XUDTS
or LUDTS messages and the reason for return in the N-NOTICE primitives".
Still, even if the values can be mapped one to one, the SCCP-User field
is a field conceptually different than the return cause field sent over
the wire in SCCP messages.
Hence, add a new enum to sccp_sap.h so that users of SCCP-User can match
existing values without having to use unintended sccp_types.h, which
holds wire-format SCCP stuff.
Related: OS#2601
Change-Id: I492df5b57bdeefc02b334c4a4db3ca346767dc60
---
M TODO-RELEASE
M include/osmocom/sccp/sccp_types.h
M include/osmocom/sigtran/sccp_sap.h
M src/sccp_sap.c
M src/sccp_sclc.c
5 files changed, 58 insertions(+), 3 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/06/43806/2
--
To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/43806?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newpatchset
Gerrit-Project: libosmo-sigtran
Gerrit-Branch: master
Gerrit-Change-Id: I492df5b57bdeefc02b334c4a4db3ca346767dc60
Gerrit-Change-Number: 43806
Gerrit-PatchSet: 2
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/43806?usp=email )
Change subject: sccp: Introduce N-NOTICE.ind Reason for return
......................................................................
sccp: Introduce N-NOTICE.ind Reason for return
The SCCP-User SAP primitive N-NOTICE.ind carries a "Reason for return"
field, described in ITU Q.711 6.2.2.2.4 Reason for return.
According to Q.713 A.5 Return cause:
"There is a one-to-one mapping between the return cause of UDTS, XUDTS
or LUDTS messages and the reason for return in the N-NOTICE primitives".
Still, even if the values can be mapped one to one, the SCCP-User field
is a field conceptually different than the return cause field sent over
the wire in SCCP messages.
Hence, add a new enum to sccp_sap.h so that users of SCCP-User can match
existing values without having to use unintended sccp_types.h, which
holds wire-format SCCP stuff.
Related: OS#2601
Change-Id: I492df5b57bdeefc02b334c4a4db3ca346767dc60
---
M TODO-RELEASE
M include/osmocom/sccp/sccp_types.h
M include/osmocom/sigtran/sccp_sap.h
M src/sccp_sclc.c
4 files changed, 32 insertions(+), 3 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/06/43806/1
diff --git a/TODO-RELEASE b/TODO-RELEASE
index 22fd2f9..ac06fda 100644
--- a/TODO-RELEASE
+++ b/TODO-RELEASE
@@ -9,3 +9,4 @@
#library what description / commit summary line
libosmocore >1.14.2 new VTY node L_CS7_QOS_CLASS_NODE added
libosmo-sigtran added enum osmo_sccp_reset_reason_*, enum osmo_sccp_release_reason_*
+libosmo-sigtran added enum osmo_sccp_return_reason
diff --git a/include/osmocom/sccp/sccp_types.h b/include/osmocom/sccp/sccp_types.h
index ab688b3..8e76568 100644
--- a/include/osmocom/sccp/sccp_types.h
+++ b/include/osmocom/sccp/sccp_types.h
@@ -231,7 +231,10 @@
static inline const char *osmo_sccp_release_cause_name(enum sccp_release_cause val)
{ return get_value_string(osmo_sccp_release_cause_names, val); }
-/* ITU-T Q.713, Section 3.12 Return cause */
+/* ITU-T Q.713, Section 3.12 Return cause
+ * Q.713 A.5 Return cause: "There is a one-to-one mapping between the return
+ * cause of UDTS, XUDTS or LUDTS messages and the reason for return in the
+ * N-NOTICE primitives" (Q.711 6.2.2.2.4 Reason for return) */
enum sccp_return_cause {
SCCP_RETURN_CAUSE_NO_TRANSLATION_NATURE = 0,
SCCP_RETURN_CAUSE_NO_TRANSLATION = 1,
diff --git a/include/osmocom/sigtran/sccp_sap.h b/include/osmocom/sigtran/sccp_sap.h
index d8ee43e..585e74e 100644
--- a/include/osmocom/sigtran/sccp_sap.h
+++ b/include/osmocom/sigtran/sccp_sap.h
@@ -198,6 +198,28 @@
OSMO_SCCP_REL_REASON_UNDEFINED = 0x100,
};
+/* Q.711 6.2.2.2.4 Reason for return.
+ * Q.713 A.5 Return cause: "There is a one-to-one mapping between the return
+ * cause of UDTS, XUDTS or LUDTS messages and the reason for return in the
+ * N-NOTICE primitives" (ITU-T Q.713, Section 3.12 Return cause) */
+enum osmo_sccp_return_reason {
+ OSMO_SCCP_RETURN_REASON_NO_TRANSLATION_NATURE = 0,
+ OSMO_SCCP_RETURN_REASON_NO_TRANSLATION = 1,
+ OSMO_SCCP_RETURN_REASON_SUBSYSTEM_CONGESTION = 2,
+ OSMO_SCCP_RETURN_REASON_SUBSYSTEM_FAILURE = 3,
+ OSMO_SCCP_RETURN_REASON_UNEQUIPPED_USER = 4,
+ OSMO_SCCP_RETURN_REASON_MTP_FAILURE = 5,
+ OSMO_SCCP_RETURN_REASON_NETWORK_CONGESTION = 6,
+ OSMO_SCCP_RETURN_REASON_UNQUALIFIED = 7,
+ OSMO_SCCP_RETURN_REASON_ERROR_IN_MSG_TRANSPORT = 8,
+ OSMO_SCCP_RETURN_REASON_ERROR_IN_LOCAL_PROCESSING = 9,
+ OSMO_SCCP_RETURN_REASON_DEST_CANNOT_PERFORM_REASSEMBLY = 10,
+ OSMO_SCCP_RETURN_REASON_SCCP_FAILURE = 11,
+ OSMO_SCCP_RETURN_REASON_HOP_COUNTER_VIOLATION = 12,
+ OSMO_SCCP_RETURN_REASON_SEGMENTATION_NOT_SUPPORTED = 13,
+ OSMO_SCCP_RETURN_REASON_SEGMENTATION_FAILURE = 14
+};
+
/* Q.711 6.3.2.2.5 Signalling point status */
enum osmo_sccp_sp_status {
OSMO_SCCP_SP_S_INACCESSIBLE = 1,
@@ -320,8 +342,7 @@
struct osmo_scu_notice_param {
struct osmo_sccp_addr called_addr;
struct osmo_sccp_addr calling_addr;
- /* ITU Q.711 6.2.2.2.4 "Reason for return":
- * enum sccp_return_cause (ITU Q.713 3.12), as per ITU Q.713 A.5. */
+ /* ITU Q.711 6.2.2.2.4 "Reason for return" (enum osmo_sccp_return_reason): */
uint32_t cause;
uint32_t importance; /* ITU Q.711 6.2.2.2.6, Q.713 3.19 */
/* user data */
diff --git a/src/sccp_sclc.c b/src/sccp_sclc.c
index 704c4bb..1d821f0 100644
--- a/src/sccp_sclc.c
+++ b/src/sccp_sclc.c
@@ -287,6 +287,10 @@
}
param->importance = xua_msg_get_u32(xua, SUA_IEI_IMPORTANCE);
+ /* Q.713 A.5 Return cause: "There is a one-to-one mapping between the
+ * return cause of UDTS, XUDTS or LUDTS messages and the reason for return in
+ * the N-NOTICE primitives"
+ */
param->cause = xua_msg_get_u32(xua, SUA_IEI_CAUSE) & ~SUA_CAUSE_T_MASK;
scu = sccp_user_find(inst, param->called_addr.ssn,
--
To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/43806?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: libosmo-sigtran
Gerrit-Branch: master
Gerrit-Change-Id: I492df5b57bdeefc02b334c4a4db3ca346767dc60
Gerrit-Change-Number: 43806
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Attention is currently required from: lynxis lazus.
Hello Jenkins Builder, lynxis lazus,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/osmo-sgsn/+/43804?usp=email
to look at the new patch set (#3).
Change subject: sigtran: N-DISCONNECT.req: Use proper SCCP-User release reason
......................................................................
sigtran: N-DISCONNECT.req: Use proper SCCP-User release reason
Until recently, libosmo-sigtran was incorrectly expecting low-level
wire-format cause in N-DISCONNECT.req. Nowadays it supports specific
reason values in the SCCP-User SAP, so use those instead.
Change-Id: I4bf44c973ae5dbe6fc2164e1ecc314b1cfdaf08c
Related: OS#2601
---
M TODO-RELEASE
M src/sgsn/iu_client.c
M src/sgsn/iu_rnc.c
M src/sgsn/iu_rnc_fsm.c
4 files changed, 8 insertions(+), 4 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/04/43804/3
--
To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/43804?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newpatchset
Gerrit-Project: osmo-sgsn
Gerrit-Branch: master
Gerrit-Change-Id: I4bf44c973ae5dbe6fc2164e1ecc314b1cfdaf08c
Gerrit-Change-Number: 43804
Gerrit-PatchSet: 3
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu>
Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu>
Attention is currently required from: lynxis lazus.
Hello lynxis lazus,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/osmo-sgsn/+/43804?usp=email
to look at the new patch set (#2).
Change subject: sigtran: N-DISCONNECT.req: Use proper SCCP-User release reason
......................................................................
sigtran: N-DISCONNECT.req: Use proper SCCP-User release reason
Until recently, libosmo-sigtran was incorrectly expecting low-level
wire-format cause in N-DISCONNECT.req. Nowadays it supports specific
reason values in the SCCP-User SAP, so use those instead.
Change-Id: I4bf44c973ae5dbe6fc2164e1ecc314b1cfdaf08c
Related: OS#2601
---
M TODO-RELEASE
M src/sgsn/iu_client.c
M src/sgsn/iu_rnc_fsm.c
3 files changed, 8 insertions(+), 2 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/04/43804/2
--
To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/43804?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newpatchset
Gerrit-Project: osmo-sgsn
Gerrit-Branch: master
Gerrit-Change-Id: I4bf44c973ae5dbe6fc2164e1ecc314b1cfdaf08c
Gerrit-Change-Number: 43804
Gerrit-PatchSet: 2
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu>
Gerrit-CC: Jenkins Builder
Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu>
Attention is currently required from: pespin.
osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/43760?usp=email )
Change subject: sigtran: Document ASP administrative state
......................................................................
Patch Set 1: Code-Review+1
(1 comment)
File common/chapters/sigtran-osmocom.adoc:
https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/43760/comment/6c14665e_ddd7… :
PS1, Line 405: adminsitrative
```suggestion
and further ACTIVATE attempts are rejected until the administrative state is
```
--
To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/43760?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: osmo-gsm-manuals
Gerrit-Branch: master
Gerrit-Change-Id: I355f382857b62a42b4752689d27a34c668c7e996
Gerrit-Change-Number: 43760
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Wed, 07 Oct 2026 11:39:15 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes