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

[S] Change in libosmo-sigtran[master]: Add DSCP configuration support for STP client
by jolly 01 Jun '26

01 Jun '26

jolly has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/42808?usp=email ) Change subject: Add DSCP configuration support for STP client ...................................................................... Add DSCP configuration support for STP client Introduce VTY command to configure the Differentiated Services Code Point (DSCP) values for the STP clients. Related: SYS#8071 Change-Id: Ia125a392eec5605553809774162675b5249b8494 --- M src/ss7_asp.c M src/ss7_asp.h M src/ss7_asp_vty.c M src/ss7_vty.h 4 files changed, 19 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/08/42808/1 diff --git a/src/ss7_asp.c b/src/ss7_asp.c index c1739f3..5993db4 100644 --- a/src/ss7_asp.c +++ b/src/ss7_asp.c @@ -816,6 +816,7 @@ osmo_stream_cli_set_local_addrs(asp->client, (const char **)asp->cfg.local.host, asp->cfg.local.host_cnt); osmo_stream_cli_set_local_port(asp->client, asp->cfg.local.port); osmo_stream_cli_set_proto(asp->client, asp->cfg.trans_proto); + osmo_stream_cli_set_ip_dscp(asp->client, asp->cfg.ip_dscp); osmo_stream_cli_set_reconnect_timeout(asp->client, 5); osmo_stream_cli_set_connect_cb(asp->client, xua_cli_connect_cb); osmo_stream_cli_set_disconnect_cb(asp->client, xua_cli_disconnect_cb); diff --git a/src/ss7_asp.h b/src/ss7_asp.h index a4e0e2f..b607046 100644 --- a/src/ss7_asp.h +++ b/src/ss7_asp.h @@ -138,6 +138,7 @@ struct osmo_ss7_asp_peer local; struct osmo_ss7_asp_peer remote; + uint8_t ip_dscp; uint8_t qos_class; uint32_t quirks; diff --git a/src/ss7_asp_vty.c b/src/ss7_asp_vty.c index 89fb949..593c607 100644 --- a/src/ss7_asp_vty.c +++ b/src/ss7_asp_vty.c @@ -410,6 +410,17 @@ return CMD_SUCCESS; } +DEFUN_ATTR(asp_ip_dscps, asp_ip_dscp_cmd, + "ip-dscp " IP_DSCP_RANGE_STR, + "Specify IP DSCP of ASP\n" + IP_DSCP_RANGE_HELP_STR, + CMD_ATTR_NODE_EXIT) +{ + struct osmo_ss7_asp *asp = vty->index; + asp->cfg.ip_dscp = atoi(argv[0]); + return CMD_SUCCESS; +} + DEFUN_ATTR(asp_qos_clas, asp_qos_class_cmd, "qos-class " QOS_CLASS_RANGE_STR, "Specify QoS Class of ASP\n" @@ -1381,6 +1392,8 @@ vty_out(vty, " remote-ip %s%s%s", asp->cfg.remote.host[i], asp->cfg.remote.idx_primary == i ? " primary" : "", VTY_NEWLINE); } + if (asp->cfg.ip_dscp != 0) + vty_out(vty, " ip-dscp %u%s", asp->cfg.ip_dscp, VTY_NEWLINE); if (asp->cfg.qos_class) vty_out(vty, " qos-class %u%s", asp->cfg.qos_class, VTY_NEWLINE); vty_out(vty, " role %s%s", osmo_str_tolower(get_value_string(osmo_ss7_asp_role_names, asp->cfg.role)), @@ -1490,6 +1503,7 @@ install_lib_element(L_CS7_ASP_NODE, &asp_no_remote_ip_cmd); install_lib_element(L_CS7_ASP_NODE, &asp_local_ip_cmd); install_lib_element(L_CS7_ASP_NODE, &asp_no_local_ip_cmd); + install_lib_element(L_CS7_ASP_NODE, &asp_ip_dscp_cmd); install_lib_element(L_CS7_ASP_NODE, &asp_qos_class_cmd); install_lib_element(L_CS7_ASP_NODE, &asp_role_cmd); install_lib_element(L_CS7_ASP_NODE, &asp_transport_role_cmd); diff --git a/src/ss7_vty.h b/src/ss7_vty.h index 18dc5a6..1d99cad 100644 --- a/src/ss7_vty.h +++ b/src/ss7_vty.h @@ -37,6 +37,9 @@ "SCTP (Stream Control Transmission Protocol)\n" \ "TCP (Transmission Control Protocol)\n" +#define IP_DSCP_RANGE_STR "<0-63>" +#define IP_DSCP_RANGE_HELP_STR "IP Differentiated Service Code Point\n" + #define QOS_CLASS_RANGE_STR "<0-7>" #define QOS_CLASS_RANGE_HELP_STR "QoS Class\n" #define QOS_CLASS_VAR_STR "(" QOS_CLASS_RANGE_STR "|default)" -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/42808?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: Ia125a392eec5605553809774162675b5249b8494 Gerrit-Change-Number: 42808 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu>

1 0

[M] Change in libosmo-sigtran[master]: Add test case to verify proper DSCP settings
by jolly 01 Jun '26

01 Jun '26

jolly has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/42809?usp=email ) Change subject: Add test case to verify proper DSCP settings ...................................................................... Add test case to verify proper DSCP settings Related: SYS#8071 Change-Id: I6ac965998433b4d8213cce30fc3fcf8fe485a092 --- M .gitignore M configure.ac M tests/Makefile.am A tests/dscp/Makefile.am A tests/dscp/dscp_test.ok A tests/dscp/dscp_test.py A tests/dscp/get_tos_diag.c A tests/dscp/osmo-stp-dscp.cfg M tests/testsuite.at 9 files changed, 248 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/09/42809/1 diff --git a/.gitignore b/.gitignore index 99cb052..8988066 100644 --- a/.gitignore +++ b/.gitignore @@ -55,6 +55,7 @@ tests/db/db_test tests/debug/debug_test tests/*/*_test +tests/dscp/get_tos_diag tests/atconfig tests/package.m4 diff --git a/configure.ac b/configure.ac index f1e1888..0bbc233 100644 --- a/configure.ac +++ b/configure.ac @@ -209,6 +209,7 @@ tests/ss7/Makefile tests/tcap/Makefile tests/vty/Makefile + tests/dscp/Makefile examples/Makefile stp/Makefile doc/Makefile diff --git a/tests/Makefile.am b/tests/Makefile.am index 7927bbd..5e056d4 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = xua m2ua ss7 vty +SUBDIRS = xua m2ua ss7 vty dscp if BUILD_WITH_TCAP_LOADSHARING SUBDIRS += tcap diff --git a/tests/dscp/Makefile.am b/tests/dscp/Makefile.am new file mode 100644 index 0000000..43b1fcd --- /dev/null +++ b/tests/dscp/Makefile.am @@ -0,0 +1,18 @@ +AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include +AM_CFLAGS=-Wall $(LIBOSMONETIF_CFLAGS) $(LIBOSMOCORE_CFLAGS) $(LIBOSMOVTY_CFLAGS) + +AM_LDFLAGS = -no-install +LDADD = $(top_builddir)/src/.libs/libosmo-sigtran.a \ + $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOVTY_LIBS) $(LIBOSMONETIF_LIBS) $(LIBSCTP_LIBS) + +if BUILD_WITH_TCAP_LOADSHARING +LDADD += $(LIBOSMOASN1TCAP_LIBS) +endif + +EXTRA_DIST = dscp_test.ok dscp_test.py + +check_PROGRAMS = get_tos_diag + +get_tos_diag_SOURCES = get_tos_diag.c + + diff --git a/tests/dscp/dscp_test.ok b/tests/dscp/dscp_test.ok new file mode 100644 index 0000000..66c7bc4 --- /dev/null +++ b/tests/dscp/dscp_test.ok @@ -0,0 +1,9 @@ +starting osmo-stp +started osmo-stp +LISTEN 127.0.0.1:2905 0.0.0.0:0 23 +ESTAB 127.0.0.1:2905 127.0.0.2:2906 23 +OTHER 127.0.0.1:2905 127.0.0.2:2906 23 +ESTAB 127.0.0.2:2906 127.0.0.1:2905 42 +OTHER 127.0.0.2:2906 127.0.0.1:2905 42 +stopping osmo-stp +stopped osmo-stp diff --git a/tests/dscp/dscp_test.py b/tests/dscp/dscp_test.py new file mode 100755 index 0000000..0122257 --- /dev/null +++ b/tests/dscp/dscp_test.py @@ -0,0 +1,70 @@ +#!/usr/bin/env python3 + +# (C) 2026 by sysmocom s.f.m.c. GmbH +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. + +import subprocess +import time +import os +import sys +from pathlib import Path + +# Pfade definieren +SCRIPT_DIR = Path(__file__).parent.resolve() +STP_BINARY = SCRIPT_DIR / ".." / ".." / "stp" / "osmo-stp" +CONFIG_FILE = SCRIPT_DIR / "osmo-stp-dscp.cfg" +DIAG_BINARY = SCRIPT_DIR / "get_tos_diag" + + +def main(): + print(f"starting osmo-stp") + + # 1. osmo-stp im Hintergrund starten + try: + proc = subprocess.Popen( + [STP_BINARY, "-c", CONFIG_FILE], + stdout=subprocess.PIPE, + stderr=subprocess.PIPE, + text=True + ) + except FileNotFoundError: + print("File not found") + sys.exit(1) + + # wait to establish socket connection + time.sleep(1.0) + + # check process + if proc.poll() is not None: + print("Process failed") + stdout, stderr = proc.communicate() + print(f"STDOUT:\n{stdout}\nSTDERR:\n{stderr}", file=sys.stderr) + sys.exit(1) + + print("started osmo-stp") + + subprocess.run([DIAG_BINARY], check=True) + + print("stopping osmo-stp") + proc.terminate() + + try: + proc.wait(timeout=5) + print("stopped osmo-stp") + except subprocess.TimeoutExpired: + print("failed to stop, killing...") + proc.kill() + +if __name__ == "__main__": + main() diff --git a/tests/dscp/get_tos_diag.c b/tests/dscp/get_tos_diag.c new file mode 100644 index 0000000..d7bb2d8 --- /dev/null +++ b/tests/dscp/get_tos_diag.c @@ -0,0 +1,120 @@ +/* + * (C) 2026 by sysmocom s.f.m.c. GmbH + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <unistd.h> +#include <asm/types.h> +#include <sys/socket.h> +#include <linux/netlink.h> +#include <linux/rtnetlink.h> +#include <linux/sock_diag.h> +#include <linux/inet_diag.h> +#include <arpa/inet.h> +#include <netinet/tcp.h> + +#define BUFFER_SIZE 8192 + +int main() +{ + int nl_fd = socket(AF_NETLINK, SOCK_RAW, NETLINK_INET_DIAG); + if (nl_fd < 0) { + perror("Failed to open netlink socket."); + return 1; + } + + struct { + struct nlmsghdr nlh; + struct inet_diag_req_v2 req; + } req; + + memset(&req, 0, sizeof(req)); + req.nlh.nlmsg_len = NLMSG_LENGTH(sizeof(struct inet_diag_req_v2)); + req.nlh.nlmsg_flags = NLM_F_REQUEST | NLM_F_DUMP; + req.nlh.nlmsg_type = SOCK_DIAG_BY_FAMILY; + + req.req.sdiag_family = AF_INET; + req.req.sdiag_protocol = IPPROTO_SCTP; + req.req.idiag_states = 0xFFFFFFFF; + + req.req.idiag_ext = (1 << (INET_DIAG_TOS - 1)); + + if (send(nl_fd, &req, req.nlh.nlmsg_len, 0) < 0) { + perror("Failed to sent netlink request."); + close(nl_fd); + return 1; + } + + char buffer[BUFFER_SIZE]; + + while (1) { + ssize_t num_bytes = recv(nl_fd, buffer, sizeof(buffer), 0); + if (num_bytes < 0) { + perror("Failed to receive netlink response."); + break; + } + + struct nlmsghdr *nlh = (struct nlmsghdr *)buffer; + while (NLMSG_OK(nlh, num_bytes)) { + if (nlh->nlmsg_type == NLMSG_DONE) { + close(nl_fd); + return 0; + } + if (nlh->nlmsg_type == NLMSG_ERROR) { + perror("Netlink error received."); + close(nl_fd); + return 1; + } + + struct inet_diag_msg *diag_msg = NLMSG_DATA(nlh); + + char src_ip[INET_ADDRSTRLEN], dst_ip[INET_ADDRSTRLEN]; + inet_ntop(AF_INET, &diag_msg->id.idiag_src, src_ip, sizeof(src_ip)); + inet_ntop(AF_INET, &diag_msg->id.idiag_dst, dst_ip, sizeof(dst_ip)); + + uint16_t src_port = ntohs(diag_msg->id.idiag_sport); + uint16_t dst_port = ntohs(diag_msg->id.idiag_dport); + + char src_addr[32], dst_addr[32]; + snprintf(src_addr, sizeof(src_addr), "%s:%d", src_ip, src_port); + snprintf(dst_addr, sizeof(dst_addr), "%s:%d", dst_ip, dst_port); + + const char *state_str = (diag_msg->idiag_state == TCP_ESTABLISHED) ? "ESTAB" : + (diag_msg->idiag_state == TCP_LISTEN) ? "LISTEN" : "OTHER"; + + uint8_t tos = 0; + + int rta_len = nlh->nlmsg_len - NLMSG_LENGTH(sizeof(struct inet_diag_msg)); + struct rtattr *attr = (struct rtattr *)(diag_msg + 1); + + while (RTA_OK(attr, rta_len)) { + if (attr->rta_type == INET_DIAG_TOS) { + tos = *(uint8_t *)RTA_DATA(attr); + break; + } + attr = RTA_NEXT(attr, rta_len); + } + + /* state local remote dscp */ + printf("%s %s %s %d\n", state_str, src_addr, dst_addr, tos>>2); + nlh = NLMSG_NEXT(nlh, num_bytes); + } + } + + close(nl_fd); + return 0; +} diff --git a/tests/dscp/osmo-stp-dscp.cfg b/tests/dscp/osmo-stp-dscp.cfg new file mode 100644 index 0000000..74f85ef --- /dev/null +++ b/tests/dscp/osmo-stp-dscp.cfg @@ -0,0 +1,22 @@ +log stderr + logging filter all 1 + logging color 1 + logging print category 1 + logging timestamp 0 + logging level set-all notice +line vty + no login +! +cs7 instance 0 + xua rkm routing-key-allocation dynamic-permitted + listen m3ua 2905 + accept-asp-connections dynamic-permitted + local-ip 127.0.0.1 + ip-dscp 23 + asp asp-clnt-m3ua 2905 2906 m3ua + local-ip 127.0.0.2 + remote-ip 127.0.0.1 + ip-dscp 42 + role asp + sctp-role client + no shutdown diff --git a/tests/testsuite.at b/tests/testsuite.at index 910fc0b..7812c93 100644 --- a/tests/testsuite.at +++ b/tests/testsuite.at @@ -26,3 +26,9 @@ cat $abs_srcdir/tcap/tcap_transaction_tracking_test.ok > expout AT_CHECK([$abs_top_builddir/tests/tcap/tcap_transaction_tracking_test], [], [expout], [ignore]) AT_CLEANUP + +AT_SETUP([dscp]) +AT_KEYWORDS([dscp]) +cat $abs_srcdir/dscp/dscp_test.ok > expout +AT_CHECK([python3 -u $abs_top_builddir/tests/dscp/dscp_test.py], [], [expout], [ignore]) +AT_CLEANUP -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/42809?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: I6ac965998433b4d8213cce30fc3fcf8fe485a092 Gerrit-Change-Number: 42809 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu>

1 0

[S] Change in pysim[master]: personalization: fix EF_SMSP length, alpha_id padding
by dexter 01 Jun '26

01 Jun '26

Attention is currently required from: fixeria, laforge. dexter has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/pysim/+/42674?usp=email ) Change subject: personalization: fix EF_SMSP length, alpha_id padding ...................................................................... Patch Set 5: Verified+1 (3 comments) Patchset: PS5: I have tested this patch with a small test program and TS48V1-B-UNIQUE.der. When I parse the results with saip_tool.py the encoded result looks fine. I get the expected amount of padding at the beginning. With that I see no major problems with this patch. We could just polish the last bits (no need to set alpha ID, rec length 38 instead of 42) and then merge it. PS5: > One still has to ensure to pass the file length (total_len=f_smsp.rec_len) to encode_record_hex. […] Done File pySim/esim/saip/personalization.py: https://gerrit.osmocom.org/c/pysim/+/42674/comment/f46d9e41_846e730c?usp=em… : PS5, Line 638: f_smsp.rec_len = 42 > (missing detail: the current version also does NOT set `f_smsp. […] The size of 38 is the default that TCA suggests. If it works with 38, then this probably means that efFileSize is not set in the template. In any case, using a size of 38 sounds reasonable. This would leave 10 chars for the alpha id. I think that 10 chars "ought to be enough for anybody". If this is the only problem we could just set f_smsp.rec_len to 38. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/42674?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: Ief6e02517f3e96158a2509d763b88aec4bd5a296 Gerrit-Change-Number: 42674 Gerrit-PatchSet: 5 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 01 Jun 2026 10:38:31 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: neels <nhofmeyr(a)sysmocom.de> Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: dexter <pmaier(a)sysmocom.de>

1 0

[S] Change in osmo-ttcn3-hacks[master]: CCID: Check if reader times out while expecting procedure byte
by jolly 01 Jun '26

01 Jun '26

jolly has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42798?usp=email ) Change subject: CCID: Check if reader times out while expecting procedure byte ...................................................................... CCID: Check if reader times out while expecting procedure byte A case 3 APDU is sent toward the reader. The reader expects a procedure byte or a status word. If none of these are sent by the SIM the reader must timeout and send an error message back to the host. Change-Id: Iacd6aacaf8220e69b9b7038e354d54c788d1eb05 --- M ccid/CCID_Tests.ttcn 1 file changed, 49 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/98/42798/1 diff --git a/ccid/CCID_Tests.ttcn b/ccid/CCID_Tests.ttcn index 1ac1351..d88b103 100644 --- a/ccid/CCID_Tests.ttcn +++ b/ccid/CCID_Tests.ttcn @@ -874,6 +874,54 @@ f_start_and_wait(); } +/* The SIM does not send the expected procedure byte. */ +private function f_TC_procedure_byte_timeout() runs on CardemSlot_CT +{ + var octetstring req := c_SIM_READ_BINARY; + var CCID_PDU ccid_pdu; + + f_cardem_manager(); + + f_ccid_power_on(CCID_PWRSEL_3V0); + + /* Send a request towards reader. */ + CCID.send(ts_CCID_XfrBlock(g_slot_nr, req, 0)); + /* Receive the request by SIM. */ + f_cardem_receive(tr_SIMTRACE_CEMU_RX_DATA(?, req)); + /* Transmit procedure byte from SIM. */ + f_cardem_transmit(ts_SIMTRACE_CEMU_TX_DATA(ts_CardEmu_DataFlags(pb_and_tx := true, final := true), + '60'O)); + /* Eat the possible 'Time Extension status' */ + timer T := 0.2; + T.start; + alt { + [] CCID.receive(tr_CCID_DataBlock(g_slot_nr, ?, tr_CCID_HeaderIN(?, CCID_CMD_STATUS_TIME_EXT, ?), ?)) { + log("Eating 'Time Extension status'."); + repeat; + } + [] as_ccid_any(); + [] T.timeout { } + } + /* Receive the response from reader. */ + ccid_pdu := f_ccid_receive(tr_CCID_DataBlock(g_slot_nr, ?, ?, ?)); + if (ccid_pdu.hdr_in.bError != CCID_ERR_ICC_MUTE) { + setverdict(fail, "Unexpected Response or error code"); + mtc.stop; + } + + /* Stop simtrace emulation, to prevent race condition. */ + vc_Cardem.stop; + vc_Cardem.done; +} +testcase TC_procedure_byte_timeout() runs on Test_CT +{ + f_init(); + + f_start_handler(refers(f_TC_procedure_byte_timeout), mp_simtrace_slot, true); + + f_start_and_wait(); +} + /* TODO */ /* IccPowerOn with wrong voltage (> 0x04) */ @@ -920,6 +968,7 @@ execute( TC_truncated_response() ); execute( TC_wrong_procedure_byte() ); execute( TC_unexpected_procedure_byte() ); + execute( TC_procedure_byte_timeout() ); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42798?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Iacd6aacaf8220e69b9b7038e354d54c788d1eb05 Gerrit-Change-Number: 42798 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu>

1 0

[S] Change in osmo-ttcn3-hacks[master]: CCID: Check if reader times out while expecting status words
by jolly 01 Jun '26

01 Jun '26

jolly has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42799?usp=email ) Change subject: CCID: Check if reader times out while expecting status words ...................................................................... CCID: Check if reader times out while expecting status words A case 1 APDU is sent toward the reader. The reader expects two status words. If none of these are sent by the SIM the reader must timeout and send an error message back to the host. Change-Id: I054b56a9e2f10e5b984ad0398efb4be5696ce16c --- M ccid/CCID_Tests.ttcn 1 file changed, 35 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/99/42799/1 diff --git a/ccid/CCID_Tests.ttcn b/ccid/CCID_Tests.ttcn index d88b103..f695bf4 100644 --- a/ccid/CCID_Tests.ttcn +++ b/ccid/CCID_Tests.ttcn @@ -922,6 +922,40 @@ f_start_and_wait(); } +/* The SIM does not send the expected status words. */ +private function f_TC_status_word_timeout() runs on CardemSlot_CT +{ + var octetstring req := c_UICC_MANAGE_CHANNEL; + var CCID_PDU ccid_pdu; + + f_cardem_manager(); + + f_ccid_power_on(CCID_PWRSEL_3V0); + + /* Send a request towards reader. */ + CCID.send(ts_CCID_XfrBlock(g_slot_nr, req, 0)); + /* Receive the request by SIM. */ + f_cardem_receive(tr_SIMTRACE_CEMU_RX_DATA(?, req)); + /* Receive the response from reader. */ + ccid_pdu := f_ccid_receive(tr_CCID_DataBlock(g_slot_nr, ?, ?, ?)); + if (ccid_pdu.hdr_in.bError != CCID_ERR_ICC_MUTE) { + setverdict(fail, "Unexpected Response or error code"); + mtc.stop; + } + + /* Stop simtrace emulation, to prevent race condition. */ + vc_Cardem.stop; + vc_Cardem.done; +} +testcase TC_status_word_timeout() runs on Test_CT +{ + f_init(); + + f_start_handler(refers(f_TC_status_word_timeout), mp_simtrace_slot, true); + + f_start_and_wait(); +} + /* TODO */ /* IccPowerOn with wrong voltage (> 0x04) */ @@ -969,6 +1003,7 @@ execute( TC_wrong_procedure_byte() ); execute( TC_unexpected_procedure_byte() ); execute( TC_procedure_byte_timeout() ); + execute( TC_status_word_timeout() ); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42799?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I054b56a9e2f10e5b984ad0398efb4be5696ce16c Gerrit-Change-Number: 42799 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu>

1 0

[S] Change in osmo-ttcn3-hacks[master]: CCID: Check if reader accepts highest P3 value 0xff
by jolly 01 Jun '26

01 Jun '26

jolly has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42800?usp=email ) Change subject: CCID: Check if reader accepts highest P3 value 0xff ...................................................................... CCID: Check if reader accepts highest P3 value 0xff This test should ensure that there is no buffer overflow when receiving large responses from SIM. Change-Id: I298795d791f2964758bd4792e10131f92cf561bc --- M ccid/CCID_Tests.ttcn 1 file changed, 39 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/00/42800/1 diff --git a/ccid/CCID_Tests.ttcn b/ccid/CCID_Tests.ttcn index f695bf4..ca638c8 100644 --- a/ccid/CCID_Tests.ttcn +++ b/ccid/CCID_Tests.ttcn @@ -629,6 +629,44 @@ f_start_and_wait(); } +/* The SIM responds with 255 bytes. */ +private function f_TC_255_bytes_response() runs on CardemSlot_CT +{ + var octetstring req := c_UICC_GET_RESPONSE_BASE & 'FF'O; + var octetstring res := '000102030405060708090a0b0c0d0e0f000102030405060708090a0b0c0d0e0f000102030405060708090a0b0c0d0e0f000102030405060708090a0b0c0d0e0f000102030405060708090a0b0c0d0e0f000102030405060708090a0b0c0d0e0f000102030405060708090a0b0c0d0e0f000102030405060708090a0b0c0d0e0f000102030405060708090a0b0c0d0e0f000102030405060708090a0b0c0d0e0f000102030405060708090a0b0c0d0e0f000102030405060708090a0b0c0d0e0f000102030405060708090a0b0c0d0e0f000102030405060708090a0b0c0d0e0f000102030405060708090a0b0c0d0e0f000102030405060708090a0b0c0d0e9000'O; + var CCID_PDU ccid_pdu; + + f_cardem_manager(); + + f_ccid_power_on(CCID_PWRSEL_3V0); + + /* Send a request towards reader. */ + CCID.send(ts_CCID_XfrBlock(g_slot_nr, req, 0)); + /* Receive the request by SIM. */ + f_cardem_receive(tr_SIMTRACE_CEMU_RX_DATA(?, req)); + /* Transmit the response by SIM. */ + f_cardem_transmit(ts_SIMTRACE_CEMU_TX_DATA(ts_CardEmu_DataFlags(pb_and_tx := true, final := true), + req[1] & res)); + /* Receive the response from reader. */ + ccid_pdu := f_ccid_receive(tr_CCID_DataBlock(g_slot_nr, ?, ?, ?)); + if (ccid_pdu.u.DataBlock.abData != res) { + setverdict(fail, "Unexpected SW1/SW2"); + mtc.stop; + } + + /* Stop simtrace emulation, to prevent race condition. */ + vc_Cardem.stop; + vc_Cardem.done; +} +testcase TC_255_bytes_response() runs on Test_CT +{ + f_init(); + + f_start_handler(refers(f_TC_255_bytes_response), mp_simtrace_slot, true); + + f_start_and_wait(); +} + /* TODO */ @@ -990,6 +1028,7 @@ execute( TC_successful_case_1() ); execute( TC_successful_case_2_3() ); execute( TC_simtrace_test() ); + execute( TC_255_bytes_response() ); /* error handling */ execute( TC_inval_slot() ); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42800?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I298795d791f2964758bd4792e10131f92cf561bc Gerrit-Change-Number: 42800 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu>

1 0

[S] Change in osmo-ttcn3-hacks[master]: CCID: Check if reader handles special P3 value 0x00 correctly
by jolly 01 Jun '26

01 Jun '26

jolly has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42801?usp=email ) Change subject: CCID: Check if reader handles special P3 value 0x00 correctly ...................................................................... CCID: Check if reader handles special P3 value 0x00 correctly If data is requested from SIM with P3 set 0x00, it means that 256 bytes are requested. The reader will receive a procedure byte, which must cause it to receive all 256 data bytes + two status words. Change-Id: Icc3fd1937b9829fcf825c58d7b676aa2be2c48e7 --- M ccid/CCID_Tests.ttcn 1 file changed, 39 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/01/42801/1 diff --git a/ccid/CCID_Tests.ttcn b/ccid/CCID_Tests.ttcn index ca638c8..9c10186 100644 --- a/ccid/CCID_Tests.ttcn +++ b/ccid/CCID_Tests.ttcn @@ -667,6 +667,44 @@ f_start_and_wait(); } +/* The SIM responds with 256 bytes. */ +private function f_TC_256_bytes_response() runs on CardemSlot_CT +{ + var octetstring req := c_UICC_GET_RESPONSE_BASE & '00'O; + var octetstring res := '232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323429000'O; + var CCID_PDU ccid_pdu; + + f_cardem_manager(); + + f_ccid_power_on(CCID_PWRSEL_3V0); + + /* Send a request towards reader. */ + CCID.send(ts_CCID_XfrBlock(g_slot_nr, req, 0)); + /* Receive the request by SIM. */ + f_cardem_receive(tr_SIMTRACE_CEMU_RX_DATA(?, req)); + /* Transmit the response by SIM. */ + f_cardem_transmit(ts_SIMTRACE_CEMU_TX_DATA(ts_CardEmu_DataFlags(pb_and_tx := true, final := true), + req[1] & res)); + /* Receive the response from reader. */ + ccid_pdu := f_ccid_receive(tr_CCID_DataBlock(g_slot_nr, ?, ?, ?)); + if (ccid_pdu.u.DataBlock.abData != res) { + setverdict(fail, "Unexpected SW1/SW2"); + mtc.stop; + } + + /* Stop simtrace emulation, to prevent race condition. */ + vc_Cardem.stop; + vc_Cardem.done; +} +testcase TC_256_bytes_response() runs on Test_CT +{ + f_init(); + + f_start_handler(refers(f_TC_256_bytes_response), mp_simtrace_slot, true); + + f_start_and_wait(); +} + /* TODO */ @@ -1029,6 +1067,7 @@ execute( TC_successful_case_2_3() ); execute( TC_simtrace_test() ); execute( TC_255_bytes_response() ); + execute( TC_256_bytes_response() ); /* error handling */ execute( TC_inval_slot() ); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42801?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Icc3fd1937b9829fcf825c58d7b676aa2be2c48e7 Gerrit-Change-Number: 42801 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu>

1 0

[M] Change in osmo-ttcn3-hacks[master]: CCID: Check if reader restarts WWT upon NULL procedure byte
by jolly 01 Jun '26

01 Jun '26

jolly has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42802?usp=email ) Change subject: CCID: Check if reader restarts WWT upon NULL procedure byte ...................................................................... CCID: Check if reader restarts WWT upon NULL procedure byte The reader will receive a NULL procedure byte every 0.2 for a long time. The reader may only respond with a status that time extension was requested. At the end the SIM proceeds with a valid response. This response must be returned by the reader. Change-Id: I4eb09e86f88df19d96e9ec55872654352ca2ebd5 --- M ccid/CCID_Tests.ttcn 1 file changed, 56 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/02/42802/1 diff --git a/ccid/CCID_Tests.ttcn b/ccid/CCID_Tests.ttcn index 9c10186..b9a23ef 100644 --- a/ccid/CCID_Tests.ttcn +++ b/ccid/CCID_Tests.ttcn @@ -705,6 +705,61 @@ f_start_and_wait(); } +/* The SIM responds with many procedure bytes to prevent timeout. */ +private function f_TC_null_procedure_byte() runs on CardemSlot_CT +{ + var octetstring req := c_SIM_READ_BINARY; + var octetstring res := '0102030405060708090a9000'O; + var CCID_PDU ccid_pdu; + var integer i; + + f_cardem_manager(); + + f_ccid_power_on(CCID_PWRSEL_3V0); + + /* Send a request towards reader. */ + CCID.send(ts_CCID_XfrBlock(g_slot_nr, req, 0)); + /* Receive the request by SIM. */ + f_cardem_receive(tr_SIMTRACE_CEMU_RX_DATA(?, req)); + for (i := 0; i < 40; i := i+1) { + /* Transmit NULL procedure byte by SIM. */ + f_cardem_transmit(ts_SIMTRACE_CEMU_TX_DATA(ts_CardEmu_DataFlags(pb_and_tx := true, final := false), + '60'O)); + /* Eat the possible 'Time Extension status' */ + timer T := 0.2; + T.start; + alt { + [] CCID.receive(tr_CCID_DataBlock(g_slot_nr, ?, tr_CCID_HeaderIN(?, CCID_CMD_STATUS_TIME_EXT, ?), ?)) { + log("Eating 'Time Extension status'."); + repeat; + } + [] as_ccid_any(); + [] T.timeout { } + } + } + /* Transmit the response by SIM. */ + f_cardem_transmit(ts_SIMTRACE_CEMU_TX_DATA(ts_CardEmu_DataFlags(pb_and_tx := true, final := true), + req[1] & res)); + /* Receive the response from reader. */ + ccid_pdu := f_ccid_receive(tr_CCID_DataBlock(g_slot_nr, ?, ?, ?)); + if (ccid_pdu.u.DataBlock.abData != res) { + setverdict(fail, "Unexpected SW1/SW2"); + mtc.stop; + } + + /* Stop simtrace emulation, to prevent race condition. */ + vc_Cardem.stop; + vc_Cardem.done; +} +testcase TC_null_procedure_byte() runs on Test_CT +{ + f_init(); + + f_start_handler(refers(f_TC_null_procedure_byte), mp_simtrace_slot, true); + + f_start_and_wait(); +} + /* TODO */ @@ -1068,6 +1123,7 @@ execute( TC_simtrace_test() ); execute( TC_255_bytes_response() ); execute( TC_256_bytes_response() ); + execute( TC_null_procedure_byte() ); /* error handling */ execute( TC_inval_slot() ); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42802?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I4eb09e86f88df19d96e9ec55872654352ca2ebd5 Gerrit-Change-Number: 42802 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu>

1 0

[XS] Change in osmo-ttcn3-hacks[master]: SIMTRACE: Increase USB receive buffer size
by jolly 01 Jun '26

01 Jun '26

jolly has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42803?usp=email ) Change subject: SIMTRACE: Increase USB receive buffer size ...................................................................... SIMTRACE: Increase USB receive buffer size The maximum SIM request data can be 255 bytes. Additionally, the SIMtrace PDU header is 14 bytes. So increase the buffer to 269 bytes. Change-Id: I05261b4a754b4892955d0b4e426bd32be261efa7 --- M library/SIMTRACE_Emulation.ttcn 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/03/42803/1 diff --git a/library/SIMTRACE_Emulation.ttcn b/library/SIMTRACE_Emulation.ttcn index c907608..7ba4b2c 100644 --- a/library/SIMTRACE_Emulation.ttcn +++ b/library/SIMTRACE_Emulation.ttcn @@ -34,9 +34,9 @@ integer usb_if_nr }; -private const octetstring c_oct261 := '000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000'O; +private const octetstring c_oct269 := '0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000'O; -private function f_usb_submit_xfer(USB_endpoint ep, octetstring data := c_oct261, +private function f_usb_submit_xfer(USB_endpoint ep, octetstring data := c_oct269, USB_transfer_type ttype := USB_TRANSFER_TYPE_BULK, integer tout_ms := 30000) runs on USB_CT { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42803?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I05261b4a754b4892955d0b4e426bd32be261efa7 Gerrit-Change-Number: 42803 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu>

1 0

[S] Change in osmo-ttcn3-hacks[master]: CCID: Check if reader sends request TPDU with maximum size
by jolly 01 Jun '26

01 Jun '26

jolly has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42804?usp=email ) Change subject: CCID: Check if reader sends request TPDU with maximum size ...................................................................... CCID: Check if reader sends request TPDU with maximum size The maximum size of a request TPDU can have 5 bytes header and 255 bytes data. It is expected that the reader transmits all bytes to SIM without failure. Change-Id: I7c1cb52b578c19d6c0ec1493e45f6ed9c43735b4 --- M ccid/CCID_Tests.ttcn 1 file changed, 44 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/04/42804/1 diff --git a/ccid/CCID_Tests.ttcn b/ccid/CCID_Tests.ttcn index b9a23ef..5e7c49b 100644 --- a/ccid/CCID_Tests.ttcn +++ b/ccid/CCID_Tests.ttcn @@ -760,12 +760,54 @@ f_start_and_wait(); } +/* The SIM request with 255 bytes. */ +private function f_TC_255_bytes_request() runs on CardemSlot_CT +{ + var octetstring req := '00D60000FF000102030405060708090a0b0c0d0e0f000102030405060708090a0b0c0d0e0f000102030405060708090a0b0c0d0e0f000102030405060708090a0b0c0d0e0f000102030405060708090a0b0c0d0e0f000102030405060708090a0b0c0d0e0f000102030405060708090a0b0c0d0e0f000102030405060708090a0b0c0d0e0f000102030405060708090a0b0c0d0e0f000102030405060708090a0b0c0d0e0f000102030405060708090a0b0c0d0e0f000102030405060708090a0b0c0d0e0f000102030405060708090a0b0c0d0e0f000102030405060708090a0b0c0d0e0f000102030405060708090a0b0c0d0e0f000102030405060708090a0b0c0d0e'O + var octetstring res := '9000'O; + var CCID_PDU ccid_pdu; + + f_cardem_manager(); + + f_ccid_power_on(CCID_PWRSEL_3V0); + + /* Send a request towards reader. */ + CCID.send(ts_CCID_XfrBlock(g_slot_nr, req, 0)); + /* Receive the request by SIM. */ + f_cardem_receive(tr_SIMTRACE_CEMU_RX_DATA(?, substr(req, 0, 5))); + /* Transmit the procedure byte from SIM. */ + f_cardem_transmit(ts_SIMTRACE_CEMU_TX_DATA(ts_CardEmu_DataFlags(pb_and_rx := true, final := false), + 'D6'O)); + /* Receive the data by SIM. */ + f_cardem_receive(tr_SIMTRACE_CEMU_RX_DATA(?, substr(req, 5, lengthof(req) - 5))); + /* Transmit the status bytes from SIM. */ + f_cardem_transmit(ts_SIMTRACE_CEMU_TX_DATA(ts_CardEmu_DataFlags(pb_and_tx := true, final := true), + res)); + /* Receive the response from reader. */ + ccid_pdu := f_ccid_receive(tr_CCID_DataBlock(g_slot_nr, ?, ?, ?)); + if (ccid_pdu.u.DataBlock.abData != res) { + setverdict(fail, "Unexpected SW1/SW2"); + mtc.stop; + } + + /* Stop simtrace emulation, to prevent race condition. */ + vc_Cardem.stop; + vc_Cardem.done; +} +testcase TC_255_bytes_request() runs on Test_CT +{ + f_init(); + + f_start_handler(refers(f_TC_255_bytes_request), mp_simtrace_slot, true); + + f_start_and_wait(); +} + /* TODO */ /* IccPowerOn: verify that CCID resets all parameters to default values */ /* IccPowerOn: verify that bPowerSelect has no effect in active state */ -/* XfrBlock: length corner cases (Lc/Le max, ...) */ /* IccClock: verify clock has stopped/restarted */ /* Abort for command that already terminated */ /* Abort for command that's still processing */ @@ -1124,6 +1166,7 @@ execute( TC_255_bytes_response() ); execute( TC_256_bytes_response() ); execute( TC_null_procedure_byte() ); + execute( TC_255_bytes_request() ); /* error handling */ execute( TC_inval_slot() ); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42804?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I7c1cb52b578c19d6c0ec1493e45f6ed9c43735b4 Gerrit-Change-Number: 42804 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu>

1 0

2026

2025

2024

2023

2022

gerrit-log June 2026