- gerrit-log - lists.osmocom.org

[S] Change in libosmo-sigtran[master]: WIP: sccp: Send RELRE when CREQ is refused by peer
by pespin 25 Oct '24

25 Oct '24

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/38551?usp=email ) Change subject: WIP: sccp: Send RELRE when CREQ is refused by peer ...................................................................... WIP: sccp: Send RELRE when CREQ is refused by peer WIP attempt to make sure the peer drops the conn if it refuses to create a new conn, perhaps due to conn already established according to peer state. Related: SYS#6602 Change-Id: Iea2e6f684a6cdbc978833785704b8cf2cbd4e645 --- M src/sccp_scoc.c 1 file changed, 9 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/51/38551/1 diff --git a/src/sccp_scoc.c b/src/sccp_scoc.c index 0e1eb34..d14a90e 100644 --- a/src/sccp_scoc.c +++ b/src/sccp_scoc.c @@ -1061,6 +1061,7 @@ struct sccp_connection *conn = fi->priv; struct osmo_scu_prim *prim = NULL; struct xua_msg *xua = NULL; + uint32_t sccp_cause; switch (event) { case SCOC_E_SCU_N_DISC_REQ: @@ -1081,11 +1082,17 @@ xua = data; /* stop conn timer */ conn_stop_connect_timer(conn); - /* release local res + ref (implicit by going to idle) */ + /* Tx RELRE in case CREQ was refused due to misaligned state + * where peer thinks this conn already exists... (SYS#6602) + * Note: this is a deviation from Figure C.2/Q.714 (sheet 2 of 7) + */ + sccp_cause = xua_msg_get_u32(xua, SUA_IEI_CAUSE); + if (sccp_cause == (SUA_CAUSE_T_REFUSAL | SCCP_REFUSAL_END_USER_FAILURE)) + xua_gen_relre_and_send(conn, SCCP_RELEASE_CAUSE_REMOTE_PROCEDURE_ERROR, NULL); /* N-DISCONNECT.ind to user */ scu_gen_encode_and_send(conn, event, xua, OSMO_SCU_PRIM_N_DISCONNECT, PRIM_OP_INDICATION); - /* below implicitly releases resources + local ref */ + /* below going to idle implicitly releases resources + local ref */ osmo_fsm_inst_state_chg(fi, S_IDLE, 0, 0); break; case SCOC_E_RCOC_RLSD_IND: -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/38551?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: Iea2e6f684a6cdbc978833785704b8cf2cbd4e645 Gerrit-Change-Number: 38551 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[M] Change in pysim[master]: pySim.ts_31_102: Add support for EF.EARFCNList
by dexter 25 Oct '24

25 Oct '24

Attention is currently required from: laforge. dexter has posted comments on this change by laforge. ( https://gerrit.osmocom.org/c/pysim/+/38472?usp=email ) Change subject: pySim.ts_31_102: Add support for EF.EARFCNList ...................................................................... Patch Set 4: Code-Review+2 (1 comment) Patchset: PS4: All tests pass now. The patch changes the output in some integration tests. I have added the changes of the .ok file. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/38472?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I16797ca58c3ad6ebaf588d04fec011a0cbcfcef3 Gerrit-Change-Number: 38472 Gerrit-PatchSet: 4 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Fri, 25 Oct 2024 16:23:15 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes

1 0

[M] Change in libosmo-sigtran[master]: sua, sccp: Add APIs to get cause string description
by pespin 25 Oct '24

25 Oct '24

pespin has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/38550?usp=email ) Change subject: sua, sccp: Add APIs to get cause string description ...................................................................... sua, sccp: Add APIs to get cause string description Change-Id: I2c38b2d8104e728dda234c36ea284266b4c55ab1 --- M TODO-RELEASE M include/osmocom/sccp/sccp_types.h M include/osmocom/sigtran/protocol/sua.h M src/sccp_types.c M src/sua.c 5 files changed, 166 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/50/38550/2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/38550?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: I2c38b2d8104e728dda234c36ea284266b4c55ab1 Gerrit-Change-Number: 38550 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-CC: Jenkins Builder

1 0

[M] Change in libosmo-sigtran[master]: WIP: Add APIs to log cause
by pespin 25 Oct '24

25 Oct '24

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/38550?usp=email ) Change subject: WIP: Add APIs to log cause ...................................................................... WIP: Add APIs to log cause Change-Id: I2c38b2d8104e728dda234c36ea284266b4c55ab1 --- M TODO-RELEASE M include/osmocom/sccp/sccp_types.h M include/osmocom/sigtran/protocol/sua.h M src/sccp_types.c M src/sua.c 5 files changed, 166 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/50/38550/1 diff --git a/TODO-RELEASE b/TODO-RELEASE index 935cda8..6d8cb80 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 API change struct osmo_ss7_instance has new member 'secondary_pc' +libosmo-sigtran add API osmo_sccp_{release,return,reset,error,refusal}_cause_name(s), osmo_sua_sccp_cause_name diff --git a/include/osmocom/sccp/sccp_types.h b/include/osmocom/sccp/sccp_types.h index bc11258..5be0392 100644 --- a/include/osmocom/sccp/sccp_types.h +++ b/include/osmocom/sccp/sccp_types.h @@ -209,6 +209,9 @@ SCCP_RELEASE_CAUSE_UNQUALIFIED = 15, SCCP_RELEASE_CAUSE_SCCP_FAILURE = 16, }; +extern const struct value_string osmo_sccp_release_cause_names[]; +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 */ enum sccp_return_cause { @@ -228,6 +231,9 @@ SCCP_RETURN_CAUSE_SEGMENTATION_NOT_SUPPORTED= 13, SCCP_RETURN_CAUSE_SEGMENTATION_FAILURE = 14 }; +extern const struct value_string osmo_sccp_return_cause_names[]; +static inline const char *osmo_sccp_return_cause_name(enum sccp_return_cause val) +{ return get_value_string(osmo_sccp_return_cause_names, val); } /* ITU-T Q.713, Section 3.13 Reset cause */ enum sccp_reset_cause { @@ -243,7 +249,11 @@ SCCP_RESET_CAUSE_ACCESS_OPERATIONAL = 9, SCCP_RESET_CAUSE_NETWORK_CONGESTION = 10, SCCP_RESET_CAUSE_RESERVED = 11, + SCCP_RESET_CAUSE_UNQUALIFIED = 12, }; +extern const struct value_string osmo_sccp_reset_cause_names[]; +static inline const char *osmo_sccp_reset_cause_name(enum sccp_reset_cause val) +{ return get_value_string(osmo_sccp_reset_cause_names, val); } /* ITU-T Q.713, Section 3.14 Error cause */ enum sccp_error_cause { @@ -253,6 +263,9 @@ SCCP_ERROR_SERVICE_CLASS_MISMATCH = 3, SCCP_ERROR_UNQUALIFIED = 4, }; +extern const struct value_string osmo_sccp_error_cause_names[]; +static inline const char *osmo_sccp_error_cause_name(enum sccp_error_cause val) +{ return get_value_string(osmo_sccp_error_cause_names, val); } /* ITU-T Q.713 Section 3.15 Refusal cause */ enum sccp_refusal_cause { @@ -277,6 +290,9 @@ SCCP_REFUSAL_NO_TRANS_FOR_ADDRESS_NATURE = 18, SCCP_REFUSAL_UNEQUIPPED_USER = 19, }; +extern const struct value_string osmo_sccp_refusal_cause_names[]; +static inline const char *osmo_sccp_refusal_cause_name(enum sccp_refusal_cause val) +{ return get_value_string(osmo_sccp_refusal_cause_names, val); } /* * messages... as of Q.713 Chapter 4 diff --git a/include/osmocom/sigtran/protocol/sua.h b/include/osmocom/sigtran/protocol/sua.h index 4ce88f9..6fed2bc 100644 --- a/include/osmocom/sigtran/protocol/sua.h +++ b/include/osmocom/sigtran/protocol/sua.h @@ -19,6 +19,7 @@ */ #pragma once +#include <stddef.h> #include <stdint.h> #include <osmocom/sigtran/protocol/m3ua.h> @@ -138,6 +139,8 @@ #define SUA_CAUSE_T_RESET 0x0400 #define SUA_CAUSE_T_ERROR 0x0500 +const char *osmo_sua_sccp_cause_name(uint32_t sccp_cause, char *out_buf, size_t out_buf_len); + /* 3.9.12 Error: Identical to M3UA, extended by two at the bottom */ #define SUA_ERR_INVALID_VERSION M3UA_ERR_INVALID_VERSION #define SUA_ERR_UNSUPP_MSG_CLASS M3UA_ERR_UNSUPP_MSG_CLASS diff --git a/src/sccp_types.c b/src/sccp_types.c index 98b3fa4..a923aa2 100644 --- a/src/sccp_types.c +++ b/src/sccp_types.c @@ -49,3 +49,98 @@ { SCCP_PNC_LONG_DATA, "Long data" }, {} }; + +/* ITU-T Q.713, Section 3.11 Release cause */ +const struct value_string osmo_sccp_release_cause_names[] = { + { SCCP_RELEASE_CAUSE_END_USER_ORIGINATED, "end user originated" }, + { SCCP_RELEASE_CAUSE_END_USER_CONGESTION, "end user congestion" }, + { SCCP_RELEASE_CAUSE_END_USER_FAILURE, "end user failure" }, + { SCCP_RELEASE_CAUSE_SCCP_USER_ORIGINATED, "SCCP user originated" }, + { SCCP_RELEASE_CAUSE_REMOTE_PROCEDURE_ERROR, "remote procedure error" }, + { SCCP_RELEASE_CAUSE_INCONSISTENT_CONN_DATA, "inconsistent connection data" }, + { SCCP_RELEASE_CAUSE_ACCESS_FAILURE, "access failure" }, + { SCCP_RELEASE_CAUSE_ACCESS_CONGESTION, "access congestion" }, + { SCCP_RELEASE_CAUSE_SUBSYSTEM_FAILURE, "subsystem failure" }, + { SCCP_RELEASE_CAUSE_SUBSYSTEM_CONGESTION, "subsystem congestion" }, + { SCCP_RELEASE_CAUSE_MTP_FAILURE, "MTP failure" }, + { SCCP_RELEASE_CAUSE_NETWORK_CONGESTION, "network congestion" }, + { SCCP_RELEASE_CAUSE_EXPIRATION_RESET, "expiration of reset timer" }, + { SCCP_RELEASE_CAUSE_EXPIRATION_INACTIVE, "expiration of receive inactivity timer" }, + { SCCP_RELEASE_CAUSE_RESERVED, "reserved" }, + { SCCP_RELEASE_CAUSE_UNQUALIFIED, "unqualified" }, + { SCCP_RELEASE_CAUSE_SCCP_FAILURE, "SCCP failure" }, + {} +}; + +/* ITU-T Q.713, Section 3.12 Return cause */ +const struct value_string osmo_sccp_return_cause_names[] = { + { SCCP_RETURN_CAUSE_NO_TRANSLATION_NATURE, "no translation for an address of such nature" }, + { SCCP_RETURN_CAUSE_NO_TRANSLATION, "no translation for this specific address" }, + { SCCP_RETURN_CAUSE_SUBSYSTEM_CONGESTION, "subsystem congestion" }, + { SCCP_RETURN_CAUSE_SUBSYSTEM_FAILURE, "subsystem failure" }, + { SCCP_RETURN_CAUSE_UNEQUIPPED_USER, "unequipped user" }, + { SCCP_RETURN_CAUSE_MTP_FAILURE, "MTP failure" }, + { SCCP_RETURN_CAUSE_NETWORK_CONGESTION, "network congestion" }, + { SCCP_RETURN_CAUSE_UNQUALIFIED, "unqualified" }, + { SCCP_RETURN_CAUSE_ERROR_IN_MSG_TRANSPORT, "error in message transport" }, + { SCCP_RETURN_CAUSE_ERROR_IN_LOCAL_PROCESSING, "error in local processing" }, + { SCCP_RETURN_CAUSE_DEST_CANNOT_PERFORM_REASSEMBLY, "destination cannot perform reassembly" }, + { SCCP_RETURN_CAUSE_SCCP_FAILURE, "SCCP failure" }, + { SCCP_RETURN_CAUSE_HOP_COUNTER_VIOLATION, "hop counter violation" }, + { SCCP_RETURN_CAUSE_SEGMENTATION_NOT_SUPPORTED, "segmentation not supported" }, + { SCCP_RETURN_CAUSE_SEGMENTATION_FAILURE, "segmentation failure" }, + {} +}; + +/* ITU-T Q.713, Section 3.13 Reset cause */ +const struct value_string osmo_sccp_reset_cause_names[] = { + { SCCP_RESET_CAUSE_END_USER_ORIGINATED, "end user originated" }, + { SCCP_RESET_CAUSE_SCCP_USER_ORIGINATED, "SCCP user originated" }, + { SCCP_RESET_CAUSE_MSG_OUT_OF_ORDER_PS, "message out of order - incorrect P(S)" }, + { SCCP_RESET_CAUSE_MSG_OUT_OF_ORDER_PR, "message out of order - incorrect P(R)" }, + { SCCP_RESET_CAUSE_RPC_OUT_OF_WINDOW, "remote procedure error - message out of window" }, + { SCCP_RESET_CAUSE_RPC_INCORRECT_PS, "remote procedure error - incorrect P(S) after (re)initialization" }, + { SCCP_RESET_CAUSE_RPC_GENERAL, "remote procedure error - general" }, + { SCCP_RESET_CAUSE_REMOTE_END_USER_OPERATIONAL, "remote end user operational" }, + { SCCP_RESET_CAUSE_NETWORK_OPERATIONAL, "network operational" }, + { SCCP_RESET_CAUSE_ACCESS_OPERATIONAL, "access operational" }, + { SCCP_RESET_CAUSE_NETWORK_CONGESTION, "network congestion" }, + { SCCP_RESET_CAUSE_RESERVED, "reserved" }, + { SCCP_RESET_CAUSE_UNQUALIFIED, "unqualified"}, + {} +}; + +/* ITU-T Q.713, Section 3.14 Error cause */ +const struct value_string osmo_sccp_error_cause_names[] = { + { SCCP_ERROR_LRN_MISMATCH_UNASSIGNED, "local reference number (LRN) mismatch - unassigned destination LRN" }, + { SCCP_ERROR_LRN_MISMATCH_INCONSISTENT, "local reference number (LRN) mismatch - inconsistent source LRN" }, + { SCCP_ERROR_POINT_CODE_MISMATCH, "point code mismatch" }, + { SCCP_ERROR_SERVICE_CLASS_MISMATCH, "service class mismatch" }, + { SCCP_ERROR_UNQUALIFIED, "unqualified" }, + {} +}; + +/* ITU-T Q.713 Section 3.15 Refusal cause */ +const struct value_string osmo_sccp_refusal_cause_names[] = { + { SCCP_REFUSAL_END_USER_ORIGINATED, "end user originated" }, + { SCCP_REFUSAL_END_USER_CONGESTION, "end user congestion" }, + { SCCP_REFUSAL_END_USER_FAILURE, "end user failure" }, + { SCCP_REFUSAL_SCCP_USER_ORIGINATED, "SCCP user originated" }, + { SCCP_REFUSAL_DESTINATION_ADDRESS_UKNOWN, "destination address unknown" }, + { SCCP_REFUSAL_DESTINATION_INACCESSIBLE, "destination inaccessible" }, + { SCCP_REFUSAL_NET_QOS_NON_TRANSIENT, "network resource - QoS not available/non-transient" }, + { SCCP_REFUSAL_NET_QOS_TRANSIENT, "network resource - QoS not available/transient" }, + { SCCP_REFUSAL_ACCESS_FAILURE, "access failure" }, + { SCCP_REFUSAL_ACCESS_CONGESTION, "access congestion" }, + { SCCP_REFUSAL_SUBSYSTEM_FAILURE, "subsystem failure" }, + { SCCP_REFUSAL_SUBSYTEM_CONGESTION, "subsystem congestion" }, + { SCCP_REFUSAL_EXPIRATION, "expiration of the connection establishment timer" }, + { SCCP_REFUSAL_INCOMPATIBLE_USER_DATA, "incompatible user data" }, + { SCCP_REFUSAL_RESERVED, "reserved" }, + { SCCP_REFUSAL_UNQUALIFIED, "unqualified" }, + { SCCP_REFUSAL_HOP_COUNTER_VIOLATION, "hop counter violation" }, + { SCCP_REFUSAL_SCCP_FAILURE, "SCCP failure" }, + { SCCP_REFUSAL_NO_TRANS_FOR_ADDRESS_NATURE, "no translation for an address of such nature" }, + { SCCP_REFUSAL_UNEQUIPPED_USER, "unequipped user" }, + {} +}; diff --git a/src/sua.c b/src/sua.c index 2753cfe..d8eb9e5 100644 --- a/src/sua.c +++ b/src/sua.c @@ -41,6 +41,7 @@ #include <osmocom/sigtran/protocol/sua.h> #include <osmocom/sigtran/protocol/m3ua.h> #include <osmocom/sigtran/osmo_ss7.h> +#include <osmocom/sccp/sccp_types.h> #include "xua_as_fsm.h" #include "xua_asp_fsm.h" @@ -1008,3 +1009,53 @@ return SUA_ERR_UNSUPP_MSG_CLASS; } } + +/* RFC 3868 3.10.6. SCCP Cause */ +const struct value_string sua_cause_type_names[] = { + { SUA_CAUSE_T_RETURN, "Return Cause" }, + { SUA_CAUSE_T_REFUSAL, "Refusal Cause" }, + { SUA_CAUSE_T_RELEASE, "Release Cause" }, + { SUA_CAUSE_T_RESET, "Reset Cause" }, + { SUA_CAUSE_T_ERROR, "Error Cause" }, + {} +}; +const char *osmo_sua_sccp_cause_name(uint32_t sccp_cause, char *out_buf, size_t out_buf_len) +{ + uint16_t cause_type = sccp_cause & SUA_CAUSE_T_MASK; + uint8_t cause_val = sccp_cause & 0xff; + const char *cause_type_str = get_value_string_or_null(sua_cause_type_names, cause_type); + const char *cause_str = NULL; + + if (!out_buf || out_buf_len == 0) + return NULL; + + if (!cause_type_str) + goto ret_unknown_cause_type; + + switch (cause_type) { + case SUA_CAUSE_T_RETURN: + cause_str = osmo_sccp_return_cause_name(cause_val); + break; + case SUA_CAUSE_T_REFUSAL: + cause_str = osmo_sccp_refusal_cause_name(cause_val); + break; + case SUA_CAUSE_T_RELEASE: + cause_str = osmo_sccp_release_cause_name(cause_val); + break; + case SUA_CAUSE_T_RESET: + cause_str = osmo_sccp_reset_cause_name(cause_val); + break; + case SUA_CAUSE_T_ERROR: + cause_str = osmo_sccp_error_cause_name(cause_val); + break; + default: + goto ret_unknown_cause_type; + } + + snprintf(out_buf, out_buf_len, "%s <%s>", cause_type_str, cause_str); + return out_buf; + +ret_unknown_cause_type: + snprintf(out_buf, out_buf_len, "Unknown SUA SCCP Cause 0x%08x\n", sccp_cause); + return out_buf; +} -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/38550?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: I2c38b2d8104e728dda234c36ea284266b4c55ab1 Gerrit-Change-Number: 38550 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[M] Change in pysim[master]: pySim.ts_31_102: Add support for EF.EARFCNList
by dexter 25 Oct '24

25 Oct '24

Attention is currently required from: laforge. dexter has uploaded a new patch set (#4) to the change originally created by laforge. ( https://gerrit.osmocom.org/c/pysim/+/38472?usp=email ) The following approvals got outdated and were removed: Verified-1 by Jenkins Builder Change subject: pySim.ts_31_102: Add support for EF.EARFCNList ...................................................................... pySim.ts_31_102: Add support for EF.EARFCNList This adds a construct + pyosmocore.tlv based declarative encoder/decoder for the EF.EARFCNList file used in the context of NB-IoT in later release USIMs. Change-Id: I16797ca58c3ad6ebaf588d04fec011a0cbcfcef3 --- M pySim/ts_31_102.py M tests/pySim-shell_test/export/export.script.ok M tests/pySim-shell_test/file_specific/test_ef_ust.ok M tests/pySim-shell_test/fsdump/fsdump.json.ok 4 files changed, 103 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/72/38472/4 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/38472?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I16797ca58c3ad6ebaf588d04fec011a0cbcfcef3 Gerrit-Change-Number: 38472 Gerrit-PatchSet: 4 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org>

1 0

[XS] Change in libosmo-sigtran[master]: sua: sua_iei_names: s/Cause/SCCP Cause/
by pespin 25 Oct '24

25 Oct '24

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/38548?usp=email ) Change subject: sua: sua_iei_names: s/Cause/SCCP Cause/ ...................................................................... sua: sua_iei_names: s/Cause/SCCP Cause/ This is how the field is named in RFC 3868 section 3.10. This also helps identifying it from other existing field "User/Cause". Change-Id: I106baa8d181ebfa1616cdd7efab2897dd78fc8e6 --- M src/sua.c M tests/xua/xua_test.ok 2 files changed, 2 insertions(+), 2 deletions(-) Approvals: daniel: Looks good to me, approved Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve diff --git a/src/sua.c b/src/sua.c index 3d9d7ec..2753cfe 100644 --- a/src/sua.c +++ b/src/sua.c @@ -89,7 +89,7 @@ { SUA_IEI_DEST_ADDR, "Destination Address" }, { SUA_IEI_SRC_REF, "Source Reference" }, { SUA_IEI_DEST_REF, "Destination Reference" }, - { SUA_IEI_CAUSE, "Cause" }, + { SUA_IEI_CAUSE, "SCCP Cause" }, { SUA_IEI_SEQ_NR, "Sequence Number" }, { SUA_IEI_RX_SEQ_NR, "Receive Sequence Number" }, { SUA_IEI_ASP_CAPA, "ASP Capability" }, diff --git a/tests/xua/xua_test.ok b/tests/xua/xua_test.ok index 3072a95..9d44775 100644 --- a/tests/xua/xua_test.ok +++ b/tests/xua/xua_test.ok @@ -75,7 +75,7 @@ => BSSMAP-RELEASED SCCP Input: [L2]> 04 00 00 03 01 02 03 00 01 0f 02 23 42 00 Transcoding message SCCP -> XUA -Decoded SUA: HDR=(CO:RELRE,V=0,LEN=0), PART(T=Destination Reference,L=4,D=00000003), PART(T=Source Reference,L=4,D=00010203), PART(T=Cause,L=4,D=00000300), PART(T=Data,L=2,D=2342) +Decoded SUA: HDR=(CO:RELRE,V=0,LEN=0), PART(T=Destination Reference,L=4,D=00000003), PART(T=Source Reference,L=4,D=00010203), PART(T=SCCP Cause,L=4,D=00000300), PART(T=Data,L=2,D=2342) Re-Encoding decoded SUA to SCCP SCCP Output: [L2]> 04 00 00 03 01 02 03 00 01 0f 02 23 42 00 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/38548?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: I106baa8d181ebfa1616cdd7efab2897dd78fc8e6 Gerrit-Change-Number: 38548 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in libosmo-sigtran[master]: cosmetic: Add some comments with spec references
by pespin 25 Oct '24

25 Oct '24

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/38549?usp=email ) Change subject: cosmetic: Add some comments with spec references ...................................................................... cosmetic: Add some comments with spec references Change-Id: I131dca5be9313d3beb51ec9d5f507552ae6c9d84 --- M include/osmocom/sccp/sccp_types.h M include/osmocom/sigtran/protocol/sua.h 2 files changed, 6 insertions(+), 1 deletion(-) Approvals: daniel: Looks good to me, approved Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve diff --git a/include/osmocom/sccp/sccp_types.h b/include/osmocom/sccp/sccp_types.h index 17018d2..bc11258 100644 --- a/include/osmocom/sccp/sccp_types.h +++ b/include/osmocom/sccp/sccp_types.h @@ -189,6 +189,7 @@ SCCP_PROTOCOL_RETURN_MESSAGE = 8, }; +/* ITU-T Q.713, Section 3.11 Release cause */ enum sccp_release_cause { SCCP_RELEASE_CAUSE_END_USER_ORIGINATED = 0, SCCP_RELEASE_CAUSE_END_USER_CONGESTION = 1, @@ -209,6 +210,7 @@ SCCP_RELEASE_CAUSE_SCCP_FAILURE = 16, }; +/* ITU-T Q.713, Section 3.12 Return cause */ enum sccp_return_cause { SCCP_RETURN_CAUSE_NO_TRANSLATION_NATURE = 0, SCCP_RETURN_CAUSE_NO_TRANSLATION = 1, @@ -227,6 +229,7 @@ SCCP_RETURN_CAUSE_SEGMENTATION_FAILURE = 14 }; +/* ITU-T Q.713, Section 3.13 Reset cause */ enum sccp_reset_cause { SCCP_RESET_CAUSE_END_USER_ORIGINATED = 0, SCCP_RESET_CAUSE_SCCP_USER_ORIGINATED = 1, @@ -242,6 +245,7 @@ SCCP_RESET_CAUSE_RESERVED = 11, }; +/* ITU-T Q.713, Section 3.14 Error cause */ enum sccp_error_cause { SCCP_ERROR_LRN_MISMATCH_UNASSIGNED = 0, /* local reference number */ SCCP_ERROR_LRN_MISMATCH_INCONSISTENT = 1, @@ -250,7 +254,7 @@ SCCP_ERROR_UNQUALIFIED = 4, }; -/* ITU=T Q.713 Section 3.15 */ +/* ITU-T Q.713 Section 3.15 Refusal cause */ enum sccp_refusal_cause { SCCP_REFUSAL_END_USER_ORIGINATED = 0, SCCP_REFUSAL_END_USER_CONGESTION = 1, diff --git a/include/osmocom/sigtran/protocol/sua.h b/include/osmocom/sigtran/protocol/sua.h index 70c16ba..4ce88f9 100644 --- a/include/osmocom/sigtran/protocol/sua.h +++ b/include/osmocom/sigtran/protocol/sua.h @@ -130,6 +130,7 @@ #define SUA_RI_HOST 3 #define SUA_RI_SSN_IP 4 +/* 3.10.6. SCCP Cause: Cause Type */ #define SUA_CAUSE_T_MASK 0xff00 #define SUA_CAUSE_T_RETURN 0x0100 #define SUA_CAUSE_T_REFUSAL 0x0200 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/38549?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: I131dca5be9313d3beb51ec9d5f507552ae6c9d84 Gerrit-Change-Number: 38549 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in libosmo-sigtran[master]: cosmetic: Add some comments with spec references
by daniel 25 Oct '24

25 Oct '24

Attention is currently required from: pespin. daniel has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/38549?usp=email ) Change subject: cosmetic: Add some comments with spec references ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/38549?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: I131dca5be9313d3beb51ec9d5f507552ae6c9d84 Gerrit-Change-Number: 38549 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 25 Oct 2024 15:53:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[XS] Change in libosmo-sigtran[master]: sua: sua_iei_names: s/Cause/SCCP Cause/
by daniel 25 Oct '24

25 Oct '24

Attention is currently required from: pespin. daniel has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/38548?usp=email ) Change subject: sua: sua_iei_names: s/Cause/SCCP Cause/ ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/38548?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: I106baa8d181ebfa1616cdd7efab2897dd78fc8e6 Gerrit-Change-Number: 38548 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 25 Oct 2024 15:53:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[S] Change in pysim[master]: global_platform: ensure ArgumentParser gets a list for choices
by dexter 25 Oct '24

25 Oct '24

dexter has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/38542?usp=email ) Change subject: global_platform: ensure ArgumentParser gets a list for choices ...................................................................... global_platform: ensure ArgumentParser gets a list for choices When we use the argument parser with choices, we sometimes use a list that we derive from a dictionary. However if we do that we still must ensure that we really put a list and not a dict_values or dict_keys class as parameter because this won't work any longer with cmd2 version 2.5.0 Related: OS#6601 Change-Id: I165fefd8feb0d96cedc15d036fb32da381f711b3 --- M pySim/global_platform/__init__.py 1 file changed, 5 insertions(+), 5 deletions(-) Approvals: osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/pySim/global_platform/__init__.py b/pySim/global_platform/__init__.py index e499e0f..53e13e8 100644 --- a/pySim/global_platform/__init__.py +++ b/pySim/global_platform/__init__.py @@ -589,7 +589,7 @@ put_key_parser.add_argument('--old-key-version-nr', type=auto_uint8, default=0, help='Old Key Version Number') put_key_parser.add_argument('--key-version-nr', type=auto_uint8, required=True, help='Key Version Number') put_key_parser.add_argument('--key-id', type=auto_uint7, required=True, help='Key Identifier (base)') - put_key_parser.add_argument('--key-type', choices=KeyType.ksymapping.values(), action='append', required=True, help='Key Type') + put_key_parser.add_argument('--key-type', choices=list(KeyType.ksymapping.values()), action='append', required=True, help='Key Type') put_key_parser.add_argument('--key-data', type=is_hexstr, action='append', required=True, help='Key Data Block') put_key_parser.add_argument('--key-check', type=is_hexstr, action='append', help='Key Check Value') put_key_parser.add_argument('--suppress-key-check', action='store_true', help='Suppress generation of Key Check Values') @@ -650,7 +650,7 @@ return data get_status_parser = argparse.ArgumentParser() - get_status_parser.add_argument('subset', choices=StatusSubset.ksymapping.values(), + get_status_parser.add_argument('subset', choices=list(StatusSubset.ksymapping.values()), help='Subset of statuses to be included in the response') get_status_parser.add_argument('--aid', type=is_hexstr, default='', help='AID Search Qualifier (search only for given AID)') @@ -685,9 +685,9 @@ return grd_list set_status_parser = argparse.ArgumentParser() - set_status_parser.add_argument('scope', choices=SetStatusScope.ksymapping.values(), + set_status_parser.add_argument('scope', choices=list(SetStatusScope.ksymapping.values()), help='Defines the scope of the requested status change') - set_status_parser.add_argument('status', choices=CLifeCycleState.ksymapping.values(), + set_status_parser.add_argument('status', choices=list(CLifeCycleState.ksymapping.values()), help='Specify the new intended status') set_status_parser.add_argument('--aid', type=is_hexstr, help='AID of the target Application or Security Domain') @@ -726,7 +726,7 @@ inst_inst_parser.add_argument('--install-parameters', type=is_hexstr, default='', help='Install Parameters') inst_inst_parser.add_argument('--privilege', action='append', dest='privileges', default=[], - choices=Privileges._construct.flags.keys(), + choices=list(Privileges._construct.flags.keys()), help='Privilege granted to newly installed Application') inst_inst_parser.add_argument('--install-token', type=is_hexstr, default='', help='Install Token (Section GPCS C.4.2/C.4.7)') -- To view, visit https://gerrit.osmocom.org/c/pysim/+/38542?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I165fefd8feb0d96cedc15d036fb32da381f711b3 Gerrit-Change-Number: 38542 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>

1 0

2026

2025

2024

2023

2022

gerrit-log