October 2026 - gerrit-log - lists.osmocom.org

[L] Change in libosmo-sigtran[master]: sccp: Introduce N-DISCONNECT.req/ind Release/Refusal reason
by pespin 07 Oct '26

07 Oct '26

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/43763?usp=email ) Change subject: sccp: Introduce N-DISCONNECT.req/ind Release/Refusal reason ...................................................................... sccp: Introduce N-DISCONNECT.req/ind Release/Refusal reason N-DISCONNECT.req has a "Reason" Parameter. the "Reason" Parameter is mandatory according to Table 6/Q.711. The options possible for the "Reason" can be found in ITU Q.711 "6.1.1.2.4 Release phase", and contain no explicit value. That enum is different from the wire-format defined in: * ITU-T Q.713, Section 3.11 Release cause * ITU-T Q.713 Section 3.15 Refusal cause Actually, ITU-T Q.713 "ANNEX A" describes a mapping between the former (N-DISCONNECT.req Reason) and the later (SCCP Release/Refusal cause). Use that table to translate as much as possible between the two (despite the mapping is described as being one-to-one, well, it leaves a lot to interpretation due to missing enums, N-to-M mappings, etc.). Related: OS#2601 Change-Id: I158463c2e9b34abe06554371d628e4fa7ea8c5c1 --- M TODO-RELEASE M include/osmocom/sigtran/sccp_sap.h M src/sccp_connection.c M src/sccp_connection.h M src/sccp_sap.c M src/sccp_scoc.c M src/sccp_scoc_fsm.c M src/sccp_user.h 8 files changed, 431 insertions(+), 6 deletions(-) Approvals: fixeria: Looks good to me, approved Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve diff --git a/TODO-RELEASE b/TODO-RELEASE index 4597a71..22fd2f9 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 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_* diff --git a/include/osmocom/sigtran/sccp_sap.h b/include/osmocom/sigtran/sccp_sap.h index 7399b3d..d8ee43e 100644 --- a/include/osmocom/sigtran/sccp_sap.h +++ b/include/osmocom/sigtran/sccp_sap.h @@ -137,6 +137,67 @@ OSMO_SCCP_SSN_BSSAP = 254, }; +/* Q.711 6.1.1.2.3, "Table 5/Q.711" and paragrapgs below it */ +enum osmo_sccp_reset_reason_nsp { + OSMO_SCCP_RESET_REASON_NSP_UNSPEC = 0x0, + OSMO_SCCP_RESET_REASON_NSP_LOCAL_SCCP_ORIGIN, +}; + +enum osmo_sccp_reset_reason_nsu { + OSMO_SCCP_RESET_REASON_NSU_USER_SYNCHRONIZATION = 0x0, +}; + +enum osmo_sccp_reset_reason_undefined { + OSMO_SCCP_RESET_REASON_UNDEFINED = 0x0, +}; + +/* Q.711 6.1.1.2.4 1) When the "originator" parameter indicates the "network service provider" */ +enum osmo_sccp_release_reason_nsp { + OSMO_SCCP_REL_REASON_NSP_DISC_NT = 0x100, + OSMO_SCCP_REL_REASON_NSP_DISC_T, + OSMO_SCCP_REL_REASON_NSP_DISC_INVALID_STATE, + OSMO_SCCP_REL_REASON_NSP_DISC_RELEASE_IN_PROGRESS, + OSMO_SCCP_REL_REASON_NSP_CREF_DST_ADDR_UNKNOWN_NT, + OSMO_SCCP_REL_REASON_NSP_CREF_DST_INACC_NT, + OSMO_SCCP_REL_REASON_NSP_CREF_DST_INACC_T, + OSMO_SCCP_REL_REASON_NSP_CREF_QOS_UNAVAIL_NT, + OSMO_SCCP_REL_REASON_NSP_CREF_QOS_UNAVAIL_T, + OSMO_SCCP_REL_REASON_NSP_CREF_REASON_UNSPEC_NT, + OSMO_SCCP_REL_REASON_NSP_CREF_REASON_UNSPEC_T, + OSMO_SCCP_REL_REASON_NSP_CREF_LOCAL_ERROR, + OSMO_SCCP_REL_REASON_NSP_CREF_INVALID_STATE, + OSMO_SCCP_REL_REASON_NSP_CREF_NO_TRANSITION, + OSMO_SCCP_REL_REASON_NSP_CREF_IN_RESTART_PHASE, + OSMO_SCCP_REL_REASON_NSP_CREF_HOP_COUNTER_VIOLATION, +}; + +/* Q.711 6.1.1.2.4 2) When the "originator" parameter indicates the "network service user" */ +enum osmo_sccp_release_reason_nsu { + OSMO_SCCP_REL_REASON_NSU_DISC_NORMAL = 0x100, + OSMO_SCCP_REL_REASON_NSU_DISC_ABNORMAL, + OSMO_SCCP_REL_REASON_NSU_DISC_END_USER_CONGESTION, + OSMO_SCCP_REL_REASON_NSU_DISC_END_USER_FAILURE, + OSMO_SCCP_REL_REASON_NSU_DISC_SCCP_USER_ORIGIN, + OSMO_SCCP_REL_REASON_NSU_DISC_ACCESS_CONGESTION, + OSMO_SCCP_REL_REASON_NSU_DISC_ACCESS_FAILURE, + OSMO_SCCP_REL_REASON_NSU_DISC_SUBSYS_CONGESTION, + OSMO_SCCP_REL_REASON_NSU_CREF_NT_CONDITION, + OSMO_SCCP_REL_REASON_NSU_CREF_T_CONDITION, + OSMO_SCCP_REL_REASON_NSU_CREF_INCOMPAT_INFO_NSDU, + OSMO_SCCP_REL_REASON_NSU_CREF_END_USER_ORIGIN, + OSMO_SCCP_REL_REASON_NSU_CREF_END_USER_CONGESTION, + OSMO_SCCP_REL_REASON_NSU_CREF_END_USER_FAILURE, + OSMO_SCCP_REL_REASON_NSU_CREF_SCCP_USER_ORIGINATED, + OSMO_SCCP_REL_REASON_NSU_CREF_ACCESS_CONGESTION, + OSMO_SCCP_REL_REASON_NSU_CREF_ACCESS_FAILURE, + OSMO_SCCP_REL_REASON_NSU_CREF_SUBSYS_CONGESTION, +}; + +/* Q.711 6.1.1.2.4 2) When the "originator" parameter indicates the "network service user" */ +enum osmo_sccp_release_reason_undefined { + OSMO_SCCP_REL_REASON_UNDEFINED = 0x100, +}; + /* Q.711 6.3.2.2.5 Signalling point status */ enum osmo_sccp_sp_status { OSMO_SCCP_SP_S_INACCESSIBLE = 1, @@ -222,6 +283,8 @@ struct osmo_scu_disconn_param { enum osmo_sccp_originator originator; struct osmo_sccp_addr responding_addr; + /* enum osmo_sccp_release_reason_* (value > 19), + * enum sccp_refusal_cause (ITU-T Q.713 Section 3.15 Refusal cause) value <= 19, backward compatibility */ uint32_t cause; uint32_t conn_id; uint32_t importance; @@ -231,6 +294,7 @@ /* OSMO_SCU_PRIM_N_RESET */ struct osmo_scu_reset_param { enum osmo_sccp_originator originator; + /* enum osmo_sccp_reset_reason_*, "Table 5/Q.711" and paragraphs below it */ uint32_t cause; uint32_t conn_id; }; diff --git a/src/sccp_connection.c b/src/sccp_connection.c index 10c2760..abf13d0 100644 --- a/src/sccp_connection.c +++ b/src/sccp_connection.c @@ -231,6 +231,7 @@ struct osmo_scu_connect_param *uconp; struct osmo_scu_data_param *udatp; struct xua_msg_part *data_ie; + uint32_t cause; scu_prim = scu_prim_alloc(primitive, operation); @@ -243,7 +244,19 @@ udisp->originator = OSMO_SCCP_ORIG_UNDEFINED; //udisp->in_sequence_control; if (xua) { - udisp->cause = xua_msg_get_u32(xua, SUA_IEI_CAUSE); + cause = xua_msg_get_u32(xua, SUA_IEI_CAUSE); + switch (cause & SUA_CAUSE_T_MASK) { + case SUA_CAUSE_T_REFUSAL: + sccp_refusal_cause_to_scu_rel_reason(&udisp->originator, &udisp->cause, cause & 0xff); + break; + case SUA_CAUSE_T_RELEASE: + sccp_release_cause_to_scu_rel_reason(&udisp->originator, &udisp->cause, cause & 0xff); + break; + default: + udisp->originator = OSMO_SCCP_ORIG_UNDEFINED; + udisp->cause = OSMO_SCCP_REL_REASON_UNDEFINED; + break; + } if (xua_msg_find_tag(xua, SUA_IEI_SRC_ADDR)) { if (sua_addr_parse(&udisp->responding_addr, xua, SUA_IEI_SRC_ADDR) < 0) { LOGPSCC(conn, LOGL_ERROR, "XUA Message %s without valid SRC_ADDR\n", diff --git a/src/sccp_connection.h b/src/sccp_connection.h index 82b707f..cb24d70 100644 --- a/src/sccp_connection.h +++ b/src/sccp_connection.h @@ -3,6 +3,7 @@ #include <osmocom/core/fsm.h> #include <osmocom/sigtran/sccp_sap.h> +#include <osmocom/sccp/sccp_types.h> struct xua_msg; @@ -34,7 +35,7 @@ uint32_t importance; uint32_t sccp_class; - uint32_t release_cause; /* WAIT_CONN_CONF */ + enum sccp_release_cause release_cause; /* WAIT_CONN_CONF */ /* SLS to be used to transmit all Connection-oriented messages * (ITU-T Q.714 1.1.2.3 Protocol class 2). diff --git a/src/sccp_sap.c b/src/sccp_sap.c index 00b2563..95d2070 100644 --- a/src/sccp_sap.c +++ b/src/sccp_sap.c @@ -25,6 +25,8 @@ #include <osmocom/sigtran/sccp_sap.h> +#include <osmocom/sccp/sccp_types.h> + #include "ss7_instance.h" #include "sccp_connection.h" #include "sccp_scoc_fsm.h" @@ -174,6 +176,337 @@ { 0, NULL } }; +/* Table A.1/Q.713 */ +static enum sccp_refusal_cause scu_rel_reason_nsp_to_sccp_refusal_cause(uint32_t reason) +{ + switch (reason) { + case OSMO_SCCP_REL_REASON_NSP_CREF_DST_ADDR_UNKNOWN_NT: + return SCCP_REFUSAL_DESTINATION_ADDRESS_UKNOWN; + case OSMO_SCCP_REL_REASON_NSP_CREF_DST_INACC_NT: + return SCCP_REFUSAL_SUBSYSTEM_FAILURE; + case OSMO_SCCP_REL_REASON_NSP_CREF_DST_INACC_T: + return SCCP_REFUSAL_DESTINATION_INACCESSIBLE; + case OSMO_SCCP_REL_REASON_NSP_CREF_QOS_UNAVAIL_NT: + return SCCP_REFUSAL_NET_QOS_NON_TRANSIENT; + case OSMO_SCCP_REL_REASON_NSP_CREF_QOS_UNAVAIL_T: + return SCCP_REFUSAL_NET_QOS_TRANSIENT; + case OSMO_SCCP_REL_REASON_NSP_CREF_REASON_UNSPEC_NT: + return SCCP_REFUSAL_UNQUALIFIED; + case OSMO_SCCP_REL_REASON_NSP_CREF_REASON_UNSPEC_T: + return SCCP_REFUSAL_EXPIRATION; + case OSMO_SCCP_REL_REASON_NSP_CREF_HOP_COUNTER_VIOLATION: + return SCCP_REFUSAL_HOP_COUNTER_VIOLATION; + /* Not specified in the table... */ + case OSMO_SCCP_REL_REASON_NSP_DISC_NT: + case OSMO_SCCP_REL_REASON_NSP_DISC_T: + case OSMO_SCCP_REL_REASON_NSP_DISC_INVALID_STATE: + case OSMO_SCCP_REL_REASON_NSP_DISC_RELEASE_IN_PROGRESS: + case OSMO_SCCP_REL_REASON_NSP_CREF_LOCAL_ERROR: + case OSMO_SCCP_REL_REASON_NSP_CREF_INVALID_STATE: + case OSMO_SCCP_REL_REASON_NSP_CREF_NO_TRANSITION: + case OSMO_SCCP_REL_REASON_NSP_CREF_IN_RESTART_PHASE: + default: + return SCCP_REFUSAL_UNQUALIFIED; + } +} + +/* Table A.1/Q.713 */ +static enum sccp_refusal_cause scu_rel_reason_nsu_to_sccp_refusal_cause(uint32_t reason) +{ + switch (reason) { + case OSMO_SCCP_REL_REASON_NSU_CREF_INCOMPAT_INFO_NSDU: + return SCCP_REFUSAL_INCOMPATIBLE_USER_DATA; + case OSMO_SCCP_REL_REASON_NSU_CREF_END_USER_ORIGIN: + return SCCP_REFUSAL_END_USER_ORIGINATED; + case OSMO_SCCP_REL_REASON_NSU_CREF_END_USER_CONGESTION: + return SCCP_REFUSAL_END_USER_CONGESTION; + case OSMO_SCCP_REL_REASON_NSU_CREF_END_USER_FAILURE: + return SCCP_REFUSAL_END_USER_FAILURE; + case OSMO_SCCP_REL_REASON_NSU_CREF_SCCP_USER_ORIGINATED: + return SCCP_REFUSAL_SCCP_USER_ORIGINATED; + case OSMO_SCCP_REL_REASON_NSU_CREF_ACCESS_CONGESTION: + return SCCP_REFUSAL_ACCESS_CONGESTION; + case OSMO_SCCP_REL_REASON_NSU_CREF_ACCESS_FAILURE: + return SCCP_REFUSAL_ACCESS_FAILURE; + case OSMO_SCCP_REL_REASON_NSU_CREF_SUBSYS_CONGESTION: + return SCCP_REFUSAL_SUBSYTEM_CONGESTION; + /* Not specified in the table... */ + case OSMO_SCCP_REL_REASON_NSU_DISC_NORMAL: + case OSMO_SCCP_REL_REASON_NSU_DISC_ABNORMAL: + case OSMO_SCCP_REL_REASON_NSU_DISC_END_USER_CONGESTION: + case OSMO_SCCP_REL_REASON_NSU_DISC_END_USER_FAILURE: + case OSMO_SCCP_REL_REASON_NSU_DISC_SCCP_USER_ORIGIN: + case OSMO_SCCP_REL_REASON_NSU_DISC_ACCESS_CONGESTION: + case OSMO_SCCP_REL_REASON_NSU_DISC_ACCESS_FAILURE: + case OSMO_SCCP_REL_REASON_NSU_DISC_SUBSYS_CONGESTION: + case OSMO_SCCP_REL_REASON_NSU_CREF_NT_CONDITION: + case OSMO_SCCP_REL_REASON_NSU_CREF_T_CONDITION: + default: + return SCCP_REFUSAL_UNQUALIFIED; + } +} + +/* Table A.1/Q.713 */ +enum sccp_refusal_cause scu_rel_reason_to_sccp_refusal_cause(enum osmo_sccp_originator originator, uint32_t reason) +{ + if (reason <= SCCP_REFUSAL_UNEQUIPPED_USER) /* direct wire-format as backward compatibility */ + return (enum sccp_refusal_cause)reason; + + switch (originator) { + case OSMO_SCCP_ORIG_NS_PROVIDER: + return scu_rel_reason_nsp_to_sccp_refusal_cause(reason); + case OSMO_SCCP_ORIG_NS_USER: + return scu_rel_reason_nsu_to_sccp_refusal_cause(reason); + case OSMO_SCCP_ORIG_UNDEFINED: + default: + return SCCP_REFUSAL_UNQUALIFIED; + } +} + +/* Table A.1/Q.713 */ +void sccp_refusal_cause_to_scu_rel_reason(enum osmo_sccp_originator *originator, uint32_t *reason, uint32_t sccp_cause) +{ + switch (sccp_cause) { + case SCCP_REFUSAL_END_USER_ORIGINATED: + *originator = OSMO_SCCP_ORIG_NS_USER; + *reason = OSMO_SCCP_REL_REASON_NSU_CREF_END_USER_ORIGIN; + break; + case SCCP_REFUSAL_END_USER_CONGESTION: + *originator = OSMO_SCCP_ORIG_NS_USER; + *reason = OSMO_SCCP_REL_REASON_NSU_CREF_END_USER_CONGESTION; + break; + case SCCP_REFUSAL_END_USER_FAILURE: + *originator = OSMO_SCCP_ORIG_NS_USER; + *reason = OSMO_SCCP_REL_REASON_NSU_CREF_END_USER_FAILURE; + break; + case SCCP_REFUSAL_SCCP_USER_ORIGINATED: + *originator = OSMO_SCCP_ORIG_NS_USER; + *reason = OSMO_SCCP_REL_REASON_NSU_CREF_SCCP_USER_ORIGINATED; + break; + case SCCP_REFUSAL_DESTINATION_ADDRESS_UKNOWN: + *originator = OSMO_SCCP_ORIG_NS_PROVIDER; + *reason = OSMO_SCCP_REL_REASON_NSP_CREF_DST_ADDR_UNKNOWN_NT; + break; + case SCCP_REFUSAL_DESTINATION_INACCESSIBLE: + *originator = OSMO_SCCP_ORIG_NS_PROVIDER; + *reason = OSMO_SCCP_REL_REASON_NSP_CREF_DST_INACC_T; + break; + case SCCP_REFUSAL_NET_QOS_NON_TRANSIENT: + *originator = OSMO_SCCP_ORIG_NS_PROVIDER; + *reason = OSMO_SCCP_REL_REASON_NSP_CREF_QOS_UNAVAIL_NT; + break; + case SCCP_REFUSAL_NET_QOS_TRANSIENT: + *originator = OSMO_SCCP_ORIG_NS_PROVIDER; + *reason = OSMO_SCCP_REL_REASON_NSP_CREF_QOS_UNAVAIL_T; + break; + case SCCP_REFUSAL_ACCESS_FAILURE: + *originator = OSMO_SCCP_ORIG_NS_USER; + *reason = OSMO_SCCP_REL_REASON_NSU_DISC_ACCESS_FAILURE; + break; + case SCCP_REFUSAL_ACCESS_CONGESTION: + *originator = OSMO_SCCP_ORIG_NS_USER; + *reason = OSMO_SCCP_REL_REASON_NSU_DISC_ACCESS_CONGESTION; + break; + case SCCP_REFUSAL_SUBSYSTEM_FAILURE: + *originator = OSMO_SCCP_ORIG_NS_PROVIDER; + *reason = OSMO_SCCP_REL_REASON_NSP_CREF_DST_INACC_NT; + break; + case SCCP_REFUSAL_SUBSYTEM_CONGESTION: + *originator = OSMO_SCCP_ORIG_NS_USER; + *reason = OSMO_SCCP_REL_REASON_NSU_CREF_SUBSYS_CONGESTION; + break; + case SCCP_REFUSAL_EXPIRATION: + *originator = OSMO_SCCP_ORIG_NS_PROVIDER; + *reason = OSMO_SCCP_REL_REASON_NSP_CREF_REASON_UNSPEC_T; + break; + case SCCP_REFUSAL_INCOMPATIBLE_USER_DATA: + *originator = OSMO_SCCP_ORIG_NS_USER; + *reason = OSMO_SCCP_REL_REASON_NSU_CREF_INCOMPAT_INFO_NSDU; + break; + case SCCP_REFUSAL_UNQUALIFIED: + *originator = OSMO_SCCP_ORIG_NS_PROVIDER; + *reason = OSMO_SCCP_REL_REASON_NSP_CREF_REASON_UNSPEC_T; + break; + case SCCP_REFUSAL_HOP_COUNTER_VIOLATION: + *originator = OSMO_SCCP_ORIG_NS_PROVIDER; + *reason = OSMO_SCCP_REL_REASON_NSP_CREF_HOP_COUNTER_VIOLATION; + break; + case SCCP_REFUSAL_NO_TRANS_FOR_ADDRESS_NATURE: + *originator = OSMO_SCCP_ORIG_NS_PROVIDER; + *reason = OSMO_SCCP_REL_REASON_NSP_CREF_DST_ADDR_UNKNOWN_NT; + break; + case SCCP_REFUSAL_UNEQUIPPED_USER: + *originator = OSMO_SCCP_ORIG_NS_PROVIDER; + *reason = OSMO_SCCP_REL_REASON_NSP_CREF_DST_ADDR_UNKNOWN_NT; + break; + /* Not specified in table... */ + case SCCP_REFUSAL_RESERVED: + case SCCP_REFUSAL_SCCP_FAILURE: + default: + *originator = OSMO_SCCP_ORIG_NS_PROVIDER; + *reason = OSMO_SCCP_REL_REASON_NSP_CREF_REASON_UNSPEC_NT; + break; + } +} + + +/* Table A.2/Q.713 */ +static enum sccp_release_cause scu_rel_reason_nsp_to_sccp_release_cause(uint32_t reason) +{ + switch (reason) { + case OSMO_SCCP_REL_REASON_NSP_DISC_NT: + return SCCP_RELEASE_CAUSE_SUBSYSTEM_FAILURE; + case OSMO_SCCP_REL_REASON_NSP_DISC_T: + return SCCP_RELEASE_CAUSE_REMOTE_PROCEDURE_ERROR; + /* Not specified in the table... */ + case OSMO_SCCP_REL_REASON_NSP_DISC_INVALID_STATE: + case OSMO_SCCP_REL_REASON_NSP_DISC_RELEASE_IN_PROGRESS: + case OSMO_SCCP_REL_REASON_NSP_CREF_DST_ADDR_UNKNOWN_NT: + case OSMO_SCCP_REL_REASON_NSP_CREF_DST_INACC_NT: + case OSMO_SCCP_REL_REASON_NSP_CREF_DST_INACC_T: + case OSMO_SCCP_REL_REASON_NSP_CREF_QOS_UNAVAIL_NT: + case OSMO_SCCP_REL_REASON_NSP_CREF_QOS_UNAVAIL_T: + case OSMO_SCCP_REL_REASON_NSP_CREF_REASON_UNSPEC_NT: + case OSMO_SCCP_REL_REASON_NSP_CREF_REASON_UNSPEC_T: + case OSMO_SCCP_REL_REASON_NSP_CREF_LOCAL_ERROR: + case OSMO_SCCP_REL_REASON_NSP_CREF_INVALID_STATE: + case OSMO_SCCP_REL_REASON_NSP_CREF_NO_TRANSITION: + case OSMO_SCCP_REL_REASON_NSP_CREF_IN_RESTART_PHASE: + case OSMO_SCCP_REL_REASON_NSP_CREF_HOP_COUNTER_VIOLATION: + default: + return SCCP_RELEASE_CAUSE_UNQUALIFIED; + } +} + +/* Table A.2/Q.713 */ +static enum sccp_release_cause scu_rel_reason_nsu_to_sccp_release_cause(uint32_t reason) +{ + switch (reason) { + case OSMO_SCCP_REL_REASON_NSU_DISC_NORMAL: + return SCCP_RELEASE_CAUSE_END_USER_ORIGINATED; + case OSMO_SCCP_REL_REASON_NSU_DISC_ABNORMAL: + return SCCP_RELEASE_CAUSE_UNQUALIFIED; + case OSMO_SCCP_REL_REASON_NSU_DISC_END_USER_CONGESTION: + return SCCP_RELEASE_CAUSE_END_USER_CONGESTION; + case OSMO_SCCP_REL_REASON_NSU_DISC_END_USER_FAILURE: + return SCCP_RELEASE_CAUSE_END_USER_FAILURE; + case OSMO_SCCP_REL_REASON_NSU_DISC_SCCP_USER_ORIGIN: + return SCCP_RELEASE_CAUSE_SCCP_USER_ORIGINATED; + case OSMO_SCCP_REL_REASON_NSU_DISC_ACCESS_CONGESTION: + return SCCP_RELEASE_CAUSE_ACCESS_CONGESTION; + case OSMO_SCCP_REL_REASON_NSU_DISC_ACCESS_FAILURE: + return SCCP_RELEASE_CAUSE_ACCESS_FAILURE; + case OSMO_SCCP_REL_REASON_NSU_CREF_SUBSYS_CONGESTION: + return SCCP_RELEASE_CAUSE_SUBSYSTEM_CONGESTION; + /* Not specified in the table... */ + case OSMO_SCCP_REL_REASON_NSU_DISC_SUBSYS_CONGESTION: + case OSMO_SCCP_REL_REASON_NSU_CREF_NT_CONDITION: + case OSMO_SCCP_REL_REASON_NSU_CREF_T_CONDITION: + case OSMO_SCCP_REL_REASON_NSU_CREF_INCOMPAT_INFO_NSDU: + case OSMO_SCCP_REL_REASON_NSU_CREF_END_USER_ORIGIN: + case OSMO_SCCP_REL_REASON_NSU_CREF_END_USER_CONGESTION: + case OSMO_SCCP_REL_REASON_NSU_CREF_END_USER_FAILURE: + case OSMO_SCCP_REL_REASON_NSU_CREF_SCCP_USER_ORIGINATED: + case OSMO_SCCP_REL_REASON_NSU_CREF_ACCESS_CONGESTION: + case OSMO_SCCP_REL_REASON_NSU_CREF_ACCESS_FAILURE: + default: + return SCCP_RELEASE_CAUSE_UNQUALIFIED; + } +} + +/* Table A.2/Q.713 */ +enum sccp_release_cause scu_rel_reason_to_sccp_release_cause(enum osmo_sccp_originator originator, uint32_t reason) +{ + if (reason <= SCCP_RELEASE_CAUSE_SCCP_FAILURE) /* direct wire-format as backward compatibility */ + return (enum sccp_refusal_cause)reason; + + switch (originator) { + case OSMO_SCCP_ORIG_NS_PROVIDER: + return scu_rel_reason_nsp_to_sccp_release_cause(reason); + case OSMO_SCCP_ORIG_NS_USER: + return scu_rel_reason_nsu_to_sccp_release_cause(reason); + case OSMO_SCCP_ORIG_UNDEFINED: + default: + return SCCP_RELEASE_CAUSE_UNQUALIFIED; + } +} + +void sccp_release_cause_to_scu_rel_reason(enum osmo_sccp_originator *originator, uint32_t *reason, uint32_t sccp_cause) +{ + switch (sccp_cause) { + case SCCP_RELEASE_CAUSE_END_USER_ORIGINATED: + *originator = OSMO_SCCP_ORIG_NS_USER; + *reason = OSMO_SCCP_REL_REASON_NSU_DISC_NORMAL; + break; + case SCCP_RELEASE_CAUSE_END_USER_CONGESTION: + *originator = OSMO_SCCP_ORIG_NS_USER; + *reason = OSMO_SCCP_REL_REASON_NSU_DISC_END_USER_CONGESTION; + break; + case SCCP_RELEASE_CAUSE_END_USER_FAILURE: + *originator = OSMO_SCCP_ORIG_NS_USER; + *reason = OSMO_SCCP_REL_REASON_NSU_DISC_END_USER_FAILURE; + break; + case SCCP_RELEASE_CAUSE_SCCP_USER_ORIGINATED: + *originator = OSMO_SCCP_ORIG_NS_USER; + *reason = OSMO_SCCP_REL_REASON_NSU_CREF_SCCP_USER_ORIGINATED; + break; + case SCCP_RELEASE_CAUSE_REMOTE_PROCEDURE_ERROR: + *originator = OSMO_SCCP_ORIG_NS_PROVIDER; + *reason = OSMO_SCCP_REL_REASON_NSP_DISC_T; + break; + case SCCP_RELEASE_CAUSE_INCONSISTENT_CONN_DATA: + *originator = OSMO_SCCP_ORIG_NS_PROVIDER; + *reason = OSMO_SCCP_REL_REASON_NSP_DISC_T; + break; + case SCCP_RELEASE_CAUSE_ACCESS_FAILURE: + *originator = OSMO_SCCP_ORIG_NS_USER; + *reason = OSMO_SCCP_REL_REASON_NSU_DISC_ACCESS_FAILURE; + break; + case SCCP_RELEASE_CAUSE_ACCESS_CONGESTION: + *originator = OSMO_SCCP_ORIG_NS_USER; + *reason = OSMO_SCCP_REL_REASON_NSU_DISC_ACCESS_CONGESTION; + break; + case SCCP_RELEASE_CAUSE_SUBSYSTEM_FAILURE: + *originator = OSMO_SCCP_ORIG_NS_PROVIDER; + *reason = OSMO_SCCP_REL_REASON_NSP_DISC_NT; + break; + case SCCP_RELEASE_CAUSE_SUBSYSTEM_CONGESTION: + *originator = OSMO_SCCP_ORIG_NS_USER; + *reason = OSMO_SCCP_REL_REASON_NSU_DISC_SUBSYS_CONGESTION; + break; + case SCCP_RELEASE_CAUSE_MTP_FAILURE: + *originator = OSMO_SCCP_ORIG_NS_PROVIDER; + *reason = OSMO_SCCP_REL_REASON_NSP_DISC_NT; + break; + case SCCP_RELEASE_CAUSE_NETWORK_CONGESTION: + *originator = OSMO_SCCP_ORIG_NS_PROVIDER; + *reason = OSMO_SCCP_REL_REASON_NSP_DISC_T; + break; + case SCCP_RELEASE_CAUSE_EXPIRATION_RESET: + *originator = OSMO_SCCP_ORIG_NS_PROVIDER; + *reason = OSMO_SCCP_REL_REASON_NSP_DISC_T; + break; + case SCCP_RELEASE_CAUSE_EXPIRATION_INACTIVE: + *originator = OSMO_SCCP_ORIG_NS_PROVIDER; + *reason = OSMO_SCCP_REL_REASON_NSP_DISC_T; + break; + case SCCP_RELEASE_CAUSE_UNQUALIFIED: + *originator = OSMO_SCCP_ORIG_NS_USER; + *reason = OSMO_SCCP_REL_REASON_NSU_DISC_ABNORMAL; + break; + case SCCP_RELEASE_CAUSE_SCCP_FAILURE: + *originator = OSMO_SCCP_ORIG_NS_PROVIDER; + *reason = OSMO_SCCP_REL_REASON_NSP_DISC_NT; + break; + case SCCP_RELEASE_CAUSE_RESERVED: + default: + *originator = OSMO_SCCP_ORIG_NS_PROVIDER; + *reason = OSMO_SCCP_REL_REASON_NSP_DISC_NT; + break; + } +} + + /* get the Connection ID of the given SCU primitive */ static uint32_t scu_prim_conn_id(const struct osmo_scu_prim *prim) { diff --git a/src/sccp_scoc.c b/src/sccp_scoc.c index 817f785..74f8db4 100644 --- a/src/sccp_scoc.c +++ b/src/sccp_scoc.c @@ -282,6 +282,8 @@ { bool encode_opt_data = xua_opt_data_length_lim(conn, prim, msg_type); struct xua_msg *xua = xua_msg_alloc(); + enum sccp_release_cause rel_cause; + enum sccp_refusal_cause ref_cause; if (!xua) return NULL; @@ -338,7 +340,9 @@ xua_msg_add_u32(xua, SUA_IEI_ROUTE_CTX, conn->inst->route_ctx); xua_msg_add_u32(xua, SUA_IEI_DEST_REF, conn->remote_ref); xua_msg_add_u32(xua, SUA_IEI_SRC_REF, conn->conn_id); - xua_msg_add_u32(xua, SUA_IEI_CAUSE, SUA_CAUSE_T_RELEASE | prim->u.disconnect.cause); + rel_cause = scu_rel_reason_to_sccp_release_cause(prim->u.disconnect.originator, + prim->u.disconnect.cause); + xua_msg_add_u32(xua, SUA_IEI_CAUSE, SUA_CAUSE_T_RELEASE | rel_cause); /* optional: data */ if (encode_opt_data) xua_msg_add_data(xua, SUA_IEI_DATA, msgb_l2len(prim->oph.msg), msgb_l2(prim->oph.msg)); @@ -373,8 +377,9 @@ xua->hdr = XUA_HDR(SUA_MSGC_CO, SUA_CO_COREF); xua_msg_add_u32(xua, SUA_IEI_ROUTE_CTX, conn->inst->route_ctx); xua_msg_add_u32(xua, SUA_IEI_DEST_REF, conn->remote_ref); - //xua_msg_add_u32(xua, SUA_IEI_CAUSE, SUA_CAUSE_T_REFUSAL | prim->u.disconnect.cause); - xua_msg_add_u32(xua, SUA_IEI_CAUSE, SUA_CAUSE_T_REFUSAL | SCCP_REFUSAL_UNEQUIPPED_USER); + ref_cause = scu_rel_reason_to_sccp_refusal_cause(prim->u.disconnect.originator, + prim->u.disconnect.cause); + xua_msg_add_u32(xua, SUA_IEI_CAUSE, SUA_CAUSE_T_REFUSAL | ref_cause); /* optional: source addr */ if (conn->called_addr.presence) xua_msg_add_sccp_addr(xua, SUA_IEI_SRC_ADDR, &conn->called_addr); diff --git a/src/sccp_scoc_fsm.c b/src/sccp_scoc_fsm.c index 1833b89..895435c 100644 --- a/src/sccp_scoc_fsm.c +++ b/src/sccp_scoc_fsm.c @@ -225,7 +225,8 @@ switch (event) { case SCOC_E_SCU_N_DISC_REQ: prim = data; - conn->release_cause = prim->u.disconnect.cause; + conn->release_cause = scu_rel_reason_to_sccp_release_cause(prim->u.disconnect.originator, + prim->u.disconnect.cause); osmo_fsm_inst_state_chg(fi, S_WAIT_CONN_CONF, 0, 0); /* keep conn timer running(!) */ break; diff --git a/src/sccp_user.h b/src/sccp_user.h index 47c8aa4..cb8ec90 100644 --- a/src/sccp_user.h +++ b/src/sccp_user.h @@ -8,6 +8,8 @@ #include <osmocom/sigtran/sccp_sap.h> struct osmo_sccp_instance; +enum sccp_refusal_cause; +enum osmo_sccp_originator; struct osmo_sccp_user { /*! \brief entry in list of sccp users of \ref osmo_sccp_instance */ @@ -38,6 +40,11 @@ int sccp_user_prim_up(struct osmo_sccp_user *scut, struct osmo_scu_prim *prim); +enum sccp_refusal_cause scu_rel_reason_to_sccp_refusal_cause(enum osmo_sccp_originator originator, uint32_t reason); +enum sccp_release_cause scu_rel_reason_to_sccp_release_cause(enum osmo_sccp_originator originator, uint32_t reason); +void sccp_refusal_cause_to_scu_rel_reason(enum osmo_sccp_originator *originator, uint32_t *reason, uint32_t sccp_cause); +void sccp_release_cause_to_scu_rel_reason(enum osmo_sccp_originator *originator, uint32_t *reason, uint32_t sccp_cause); + #define _LOGPSCU(scu, subsys, level, fmt, args ...) \ _LOGPSCI((scu)->inst, subsys, level, "SCU(%s) " fmt, osmo_sccp_user_name(scu), ## args) #define LOGPSCU(scu, level, fmt, args ...) \ -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/43763?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: I158463c2e9b34abe06554371d628e4fa7ea8c5c1 Gerrit-Change-Number: 43763 Gerrit-PatchSet: 6 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in osmo-gsm-manuals[master]: sigtran: Document ASP administrative state
by pespin 07 Oct '26

07 Oct '26

Attention is currently required from: osmith. pespin 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: (1 comment) File common/chapters/sigtran-osmocom.adoc: https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/43760/comment/cda76cae_6f2e… : PS1, Line 405: adminsitrative > ```suggestion […] Done -- 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: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Wed, 07 Oct 2026 12:40:14 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith <osmith(a)sysmocom.de>

1 0

[S] Change in osmo-gsm-manuals[master]: sigtran: Document ASP administrative state
by pespin 07 Oct '26

07 Oct '26

Attention is currently required from: osmith, pespin. Hello Jenkins Builder, osmith, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/43760?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Code-Review+1 by osmith, Verified+1 by Jenkins Builder Change subject: sigtran: Document ASP administrative state ...................................................................... sigtran: Document ASP administrative state Related: OS#6752 Change-Id: I355f382857b62a42b4752689d27a34c668c7e996 --- M common/chapters/cs7-config.adoc M common/chapters/sigtran-osmocom.adoc M common/chapters/sigtran.adoc 3 files changed, 31 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/60/43760/2 -- 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: newpatchset Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: I355f382857b62a42b4752689d27a34c668c7e996 Gerrit-Change-Number: 43760 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in osmo-gsm-manuals[master]: sigtran.adoc: Document IPSP support
by pespin 07 Oct '26

07 Oct '26

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/43758?usp=email ) Change subject: sigtran.adoc: Document IPSP support ...................................................................... sigtran.adoc: Document IPSP support libosmo-sigtran has support for IPSP role since version 2.3.0, update the documentation accordingly. Mention that IPSP role is not yet supported for IPA ASPs. Related SYS#6474 Change-Id: I5489b0ea485943b96038da49c81e812a6da22492 --- M common/chapters/sigtran.adoc 1 file changed, 4 insertions(+), 2 deletions(-) Approvals: osmith: Looks good to me, approved jolly: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/common/chapters/sigtran.adoc b/common/chapters/sigtran.adoc index 074e546..115c3fc 100644 --- a/common/chapters/sigtran.adoc +++ b/common/chapters/sigtran.adoc @@ -505,8 +505,10 @@ to the SGW to talk to the SS7 network * _IPSP_ (IP Server Process): M3UA in point-to-point mode -Osmocom (libosmo-sigtran) implements both the SGP and ASP roles, but not -the IPSP role. +Osmocom (libosmo-sigtran) implements all M3UA/SUA roles. + +NOTE: IPA Application Server Processes support both the SGP and ASP roles, but +not the IPSP role (https://osmocom.org/issues/6950[OS#6950]). ==== Traffic Modes in SIGTRAN -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/43758?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: I5489b0ea485943b96038da49c81e812a6da22492 Gerrit-Change-Number: 43758 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in osmo-gsm-manuals[master]: sigtran.adoc: Rename 'SCTP role' to 'Transport layer role'
by pespin 07 Oct '26

07 Oct '26

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/43756?usp=email ) Change subject: sigtran.adoc: Rename 'SCTP role' to 'Transport layer role' ...................................................................... sigtran.adoc: Rename 'SCTP role' to 'Transport layer role' The client/server behavior applies to both SCTP and TCP, hence this concept was already renamed to "transport-role (client|server)" a while ago in libosmo-sigtran.git. Do the same here. Change-Id: I961552d00fde06154489b091d7d742b5ee86d206 --- M common/chapters/cs7-config.adoc M common/chapters/sigtran.adoc 2 files changed, 19 insertions(+), 19 deletions(-) Approvals: Jenkins Builder: Verified jolly: Looks good to me, but someone else must approve osmith: Looks good to me, approved diff --git a/common/chapters/cs7-config.adoc b/common/chapters/cs7-config.adoc index 6f212b2..afc30af 100644 --- a/common/chapters/cs7-config.adoc +++ b/common/chapters/cs7-config.adoc @@ -51,7 +51,7 @@ asp asp-clnt-OsmoMSC-A-Iu 2905 0 m3ua remote-ip 127.0.0.1 role asp - sctp-role client + transport-role client as as-clnt-OsmoMSC-A-Iu m3ua asp asp-clnt-OsmoMSC-A-Iu routing-key 2 0.23.1 @@ -88,7 +88,7 @@ # optional: local bind to a specific IP local-ip 10.9.8.7 role asp - sctp-role client + transport-role client ---- Be aware that such an `asp` needs to be linked to an `as`, see <<as_and_asp>>. @@ -239,7 +239,7 @@ # where to reach the STP: remote-ip 127.0.0.1 role asp - sctp-role client + transport-role client as my-as m3ua asp my-asp ---- @@ -256,7 +256,7 @@ asp my-asp 2905 0 m3ua remote-ip 127.0.0.1 role asp - sctp-role client + transport-role client as my-as m3ua routing-key 2 0.23.1 ---- @@ -268,7 +268,7 @@ asp my-asp 2905 0 m3ua remote-ip 127.0.0.1 role asp - sctp-role client + transport-role client as my-as m3ua asp my-asp routing-key 2 0.23.1 @@ -402,7 +402,7 @@ asp mybsc-0 2905 2905 m3ua remote-ip 2.2.2.2 local-ip 1.1.1.1 - sctp-role client + transport-role client as mybsc0 m3ua asp mybsc0-0 routing-key 1 1.1.1 @@ -451,7 +451,7 @@ asp mymsc-0 2905 2905 m3ua remote-ip 2.2.2.2 local-ip 3.3.3.3 - sctp-role client + transport-role client as mymsc0 m3ua asp mymsc0-0 routing-key 3 3.3.3 @@ -468,7 +468,7 @@ asp mybsc-0 2905 0 m3ua remote-ip 2.2.2.2 local-ip 1.1.1.1 - sctp-role client + transport-role client as mybsc0 m3ua asp mybsc0-0 @@ -497,7 +497,7 @@ asp mymsc-0 2905 0 m3ua remote-ip 2.2.2.2 local-ip 3.3.3.3 - sctp-role client + transport-role client as mymsc0 m3ua asp mymsc0-0 ---- diff --git a/common/chapters/sigtran.adoc b/common/chapters/sigtran.adoc index 714d86b..074e546 100644 --- a/common/chapters/sigtran.adoc +++ b/common/chapters/sigtran.adoc @@ -449,11 +449,11 @@ to the Linux Kernel SCTP stack and used whenever an association is being established. -On the client side (see <<sctp_role>>), the parameters are configured in the `asp` node: +On the client side (see <<transport_layer_role>>), the parameters are configured in the `asp` node: ---- cs7 instance 0 asp my-asp 2905 0 m3ua - sctp-role client + transport-role client sctp-param init num-ostreams 250 <1> sctp-param init max-instreams 300 <2> sctp-param init max-attempts 3 <3> @@ -468,11 +468,11 @@ connection failed. <4> Retransmit an SCTP INIT message after 10000 ms if no answer is received. -On the server side (see <<sctp_role>>), the parameters are configured in the `listen` node: +On the server side (see <<transport_layer_role>>), the parameters are configured in the `listen` node: ---- cs7 instance 0 asp my-asp 2905 0 m3ua - sctp-role server + transport-role server listen m3ua 2905 sctp-param init num-ostreams 250 <1> sctp-param init max-instreams 300 <2> @@ -485,14 +485,14 @@ <2> Announce to the server that a maximum of up to 300 inbound SCTP streams are supported. This value is transmitted during SCTP INIT ACK packet. -[[sctp_role]] -==== SCTP role +[[transport_layer_role]] +==== Transport layer role -The _SCTP role_ defines which of the two L4 protocol roles SCTP assumes: +The _Transport layer role_ defines which of the two L4 protocol roles TCP/SCTP assumes: -* The _SCTP server_ role binds to a local port and handles incoming - connections from clients -* The _SCTP client_ role connects to a remote SCTP sever. +* The _server_ role binds to a local port and handles incoming + connections from TCP/SCTP clients. +* The _client_ role connects to a remote TCP/SCTP sever. ==== M3UA/SUA role -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/43756?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: I961552d00fde06154489b091d7d742b5ee86d206 Gerrit-Change-Number: 43756 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in osmo-gsm-manuals[master]: sigtran: Document xUA Server Administrative State
by pespin 07 Oct '26

07 Oct '26

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/43759?usp=email ) Change subject: sigtran: Document xUA Server Administrative State ...................................................................... sigtran: Document xUA Server Administrative State Related: OS#7039 Change-Id: I771f05d2ef001f78cbd4d6fcd585535a841366ea --- M common/chapters/cs7-config.adoc M common/chapters/sigtran-osmocom.adoc M common/chapters/sigtran.adoc 3 files changed, 10 insertions(+), 0 deletions(-) Approvals: jolly: Looks good to me, but someone else must approve Jenkins Builder: Verified osmith: Looks good to me, approved diff --git a/common/chapters/cs7-config.adoc b/common/chapters/cs7-config.adoc index afc30af..8d3dbe7 100644 --- a/common/chapters/cs7-config.adoc +++ b/common/chapters/cs7-config.adoc @@ -422,6 +422,7 @@ listen m3ua 2905 accept-asp-connections pre-configured local-ip 2.2.2.2 + no shutdown # asp <name> <remote-port> <local-port|0> m3ua asp mybsc-0 2905 2905 m3ua @@ -487,6 +488,7 @@ listen m3ua 2905 accept-asp-connections dynamic-permitted local-ip 2.2.2.2 + no shutdown ---- .osmo-msc.cfg diff --git a/common/chapters/sigtran-osmocom.adoc b/common/chapters/sigtran-osmocom.adoc index fa02694..9cd873c 100644 --- a/common/chapters/sigtran-osmocom.adoc +++ b/common/chapters/sigtran-osmocom.adoc @@ -306,10 +306,17 @@ |Local IP|Local Port Number to which the server shall bind/listen |Local Port|Local IP Address to which the server shall bind/listen |Protocol|Protocol (M3UA, SUA, IPA) to be operated by this server +|Administrative State|Whether the listener transport socket (TCP/SCTP) is listening for clients to connect to, or closed. |Accept Dynamic ASPs|Should we accept connections from ASPs that are not explicitly pre-configured with their source IP and port? |QoS Class|QoS Class the server will apply to incoming connections |==== +The user can change the administrative state of a given xUA Server at any time +by means of the _[no] shutdown_ VTY commands. When in _shutdown_ state, the xUA +Server has its listen socket closed so no clients can connect to it. This is +useful to temporarily disable access to a xUA Server and hence new incoming +connections to related ASPs. Shutting down a xUA Server does't release already +established connections on related ASPs; it only affects new connections. === Osmocom SS7 Users diff --git a/common/chapters/sigtran.adoc b/common/chapters/sigtran.adoc index 115c3fc..b691436 100644 --- a/common/chapters/sigtran.adoc +++ b/common/chapters/sigtran.adoc @@ -477,6 +477,7 @@ sctp-param init num-ostreams 250 <1> sctp-param init max-instreams 300 <2> ... + no shutdown ---- <1> Announce to the server that up to 250 outbound SCTP streams (server to client) may be requested. This value is transmitted during SCTP INIT packet, and -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/43759?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: I771f05d2ef001f78cbd4d6fcd585535a841366ea Gerrit-Change-Number: 43759 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in osmo-smlc[master]: sigtran: N-NOTICE.ind: Use proper SCCP-User return reason
by pespin 07 Oct '26

07 Oct '26

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-smlc/+/43812?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: 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 https://gerrit.osmocom.org/c/osmo-smlc/+/43812?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-smlc Gerrit-Branch: master Gerrit-Change-Id: Icc0d3582c9d7cef72b490bfb1fdb877032673cb5 Gerrit-Change-Number: 43812 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in osmo-sgsn[master]: sigtran: N-NOTICE.ind: Use proper SCCP-User return reason
by pespin 07 Oct '26

07 Oct '26

pespin has uploaded this change for review. ( 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(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/11/43811/1 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: newchange Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Ic27a7f2e62d3392668e6ffc3b37ab278f343e128 Gerrit-Change-Number: 43811 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in osmo-msc[master]: sigtran: N-NOTICE.ind: Use proper SCCP-User return reason
by pespin 07 Oct '26

07 Oct '26

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/43810?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: If3e74e9fd0bb91d529429f02a90749a4ef380fea Related: OS#2601 --- M TODO-RELEASE M src/libmsc/sccp_ran.c 2 files changed, 5 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/10/43810/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/libmsc/sccp_ran.c b/src/libmsc/sccp_ran.c index 46fd196..026db0b 100644 --- a/src/libmsc/sccp_ran.c +++ b/src/libmsc/sccp_ran.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> @@ -68,18 +67,18 @@ if (!rp) { LOGP(DMSC, LOGL_DEBUG, "(calling_addr=%s) N-NOTICE.ind cause=%u='%s' importance=%u didn't match any ran_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_RAN_PEER(rp, 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-msc/+/43810?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: If3e74e9fd0bb91d529429f02a90749a4ef380fea Gerrit-Change-Number: 43810 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in osmo-iuh[master]: sigtran: N-NOTICE.ind: Use proper SCCP-User return reason
by pespin 07 Oct '26

07 Oct '26

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-iuh/+/43809?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: Ic49e3d2776f7609ef325056bd5431fe36f5a8d53 Related: OS#2601 --- M TODO-RELEASE M src/iu_client.c 2 files changed, 5 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/09/43809/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/iu_client.c b/src/iu_client.c index ae87460..acb9d2f 100644 --- a/src/iu_client.c +++ b/src/iu_client.c @@ -35,7 +35,6 @@ #include <osmocom/gprs/gprs_msgb.h> #include <osmocom/sigtran/sccp_sap.h> #include <osmocom/sigtran/sccp_helpers.h> -#include <osmocom/sccp/sccp_types.h> #include <osmocom/ranap/ranap_common_cn.h> #include <osmocom/ranap/ranap_ies_defs.h> #include <osmocom/ranap/ranap_msg_factory.h> @@ -1031,12 +1030,12 @@ LOGPIU(LOGL_DEBUG, "(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; default: @@ -1051,7 +1050,7 @@ LOGPIU(LOGL_NOTICE, "RNC %s now unreachable: N-NOTICE.ind cause=%u='%s' importance=%u\n", osmo_rnc_id_name(&rnc->rnc_id), - ni->cause, osmo_sccp_return_cause_name(ni->cause), + ni->cause, osmo_sccp_return_reason_name(ni->cause), ni->importance); llist_for_each_entry_safe(ue_ctx, ue_ctx_tmp, &ue_conn_ctx_list, list) { if (ue_ctx->rnc != rnc) -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/43809?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: Ic49e3d2776f7609ef325056bd5431fe36f5a8d53 Gerrit-Change-Number: 43809 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

2026

2025

2024

2023

2022

gerrit-log October 2026