September 2025 - gerrit-log - lists.osmocom.org

[S] Change in osmo-msc[master]: vlr: vlr_set_ciph_mode(): use vlr_subscr_security_context instead of ...
by fixeria 30 Sep '25

30 Sep '25

Attention is currently required from: lynxis lazus, neels. fixeria has posted comments on this change by lynxis lazus. ( https://gerrit.osmocom.org/c/osmo-msc/+/41168?usp=email ) Change subject: vlr: vlr_set_ciph_mode(): use vlr_subscr_security_context instead of umts_aka ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/41168?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ia556bc33d1cf30ef17fed2828908aa0b6b6dc8be Gerrit-Change-Number: 41168 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Tue, 30 Sep 2025 18:38:15 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[XS] Change in osmo-el2tpd[master]: src/l2tp_protocol.h: include netinet/in.h
by osmith 30 Sep '25

30 Sep '25

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-el2tpd/+/41184?usp=email ) Change subject: src/l2tp_protocol.h: include netinet/in.h ...................................................................... src/l2tp_protocol.h: include netinet/in.h Fix the following error seen in the master-osmo-el2tpd jenkins job after switching it to debian 13: In file included from l2tpd_lapd.c:31: l2tp_protocol.h:28:25: error: expected identifier before numeric constant 28 | #define IPPROTO_L2TP 115 This happens, because /usr/include/netinet/in.h has: /* Standard well-defined IP protocols. */ enum { IPPROTO_IP = 0, /* Dummy protocol for TCP. */ #define IPPROTO_IP IPPROTO_IP IPPROTO_ICMP = 1, /* Internet Control Message Protocol. */ #define IPPROTO_ICMP IPPROTO_ICMP … IPPROTO_COMP = 108, /* Compression Header Protocol. */ #define IPPROTO_COMP IPPROTO_COMP IPPROTO_L2TP = 115, /* Layer 2 Tunnelling Protocol. */ #define IPPROTO_L2TP IPPROTO_L2TP … }; Which then becomes (seen with gcc -E): IPPROTO_COMP = 108, # 84 "/usr/include/netinet/in.h" 115 # 84 "/usr/include/netinet/in.h" 3 4 = 115, IPPROTO_SCTP = 132, Fix this by including netinet/in.h first, so it won't be redefined if it is already there. Change-Id: Iaec15ee59a1e740d41e616142637612d2aacf1dc --- M src/l2tp_protocol.h 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-el2tpd refs/changes/84/41184/1 diff --git a/src/l2tp_protocol.h b/src/l2tp_protocol.h index 32821f5..6b9fe55 100644 --- a/src/l2tp_protocol.h +++ b/src/l2tp_protocol.h @@ -24,6 +24,8 @@ * */ +#include "netinet/in.h" + #ifndef IPPROTO_L2TP #define IPPROTO_L2TP 115 #endif -- To view, visit https://gerrit.osmocom.org/c/osmo-el2tpd/+/41184?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-el2tpd Gerrit-Branch: master Gerrit-Change-Id: Iaec15ee59a1e740d41e616142637612d2aacf1dc Gerrit-Change-Number: 41184 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

1 0

[XS] Change in osmo-ccid-firmware[master]: ysmoOCTSIM/usb/class/dfu: fix missing include
by osmith 30 Sep '25

30 Sep '25

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/41182?usp=email ) Change subject: ysmoOCTSIM/usb/class/dfu: fix missing include ...................................................................... ysmoOCTSIM/usb/class/dfu: fix missing include Fix for: ../usb/class/dfu/device/dfudf.c:199:17: error: implicit declaration of function 'delay_us' [-Wimplicit-function-declaration] Change-Id: Ia36d25d47f4d5dc4e38c1ea9c8e193ff52f5b5d1 --- M sysmoOCTSIM/usb/class/dfu/device/dfudf.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware refs/changes/82/41182/1 diff --git a/sysmoOCTSIM/usb/class/dfu/device/dfudf.c b/sysmoOCTSIM/usb/class/dfu/device/dfudf.c index 5e5db89..d9b5520 100644 --- a/sysmoOCTSIM/usb/class/dfu/device/dfudf.c +++ b/sysmoOCTSIM/usb/class/dfu/device/dfudf.c @@ -22,7 +22,7 @@ #include "dfudf.h" #include "usb_dfu.h" - +#include "hal_delay.h" /** USB Device DFU Function Specific Data */ struct dfudf_func_data { -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/41182?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: Ia36d25d47f4d5dc4e38c1ea9c8e193ff52f5b5d1 Gerrit-Change-Number: 41182 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

1 0

[XS] Change in osmo-ccid-firmware[master]: ccid_hosts: fix missing talloc_report_full
by osmith 30 Sep '25

30 Sep '25

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/41181?usp=email ) Change subject: ccid_hosts: fix missing talloc_report_full ...................................................................... ccid_hosts: fix missing talloc_report_full Fix for: ccid_main_functionfs.c:534:17: error: implicit declaration of function 'talloc_report_full' [-Wimplicit-function-declaration] 534 | talloc_report_full(g_tall_ctx, stderr); Change-Id: I2b79d6f28e80acef8e1cab0dab949233698336ad --- M ccid_host/Makefile M ccid_host/ccid_main_functionfs.c M ccid_host/cuart_fsm_test.c M ccid_host/hub_main_functionfs.c M contrib/jenkins.sh 5 files changed, 6 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware refs/changes/81/41181/1 diff --git a/ccid_host/Makefile b/ccid_host/Makefile index b117232..718377a 100644 --- a/ccid_host/Makefile +++ b/ccid_host/Makefile @@ -1,12 +1,14 @@ CFLAGS= \ -Wall \ -g \ + $(shell pkg-config --cflags talloc) \ $(shell pkg-config --cflags libosmocore) \ -I../ccid_common \ -I. \ $(NULL) LIBS?= \ -lasan \ + $(shell pkg-config --libs talloc) \ $(shell pkg-config --libs libosmocore) \ $(NULL) diff --git a/ccid_host/ccid_main_functionfs.c b/ccid_host/ccid_main_functionfs.c index dd1e274..1764900 100644 --- a/ccid_host/ccid_main_functionfs.c +++ b/ccid_host/ccid_main_functionfs.c @@ -24,6 +24,7 @@ #include <signal.h> #include <sys/types.h> #include <linux/usb/functionfs.h> +#include <talloc.h> #include "ccid_proto.h" #include "logging.h" diff --git a/ccid_host/cuart_fsm_test.c b/ccid_host/cuart_fsm_test.c index 001f8e7..900c90c 100644 --- a/ccid_host/cuart_fsm_test.c +++ b/ccid_host/cuart_fsm_test.c @@ -22,6 +22,7 @@ #include <stdio.h> #include <errno.h> #include <signal.h> +#include <talloc.h> #include <osmocom/core/utils.h> #include <osmocom/core/logging.h> #include <osmocom/core/application.h> diff --git a/ccid_host/hub_main_functionfs.c b/ccid_host/hub_main_functionfs.c index 6d31243..201e29e 100644 --- a/ccid_host/hub_main_functionfs.c +++ b/ccid_host/hub_main_functionfs.c @@ -25,6 +25,7 @@ #include <sys/types.h> #include <linux/usb/functionfs.h> #include <linux/usb/ch11.h> +#include <talloc.h> #if __BYTE_ORDER == __LITTLE_ENDIAN #define cpu_to_le16(x) (x) diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 0bf6771..ed42eaa 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -17,7 +17,7 @@ echo echo "=============== libosmocore host build ===========" -osmo-build-dep.sh libosmocore "" --disable-doxygen +osmo-build-dep.sh libosmocore "" --disable-doxygen --disable-pseudotalloc export PKG_CONFIG_PATH="$inst/lib/pkgconfig:$PKG_CONFIG_PATH" export LD_LIBRARY_PATH="$inst/lib" export PATH="$inst/bin:$PATH" -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/41181?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: I2b79d6f28e80acef8e1cab0dab949233698336ad Gerrit-Change-Number: 41181 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

1 0

[XS] Change in osmo-ccid-firmware[master]: contrib/jenkins: use osmo-clean-workspace.sh
by osmith 30 Sep '25

30 Sep '25

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/41183?usp=email ) Change subject: contrib/jenkins: use osmo-clean-workspace.sh ...................................................................... contrib/jenkins: use osmo-clean-workspace.sh Clean the workspace at the beginning, because otherwise the build fails when running twice in a row. For some reason a pseudo-talloc.h from libosmocore appears, resulting in: error: implicit declaration of function 'talloc_report_full' Change-Id: If2e29ffd5150b57858b46e92e157f83a0cf3a11a --- M contrib/jenkins.sh 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware refs/changes/83/41183/1 diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index ed42eaa..71c0737 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -14,6 +14,7 @@ inst="$TOPDIR/install" export deps inst +osmo-clean-workspace.sh echo echo "=============== libosmocore host build ===========" -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/41183?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: If2e29ffd5150b57858b46e92e157f83a0cf3a11a Gerrit-Change-Number: 41183 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

1 0

[S] Change in osmo-ccid-firmware[master]: ccid_host: remove unused _set_dtr
by osmith 30 Sep '25

30 Sep '25

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/41178?usp=email ) Change subject: ccid_host: remove unused _set_dtr ...................................................................... ccid_host: remove unused _set_dtr Fix for: cuart_driver_tty.c:62:13: warning: '_set_dtr' defined but not used [-Wunused-function] 62 | static void _set_dtr(int fd, bool dtr) Change-Id: I43b08a584891e94b9cfab095834e499dd5914b4f --- M ccid_host/cuart_driver_tty.c 1 file changed, 0 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware refs/changes/78/41178/1 diff --git a/ccid_host/cuart_driver_tty.c b/ccid_host/cuart_driver_tty.c index a9032fa..66d1e9d 100644 --- a/ccid_host/cuart_driver_tty.c +++ b/ccid_host/cuart_driver_tty.c @@ -59,20 +59,6 @@ return 0; } -static void _set_dtr(int fd, bool dtr) -{ - int status, rc; - - rc = ioctl(fd, TIOCMGET, &status); - OSMO_ASSERT(rc == 0); - if (dtr) /* set DTR */ - status |= TIOCM_DTR; - else - status &= ~TIOCM_DTR; - rc = ioctl(fd, TIOCMSET, &status); - OSMO_ASSERT(rc == 0); -} - static void _set_rts(int fd, bool rts) { int status, rc; -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/41178?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: I43b08a584891e94b9cfab095834e499dd5914b4f Gerrit-Change-Number: 41178 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

1 0

[XS] Change in osmo-ccid-firmware[master]: contrib/jenkins: fix a typo
by osmith 30 Sep '25

30 Sep '25

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/41175?usp=email ) Change subject: contrib/jenkins: fix a typo ...................................................................... contrib/jenkins: fix a typo Change-Id: Iaa8349e90d222ef918051c344e45ec51ae649884 --- M contrib/jenkins.sh 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware refs/changes/75/41175/1 diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 9111965..0bf6771 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -16,7 +16,7 @@ echo -echo "=============== libosmocore hostt build ===========" +echo "=============== libosmocore host build ===========" osmo-build-dep.sh libosmocore "" --disable-doxygen export PKG_CONFIG_PATH="$inst/lib/pkgconfig:$PKG_CONFIG_PATH" export LD_LIBRARY_PATH="$inst/lib" -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/41175?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: Iaa8349e90d222ef918051c344e45ec51ae649884 Gerrit-Change-Number: 41175 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

1 0

[XS] Change in osmo-ccid-firmware[master]: ccid_gen_notify_slot_status: add msgb_put cast
by osmith 30 Sep '25

30 Sep '25

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/41176?usp=email ) Change subject: ccid_gen_notify_slot_status: add msgb_put cast ...................................................................... ccid_gen_notify_slot_status: add msgb_put cast Fix this error seen in master-osmo-ccid-firmware after switching to debian trixie with 14.2: ../main.c:338:57: error: initialization of 'struct ccid_rdr_to_pc_notify_slot_change *' from incompatible pointer type 'unsigned char *' [-Wincompatible-pointer-types] 338 | struct ccid_rdr_to_pc_notify_slot_change *nsc = msgb_put(msg, sizeof(*nsc) + sizeof(statusbytes)); Change-Id: I5618297533246adc8adaacf49fd58ec1f0f97cfc --- M sysmoOCTSIM/main.c 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware refs/changes/76/41176/1 diff --git a/sysmoOCTSIM/main.c b/sysmoOCTSIM/main.c index 7d81853..fe569fd 100644 --- a/sysmoOCTSIM/main.c +++ b/sysmoOCTSIM/main.c @@ -335,7 +335,8 @@ uint8_t statusbytes[2] = {0}; //struct msgb *msg = ccid_msgb_alloc(); struct msgb *msg = msgb_alloc(300,"IRQ"); - struct ccid_rdr_to_pc_notify_slot_change *nsc = msgb_put(msg, sizeof(*nsc) + sizeof(statusbytes)); + struct ccid_rdr_to_pc_notify_slot_change *nsc = + (struct ccid_rdr_to_pc_notify_slot_change *)msgb_put(msg, sizeof(*nsc) + sizeof(statusbytes)); nsc->bMessageType = RDR_to_PC_NotifySlotChange; for(int i = 0; i <8; i++) { -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/41176?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: I5618297533246adc8adaacf49fd58ec1f0f97cfc Gerrit-Change-Number: 41176 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

1 0

[XS] Change in osmo-ccid-firmware[master]: ccid_host: fix read_timeout defined but not used
by osmith 30 Sep '25

30 Sep '25

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/41177?usp=email ) Change subject: ccid_host: fix read_timeout defined but not used ...................................................................... ccid_host: fix read_timeout defined but not used Comment out the read_timeout fuction, as it is only used in already commented out code. Fix for: cuart_driver_tty.c:90:12: warning: 'read_timeout' defined but not used [-Wunused-function] 90 | static int read_timeout(int fd, uint8_t *out, size_t len, unsigned long timeout_ms) Change-Id: I49fc59ebaa4abc3e9b8838e1b427f4455acdb390 --- M ccid_host/cuart_driver_tty.c 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware refs/changes/77/41177/1 diff --git a/ccid_host/cuart_driver_tty.c b/ccid_host/cuart_driver_tty.c index f8a1438..a9032fa 100644 --- a/ccid_host/cuart_driver_tty.c +++ b/ccid_host/cuart_driver_tty.c @@ -87,6 +87,7 @@ OSMO_ASSERT(rc == 0); } +#if 0 static int read_timeout(int fd, uint8_t *out, size_t len, unsigned long timeout_ms) { struct timeval tv = { .tv_sec = timeout_ms / 1000, .tv_usec = (timeout_ms % 1000) * 1000 }; @@ -103,6 +104,7 @@ return read(fd, out, len); } +#endif static int _flush(int fd) { -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/41177?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: I49fc59ebaa4abc3e9b8838e1b427f4455acdb390 Gerrit-Change-Number: 41177 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

1 0

[S] Change in osmo-ccid-firmware[master]: ccid_host/Makefile: tweak formatting (cosmetic)
by osmith 30 Sep '25

30 Sep '25

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/41180?usp=email ) Change subject: ccid_host/Makefile: tweak formatting (cosmetic) ...................................................................... ccid_host/Makefile: tweak formatting (cosmetic) Change-Id: Ic2e92f9364361af0989b447d3824e867c0cb23d4 --- M ccid_host/Makefile 1 file changed, 11 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware refs/changes/80/41180/1 diff --git a/ccid_host/Makefile b/ccid_host/Makefile index 7625177..b117232 100644 --- a/ccid_host/Makefile +++ b/ccid_host/Makefile @@ -1,5 +1,14 @@ -CFLAGS=-Wall -g $(shell pkg-config --cflags libosmocore) -I../ccid_common -I. -LIBS?=-lasan $(shell pkg-config --libs libosmocore) +CFLAGS= \ + -Wall \ + -g \ + $(shell pkg-config --cflags libosmocore) \ + -I../ccid_common \ + -I. \ + $(NULL) +LIBS?= \ + -lasan \ + $(shell pkg-config --libs libosmocore) \ + $(NULL) all: ccid_functionfs hub_functionfs cuart_test cuart_fsm_test -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/41180?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: Ic2e92f9364361af0989b447d3824e867c0cb23d4 Gerrit-Change-Number: 41180 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

1 0