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

[M] Change in osmo-remsim[master]: Introduce osmo-remsim-client-socket
by jolly 19 Oct '26

19 Oct '26

Attention is currently required from: jolly, laforge, lynxis lazus. Hello Jenkins Builder, laforge, lynxis lazus, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-remsim/+/43742?usp=email to look at the new patch set (#4). The following approvals got outdated and were removed: Code-Review+1 by laforge, Verified+1 by Jenkins Builder Change subject: Introduce osmo-remsim-client-socket ...................................................................... Introduce osmo-remsim-client-socket Add new remsim client with socket interface. It is similar to the osmo-remsim-client-shell, but it uses a unix socket instead of stdin and stdout to exchange APDUs. The coding is binary instead of hex string. Related: SYS#8159 Change-Id: I9eddb60e4e7c3191ca2b340690416b53005f714f --- M .gitignore M debian/control A debian/osmo-remsim-client-socket.install M src/client/Makefile.am M src/client/client.h M src/client/remsim_client_main.c A src/client/user_socket.c 7 files changed, 203 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-remsim refs/changes/42/43742/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/43742?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: I9eddb60e4e7c3191ca2b340690416b53005f714f Gerrit-Change-Number: 43742 Gerrit-PatchSet: 4 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu>

1 0

[XS] Change in osmo-ttcn3-hacks[master]: SGP23_Constants: remove stray # in f_SGP23_ACTIVATION_CODE_x
by dexter 19 Oct '26

19 Oct '26

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43923?usp=email ) Change subject: SGP23_Constants: remove stray # in f_SGP23_ACTIVATION_CODE_x ...................................................................... SGP23_Constants: remove stray # in f_SGP23_ACTIVATION_CODE_x The first three f_SGP23_ACTIVATION_CODE_x functions produce a # in front of the SM-DP+ address. This is not correct and leads to test failures (IPAd) Change-Id: I31d37aca3a52c860748662ac389e3b798fd15ccd Related: SYS#8203 --- M library/euicc/SGP23_Constants.ttcn 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/23/43923/1 diff --git a/library/euicc/SGP23_Constants.ttcn b/library/euicc/SGP23_Constants.ttcn index ab487bc..a1695ad 100644 --- a/library/euicc/SGP23_Constants.ttcn +++ b/library/euicc/SGP23_Constants.ttcn @@ -26,16 +26,16 @@ {'C0BC70BA36929D43B467FF57570530E57AB8FCD8'O, 'F54172BDF98A95D65CBEB88A38A1C11D800A85C3'O}; function f_SGP23_ACTIVATION_CODE_1(charstring test_dp_address := SGP23_TEST_DP_ADDRESS1, charstring matching_id := SGP23_MATCHING_ID_1) return charstring { - return "1$#" & test_dp_address & "$" & matching_id; + return "1$" & test_dp_address & "$" & matching_id; } function f_SGP23_ACTIVATION_CODE_2(charstring test_dp_address := SGP23_TEST_DP_ADDRESS1, charstring matching_id := SGP23_MATCHING_ID_2, charstring sm_dp_oid := "foo") return charstring { - return "1$#" & test_dp_address & "$" & matching_id & "$" & sm_dp_oid; + return "1$" & test_dp_address & "$" & matching_id & "$" & sm_dp_oid; } function f_SGP23_ACTIVATION_CODE_3(charstring test_dp_address := SGP23_TEST_DP_ADDRESS1, charstring matching_id := SGP23_MATCHING_ID_3) return charstring { - return "1$#" & test_dp_address & "$" & matching_id & "$$1"; + return "1$" & test_dp_address & "$" & matching_id & "$$1"; } function f_SGP23_ACTIVATION_CODE_3_NO_CC(charstring test_dp_address := SGP23_TEST_DP_ADDRESS1, charstring matching_id := SGP23_MATCHING_ID_3) return charstring { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43923?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: I31d37aca3a52c860748662ac389e3b798fd15ccd Gerrit-Change-Number: 43923 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de>

1 0

[S] Change in osmocom-bb[master]: trxcon/trx_if: negotiate TRXD PDU version 1 (TRXDv1)
by fixeria 19 Oct '26

19 Oct '26

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/43829?usp=email ) ( 3 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: trxcon/trx_if: negotiate TRXD PDU version 1 (TRXDv1) ...................................................................... trxcon/trx_if: negotiate TRXD PDU version 1 (TRXDv1) Now that trx_if.c is built against libosmo-trx, enable TRXDv1 by negotiating it (SETFORMAT) before every POWERON, since the transceiver may reset its active format back to legacy on the preceding POWEROFF. This significantly improves the ttcn3-bts-test pass/fail ratio in the frequency hopping configuration: TRXDv1 lets the transceiver (osmo-trx-proxy) send us NOPE.ind, which we rely on to keep driving uplink bursts even when no downlink burst was received. Change-Id: I08d588f74925bb7a85e131defc0fa82158d90680 Related: OS#6638 --- M src/host/trxcon/src/trx_if.c M src/host/trxcon/src/trxcon_shim.c 2 files changed, 36 insertions(+), 6 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/src/host/trxcon/src/trx_if.c b/src/host/trxcon/src/trx_if.c index a974b46..bbbc93f 100644 --- a/src/host/trxcon/src/trx_if.c +++ b/src/host/trxcon/src/trx_if.c @@ -45,6 +45,13 @@ #include <osmocom/bb/trxcon/trx_if.h> #include <osmocom/bb/trxcon/logging.h> +/* Highest TRXD PDU version supported by trxcon (TRXDv1). + * + * TRXDv2 requires Tx PDUs to contain modulation and training sequence info. + * struct trxcon_phyif_burst_req currently does not contain this information, + * so we cannot populate the necessary fields in trx_if_handle_phyif_burst_req(). */ +#define TRXD_PDU_VER_MAX 1 + /* Give up after 3 retransmissions of a TRXC command */ #define TRX_MAX_RETRANS 3 @@ -148,6 +155,15 @@ return osmo_trxc_client_poweron(trx->trxc_client, &trx_poweron_rsp_cb, trx); } +static void trx_setformat_cb(struct osmo_trxc_client *client, + uint8_t ver_use, void *cb_data) +{ + struct trx_instance *trx = cb_data; + + LOGPFSML(trx->fi, LOGL_INFO, "Using TRXD PDU version %u\n", ver_use); + osmo_trx_ep_set_pdu_ver(trx->ep, 0, ver_use); +} + static int trx_if_cmd_setslot(struct trx_instance *trx, const struct trxcon_phyif_cmdp_setslot *cmdp) { @@ -400,8 +416,11 @@ } } -/* No state change here: the POWERON response (see trx_poweron_rsp_cb()) - * is what moves us to TRX_ST_POWERON. */ +/* (Re-)negotiate the TRXD PDU format and send POWERON right behind it, + * since the transceiver may have reset its active format back to legacy + * on the preceding POWEROFF (or never negotiated it at all, if this is the + * very first POWERON). No state change here: the POWERON response (see + * trx_poweron_rsp_cb()) is what moves us to TRX_ST_POWERON. */ static void trx_fsm_handle_poweron_req(struct osmo_fsm_inst *fi) { struct trx_instance *trx = fi->priv; @@ -411,6 +430,9 @@ return; } + osmo_trxc_client_negotiate_format(trx->trxc_client, + TRXD_PDU_VER_MAX, + &trx_setformat_cb, trx); trx_if_cmd_poweron(trx); } @@ -488,8 +510,8 @@ .tn = bi->tn, .toa256 = bi->toa256, .rssi = bi->rssi, - .burst = &bi->burst[0], - .burst_len = bi->burst_len, + .burst = (bi->flags & OSMO_TRXD_F_NOPE_IND) ? NULL : &bi->burst[0], + .burst_len = (bi->flags & OSMO_TRXD_F_NOPE_IND) ? 0 : bi->burst_len, }; trxcon_phyif_handle_burst_ind(trx->priv, &phybi); diff --git a/src/host/trxcon/src/trxcon_shim.c b/src/host/trxcon/src/trxcon_shim.c index ed2d402..3446f13 100644 --- a/src/host/trxcon/src/trxcon_shim.c +++ b/src/host/trxcon/src/trxcon_shim.c @@ -232,8 +232,16 @@ .burst_len = phybi->burst_len, }; - OSMO_ASSERT(phybi->burst_len <= sizeof(bi.burst)); - memcpy(&bi.burst[0], phybi->burst, phybi->burst_len); + if (phybi->burst_len > 0) { + OSMO_ASSERT(phybi->burst_len <= sizeof(bi.burst)); + memcpy(bi.burst, phybi->burst, phybi->burst_len); + } else { + /* NOPE.ind: the transceiver did not detect a burst for this fn/tn, + * but still reports timing/level measurements. Feed the scheduler + * with a burst all soft-bits of which are uncertain (50% 0, 50% 1). */ + bi.burst_len = GSM_NBITS_NB_GMSK_BURST; + memset(bi.burst, 0, bi.burst_len); + } /* Poke scheduler */ return l1sched_handle_rx_burst(trxcon->sched, &bi); -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/43829?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I08d588f74925bb7a85e131defc0fa82158d90680 Gerrit-Change-Number: 43829 Gerrit-PatchSet: 5 Gerrit-Owner: fixeria <vyanitskiy(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

[L] Change in osmocom-bb[master]: trxcon/trx_if: migrate to libosmo-trx
by fixeria 19 Oct '26

19 Oct '26

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/43828?usp=email ) Change subject: trxcon/trx_if: migrate to libosmo-trx ...................................................................... trxcon/trx_if: migrate to libosmo-trx libosmo-trx (part of osmo-trx.git) is a new library providing a more advanced, shared implementation of the TRXC/TRXD protocol, factored out of osmo-trx and osmo-bts-trx. Replace the existing TRXC/TRXD protocol implementation in trx_if.c with it. This reduces code duplication and gives us TRXDv1/v2 support for free. Since this makes libosmo-trx a hard dependency of trx_if.c, gate the trxcon binary itself behind a new --with-trxcon=yes|no (default yes), so that building the rest of osmocom-bb doesn't force everyone to have libosmo-trx installed; the scheduler/GPRS libraries are unaffected and keep building unconditionally. Change-Id: I4604f4b12ca903e936dedf167b478455bd28a2e8 Related: osmo-trx.git I817e394f74a10e3adae4a0b58342c82acdf0794e Related: osmo-trx.git I767fa43a9ca88be40c385f6dcb9de22891a6afc3 Related: OS#6638 --- M contrib/jenkins.sh M debian/control M src/Makefile M src/host/trxcon/configure.ac M src/host/trxcon/src/Makefile.am M src/host/trxcon/src/trx_if.c 6 files changed, 234 insertions(+), 452 deletions(-) Approvals: osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index fce8744..2846a46 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -26,6 +26,7 @@ osmo-build-dep.sh libosmocore "" --disable-doxygen osmo-build-dep.sh libosmo-gprs +osmo-build-dep.sh osmo-trx "" --disable-doxygen --disable-multi-arfcn --without-proxy osmo-build-dep.sh gapk set +x diff --git a/debian/control b/debian/control index 0939ca4..aabe874 100644 --- a/debian/control +++ b/debian/control @@ -16,6 +16,7 @@ libosmo-gprs-rlcmac-dev, libosmo-gprs-sm-dev, libosmo-gprs-sndcp-dev, + libosmo-trx-dev (>= 1.8.0), libosmogapk-dev, osmo-gsm-manuals-dev (>= 1.6.0) Standards-Version: 4.1.4 diff --git a/src/Makefile b/src/Makefile index 0835a85..315e153 100644 --- a/src/Makefile +++ b/src/Makefile @@ -13,7 +13,9 @@ all: libosmocore-target nofirmware firmware mtk-firmware -nofirmware: layer23 osmocon trxcon gprsdecode virtphy +# trxcon is excluded on purpose because it requires libosmo-trx +# and we don't want to make the rest of osmocom-bb depend on it. +nofirmware: layer23 osmocon gprsdecode virtphy libosmocore-target: shared/libosmocore/build-target/src/.libs/libosmocore.a @@ -110,7 +112,6 @@ make -C host/osmocon $@ make -C host/gprsdecode $@ make -C host/virt_phy $@ - make -C host/trxcon $@ make -C target/firmware $@ make -C target/firmware -f Makefile.mtk $@ @@ -120,6 +121,5 @@ make -C host/osmocon $@ make -C host/gprsdecode $@ make -C host/virt_phy $@ - make -C host/trxcon $@ # 'firmware' also handles 'mtk-firmware' make -C target/firmware $@ diff --git a/src/host/trxcon/configure.ac b/src/host/trxcon/configure.ac index 6508689..df7b604 100644 --- a/src/host/trxcon/configure.ac +++ b/src/host/trxcon/configure.ac @@ -53,6 +53,23 @@ CPPFLAGS="$CPPFLAGS $WERROR_FLAGS" fi +dnl trxcon requires libosmo-trx (osmo-trx.git) for its TRXC/TRXD backend; +dnl allow disabling the trxcon binary itself (--without-trxcon) so that +dnl building libtrxcon, libl1sched, libl1gprs, and the rest of osmocom-bb +dnl doesn't require libosmo-trx. +AC_ARG_WITH([trxcon], + [AS_HELP_STRING([--with-trxcon], + [Build the trxcon binary @<:@default=yes@:>@])], + [], [with_trxcon=yes]) +AS_IF([test "x$with_trxcon" = "xyes"], [ + PKG_CHECK_MODULES(LIBOSMOTRX, libosmo-trx) +]) + +AM_CONDITIONAL([BUILD_TRXCON], [test "x$with_trxcon" = "xyes"]) + +AC_MSG_CHECKING([whether to build the trxcon binary]) +AC_MSG_RESULT([$with_trxcon]) + AC_MSG_RESULT([CFLAGS="$CFLAGS"]) AC_MSG_RESULT([CPPFLAGS="$CPPFLAGS"]) diff --git a/src/host/trxcon/src/Makefile.am b/src/host/trxcon/src/Makefile.am index 7be7de6..00505c1 100644 --- a/src/host/trxcon/src/Makefile.am +++ b/src/host/trxcon/src/Makefile.am @@ -8,6 +8,7 @@ $(LIBOSMOCORE_CFLAGS) \ $(LIBOSMOCODING_CFLAGS) \ $(LIBOSMOGSM_CFLAGS) \ + $(LIBOSMOTRX_CFLAGS) \ $(NULL) @@ -45,7 +46,10 @@ $(NULL) -bin_PROGRAMS = trxcon +bin_PROGRAMS = + +if BUILD_TRXCON +bin_PROGRAMS += trxcon trxcon_SOURCES = \ l1ctl_server.c \ @@ -61,4 +65,6 @@ $(LIBOSMOCORE_LIBS) \ $(LIBOSMOCODING_LIBS) \ $(LIBOSMOGSM_LIBS) \ + $(LIBOSMOTRX_LIBS) \ $(NULL) +endif diff --git a/src/host/trxcon/src/trx_if.c b/src/host/trxcon/src/trx_if.c index ec6f3ab..a974b46 100644 --- a/src/host/trxcon/src/trx_if.c +++ b/src/host/trxcon/src/trx_if.c @@ -4,7 +4,7 @@ * * Copyright (C) 2013 by Andreas Eversberg <jolly(a)eversberg.eu> * Copyright (C) 2016-2017 by Vadim Yanitskiy <axilirator(a)gmail.com> - * Copyright (C) 2022 by sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> + * Copyright (C) 2022-2026 by sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> * * All Rights Reserved * @@ -26,16 +26,10 @@ #include <errno.h> #include <stdint.h> #include <stdbool.h> -#include <unistd.h> #include <stdlib.h> #include <string.h> -#include <netinet/in.h> - -#include <osmocom/core/linuxlist.h> #include <osmocom/core/logging.h> -#include <osmocom/core/select.h> -#include <osmocom/core/socket.h> #include <osmocom/core/talloc.h> #include <osmocom/core/bits.h> #include <osmocom/core/fsm.h> @@ -43,13 +37,16 @@ #include <osmocom/gsm/gsm_utils.h> #include <osmocom/gsm/gsm0502.h> +#include <osmocom/trx/trxc.h> +#include <osmocom/trx/trxc_client.h> +#include <osmocom/trx/trxd.h> +#include <osmocom/trx/ep.h> + #include <osmocom/bb/trxcon/trx_if.h> #include <osmocom/bb/trxcon/logging.h> -#define TRXDv0_HDR_LEN 8 - -#define TRXC_BUF_SIZE 1024 -#define TRXD_BUF_SIZE 512 +/* Give up after 3 retransmissions of a TRXC command */ +#define TRX_MAX_RETRANS 3 #define S(x) (1 << (x)) @@ -59,11 +56,9 @@ }; struct trx_instance { - struct osmo_fd trx_ofd_ctrl; - struct osmo_fd trx_ofd_data; + struct osmo_trx_ep *ep; + struct osmo_trxc_client *trxc_client; - struct osmo_timer_list trx_ctrl_timer; - struct llist_head trx_ctrl_list; struct osmo_fsm_inst *fi; uint32_t fn_advance; @@ -76,162 +71,56 @@ void *priv; }; -struct trx_ctrl_msg { - struct llist_head list; - char cmd[TRXC_BUF_SIZE]; - int retry_cnt; - int critical; - int cmd_len; -}; - static struct osmo_fsm trx_fsm; -static int trx_udp_open(void *priv, struct osmo_fd *ofd, const char *host_local, - uint16_t port_local, const char *host_remote, uint16_t port_remote, - int (*cb)(struct osmo_fd *fd, unsigned int what)) -{ - int rc; - - ofd->data = priv; - ofd->fd = -1; - ofd->cb = cb; - - /* Init UDP Connection */ - rc = osmo_sock_init2_ofd(ofd, AF_UNSPEC, SOCK_DGRAM, 0, host_local, port_local, - host_remote, port_remote, - OSMO_SOCK_F_BIND | OSMO_SOCK_F_CONNECT); - return rc; -} - -static void trx_udp_close(struct osmo_fd *ofd) -{ - if (ofd->fd > 0) { - osmo_fd_unregister(ofd); - close(ofd->fd); - ofd->fd = -1; - } -} - /* ------------------------------------------------------------------------ */ -/* Control (CTRL) interface handlers */ -/* ------------------------------------------------------------------------ */ -/* Commands on the Per-ARFCN Control Interface */ -/* */ -/* The per-ARFCN control interface uses a command-response protocol. */ -/* Commands are NULL-terminated ASCII strings, one per UDP socket. */ -/* Each command has a corresponding response. */ -/* Every command is of the form: */ -/* */ -/* CMD <cmdtype> [params] */ -/* */ -/* The <cmdtype> is the actual command. */ -/* Parameters are optional depending on the commands type. */ -/* Every response is of the form: */ -/* */ -/* RSP <cmdtype> <status> [result] */ -/* */ -/* The <status> is 0 for success and a non-zero error code for failure. */ -/* Successful responses may include results, depending on the command type. */ +/* Control (TRXC) interface handlers */ /* ------------------------------------------------------------------------ */ -static void trx_ctrl_timer_cb(void *data); - -/* Send first CTRL message and start timer */ -static void trx_ctrl_send(struct trx_instance *trx) +/* Transmit a TRXC message enqueued by the command queue engine */ +static int trxc_client_tx_msg_cb(struct osmo_trxc_client *client, + const struct osmo_trxc_msg *msg) { - struct trx_ctrl_msg *tcm; + struct trx_instance *trx = osmo_trxc_client_get_priv(client); - if (llist_empty(&trx->trx_ctrl_list)) - return; - tcm = llist_entry(trx->trx_ctrl_list.next, struct trx_ctrl_msg, list); - - /* Send command */ - LOGPFSML(trx->fi, LOGL_DEBUG, "Sending control '%s'\n", tcm->cmd); - send(trx->trx_ofd_ctrl.fd, tcm->cmd, strlen(tcm->cmd) + 1, 0); - - /* Start expire timer */ - trx->trx_ctrl_timer.data = trx; - trx->trx_ctrl_timer.cb = trx_ctrl_timer_cb; - osmo_timer_schedule(&trx->trx_ctrl_timer, 2, 0); + return osmo_trx_ep_send_ctrl_msg(trx->ep, 0, msg); } -static void trx_ctrl_timer_cb(void *data) +/* A critical TRXC command failed (NACKed, mismatched, or timed out) */ +static void trxc_client_fatal_error_cb(struct osmo_trxc_client *client, + const struct osmo_trxc_msg *rsp) { - struct trx_instance *trx = (struct trx_instance *) data; - struct trx_ctrl_msg *tcm; + struct trx_instance *trx = osmo_trxc_client_get_priv(client); - /* Queue may be cleaned at this moment */ - if (llist_empty(&trx->trx_ctrl_list)) - return; - - LOGPFSML(trx->fi, LOGL_NOTICE, "No response from transceiver...\n"); - - tcm = llist_entry(trx->trx_ctrl_list.next, struct trx_ctrl_msg, list); - if (++tcm->retry_cnt > 3) { + if (rsp == NULL) { /* no response, retransmissions exhausted */ LOGPFSML(trx->fi, LOGL_NOTICE, "Transceiver offline\n"); osmo_fsm_inst_term(trx->fi, OSMO_FSM_TERM_TIMEOUT, NULL); - return; + } else { + osmo_fsm_inst_term(trx->fi, OSMO_FSM_TERM_ERROR, NULL); } - - /* Attempt to send a command again */ - trx_ctrl_send(trx); } -/* Add a new CTRL command to the trx_ctrl_list */ -static int trx_ctrl_cmd(struct trx_instance *trx, int critical, - const char *cmd, const char *fmt, ...) +/* Feed responses received on the ctrl socket into the command queue engine */ +void osmo_trx_ep_rx_ctrl_msg(struct osmo_trx_ep *ep, unsigned int chan, + const struct osmo_trxc_msg *msg) { - struct trx_ctrl_msg *tcm; - int len, pending = 0; - va_list ap; + struct trx_instance *trx = osmo_trx_ep_get_priv(ep); - /* TODO: make sure that transceiver online */ + osmo_trxc_client_rx_msg(trx->trxc_client, msg); +} - if (!llist_empty(&trx->trx_ctrl_list)) - pending = 1; +static int trx_poweroff_rsp_cb(struct osmo_trxc_client *client, + const struct osmo_trxc_msg *rsp, void *cb_data) +{ + struct trx_instance *trx = cb_data; - /* Allocate a message */ - tcm = talloc_zero(trx, struct trx_ctrl_msg); - if (!tcm) - return -ENOMEM; + if (rsp->status != 0) + return -EINVAL; /* critical, escalate to fatal_error */ - /* Fill in command arguments */ - if (fmt && fmt[0]) { - len = snprintf(tcm->cmd, sizeof(tcm->cmd) - 1, "CMD %s ", cmd); - va_start(ap, fmt); - vsnprintf(tcm->cmd + len, sizeof(tcm->cmd) - len - 1, fmt, ap); - va_end(ap); - } else { - snprintf(tcm->cmd, sizeof(tcm->cmd) - 1, "CMD %s", cmd); - } - - tcm->cmd_len = strlen(cmd); - tcm->critical = critical; - llist_add_tail(&tcm->list, &trx->trx_ctrl_list); - LOGPFSML(trx->fi, LOGL_INFO, "Adding new control '%s'\n", tcm->cmd); - - /* Send message, if no pending messages */ - if (!pending) - trx_ctrl_send(trx); - + osmo_fsm_inst_state_chg(trx->fi, TRX_ST_POWEROFF, 0, 0); return 0; } -/* - * Power Control - * - * POWEROFF shuts off transmitter power and stops the demodulator. - * CMD POWEROFF - * RSP POWEROFF <status> - * - * POWERON starts the transmitter and starts the demodulator. - * Initial power level is very low. - * This command fails if the transmitter and receiver are not yet tuned. - * This command fails if the transceiver is already on. - * CMD POWERON - * RSP POWERON <status> - */ - static int trx_if_cmd_poweroff(struct trx_instance *trx) { /* The transceiver forgets the tuned Rx/Tx frequencies on POWEROFF */ @@ -239,44 +128,48 @@ trx->tx_freq_khz = 0; trx->hopping = false; - return trx_ctrl_cmd(trx, 1, "POWEROFF", ""); + return osmo_trxc_client_poweroff(trx->trxc_client, &trx_poweroff_rsp_cb, trx); +} + +static int trx_poweron_rsp_cb(struct osmo_trxc_client *client, + const struct osmo_trxc_msg *rsp, void *cb_data) +{ + struct trx_instance *trx = cb_data; + + if (rsp->status != 0) + return -EINVAL; /* critical, escalate to fatal_error */ + + osmo_fsm_inst_state_chg(trx->fi, TRX_ST_POWERON, 0, 0); + return 0; } static int trx_if_cmd_poweron(struct trx_instance *trx) { - return trx_ctrl_cmd(trx, 1, "POWERON", ""); + return osmo_trxc_client_poweron(trx->trxc_client, &trx_poweron_rsp_cb, trx); } -/* - * Timeslot Control - * - * SETSLOT sets the format of the uplink timeslots in the ARFCN. - * The <timeslot> indicates the timeslot of interest. - * The <chantype> indicates the type of channel that occupies the timeslot. - * A chantype of zero indicates the timeslot is off. - * CMD SETSLOT <timeslot> <chantype> - * RSP SETSLOT <status> <timeslot> <chantype> - */ - static int trx_if_cmd_setslot(struct trx_instance *trx, const struct trxcon_phyif_cmdp_setslot *cmdp) { - /* Values correspond to 'enum ChannelCombination' in osmo-trx.git */ static const uint8_t chan_types[_GSM_PCHAN_MAX] = { - [GSM_PCHAN_UNKNOWN] = 0, - [GSM_PCHAN_NONE] = 0, - [GSM_PCHAN_CCCH] = 4, - [GSM_PCHAN_CCCH_SDCCH4] = 5, - [GSM_PCHAN_CCCH_SDCCH4_CBCH] = 5, - [GSM_PCHAN_TCH_F] = 1, - [GSM_PCHAN_TCH_H] = 3, - [GSM_PCHAN_SDCCH8_SACCH8C] = 7, - [GSM_PCHAN_SDCCH8_SACCH8C_CBCH] = 7, - [GSM_PCHAN_PDCH] = 13, + [GSM_PCHAN_UNKNOWN] = OSMO_TRXC_CHAN_COMB_UNUSED, + [GSM_PCHAN_NONE] = OSMO_TRXC_CHAN_COMB_UNUSED, + [GSM_PCHAN_CCCH] = OSMO_TRXC_CHAN_COMB_BCCH, + [GSM_PCHAN_CCCH_SDCCH4] = OSMO_TRXC_CHAN_COMB_BCCH_SDCCH4, + [GSM_PCHAN_CCCH_SDCCH4_CBCH] = OSMO_TRXC_CHAN_COMB_BCCH_SDCCH4, + [GSM_PCHAN_TCH_F] = OSMO_TRXC_CHAN_COMB_TCHF, + [GSM_PCHAN_TCH_H] = OSMO_TRXC_CHAN_COMB_TCHH, + [GSM_PCHAN_SDCCH8_SACCH8C] = OSMO_TRXC_CHAN_COMB_SDCCH8, + [GSM_PCHAN_SDCCH8_SACCH8C_CBCH] = OSMO_TRXC_CHAN_COMB_SDCCH8, + [GSM_PCHAN_PDCH] = OSMO_TRXC_CHAN_COMB_PDTCH, }; - return trx_ctrl_cmd(trx, 1, "SETSLOT", "%u %u", - cmdp->tn, chan_types[cmdp->pchan]); + /* SETSLOT may be pending for different timeslots at once, so the + * response needs to be matched against the params, too. */ + return osmo_trxc_client_send_cmd(trx->trxc_client, + OSMO_TRXC_F_CRITICAL | OSMO_TRXC_F_MATCH_PARAMS, + NULL, NULL, OSMO_TRXC_CMD_SETSLOT, + "%u %u", cmdp->tn, chan_types[cmdp->pchan]); } /* @@ -302,7 +195,7 @@ return -ENOTSUP; } - rc = trx_ctrl_cmd(trx, 1, "RXTUNE", "%u", freq10 * 100); + rc = osmo_trxc_client_rxtune(trx->trxc_client, freq10 * 100, NULL, NULL); if (rc == 0) { trx->rx_freq_khz = freq10 * 100; trx->hopping = false; @@ -323,7 +216,7 @@ return -ENOTSUP; } - rc = trx_ctrl_cmd(trx, 1, "TXTUNE", "%u", freq10 * 100); + rc = osmo_trxc_client_txtune(trx->trxc_client, freq10 * 100, NULL, NULL); if (rc == 0) { trx->tx_freq_khz = freq10 * 100; trx->hopping = false; @@ -343,6 +236,44 @@ * RSP MEASURE <status> <kHz> <dB> */ +static int trx_measure_rsp_cb(struct osmo_trxc_client *client, + const struct osmo_trxc_msg *rsp, void *cb_data) +{ + struct trx_instance *trx = cb_data; + unsigned int freq10; + uint16_t band_arfcn; + int dbm; + + if (rsp->status != 0) + return 0; /* not critical */ + + /* Parse freq. and power level */ + if (osmo_trxc_msg_params_scan(rsp, "%u %d", &freq10, &dbm) != 2) { + LOGPFSML(trx->fi, LOGL_ERROR, + "Failed to parse RSP MEASURE params: '%s'\n", rsp->params); + return 0; + } + freq10 /= 100; + + band_arfcn = gsm_freq102arfcn((uint16_t)freq10, 0); + if (band_arfcn == 0xffff) { + LOGPFSML(trx->fi, LOGL_ERROR, + "Failed to parse ARFCN from RSP MEASURE: %s\n", rsp->params); + return 0; + } + + const struct trxcon_phyif_rsp phyrsp = { + .type = TRXCON_PHYIF_CMDT_MEASURE, + .param.measure = { + .band_arfcn = band_arfcn, + .dbm = dbm, + }, + }; + + trxcon_phyif_handle_rsp(trx->priv, &phyrsp); + return 0; +} + static int trx_if_cmd_measure(struct trx_instance *trx, const struct trxcon_phyif_cmdp_measure *cmdp) { @@ -356,35 +287,11 @@ return -ENOTSUP; } - return trx_ctrl_cmd(trx, 1, "MEASURE", "%u", freq10 * 100); -} - -static void trx_if_measure_rsp_cb(struct trx_instance *trx, char *resp) -{ - unsigned int freq10; - uint16_t band_arfcn; - int dbm; - - /* Parse freq. and power level */ - sscanf(resp, "%u %d", &freq10, &dbm); - freq10 /= 100; - - band_arfcn = gsm_freq102arfcn((uint16_t) freq10, 0); - if (band_arfcn == 0xffff) { - LOGPFSML(trx->fi, LOGL_ERROR, - "Failed to parse ARFCN from RSP MEASURE: %s\n", resp); - return; - } - - const struct trxcon_phyif_rsp rsp = { - .type = TRXCON_PHYIF_CMDT_MEASURE, - .param.measure = { - .band_arfcn = band_arfcn, - .dbm = dbm, - }, - }; - - trxcon_phyif_handle_rsp(trx->priv, &rsp); + /* MEASURE may be pending for different frequencies at once, so the + * response needs to be matched against the params, too. */ + return osmo_trxc_client_send_cmd(trx->trxc_client, OSMO_TRXC_F_MATCH_PARAMS, + &trx_measure_rsp_cb, trx, + "MEASURE", "%u", freq10 * 100); } /* @@ -403,7 +310,8 @@ static int trx_if_cmd_setta(struct trx_instance *trx, const struct trxcon_phyif_cmdp_setta *cmdp) { - return trx_ctrl_cmd(trx, 0, "SETTA", "%d", cmdp->ta); + return osmo_trxc_client_send_cmd(trx->trxc_client, 0, NULL, NULL, + "SETTA", "%d", cmdp->ta); } /* @@ -422,8 +330,8 @@ static int trx_if_cmd_setfh(struct trx_instance *trx, const struct trxcon_phyif_cmdp_setfreq_h1 *cmdp) { - /* Reserve some room for CMD SETFH <HSN> <MAIO> */ - char ma_buf[TRXC_BUF_SIZE - 24]; + /* Reserve some room for '<HSN> <MAIO> ' */ + char ma_buf[OSMO_TRXC_PARAMS_LEN_MAX - 8]; size_t ma_buf_len = sizeof(ma_buf) - 1; uint16_t rx_freq, tx_freq; char *ptr; @@ -463,7 +371,9 @@ /* Overwrite the last space */ *(ptr - 1) = '\0'; - rc = trx_ctrl_cmd(trx, 1, "SETFH", "%u %u %s", cmdp->hsn, cmdp->maio, ma_buf); + rc = osmo_trxc_client_send_cmd(trx->trxc_client, OSMO_TRXC_F_CRITICAL, + NULL, NULL, OSMO_TRXC_CMD_SETFH, + "%u %u %s", cmdp->hsn, cmdp->maio, ma_buf); if (rc == 0) { trx->rx_freq_khz = 0; trx->tx_freq_khz = 0; @@ -490,7 +400,7 @@ } } -/* No state change here: the POWERON response (see trx_ctrl_read_cb()) +/* No state change here: the POWERON response (see trx_poweron_rsp_cb()) * is what moves us to TRX_ST_POWERON. */ static void trx_fsm_handle_poweron_req(struct osmo_fsm_inst *fi) { @@ -555,87 +465,6 @@ } } -/* Get response from CTRL socket */ -static int trx_ctrl_read_cb(struct osmo_fd *ofd, unsigned int what) -{ - struct trx_instance *trx = ofd->data; - struct trx_ctrl_msg *tcm; - int resp, rsp_len; - char buf[TRXC_BUF_SIZE], *p; - ssize_t read_len; - - read_len = read(ofd->fd, buf, sizeof(buf) - 1); - if (read_len <= 0) { - LOGPFSML(trx->fi, LOGL_ERROR, "read() failed with rc=%zd\n", read_len); - return read_len; - } - buf[read_len] = '\0'; - - if (!!strncmp(buf, "RSP ", 4)) { - LOGPFSML(trx->fi, LOGL_NOTICE, "Unknown message on CTRL port: %s\n", buf); - return 0; - } - - /* Calculate the length of response item */ - p = strchr(buf + 4, ' '); - rsp_len = p ? p - buf - 4 : strlen(buf) - 4; - - LOGPFSML(trx->fi, LOGL_INFO, "Response message: '%s'\n", buf); - - /* Abort expire timer */ - osmo_timer_del(&trx->trx_ctrl_timer); - - /* Get command for response message */ - if (llist_empty(&trx->trx_ctrl_list)) { - LOGPFSML(trx->fi, LOGL_NOTICE, "Response message without command\n"); - return -EINVAL; - } - - tcm = llist_entry(trx->trx_ctrl_list.next, - struct trx_ctrl_msg, list); - - /* Check if response matches command */ - if (!!strncmp(buf + 4, tcm->cmd + 4, rsp_len)) { - LOGPFSML(trx->fi, (tcm->critical) ? LOGL_FATAL : LOGL_ERROR, - "Response message '%s' does not match command " - "message '%s'\n", buf, tcm->cmd); - goto rsp_error; - } - - /* Check for response code */ - sscanf(p + 1, "%d", &resp); - if (resp) { - LOGPFSML(trx->fi, (tcm->critical) ? LOGL_FATAL : LOGL_ERROR, - "Transceiver rejected TRX command with " - "response: '%s'\n", buf); - - if (tcm->critical) - goto rsp_error; - } - - /* Trigger state machine: only POWERON/POWEROFF responses drive a - * state transition; everything else is state-transparent. */ - if (!strncmp(tcm->cmd + 4, "POWERON", 7)) - osmo_fsm_inst_state_chg(trx->fi, TRX_ST_POWERON, 0, 0); - else if (!strncmp(tcm->cmd + 4, "POWEROFF", 8)) - osmo_fsm_inst_state_chg(trx->fi, TRX_ST_POWEROFF, 0, 0); - else if (!strncmp(tcm->cmd + 4, "MEASURE", 7)) - trx_if_measure_rsp_cb(trx, buf + 14); - - /* Remove command from list */ - llist_del(&tcm->list); - talloc_free(tcm); - - /* Send next message, if any */ - trx_ctrl_send(trx); - - return 0; - -rsp_error: - osmo_fsm_inst_term(trx->fi, OSMO_FSM_TERM_ERROR, NULL); - return -EIO; -} - /* Dispatch a PHYIF command as an event of the trx_fsm */ int trx_if_handle_phyif_cmd(struct trx_instance *trx, const struct trxcon_phyif_cmd *cmd) { @@ -643,117 +472,46 @@ } /* ------------------------------------------------------------------------ */ -/* Data interface handlers */ -/* ------------------------------------------------------------------------ */ -/* DATA interface */ -/* */ -/* Messages on the data interface carry one radio burst per UDP message. */ -/* */ -/* Received Data Burst: */ -/* 1 byte timeslot index */ -/* 4 bytes GSM frame number, BE */ -/* 1 byte RSSI in -dBm */ -/* 2 bytes correlator timing offset in 1/256 symbol steps, 2's-comp, BE */ -/* 148 bytes soft symbol estimates, 0 -> definite "0", 255 -> definite "1" */ -/* 2 bytes are not used, but being sent by OsmoTRX */ -/* */ -/* Transmit Data Burst: */ -/* 1 byte timeslot index */ -/* 4 bytes GSM frame number, BE */ -/* 1 byte transmit level wrt ARFCN max, -dB (attenuation) */ -/* 148 bytes output symbol values, 0 & 1 */ +/* Data (TRXD) interface handlers */ /* ------------------------------------------------------------------------ */ -static int trx_data_rx_cb(struct osmo_fd *ofd, unsigned int what) +/* Handle a burst indication received on the data socket */ +void osmo_trx_ep_rx_burst_ind(struct osmo_trx_ep *ep, unsigned int chan, + const struct osmo_trxd_burst_ind *bi) { - struct trx_instance *trx = ofd->data; - struct trxcon_phyif_burst_ind bi; - uint8_t buf[TRXD_BUF_SIZE]; - ssize_t read_len; - sbit_t *burst; + struct trx_instance *trx = osmo_trx_ep_get_priv(ep); - read_len = read(ofd->fd, buf, sizeof(buf)); - if (read_len <= 0) { - strerror_r(errno, (char *)buf, sizeof(buf)); - LOGPFSMSL(trx->fi, DTRXD, LOGL_ERROR, - "read() failed on TRXD with rc=%zd (%s)\n", - read_len, (const char *)buf); - return read_len; - } + LOGPFSMSL(trx->fi, DTRXD, LOGL_DEBUG, "Rx %s\n", osmo_trxd_burst_ind_name(bi)); - if (read_len < TRXDv0_HDR_LEN) { - LOGPFSMSL(trx->fi, DTRXD, LOGL_ERROR, - "Got malformed TRXD PDU (short length=%zd)\n", read_len); - return -EINVAL; - } - - if ((buf[0] >> 4) != 0) { - LOGPFSMSL(trx->fi, DTRXD, LOGL_ERROR, - "Got TRXD PDU with unexpected version\n"); - return -ENOTSUP; - } - - read_len -= TRXDv0_HDR_LEN; - switch (read_len) { - /* TRXDv0 PDUs may have 2 dummy bytes at the end */ - case GSM_NBITS_NB_GMSK_BURST + 2: - case GSM_NBITS_NB_8PSK_BURST + 2: - read_len -= 2; - break; - case GSM_NBITS_NB_GMSK_BURST: - case GSM_NBITS_NB_8PSK_BURST: - break; - default: - LOGPFSMSL(trx->fi, DTRXD, LOGL_ERROR, - "Got TRXD PDU unexpected burst length=%zd\n", read_len); - return -EINVAL; - } - - burst = (sbit_t *)&buf[8]; - - bi = (struct trxcon_phyif_burst_ind) { - .tn = buf[0] & 0x07, - .fn = osmo_load32be(buf + 1), - .rssi = -(int8_t) buf[5], - .toa256 = (int16_t) (buf[6] << 8) | buf[7], - .burst = burst, /* at least GSM_NBITS_NB_GMSK_BURST */ - .burst_len = read_len, + const struct trxcon_phyif_burst_ind phybi = { + .fn = bi->fn, + .tn = bi->tn, + .toa256 = bi->toa256, + .rssi = bi->rssi, + .burst = &bi->burst[0], + .burst_len = bi->burst_len, }; - /* Convert ubits {254..0} to sbits {-127..127} in-place */ - for (unsigned int i = 0; i < bi.burst_len; i++) { - if (buf[8 + i] == 255) - burst[i] = -127; - else - burst[i] = 127 - buf[8 + i]; - } + trxcon_phyif_handle_burst_ind(trx->priv, &phybi); - if (bi.fn >= GSM_TDMA_HYPERFRAME) { - LOGPFSMSL(trx->fi, DTRXD, LOGL_ERROR, "Illegal FN %u\n", bi.fn); - return -EINVAL; - } - - LOGPFSMSL(trx->fi, DTRXD, LOGL_DEBUG, - "RX burst tn=%u fn=%u rssi=%d toa=%d\n", - bi.tn, bi.fn, bi.rssi, bi.toa256); - - trxcon_phyif_handle_burst_ind(trx->priv, &bi); - - struct trxcon_phyif_rts_ind rts = { - .fn = GSM_TDMA_FN_SUM(bi.fn, trx->fn_advance), - .tn = bi.tn, + const struct trxcon_phyif_rts_ind rts = { + .fn = GSM_TDMA_FN_SUM(bi->fn, trx->fn_advance), + .tn = bi->tn, }; trxcon_phyif_handle_rts_ind(trx->priv, &rts); - - return 0; } int trx_if_handle_phyif_burst_req(struct trx_instance *trx, const struct trxcon_phyif_burst_req *br) { - uint8_t buf[TRXD_BUF_SIZE]; - size_t length; + struct osmo_trxd_burst_req dbr = { + .fn = br->fn, + .tn = br->tn, + .att = br->pwr, + .burst_len = br->burst_len, + }; + int rc; /* We must be sure that POWERON has been acknowledged by the * transceiver before attempting to transmit any bursts. */ @@ -763,31 +521,26 @@ return -EAGAIN; } - LOGPFSMSL(trx->fi, DTRXD, LOGL_DEBUG, - "TX burst tn=%u fn=%u pwr=%u\n", - br->tn, br->fn, br->pwr); + if (br->burst_len != 0) + memcpy(&dbr.burst[0], br->burst, br->burst_len); + else /* a burst request without a payload: NOPE.req */ + dbr.flags |= OSMO_TRXD_F_NOPE_REQ; - buf[0] = br->tn; - osmo_store32be(br->fn, buf + 1); - buf[5] = br->pwr; - length = 6; + LOGPFSMSL(trx->fi, DTRXD, LOGL_DEBUG, "Tx %s\n", osmo_trxd_burst_req_name(&dbr)); - /* Copy ubits {0,1} */ - if (br->burst_len != 0) { - memcpy(buf + 6, br->burst, br->burst_len); - length += br->burst_len; + rc = osmo_trx_ep_send_burst_req(trx->ep, 0, &dbr); + if (rc < 0) { + LOGPFSMSL(trx->fi, DTRXD, LOGL_ERROR, + "osmo_trx_ep_send_burst_req(%s) failed: %d\n", + osmo_trxd_burst_req_name(&dbr), rc); } - /* Send data to transceiver */ - send(trx->trx_ofd_data.fd, buf, length, 0); - - return 0; + return rc; } /* Init TRX interface (TRXC, TRXD sockets and FSM) */ struct trx_instance *trx_if_open(const struct trx_if_params *params) { - const unsigned int offset = params->instance * 2; struct trx_instance *trx; struct osmo_fsm_inst *fi; int rc; @@ -814,51 +567,51 @@ return NULL; } - /* Initialize CTRL queue */ - INIT_LLIST_HEAD(&trx->trx_ctrl_list); - - /* Open sockets */ - rc = trx_udp_open(trx, &trx->trx_ofd_ctrl, /* TRXC */ - params->local_host, params->base_port + 101 + offset, - params->remote_host, params->base_port + 1 + offset, - trx_ctrl_read_cb); - if (rc < 0) - goto udp_error; - - rc = trx_udp_open(trx, &trx->trx_ofd_data, /* TRXD */ - params->local_host, params->base_port + 102 + offset, - params->remote_host, params->base_port + 2 + offset, - trx_data_rx_cb); - if (rc < 0) - goto udp_error; - trx->fn_advance = params->fn_advance; trx->priv = params->priv; fi->priv = trx; trx->fi = fi; + /* The TRX protocol endpoint: per-channel ctrl/data UDP sockets. + * Shifting the base port by 2 * instance makes the single channel + * of this endpoint use the ports of the given TRX instance. */ + trx->ep = osmo_trx_ep_alloc(trx, 1); + if (trx->ep == NULL) + goto error; + osmo_trx_ep_set_name(trx->ep, "trx_ep(%u)", params->instance); + osmo_trx_ep_set_log_cat(trx->ep, DTRXD); + osmo_trx_ep_set_priv(trx->ep, trx); + osmo_trx_ep_set_mode(trx->ep, OSMO_TRX_EP_MODE_L1); + osmo_trx_ep_set_laddr(trx->ep, params->local_host); + osmo_trx_ep_set_raddr(trx->ep, params->remote_host); + osmo_trx_ep_set_base_port(trx->ep, params->base_port + 2 * params->instance); + osmo_trx_ep_set_clock_socket(trx->ep, false); + + /* The TRXC command queue engine */ + trx->trxc_client = osmo_trxc_client_alloc(trx); + if (trx->trxc_client == NULL) + goto error; + osmo_trxc_client_set_name(trx->trxc_client, "trxc_client(%u)", params->instance); + osmo_trxc_client_set_log_cat(trx->trxc_client, DTRXC); + osmo_trxc_client_set_max_retrans(trx->trxc_client, TRX_MAX_RETRANS); + osmo_trxc_client_set_priv(trx->trxc_client, trx); + osmo_trxc_client_set_tx_msg_cb(trx->trxc_client, &trxc_client_tx_msg_cb); + osmo_trxc_client_set_fatal_error_cb(trx->trxc_client, &trxc_client_fatal_error_cb); + + rc = osmo_trx_ep_open(trx->ep); + if (rc != 0) { + LOGPFSML(params->parent_fi, LOGL_ERROR, + "osmo_trx_ep_open() failed: %d\n", rc); + goto error; + } + return trx; -udp_error: - LOGPFSML(params->parent_fi, LOGL_ERROR, "Couldn't establish UDP connection\n"); - osmo_fsm_inst_free(trx->fi); +error: + osmo_fsm_inst_free(fi); return NULL; } -/* Flush pending control messages */ -static void trx_if_flush_ctrl(struct trx_instance *trx) -{ - struct trx_ctrl_msg *tcm; - - /* Clear command queue */ - while (!llist_empty(&trx->trx_ctrl_list)) { - tcm = llist_entry(trx->trx_ctrl_list.next, - struct trx_ctrl_msg, list); - llist_del(&tcm->list); - talloc_free(tcm); - } -} - void trx_if_close(struct trx_instance *trx) { if (trx == NULL || trx->fi == NULL) @@ -869,7 +622,6 @@ static void trx_fsm_cleanup_cb(struct osmo_fsm_inst *fi, enum osmo_fsm_term_cause cause) { - static const char cmd_poweroff[] = "CMD POWEROFF"; struct trx_instance *trx = fi->priv; /* May be unallocated due to init error */ @@ -878,19 +630,24 @@ LOGPFSML(fi, LOGL_NOTICE, "Shutdown transceiver interface\n"); - /* Abort TRXC response timer (if pending) */ - osmo_timer_del(&trx->trx_ctrl_timer); + /* Flush the TRXC command queue */ + osmo_trxc_client_free(trx->trxc_client); + trx->trxc_client = NULL; - /* Flush CTRL message list */ - trx_if_flush_ctrl(trx); + /* Power off if the transceiver is up (osmo_trx_ep API takes care of + * sending pending TRXC data, even after osmo_trx_ep_{close,free}()). */ + if (fi->state == TRX_ST_POWERON && trx->ep != NULL) { + const struct osmo_trxc_msg cmd_poweroff = { + .type = OSMO_TRXC_MT_CMD, + .cmd = OSMO_TRXC_CMD_POWEROFF, + }; + osmo_trx_ep_send_ctrl_msg(trx->ep, 0, &cmd_poweroff); + } - /* Power off if the transceiver is up */ - if (fi->state == TRX_ST_POWERON && trx->trx_ofd_ctrl.fd >= 0) - send(trx->trx_ofd_ctrl.fd, &cmd_poweroff[0], sizeof(cmd_poweroff), 0); - - /* Close sockets */ - trx_udp_close(&trx->trx_ofd_ctrl); - trx_udp_close(&trx->trx_ofd_data); + /* Shutdown the TRX endpoint */ + osmo_trx_ep_close(trx->ep); + osmo_trx_ep_free(trx->ep); + trx->ep = NULL; /* Free memory */ trx->fi->priv = NULL; -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/43828?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I4604f4b12ca903e936dedf167b478455bd28a2e8 Gerrit-Change-Number: 43828 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria <vyanitskiy(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> Gerrit-CC: laforge <laforge(a)osmocom.org>

1 0

[S] Change in osmocom-bb[master]: trxcon/trx_if: negotiate TRXD PDU version 1 (TRXDv1)
by fixeria 19 Oct '26

19 Oct '26

Attention is currently required from: pespin. fixeria has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/osmocom-bb/+/43829?usp=email ) Change subject: trxcon/trx_if: negotiate TRXD PDU version 1 (TRXDv1) ...................................................................... Patch Set 4: (1 comment) File src/host/trxcon/src/trxcon_shim.c: https://gerrit.osmocom.org/c/osmocom-bb/+/43829/comment/99694710_b9b70445?u… : PS3, Line 241: * with a burst all soft-bits of which are uncertain (50% 0, 50% 1). */ > This is about **soft-bits**, where […] Done -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/43829?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I08d588f74925bb7a85e131defc0fa82158d90680 Gerrit-Change-Number: 43829 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 19 Oct 2026 11:22:51 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in osmo-ttcn3-hacks[master]: smf: Remove unused open5gs-nrf.yaml
by pespin 19 Oct '26

19 Oct '26

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43922?usp=email ) Change subject: smf: Remove unused open5gs-nrf.yaml ...................................................................... smf: Remove unused open5gs-nrf.yaml Change-Id: Iade84e45f120ecfec47c32bb53f2d1a7d5006825 --- D smf/open5gs-nrf.yaml 1 file changed, 0 insertions(+), 40 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/22/43922/1 diff --git a/smf/open5gs-nrf.yaml b/smf/open5gs-nrf.yaml deleted file mode 100644 index 57f5b45..0000000 --- a/smf/open5gs-nrf.yaml +++ /dev/null @@ -1,40 +0,0 @@ -# See https://github.com/open5gs/open5gs/blob/main/configs/open5gs/nrf.yaml.in - -db_uri: mongodb://localhost/open5gs - -logger: - level: debug - -global: - max: - ue: 1024 - -sbi: - server: - no_tls: true - cacert: /etc/open5gs/tls/ca.crt - key: /etc/open5gs/tls/nrf.key - cert: /etc/open5gs/tls/nrf.crt - client: - no_tls: true - cacert: /etc/open5gs/tls/ca.crt - key: /etc/open5gs/tls/nrf.key - cert: /etc/open5gs/tls/nrf.crt - -nrf: - sbi: - server: - - address: 127.0.0.10 - port: 7777 - -scp: - sbi: - - addr: 127.0.1.10 - port: 7777 - - -parameter: - -max: - -time: -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43922?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: Iade84e45f120ecfec47c32bb53f2d1a7d5006825 Gerrit-Change-Number: 43922 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[L] Change in osmo-ttcn3-hacks[master]: SGP23_Constants: collect constants at a central place
by dexter 19 Oct '26

19 Oct '26

dexter has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43841?usp=email ) Change subject: SGP23_Constants: collect constants at a central place ...................................................................... SGP23_Constants: collect constants at a central place The modules RSPDefinitions_Templates and SGP32Definitions_Templates have inline constants all over the place. Some of those constants even interact with each other (e.g. it is important to use the same transactionId value consistently). This is difficult difficult to maintain and the constants currently in use also do not follow any specification. Let's collect those constants and re-define them in a central module. Fortunately SGP.23 already defines a lot of those constants and values we can use. Related: SYS#8203 Change-Id: I00e3de0b20156993b8e15b5bbd4734faa20b66cf --- M eim/gen_links.sh M ipad/gen_links.sh M library/euicc/RSPDefinitions_Templates.ttcn A library/euicc/SGP23_Constants.ttcn M library/euicc/SGP32Definitions_Templates.ttcn M smdpp/gen_links.sh 6 files changed, 321 insertions(+), 166 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved jolly: Looks good to me, but someone else must approve diff --git a/eim/gen_links.sh b/eim/gen_links.sh index 91a67ea..5f92fb7 100755 --- a/eim/gen_links.sh +++ b/eim/gen_links.sh @@ -35,7 +35,8 @@ FILES+="PKIX1Explicit88_Templates.ttcn PKIX1Explicit88_Types.ttcn PKIX1Implicit88_Templates.ttcn " FILES+="PKIX1Implicit88_Types.ttcn RSPDefinitions_Templates.ttcn RSPDefinitions_Types.ttcn " FILES+="SGP32Definitions_Templates.ttcn SGP32Definitions_Types.ttcn esipa_Types_JSON.ttcn " -FILES+="es9p_Types_JSON.ttcn esx_header_Types_JSON.ttcn" +FILES+="es9p_Types_JSON.ttcn esx_header_Types_JSON.ttcn SGP23_Constants.ttcn" + gen_links $DIR $FILES DIR=../library diff --git a/ipad/gen_links.sh b/ipad/gen_links.sh index 29bda02..ba27ca4 100755 --- a/ipad/gen_links.sh +++ b/ipad/gen_links.sh @@ -34,7 +34,8 @@ FILES="PEDefinitions.asn PKIX1Explicit88.asn PKIX1Implicit88.asn RSPDefinitions.asn SGP32Definitions.asn " FILES+="PKIX1Explicit88_Templates.ttcn PKIX1Explicit88_Types.ttcn PKIX1Implicit88_Templates.ttcn " FILES+="PKIX1Implicit88_Types.ttcn RSPDefinitions_Templates.ttcn RSPDefinitions_Types.ttcn " -FILES+="SGP32Definitions_Templates.ttcn SGP32Definitions_Types.ttcn " +FILES+="SGP32Definitions_Templates.ttcn SGP32Definitions_Types.ttcn SGP23_Constants.ttcn" + gen_links $DIR $FILES DIR=../library diff --git a/library/euicc/RSPDefinitions_Templates.ttcn b/library/euicc/RSPDefinitions_Templates.ttcn index 1d696b2..c4df06a 100644 --- a/library/euicc/RSPDefinitions_Templates.ttcn +++ b/library/euicc/RSPDefinitions_Templates.ttcn @@ -19,6 +19,7 @@ import from PKIX1Explicit88_Types all; import from PKIX1Implicit88 all; +import from SGP23_Constants all; /* GSMA SGP.22, section 2.5.4 */ template (present) BoundProfilePackage @@ -47,14 +48,14 @@ ts_boundProfilePackage := { initialiseSecureChannelRequest := { remoteOpId := 1, - transactionId := 'ABCDEF'O, + transactionId := SGP23_S_TRANSACTION_ID, controlRefTemplate := { keyType := '88'O, /* AES */ keyLen := '10'O, /* 16 byte key-length */ - hostId := '01020304050607080910111213141516'O + hostId := SGP23_HOST_ID }, - smdpOtpk := '1122334455667788'O, - smdpSign := 'AABBCCDDEEFF0000'O + smdpOtpk := SGP23_OTPK_SM_DPp_ECKA, + smdpSign := SGP23_SM_DPp_SIGN }, /* ES8+.ConfigureISDP */ firstSequenceOf87 := {'B318A07DA7C25DCEB6537E6A38E46CB71110BD7AA61AF693'O}, @@ -465,21 +466,23 @@ serverAddress := serverAddress, serverChallenge := serverChallenge } -template (value) ServerSigned1 ts_serverSigned1(template (value) octetstring transactionId := 'ABCDEF'O, - template (value) octetstring euiccChallenge := '00112233445566778899AABBCCDDEEFF'O, - template (value) universal charstring serverAddress := "smdp.example.com", - template (value) octetstring serverChallenge := '01020304050607080910111213141516'O) := { +template (value) ServerSigned1 ts_serverSigned1(template (value) octetstring transactionId := SGP23_S_TRANSACTION_ID, + template (value) octetstring euiccChallenge := SGP23_S_EUICC_CHALLENGE, + template (value) universal charstring serverAddress := SGP23_TEST_DP_ADDRESS1, + template (value) octetstring serverChallenge := SGP23_SMDP_CHALLENGE) := { transactionId := transactionId, euiccChallenge := euiccChallenge, serverAddress := serverAddress, serverChallenge := serverChallenge } -template (present) CtxParams1 tr_ctxParams1 := { +template (present) CtxParams1 tr_ctxParams1(template universal charstring matchingId := *, + template octetstring imei := *, + template (present) octetstring tac := ?) := { ctxParamsForCommonAuthentication := { - matchingId := *, + matchingId := matchingId, deviceInfo := { - tac := ?, + tac := tac, deviceCapabilities := { gsmSupportedRelease := *, utranSupportedRelease := *, @@ -497,24 +500,26 @@ euiccFormFactorType := *, deviceAdditionalFeatureSupport := * }, - imei := * + imei := imei } } } -template (value) CtxParams1 ts_ctxParams1 := { +template (value) CtxParams1 ts_ctxParams1(template (omit) universal charstring matchingId := omit, + template (omit) octetstring imei := omit, + template (value) octetstring tac := SGP23_S_TAC) := { ctxParamsForCommonAuthentication := { - matchingId := omit, + matchingId := matchingId, deviceInfo := { - tac := '12345678'O, + tac := tac, deviceCapabilities := { - gsmSupportedRelease := omit, - utranSupportedRelease := omit, - cdma2000onexSupportedRelease := omit, - cdma2000hrpdSupportedRelease := omit, - cdma2000ehrpdSupportedRelease := omit, - eutranEpcSupportedRelease := omit, - contactlessSupportedRelease := omit, - rspCrlSupportedVersion := omit, + gsmSupportedRelease := '050000'O, /* See also GSMA SGP.23, annex A, section A1 */ + utranSupportedRelease := '080000'O, /* See also GSMA SGP.23, annex A, section A1 */ + cdma2000onexSupportedRelease := '010000'O, /* See also GSMA SGP.23, annex A, section A1 */ + cdma2000hrpdSupportedRelease := '010000'O, /* See also GSMA SGP.23, annex A, section A1 */ + cdma2000ehrpdSupportedRelease := '020000'O, /* See also GSMA SGP.23, annex A, section A1 */ + eutranEpcSupportedRelease := '020000'O, /* See also GSMA SGP.23, annex A, section A1 */ + contactlessSupportedRelease := '090000'O, /* See also GSMA SGP.23, annex A, section A1 */ + rspCrlSupportedVersion := SGP23_RSP_SVN_H, nrEpcSupportedRelease := omit, nr5gcSupportedRelease := omit, eutran5gcSupportedRelease := omit, @@ -523,7 +528,7 @@ euiccFormFactorType := omit, deviceAdditionalFeatureSupport := omit }, - imei := omit + imei := imei } } } @@ -539,9 +544,9 @@ euiccInfo2 := euiccInfo2, ctxParams1 := ctxParams1 } -template (value) EuiccSigned1 ts_euiccSigned1(template (value) octetstring transactionId := 'ABCDEF'O, - template (value) universal charstring serverAddress := "smdp.example.com", - template (value) octetstring serverChallenge := '01020304050607080910111213141516'O, +template (value) EuiccSigned1 ts_euiccSigned1(template (value) octetstring transactionId := SGP23_S_TRANSACTION_ID, + template (value) universal charstring serverAddress := SGP23_TEST_DP_ADDRESS1, + template (value) octetstring serverChallenge := SGP23_SMDP_CHALLENGE, template (value) EUICCInfo2 euiccInfo2 := ts_EUICCInfo2, template (value) CtxParams1 ctxParams1 := ts_ctxParams1) := { transactionId := transactionId, @@ -565,7 +570,7 @@ serviceSpecificDataNotStoredInEuicc := * } template (value) StoreMetadataRequest ts_storeMetadataRequest := { - iccid := '123456789ABCDEFFAAAA'O, + iccid := SGP23_ICCID_OP_PROF1, serviceProviderName := "testsuite", profileName := "testprofile", iconType := omit, @@ -584,7 +589,7 @@ ccRequiredFlag := ccRequiredFlag, bppEuiccOtpk := * } -template (value) SmdpSigned2 ts_smdpSigned2(template (value) octetstring transactionId := 'ABCDEF'O, +template (value) SmdpSigned2 ts_smdpSigned2(template (value) octetstring transactionId := SGP23_S_TRANSACTION_ID, template (value) boolean ccRequiredFlag := false) := { transactionId := transactionId, ccRequiredFlag := ccRequiredFlag, @@ -612,19 +617,19 @@ finalResult := ? } template (value) ProfileInstallationResultData -ts_profileInstallationResultData(template (value) charstring notificationAddress := "smdp.example.com") := { - transactionId := 'ABCDEF'O, +ts_profileInstallationResultData(template (value) charstring notificationAddress := SGP23_TEST_DP_ADDRESS1) := { + transactionId := SGP23_S_TRANSACTION_ID, notificationMetadata := { seqNumber := 1234, profileManagementOperation := '01'B, /* is this correct? (notificationInstall) */ notificationAddress := notificationAddress, - iccid := '123456789ABCDEFFAAAA'O + iccid := SGP23_ICCID_OP_PROF1 }, - smdpOid := id_rsp, /* random OBJECT IDENTIFIER for testing */ + smdpOid := SGP23_S_SM_DPp_OID, finalResult := { successResult := { - aid := '0102030405'O, - simaResponse := '4141414141414141414141414141414141414141414141414141'O + aid := SGP23_SSD_AID, + simaResponse := SGP23_SIMA_RESULT_OK } } } @@ -636,7 +641,7 @@ template (value) ProfileInstallationResult ts_profileInstallationResult := { profileInstallationResultData := ts_profileInstallationResultData, - euiccSignPIR := '00112233445566778899AABBCCDDEEFF'O + euiccSignPIR := SGP23_EUICC_SIGN_PIR } /* GSMA SGP.22, section 5.6.1 (ES9+) */ @@ -651,8 +656,8 @@ } } template (value) RemoteProfileProvisioningRequest -ts_initiateAuthenticationRequest(template (value) octetstring euiccChallenge := '00112233445566778899aabbccddeeff'O, - template (value) charstring smdpAddress := "smdp.example.com", +ts_initiateAuthenticationRequest(template (value) octetstring euiccChallenge := SGP23_S_EUICC_CHALLENGE, + template (value) charstring smdpAddress := SGP23_TEST_DP_ADDRESS1, template (value) EUICCInfo1 euiccInfo1 := ts_EUICCInfo1) := { initiateAuthenticationRequest := { euiccChallenge := euiccChallenge, @@ -677,10 +682,10 @@ } } template (value) RemoteProfileProvisioningResponse -ts_initiateAuthenticationResponse(template (value) octetstring transactionId := 'ABCDEF'O, +ts_initiateAuthenticationResponse(template (value) octetstring transactionId := SGP23_S_TRANSACTION_ID, template (value) ServerSigned1 serverSigned1 := ts_serverSigned1, - template (value) octetstring serverSignature1 := '01020304'O, - template (value) SubjectKeyIdentifier euiccCiPKIdToBeUsed := 'F54172BDF98A95D65CBEB88A38A1C11D800A85C3'O, /* NIST */ + template (value) octetstring serverSignature1 := SGP23_SERVER_SIGNATURE1, + template (value) SubjectKeyIdentifier euiccCiPKIdToBeUsed := SGP23_EUICC_CI_PK_ID_TO_BE_USED, template (value) Certificate serverCertificate := ts_cert_s_sm_dpauth_nist) := { initiateAuthenticationResponse := { initiateAuthenticationOk := { @@ -703,7 +708,7 @@ } } template (value) RemoteProfileProvisioningRequest -ts_getBoundProfilePackageRequest(template (value) octetstring transactionId := 'ABCDEF'O, +ts_getBoundProfilePackageRequest(template (value) octetstring transactionId := SGP23_S_TRANSACTION_ID, template (value) PrepareDownloadResponse prepareDownloadResponse := ts_prepareDownloadResponse) := { getBoundProfilePackageRequest := { transactionId := transactionId, @@ -721,7 +726,7 @@ } } template (value) RemoteProfileProvisioningResponse -ts_getBoundProfilePackageResponse(template (value) octetstring transactionId := 'ABCDEF'O, +ts_getBoundProfilePackageResponse(template (value) octetstring transactionId := SGP23_S_TRANSACTION_ID, template (value) BoundProfilePackage boundProfilePackage := ts_boundProfilePackage) := { getBoundProfilePackageResponse := { getBoundProfilePackageOk := { @@ -741,7 +746,7 @@ } } template (value) RemoteProfileProvisioningRequest -ts_authenticateClientRequest(template (value) octetstring transactionId := 'ABCDEF'O, +ts_authenticateClientRequest(template (value) octetstring transactionId := SGP23_S_TRANSACTION_ID, template (value) AuthenticateServerResponse authenticateServerResponse := ts_authenticateServerResponse) := { authenticateClientRequest := { transactionId := transactionId, @@ -765,10 +770,10 @@ } } template (value) RemoteProfileProvisioningResponse -ts_authenticateClientResponseEs9(template (value) octetstring transactionId := 'ABCDEF'O, +ts_authenticateClientResponseEs9(template (value) octetstring transactionId := SGP23_S_TRANSACTION_ID, template (value) StoreMetadataRequest profileMetaData := ts_storeMetadataRequest, template (value) SmdpSigned2 smdpSigned2 := ts_smdpSigned2, - template (value) octetstring smdpSignature2 := 'BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB'O, + template (value) octetstring smdpSignature2 := SGP23_SMDP_SIGNATURE2, template (value) Certificate smdpCertificate := ts_cert_s_sm_dpauth_nist) := { authenticateClientResponseEs9 := { authenticateClientOk := { @@ -805,7 +810,7 @@ } } template (value) RemoteProfileProvisioningRequest -ts_cancelSessionRequestEs9(template (value) octetstring transactionId := 'ABCDEF'O, +ts_cancelSessionRequestEs9(template (value) octetstring transactionId := SGP23_S_TRANSACTION_ID, template (value) CancelSessionResponse cancelSessionResponse := ts_cancelSessionResponse) := { cancelSessionRequestEs9 := { transactionId := transactionId, @@ -834,8 +839,8 @@ } template (value) EuiccConfiguredAddressesResponse ts_euiccConfiguredAddressesResponse := { - defaultDpAddress := "smdp.example.com", - rootDsAddress := "smds.example.com" + defaultDpAddress := SGP23_TEST_DEFAULT_DP_ADDRESS_1, + rootDsAddress := SGP23_TEST_DS_ADDRESS1 } /* GSMA SGP.22, section 5.7.5 (ES10x) */ @@ -851,11 +856,11 @@ template (value) PrepareDownloadResponseOk ts_prepareDownloadResponseOk := { euiccSigned2 := { - transactionId := 'ABCDEF'O, - euiccOtpk := 'AABBCCDDEEFF'O, + transactionId := SGP23_S_TRANSACTION_ID, + euiccOtpk := SGP23_OTPK_EUICC_ECKA, hashCc := omit }, - euiccSignature2 := 'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'O + euiccSignature2 := SGP23_EUICC_SIGNATURE1 } template (present) PrepareDownloadResponse tr_prepareDownloadResponse := { @@ -873,7 +878,7 @@ } template (value) PrepareDownloadResponseError ts_prepareDownloadResponseError := { - transactionId := 'ABCDEF'O, + transactionId := SGP23_S_TRANSACTION_ID, downloadErrorCode := 127 // undefinedError } template (present) PrepareDownloadResponse @@ -891,7 +896,7 @@ euiccChallenge := ? } template (value) GetEuiccChallengeResponse -ts_GetEuiccChallengeResponse(template (value) octetstring euiccChallenge := '00112233445566778899AABBCCDDEEFF'O) := { +ts_GetEuiccChallengeResponse(template (value) octetstring euiccChallenge := SGP23_S_EUICC_CHALLENGE) := { euiccChallenge := euiccChallenge } @@ -904,10 +909,8 @@ euiccCiPKIdListForSigning := euiccCiPKIdListForSigning } template (value) EUICCInfo1 -ts_EUICCInfo1(template (value) record of octetstring euiccCiPKIdListForVerification := {'C0BC70BA36929D43B467FF57570530E57AB8FCD8'O, - 'F54172BDF98A95D65CBEB88A38A1C11D800A85C3'O}, - template (value) record of octetstring euiccCiPKIdListForSigning := {'C0BC70BA36929D43B467FF57570530E57AB8FCD8'O, - 'F54172BDF98A95D65CBEB88A38A1C11D800A85C3'O}) := { +ts_EUICCInfo1(template (value) record of octetstring euiccCiPKIdListForVerification := SGP23_EUICC_CI_PK_ID_LIST_FOR_VERIFICATION_1, + template (value) record of octetstring euiccCiPKIdListForSigning := SGP23_EUICC_CI_PK_ID_LIST_FOR_SIGNING_1) := { svn := '020200'O, euiccCiPKIdListForVerification := euiccCiPKIdListForVerification, euiccCiPKIdListForSigning := euiccCiPKIdListForSigning @@ -937,26 +940,20 @@ } template (value) EUICCInfo2 ts_EUICCInfo2 := { - profileVersion := '414243'O, - svn := '02000C'O, - euiccFirmwareVer := '414243'O, - extCardResource := '414243'O, + profileVersion := SGP23_PROFILE_VERSION, + svn := SGP23_RSP_SVN_V2_2_1, + euiccFirmwareVer := SGP23_EUICC_FIRMWARE_VER, + extCardResource := SGP23_EXT_CARD_RESOURCE_LIMITED_SPACE, uiccCapability := '1111111111111111111'B, ts102241Version := omit, globalplatformVersion := omit, rspCapability := '1111'B, - euiccCiPKIdListForVerification := { - 'C0BC70BA36929D43B467FF57570530E57AB8FCD8'O, - 'F54172BDF98A95D65CBEB88A38A1C11D800A85C3'O - }, - euiccCiPKIdListForSigning := { - 'C0BC70BA36929D43B467FF57570530E57AB8FCD8'O, - 'F54172BDF98A95D65CBEB88A38A1C11D800A85C3'O - }, + euiccCiPKIdListForVerification := SGP23_EUICC_CI_PK_ID_LIST_FOR_VERIFICATION_1, + euiccCiPKIdListForSigning := SGP23_EUICC_CI_PK_ID_LIST_FOR_SIGNING_1, euiccCategory := omit, forbiddenProfilePolicyRules := omit, - ppVersion := '414243'O, - sasAcreditationNumber := "123456", + ppVersion := SGP23_PP_VERSION, + sasAcreditationNumber := SGP23_SAS_ACREDITATION_NUMBER, certificationDataObject := omit, treProperties := omit, treProductReference := omit, @@ -970,7 +967,7 @@ { profileInstallationResult := { profileInstallationResultData := ts_profileInstallationResultData, - euiccSignPIR := 'BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB'O + euiccSignPIR := SGP23_EUICC_SIGN_PIR } } } @@ -1001,36 +998,45 @@ /* GSMA SGP.22, section 5.7.13 (ES10x) */ template (present) AuthenticateServerResponse -tr_authenticateServerResponse := { +tr_authenticateServerResponse(template (present) octetstring transactionId := ?, + template (present) charstring serverAddress := ?, + template (present) octetstring serverChallenge := ?, + template (present) CtxParams1 ctxParams1 := tr_ctxParams1, + template (present) octetstring euiccSignature1 := ?, + template (present) Certificate euiccCertificate := ?, + template (present) Certificate eumCertificate := ?) := { authenticateResponseOk := { euiccSigned1 := { - transactionId := ?, - serverAddress := ?, - serverChallenge := ?, + transactionId := transactionId, + serverAddress := serverAddress, + serverChallenge := serverChallenge, euiccInfo2 := ?, - ctxParams1 := tr_ctxParams1 + ctxParams1 := ctxParams1 }, - euiccSignature1 := ?, - euiccCertificate := ?, - eumCertificate := ? + euiccSignature1 := euiccSignature1, + euiccCertificate := euiccCertificate, + eumCertificate := eumCertificate } } template (value) AuthenticateServerResponse -ts_authenticateServerResponse := { +ts_authenticateServerResponse(template (value) octetstring transactionId := SGP23_S_TRANSACTION_ID, + template (value) charstring serverAddress := SGP23_TEST_DP_ADDRESS1, + template (value) octetstring serverChallenge := SGP23_SMDP_CHALLENGE, + template (value) CtxParams1 ctxParams1 := ts_ctxParams1, + template (value) octetstring euiccSignature1 := SGP23_EUICC_SIGNATURE1, + template (value) Certificate euiccCertificate := ts_cert_euicc_nist, + template (value) Certificate eumCertificate := ts_cert_eum_nist) := { authenticateResponseOk := { euiccSigned1 := { - transactionId := 'ABCDEF'O, - serverAddress := "smdp.example.com", - serverChallenge := '01020304050607080910111213141516'O, + transactionId := transactionId, + serverAddress := serverAddress, + serverChallenge := serverChallenge, euiccInfo2 := ts_EUICCInfo2, - ctxParams1 := ts_ctxParams1 + ctxParams1 := ctxParams1 }, - euiccSignature1 := '12345678'O, - euiccCertificate := ts_cert_euicc_nist, -// euiccCertificate := ts_cert_euicc_brp, - eumCertificate := ts_cert_eum_nist -// eumCertificate := ts_cert_eum_brp - + euiccSignature1 := euiccSignature1, + euiccCertificate := euiccCertificate, + eumCertificate := eumCertificate } } @@ -1042,7 +1048,7 @@ } template (value) CancelSessionRequest ts_cancelSessionRequest := { - transactionId := 'ABCDEF'O, + transactionId := SGP23_S_TRANSACTION_ID, reason := 127 // undefinedReason } @@ -1058,11 +1064,11 @@ template (value) CancelSessionResponseOk ts_cancelSessionResponseOk := { euiccCancelSessionSigned := { - transactionId := 'ABCDEF'O, - smdpOid := id_rspRole_euicc, + transactionId := SGP23_S_TRANSACTION_ID, + smdpOid := SGP23_S_SM_DPp_OID, reason := 5 }, - euiccCancelSessionSignature := '1234567890'O + euiccCancelSessionSignature := SGP23_EUICC_CANCEL_SESSION_SIGNATURE } template (present) CancelSessionResponse tr_cancelSessionResponse := { @@ -1079,7 +1085,7 @@ eidValue := ? } template (value) GetEuiccDataResponse -ts_getEuiccDataResponse(template (value) octetstring eidValue := '000102030405060708090A0B0C0D0E0F'O) := { +ts_getEuiccDataResponse(template (value) octetstring eidValue := SGP23_EID1) := { eidValue := eidValue } @@ -1097,7 +1103,7 @@ template (value) NotificationMetadata ts_notificationMetadata(template (value) integer seqNumber := 1, template (value) NotificationEvent profileManagementOperation := '1000'B, - template (value) charstring notificationAddress := "smdp.example.com", + template (value) charstring notificationAddress := SGP23_TEST_DP_ADDRESS1, template (omit) octetstring iccid := omit) := { seqNumber := seqNumber, profileManagementOperation := profileManagementOperation, @@ -1118,7 +1124,7 @@ } template (value) OtherSignedNotification ts_otherSignedNotification(template (value) NotificationMetadata tbsOtherNotification := ts_notificationMetadata, - template (value) octetstring euiccNotificationSignature := '0123456789ABCDEF'O, + template (value) octetstring euiccNotificationSignature := SGP23_TBS_EUICC_NOTIF_SIG, template (value) Certificate euiccCertificate, template (value) Certificate eumCertificate) := { tbsOtherNotification := tbsOtherNotification, diff --git a/library/euicc/SGP23_Constants.ttcn b/library/euicc/SGP23_Constants.ttcn new file mode 100644 index 0000000..ab487bc --- /dev/null +++ b/library/euicc/SGP23_Constants.ttcn @@ -0,0 +1,152 @@ +/* eUICC Constants in TTCN-3 + * + * This module implements a set of constants which are used by the eUICC related templates provided in this directory. + * + * The constants follow the naming scheme of the SGP.23 test specification and wherever possible the constant values + * also match the contents as specified. Unfortunately SGP.23 does not specify expected values for dynamic content, + * even though in many test situations constants would be sufficient. For that reason, this module also defines a + * constant for each of those dynamic content values as well. + * + * Author: Philipp Maier <pmaier(a)sysmocom.de> / sysmocom - s.f.m.c. GmbH + * + * Released under the terms of GNU General Public License, Version 2 or + * (at your option) any later version. + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +module SGP23_Constants { + +/* Generic Constants (see also: SGP.23, annex A, section A1) */ +const octetstring SGP23_EID1 := '89049032123451234512345678901235'O; +const octetstring SGP23_EID2 := '89049032112341234012345678901375'O; +const record of octetstring SGP23_EUICC_CI_PK_ID_LIST_FOR_SIGNING_1 := + {'C0BC70BA36929D43B467FF57570530E57AB8FCD8'O, 'F54172BDF98A95D65CBEB88A38A1C11D800A85C3'O}; +const record of octetstring SGP23_EUICC_CI_PK_ID_LIST_FOR_VERIFICATION_1 := + {'C0BC70BA36929D43B467FF57570530E57AB8FCD8'O, 'F54172BDF98A95D65CBEB88A38A1C11D800A85C3'O}; +function f_SGP23_ACTIVATION_CODE_1(charstring test_dp_address := SGP23_TEST_DP_ADDRESS1, + charstring matching_id := SGP23_MATCHING_ID_1) return charstring { + return "1$#" & test_dp_address & "$" & matching_id; +} +function f_SGP23_ACTIVATION_CODE_2(charstring test_dp_address := SGP23_TEST_DP_ADDRESS1, + charstring matching_id := SGP23_MATCHING_ID_2, + charstring sm_dp_oid := "foo") return charstring { + return "1$#" & test_dp_address & "$" & matching_id & "$" & sm_dp_oid; +} +function f_SGP23_ACTIVATION_CODE_3(charstring test_dp_address := SGP23_TEST_DP_ADDRESS1, + charstring matching_id := SGP23_MATCHING_ID_3) return charstring { + return "1$#" & test_dp_address & "$" & matching_id & "$$1"; +} +function f_SGP23_ACTIVATION_CODE_3_NO_CC(charstring test_dp_address := SGP23_TEST_DP_ADDRESS1, + charstring matching_id := SGP23_MATCHING_ID_3) return charstring { + return f_SGP23_ACTIVATION_CODE_1(test_dp_address, matching_id); +} +function f_SGP23_ACTIVATION_CODE_4(charstring test_dp_address := SGP23_TEST_DP_ADDRESS1, + charstring matching_id := SGP23_MATCHING_ID_4) return charstring { + return f_SGP23_ACTIVATION_CODE_1(test_dp_address, matching_id); +} +function f_SGP23_ACTIVATION_CODE_5(charstring test_dp_address := SGP23_TEST_DP_ADDRESS1, + charstring matching_id := SGP23_MATCHING_ID_EMPTY) return charstring { + return f_SGP23_ACTIVATION_CODE_1(test_dp_address, matching_id); +} +const octetstring SGP23_ICCID_OP_PROF1 := '989209012143658709F5'O; +const octetstring SGP23_ICCID_OP_PROF1_NON_SWAP := '8929901012345678905F'O; +const octetstring SGP23_ICCID_OP_PROF2 := '989209013254769810F9'O; +const octetstring ICCID_OP_PROF2_NON_SWAP := '8929901023456789019F'O; +const octetstring SGP23_HOST_ID := '47534D4120534D2D5858'O; +const octetstring SGP23_ICCID_OP_PROF3 := '989209014365870921F5'O; +const octetstring SGP23_ICCID_OP_PROF4 := '989209015476981032F9'O; +const octetstring SGP23_ICCID_OP_PROF5 := '989209016587092143F5'O; +const octetstring SGP23_ICCID_OP_PROF6 := '989209017698103254F9'O; +const octetstring SGP23_ICCID_OP_PROF7 := '989209018709214365F5'O; +const octetstring SGP23_ICCID_OP_PROF8 := '989209019810325476F9'O; +const octetstring SGP23_ICCID_OP_PROF9 := '989209012143658776F5'O; +const octetstring SGP23_ICCID_OP_PROFX := '9892090143658709FFFF'O; +const octetstring SGP23_ICCID_OP_PROF10 := '98109909002143658779'O; +const octetstring SGP23_ICCID_UNKNOWN := '9892010A2143658709F8'O; +const octetstring SGP23_INSTALLED_PROFILES := '00'O; +const charstring SGP23_MATCHING_ID_1 := "04386-AGYFT-A74Y8-3F815"; +const charstring SGP23_MATCHING_ID_2 := "04386-AGYFT-A74Y8-3F816"; +const charstring SGP23_MATCHING_ID_3 := "04386-AGYFT-A74Y8-3F817"; +const charstring SGP23_MATCHING_ID_4 := "04386-AGYFT-A74Y8-3F818"; +const octetstring SGP23_MCC_MNC_WILDCARD := '92F9EE'O; +const octetstring SGP23_MCC_MNC1 := '92F918'O; +const octetstring SGP23_MCC_MNC2 := '92F928'O; +const octetstring SGP23_MCC_MNC4 := '92F948'O; +const octetstring SGP23_MCC_MNC9 := '92F998'O; +const octetstring SGP23_RSP_SVN := '020100'O; +const octetstring SGP23_RSP_SVN_H := '020100'O; +const octetstring SGP23_RSP_SVN_V2_2_1 := '020201'O; +const octetstring SGP23_RSP_SVN_V2_2_2 := '020202'O; +const octetstring SGP23_RSP_SVN_V2_3 := '020300'O; +const octetstring SGP23_S_EUICC_CHALLENGE := '01020304050607080102030405060708'O; +const octetstring SGP23_S_EUICC_CHALLENGE_2 := '21222324252627282122232425262728'O; +const octetstring SGP23_S_IMEI := '0000000011111111'O; +const objid SGP23_S_SM_DPp_OID := objid {2 999 10}; +const objid SGP23_S_SM_DPp_OID2 := objid {2 999 12}; +const objid SGP23_S_SM_DPp_OID4 := objid {2 999 14}; +const objid SGP23_S_SM_DPp_OID8 := objid {2 999 18}; +const objid SGP23_S_SM_DS_OID := objid {2 999 15}; +const octetstring SGP23_S_TAC := '00000000'O; +const octetstring SGP23_SIMA_RESULT_OK := '3007A0053003800100'O; +const octetstring SGP23_SSD_AID := 'A00000055910100102736456616C7565'O; +const charstring SGP23_TEST_ALT_DS_ADDRESS := "testaltsmds.example.com"; +const charstring SGP23_TEST_DEFAULT_DP_ADDRESS_1 := "testdefaultsmdpplus1.example.com"; +const charstring SGP23_TEST_DP_ADDRESS1 := "testsmdpplus1.example.com"; +const charstring SGP23_TEST_DP_ADDRESS2 := "testsmdpplus2.example.com"; +const charstring SGP23_TEST_DP_ADDRESS3 := "testsmdpplus3.example.com"; +const charstring SGP23_TEST_DP_ADDRESS4 := "testsmdpplus4.example.com"; +const charstring SGP23_TEST_DP_ADDRESS8 := "testsmdpplus8.example.com"; +const charstring SGP23_TEST_DS_ADDRESS1 := "testsmds1.example.com"; +const charstring SGP23_TEST_ROOT_DS_ADDRESS := "testrootsmds.example.com"; +const octetstring SGP23_UNKNOWN_BPP_SEGMENT := 'C9050102030405'O; +const charstring SGP23_UNKNOWN_SERVER_ADDRESS := "unknownserver.example.com"; +const octetstring SGP23_USIM_AID := 'A0000000871002FF33FF018900000100'O; + +/* Dynamic Content (see also: SGP.23, annex B) */ +const octetstring SGP23_EUICC_CI_PK_ID_TO_BE_USED := 'F54172BDF98A95D65CBEB88A38A1C11D800A85C3'O; +const octetstring SGP23_S_TRANSACTION_ID := '5454434e332d54455354535549544521'O; +const octetstring SGP23_EUICC_CANCEL_SESSION_SIGNATURE := + '53475032335F45554943435F43414E43454C5F53455353494F4E5F5349472052 + 53475032335F45554943435F43414E43454C5F53455353494F4E5F5349472053'O; +const octetstring SGP23_EUICC_SIGNATURE1 := + '53475032335F45554943435F5349474E41545552453120202020202020202052 + 53475032335F45554943435F5349474E41545552453120202020202020202053'O; +const octetstring SGP23_SMDP_CHALLENGE := '21534D44505F4348414C4C454E474521'O; +const octetstring SGP23_SM_DPp_SIGN := + '53475032335F534D5F4450705F5349474E202020202020202020202020202052 + 53475032335F534D5F4450705F5349474E202020202020202020202020202053'O; +const octetstring SGP23_SERVER_SIGNATURE1 := + '53475032335F5345525645525F5349474E415455524531202020202020202052 + 53475032335F5345525645525F5349474E415455524531202020202020202053'O; +const octetstring SGP23_EUICC_SIGN_PIR := + '53475032335F45554943435F5349474E5F504952202020202020202020202052 + 53475032335F45554943435F5349474E5F504952202020202020202020202053'O; +const octetstring SGP23_OTPK_EUICC_ECKA := + '53475032335F4F54504B5F45554943435F45434B412020202020202020202052 + 53475032335F4F54504B5F45554943435F45434B412020202020202020202053'O; +const octetstring SGP23_OTPK_SM_DPp_ECKA := + '53475032335F4F54504B5F534D5F4450705F45434B4120202020202020202052 + 53475032335F4F54504B5F534D5F4450705F45434B4120202020202020202053'O; +const octetstring SGP23_SMDP_SIGNATURE2 := + '53475032335F534D44505F5349474E4154555245322020202020202020202052 + 53475032335F534D44505F5349474E4154555245322020202020202020202053'O; +const octetstring SGP23_TBS_EUICC_NOTIF_SIG := + '53475032335F5442535F45554943435F4E4F5449465F53494720202020202052 + 53475032335F5442535F45554943435F4E4F5449465F53494720202020202053'O; +const octetstring SGP23_ISD_P_AID := 'A0000005591010FFFFFFFF8900001000'O; + +/* ES9+ Requests And Responses (see also SGP.23, annex D, section D.2) */ +const octetstring SGP23_EUICC_FIRMWARE_VER := '010000'O; +const octetstring SGP23_EXT_CARD_RESOURCE_LIMITED_SPACE := + '81'O & int2oct(lengthof(SGP23_INSTALLED_PROFILES), 8) & SGP23_INSTALLED_PROFILES & + '82'O & int2oct(lengthof(SGP23_NON_VOLATILE_MEM_LIMITED_SPACE), 8) & SGP23_NON_VOLATILE_MEM_LIMITED_SPACE & + '83'O & int2oct(lengthof(SGP23_S_VOLATILE_MEM), 8) & SGP23_S_VOLATILE_MEM; +const octetstring SGP23_PP_VERSION := '010000'O; +const octetstring SGP23_PROFILE_VERSION := '020100'O; +const charstring SGP23_MATCHING_ID_EMPTY := ""; +const octetstring SGP23_NON_VOLATILE_MEM_LIMITED_SPACE := '0001'O; +const octetstring SGP23_S_VOLATILE_MEM := '0100'O; +const charstring SGP23_SAS_ACREDITATION_NUMBER := "GSMA_SAS_123456789"; + +} diff --git a/library/euicc/SGP32Definitions_Templates.ttcn b/library/euicc/SGP32Definitions_Templates.ttcn index 363a84f..1911515 100644 --- a/library/euicc/SGP32Definitions_Templates.ttcn +++ b/library/euicc/SGP32Definitions_Templates.ttcn @@ -21,6 +21,8 @@ import from PKIX1Explicit88_Templates all; import from PKIX1Explicit88_Types all; +import from SGP23_Constants all; + /* GSMA SGP.32, section 5.9.2 (ES10x) */ template (present) SGP32_EUICCInfo2 tr_SGP32_EUICCInfo2 := { @@ -50,26 +52,20 @@ } template (value) SGP32_EUICCInfo2 ts_SGP32_EUICCInfo2 := { - profileVersion := '414243'O, - svn := '02000C'O, - euiccFirmwareVer := '414243'O, - extCardResource := '414243'O, + profileVersion := SGP23_PROFILE_VERSION, + svn := SGP23_RSP_SVN_V2_2_1, + euiccFirmwareVer := SGP23_EUICC_FIRMWARE_VER, + extCardResource := SGP23_EXT_CARD_RESOURCE_LIMITED_SPACE, uiccCapability := '1111111111111111111'B, ts102241Version := omit, globalplatformVersion := omit, rspCapability := '1111'B, - euiccCiPKIdListForVerification := { - 'C0BC70BA36929D43B467FF57570530E57AB8FCD8'O, - 'F54172BDF98A95D65CBEB88A38A1C11D800A85C3'O - }, - euiccCiPKIdListForSigning := { - 'C0BC70BA36929D43B467FF57570530E57AB8FCD8'O, - 'F54172BDF98A95D65CBEB88A38A1C11D800A85C3'O - }, + euiccCiPKIdListForVerification := SGP23_EUICC_CI_PK_ID_LIST_FOR_VERIFICATION_1, + euiccCiPKIdListForSigning := SGP23_EUICC_CI_PK_ID_LIST_FOR_SIGNING_1, euiccCategory := omit, forbiddenProfilePolicyRules := omit, - ppVersion := '414243'O, - sasAcreditationNumber := "123456", + ppVersion := SGP23_PP_VERSION, + sasAcreditationNumber := SGP23_SAS_ACREDITATION_NUMBER, certificationDataObject := omit, treProperties := omit, treProductReference := omit, @@ -105,9 +101,8 @@ template (value) EsipaMessageFromEimToIpa ts_initiateAuthenticationResponseEsipa(template (omit) octetstring transactionId := omit, template (value) ServerSigned1 serverSigned1 := ts_serverSigned1, - template (value) octetstring serverSignature1 := '5252525252525252525252525252525252525252525252525252525252525252 - 5353535353535353535353535353535353535353535353535353535353535353'O, - template (value) octetstring euiccCiPKIdentifierToBeUsed := 'F54172BDF98A95D65CBEB88A38A1C11D800A85C3'O /* NIST */, + template (value) octetstring serverSignature1 := SGP23_SERVER_SIGNATURE1, + template (value) octetstring euiccCiPKIdentifierToBeUsed := SGP23_EUICC_CI_PK_ID_TO_BE_USED, template (value) Certificate serverCertificate := ts_cert_s_sm_dpauth_nist, template (omit) universal charstring matchingId := omit, template (omit) CtxParams1 ctxParams1 := omit) := { @@ -138,8 +133,8 @@ } } template (value) EsipaMessageFromIpaToEim -ts_initiateAuthenticationRequestEsipa(template (value) octetstring euiccChallenge := '00112233445566778899aabbccddeeff'O, - template (omit) charstring smdpAddress := "smdp.example.com", +ts_initiateAuthenticationRequestEsipa(template (value) octetstring euiccChallenge := SGP23_S_EUICC_CHALLENGE, + template (omit) charstring smdpAddress := SGP23_TEST_DP_ADDRESS1, template (omit) EUICCInfo1 euiccInfo1 := ts_EUICCInfo1, template (omit) octetstring eimTransactionId := omit) := { initiateAuthenticationRequestEsipa := { @@ -151,22 +146,22 @@ } /* GSMA SGP.32, section 6.3.2.2 */ -template (present) SGP32_EuiccSigned1 tr_euiccSigned1(template (present) octetstring transactionId := ?, - template (present) universal charstring serverAddress := ?, - template (present) octetstring serverChallenge := ?, - template (present) SGP32_EUICCInfo2 euiccInfo2 := ?, - template (present) CtxParams1 ctxParams1 := ?) := { +template (present) SGP32_EuiccSigned1 tr_SGP32_euiccSigned1(template (present) octetstring transactionId := ?, + template (present) universal charstring serverAddress := ?, + template (present) octetstring serverChallenge := ?, + template (present) SGP32_EUICCInfo2 euiccInfo2 := ?, + template (present) CtxParams1 ctxParams1 := ?) := { transactionId := transactionId, serverAddress := serverAddress, serverChallenge := serverChallenge, euiccInfo2 := euiccInfo2, ctxParams1 := ctxParams1 } -template (value) SGP32_EuiccSigned1 ts_euiccSigned1(template (value) octetstring transactionId := 'ABCDEF'O, - template (value) universal charstring serverAddress := "smdp.example.com", - template (value) octetstring serverChallenge := '01020304050607080910111213141516'O, - template (value) SGP32_EUICCInfo2 euiccInfo2 := ts_SGP32_EUICCInfo2, - template (value) CtxParams1 ctxParams1 := ts_ctxParams1) := { +template (value) SGP32_EuiccSigned1 ts_SGP32_euiccSigned1(template (value) octetstring transactionId := SGP23_S_TRANSACTION_ID, + template (value) universal charstring serverAddress := SGP23_TEST_DP_ADDRESS1, + template (value) octetstring serverChallenge := SGP23_SMDP_CHALLENGE, + template (value) SGP32_EUICCInfo2 euiccInfo2 := ts_SGP32_EUICCInfo2, + template (value) CtxParams1 ctxParams1 := ts_ctxParams1) := { transactionId := transactionId, serverAddress := serverAddress, serverChallenge := serverChallenge, @@ -176,20 +171,22 @@ template (present) SGP32_AuthenticateServerResponse tr_SGP32_authenticateServerResponse := { authenticateResponseOk := { - euiccSigned1 := tr_euiccSigned1, + euiccSigned1 := tr_SGP32_euiccSigned1, euiccSignature1 := ?, euiccCertificate := ?, eumCertificate := ? } } template (value) SGP32_AuthenticateServerResponse -ts_SGP32_authenticateServerResponse := { +ts_SGP32_authenticateServerResponse(template (value) SGP32_EuiccSigned1 euiccSigned1 := ts_SGP32_euiccSigned1, + template (value) octetstring euiccSignature1 := SGP23_EUICC_SIGNATURE1, + template (value) Certificate euiccCertificate := ts_cert_euicc_nist, + template (value) Certificate eumCertificate := ts_cert_eum_nist) := { authenticateResponseOk := { - euiccSigned1 := ts_euiccSigned1, - euiccSignature1 := '5252525252525252525252525252525252525252525252525252525252525252 - 5353535353535353535353535353535353535353535353535353535353535353'O, - euiccCertificate := ts_cert_euicc_nist, - eumCertificate := ts_cert_eum_nist + euiccSigned1 := euiccSigned1, + euiccSignature1 := euiccSignature1, + euiccCertificate := euiccCertificate, + eumCertificate := eumCertificate } } template (present) EsipaMessageFromIpaToEim @@ -201,7 +198,7 @@ } } template (value) EsipaMessageFromIpaToEim -ts_authenticateClientRequestEsipa(template (value) octetstring transactionId := 'ABCDEF'O, +ts_authenticateClientRequestEsipa(template (value) octetstring transactionId := SGP23_S_TRANSACTION_ID, template (value) SGP32_AuthenticateServerResponse authenticateServerResponse := ts_SGP32_authenticateServerResponse) := { authenticateClientRequestEsipa := { transactionId := transactionId, @@ -226,8 +223,8 @@ } } template (value) EsipaMessageFromEimToIpa -ts_authenticateClientResponseEsipa_dse(template (value) octetstring transactionId := 'ABCDEF'O, - template (value) charstring activationCode := "1$SMDP.EXAMPLE.COM$$1.3.6.1.4.1.31746") := { +ts_authenticateClientResponseEsipa_dse(template (value) octetstring transactionId := SGP23_S_TRANSACTION_ID, + template (value) charstring activationCode := f_SGP23_ACTIVATION_CODE_1()) := { authenticateClientResponseEsipa := { authenticateClientOkDSEsipa := { transactionId := transactionId, @@ -264,8 +261,7 @@ ts_authenticateClientResponseEsipa_dpe(template (omit) octetstring transactionId := omit, template (omit) SGP32_StoreMetadataRequest profileMetaData := omit, template (value) SmdpSigned2 smdpSigned2 := ts_smdpSigned2, - template (value) octetstring smdpSignature2 := '5252525252525252525252525252525252525252525252525252525252525252 - 5353535353535353535353535353535353535353535353535353535353535353'O, + template (value) octetstring smdpSignature2 := SGP23_SMDP_SIGNATURE2, template (value) Certificate smdpCertificate := ts_cert_s_sm_dpauth_nist, template (omit) octetstring hashCc := omit) := { authenticateClientResponseEsipa := { @@ -305,7 +301,7 @@ } } template (value) EsipaMessageFromIpaToEim -ts_getEimPackageRequest(template (value) octetstring eidValue, +ts_getEimPackageRequest(template (value) octetstring eidValue := SGP23_EID1, template (omit) AsnNull notifyStateChange := omit, template (omit) integer stateChangeCause := omit, template (omit) octetstring rPLMN := omit) := { @@ -327,7 +323,7 @@ eimTransactionId := eimTransactionId } template (value) ProfileDownloadTriggerRequest -ts_profileDownloadTriggerRequest(template (value) charstring activationCode := "1$SMDP.EXAMPLE.COM$$1.3.6.1.4.1.31746", +ts_profileDownloadTriggerRequest(template (value) charstring activationCode := f_SGP23_ACTIVATION_CODE_1(), template (omit) octetstring eimTransactionId := omit) := { profileDownloadData := { activationCode := activationCode @@ -419,7 +415,7 @@ psmoList := { { enable := { - iccid := '123456789ABCDEFFAAAA'O, + iccid := SGP23_ICCID_OP_PROF1, rollbackFlag := NULL } } @@ -440,7 +436,7 @@ psmoList := { { disable := { - iccid := '123456789ABCDEFFAAAA'O + iccid := SGP23_ICCID_OP_PROF1 } } } @@ -460,7 +456,7 @@ psmoList := { { delete := { - iccid := '123456789ABCDEFFAAAA'O + iccid := SGP23_ICCID_OP_PROF1 } } } @@ -485,12 +481,12 @@ psmoList := { { disable := { - iccid := '123456789ABCDEFFAAAA'O + iccid := SGP23_ICCID_OP_PROF1 } }, { delete := { - iccid := '123456789ABCDEFFAAAA'O + iccid := SGP23_ICCID_OP_PROF2 } } } @@ -512,7 +508,7 @@ { listProfileInfo := { searchCriteria := { - iccid := '123456789ABCDEFFAAAA'O + iccid := SGP23_ICCID_OP_PROF1 }, tagList := '92'O /* profileName */ } @@ -553,8 +549,8 @@ { configureImmediateEnable := { immediateEnableFlag := NULL, - defaultSmdpOid := objid {1 2 3}, - defaultSmdpAddress := "smdp.example.com" + defaultSmdpOid := SGP23_S_SM_DS_OID, + defaultSmdpAddress := SGP23_TEST_DP_ADDRESS1 } } } @@ -574,7 +570,7 @@ psmoList := { { setFallbackAttribute := { - iccid := '123456789ABCDEFFAAAA'O + iccid := SGP23_ICCID_OP_PROF1 } } } @@ -610,7 +606,7 @@ psmoList := { { setDefaultDpAddress := { - defaultDpAddress := "smdp.example.com" + defaultDpAddress := SGP23_TEST_DP_ADDRESS1 } } } @@ -698,7 +694,7 @@ ts_euiccPackageSigned(template (value) EuiccPackage euiccPackage := ts_euiccPackage_enablePsmo, template (omit) octetstring eimTransactionId := omit) := { eimId := "myEim", - eidValue := '00112233445566778899AABBCCDDEEFF'O, + eidValue := SGP23_EID1, counterValue := 123, eimTransactionId := eimTransactionId, euiccPackage := euiccPackage @@ -746,7 +742,7 @@ } } template (value) EsipaMessageFromIpaToEim -ts_cancelSessionRequestEsipa(template (value) octetstring transactionId := 'ABCDEF'O, +ts_cancelSessionRequestEsipa(template (value) octetstring transactionId := SGP23_S_TRANSACTION_ID, template (value) SGP32_CancelSessionResponse cancelSessionResponse := ts_SGP32_cancelSessionResponse) := { cancelSessionRequestEsipa := { transactionId := transactionId, @@ -798,7 +794,7 @@ } } template (value) EsipaMessageFromIpaToEim -ts_getBoundProfilePackageRequestEsipa(template (value) octetstring transactionId := 'ABCDEF'O, +ts_getBoundProfilePackageRequestEsipa(template (value) octetstring transactionId := SGP23_S_TRANSACTION_ID, template (value) SGP32_PrepareDownloadResponse prepareDownloadResponse := ts_SGP32_prepareDownloadResponse) := { getBoundProfilePackageRequestEsipa := { transactionId := transactionId, @@ -890,11 +886,10 @@ euiccSignPIR := ? } } -template (value) SGP32_PendingNotification ts_SGP32_pendingNotification_prfleInstRslt(template (value) charstring notificationAddress := "smdp.example.com") := { +template (value) SGP32_PendingNotification ts_SGP32_pendingNotification_prfleInstRslt(template (value) charstring notificationAddress := SGP23_TEST_DP_ADDRESS1) := { profileInstallationResult := { profileInstallationResultData := ts_profileInstallationResultData(notificationAddress), - euiccSignPIR := '5252525252525252525252525252525252525252525252525252525252525252 - 5353535353535353535353535353535353535353535353535353535353535353'O + euiccSignPIR := SGP23_EUICC_SIGN_PIR } } template (present) SGP32_PendingNotification @@ -1119,8 +1114,8 @@ listProfileInfoResult := { profileInfoListOk := { { - iccid := '123456789ABCDEFFAAAA'O, - isdpAid := omit, + iccid := SGP23_ICCID_OP_PROF1, + isdpAid := SGP23_ISD_P_AID, profileState := 1, /* enabled */ profileNickname := omit, serviceProviderName := omit, @@ -1178,7 +1173,7 @@ pprIds := '000'B, allowedOperators := { { - mccMnc := '001F01'O, + mccMnc := SGP23_MCC_MNC1, gid1 := omit, gid2 := omit } @@ -1560,11 +1555,11 @@ ipaEuiccDataResponse := { ipaEuiccData := { notificationsList := omit, - defaultSmdpAddress := "smdp.example.com", + defaultSmdpAddress := SGP23_TEST_DP_ADDRESS1, euiccPackageResultList := omit, euiccInfo1 := ts_EUICCInfo1, euiccInfo2 := ts_SGP32_EUICCInfo2, - rootSmdsAddress := "smds.example.com", + rootSmdsAddress := SGP23_TEST_DS_ADDRESS1, associationToken := 1, eumCertificate := ts_cert_eum_nist, euiccCertificate := ts_cert_euicc_nist, diff --git a/smdpp/gen_links.sh b/smdpp/gen_links.sh index 1b1b27f..77fd33a 100755 --- a/smdpp/gen_links.sh +++ b/smdpp/gen_links.sh @@ -29,7 +29,7 @@ FILES="PEDefinitions.asn PKIX1Explicit88.asn PKIX1Implicit88.asn RSPDefinitions.asn SGP32Definitions.asn " FILES+="PKIX1Explicit88_Templates.ttcn PKIX1Explicit88_Types.ttcn PKIX1Implicit88_Templates.ttcn " FILES+="PKIX1Implicit88_Types.ttcn RSPDefinitions_Templates.ttcn RSPDefinitions_Types.ttcn " -FILES+="SGP32Definitions_Templates.ttcn SGP32Definitions_Types.ttcn " +FILES+="SGP32Definitions_Templates.ttcn SGP32Definitions_Types.ttcn SGP23_Constants.ttcn " FILES+="es9p_Types_JSON.ttcn es2p_Types_JSON.ttcn es12_Types_JSON.ttcn esx_header_Types_JSON.ttcn" gen_links $DIR $FILES -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43841?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I00e3de0b20156993b8e15b5bbd4734faa20b66cf Gerrit-Change-Number: 43841 Gerrit-PatchSet: 4 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org>

1 0

[L] Change in osmocom-bb[master]: trxcon/trx_if: migrate to libosmo-trx
by pespin 19 Oct '26

19 Oct '26

Attention is currently required from: fixeria, laforge. pespin has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/osmocom-bb/+/43828?usp=email ) Change subject: trxcon/trx_if: migrate to libosmo-trx ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/43828?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I4604f4b12ca903e936dedf167b478455bd28a2e8 Gerrit-Change-Number: 43828 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 19 Oct 2026 10:14:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[XS] Change in osmo-msc[master]: mm-info: properly encode length 8n-1 network names
by pespin 19 Oct '26

19 Oct '26

Attention is currently required from: fixeria, tempest. pespin has posted comments on this change by tempest. ( https://gerrit.osmocom.org/c/osmo-msc/+/43918?usp=email ) Change subject: mm-info: properly encode length 8n-1 network names ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/43918?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: Ib8328cd2c9984b490951d39f21e86a4ef63e35d5 Gerrit-Change-Number: 43918 Gerrit-PatchSet: 1 Gerrit-Owner: tempest <jackleea1b(a)gmail.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: tempest <jackleea1b(a)gmail.com> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 19 Oct 2026 10:12:33 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[S] Change in osmo-ttcn3-hacks[master]: RSPDefinitions_Templates: add parameters to tr/ts_cancelSessionRespon...
by jolly 19 Oct '26

19 Oct '26

Attention is currently required from: dexter. jolly has posted comments on this change by dexter. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43910?usp=email ) Change subject: RSPDefinitions_Templates: add parameters to tr/ts_cancelSessionResponseOk ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43910?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Iaf396e4a9df6d03ef83f309d25d7cf20babfdbc4 Gerrit-Change-Number: 43910 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Mon, 19 Oct 2026 09:48:22 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

2026

2025

2024

2023

2022

gerrit-log October 2026