- gerrit-log - lists.osmocom.org

[S] Change in libsmpp34[master]: fix warnings about implicit declaration of strtol()
by fixeria 08 Jan '24

08 Jan '24

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/libsmpp34/+/35503?usp=email ) Change subject: fix warnings about implicit declaration of strtol() ...................................................................... fix warnings about implicit declaration of strtol() This commit fixes several warnings like this one: In file included from ../../../src/libsmpp34/test_apps/smpp.c:40: test_apps/smpp.c: In function ‘do_smpp_send_message2’: test_apps/esme.h:32:16: warning: implicit declaration of function ‘strtol’; did you mean ‘strtok’? [-Wimplicit-function-declaration] 32 | dst = strtol((char*)clave, NULL, 10);\ | ^~~~~~ test_apps/smpp.c:223:5: note: in expansion of macro ‘GET_PROP_INT’ 223 | GET_PROP_INT( req.source_addr_ton, p, "source_addr_ton" ); | ^~~~~~~~~~~~ Change-Id: I16d9e0171d4c26f721c300e22c78b77f6db4895c --- M test_apps/esme.c M test_apps/sendwp.c M test_apps/smpp.c M test_apps/tcp.c 4 files changed, 25 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libsmpp34 refs/changes/03/35503/1 diff --git a/test_apps/esme.c b/test_apps/esme.c index 77fb198..5d9dafd 100644 --- a/test_apps/esme.c +++ b/test_apps/esme.c @@ -23,6 +23,7 @@ */ #include <stdio.h> +#include <stdlib.h> #include <unistd.h> #include <string.h> #include <libxml/xmlmemory.h> diff --git a/test_apps/sendwp.c b/test_apps/sendwp.c index b719c45..f75af76 100644 --- a/test_apps/sendwp.c +++ b/test_apps/sendwp.c @@ -23,6 +23,7 @@ */ #include <stdio.h> +#include <stdlib.h> #include <unistd.h> #include <string.h> #include <libxml/xmlmemory.h> diff --git a/test_apps/smpp.c b/test_apps/smpp.c index c764907..2cdb138 100644 --- a/test_apps/smpp.c +++ b/test_apps/smpp.c @@ -23,6 +23,7 @@ */ #include <stdio.h> +#include <stdlib.h> #include <unistd.h> #include <string.h> #include <sys/types.h> diff --git a/test_apps/tcp.c b/test_apps/tcp.c index 4cf681d..3051df2 100644 --- a/test_apps/tcp.c +++ b/test_apps/tcp.c @@ -28,6 +28,7 @@ #include <arpa/inet.h> #include <netdb.h> #include <stdio.h> +#include <stdlib.h> #include <unistd.h> #include <string.h> #include <libxml/xmlmemory.h> -- To view, visit https://gerrit.osmocom.org/c/libsmpp34/+/35503?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libsmpp34 Gerrit-Branch: master Gerrit-Change-Id: I16d9e0171d4c26f721c300e22c78b77f6db4895c Gerrit-Change-Number: 35503 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in libosmo-abis[master]: trau/osmo_ortp: support building without OrtpMemoryFunctions API
by fixeria 08 Jan '24

08 Jan '24

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/35502?usp=email ) Change subject: trau/osmo_ortp: support building without OrtpMemoryFunctions API ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: > Maybe use the new bctoolbox APIs if available instead of falling back to whatever is default? This is indeed an option, but we don't depend on bctoolbox directly (it's a dependency of ortp itself), so I don't think we can use its API. -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/35502?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I9fe6299fde81faeab86cd6645d67edd2f41e1873 Gerrit-Change-Number: 35502 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 08 Jan 2024 13:37:10 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 0

[S] Change in libosmo-abis[master]: trau/osmo_ortp: support building without OrtpMemoryFunctions API
by pespin 08 Jan '24

08 Jan '24

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/35502?usp=email ) Change subject: trau/osmo_ortp: support building without OrtpMemoryFunctions API ...................................................................... Patch Set 1: Code-Review+1 (1 comment) Patchset: PS1: Maybe use the new bctoolbox APIs if available instead of falling back to whatever is default? -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/35502?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I9fe6299fde81faeab86cd6645d67edd2f41e1873 Gerrit-Change-Number: 35502 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 08 Jan 2024 13:29:49 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in libosmo-abis[master]: trau/osmo_ortp: support building without OrtpMemoryFunctions API
by fixeria 08 Jan '24

08 Jan '24

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-abis/+/35502?usp=email ) Change subject: trau/osmo_ortp: support building without OrtpMemoryFunctions API ...................................................................... trau/osmo_ortp: support building without OrtpMemoryFunctions API Recent ortp versions (v5.3.0+, maintained by linphone.org) no longer have the memory allocator configuration API. See the related commit: https://gitlab.linphone.org/BC/public/ortp/-/commit/9ba9db486a61bebeb11287e… A similar API is provided by bctoolbox, a dependency of ortp: void bctbx_set_memory_functions(BctoolboxMemoryFunctions *functions); Let's support building against v5.3.0+ by checking (in ./configure) if the old API is available. Use talloc if possible; otherwise fall-back to whatever ortp uses by default (glibc's malloc). Change-Id: I9fe6299fde81faeab86cd6645d67edd2f41e1873 --- M configure.ac M src/trau/osmo_ortp.c 2 files changed, 43 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/02/35502/1 diff --git a/configure.ac b/configure.ac index 37ac91a..5097c93 100644 --- a/configure.ac +++ b/configure.ac @@ -161,6 +161,19 @@ [rtp_session_signal_connect requires ulong parameter])]) CFLAGS=$_cflags_save +_cflags_save=$CFLAGS +CFLAGS="$CFLAGS $ORTP_CFLAGS" +AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM( + [[#include <ortp/ortp.h>]], + [[OrtpMemoryFunctions memfn = { };]] + )], + [AC_DEFINE([HAVE_ORTP_MEM_FUNC], [1], + [OrtpMemoryFunctions is available, will use talloc])], + [AC_DEFINE([HAVE_ORTP_MEM_FUNC], [0], + [OrtpMemoryFunctions is not available])]) +CFLAGS=$_cflags_save + AC_MSG_RESULT([CFLAGS="$CFLAGS"]) AC_MSG_RESULT([CPPFLAGS="$CPPFLAGS"]) diff --git a/src/trau/osmo_ortp.c b/src/trau/osmo_ortp.c index 015ac34..701b81d 100644 --- a/src/trau/osmo_ortp.c +++ b/src/trau/osmo_ortp.c @@ -47,7 +47,7 @@ static void *tall_rtp_ctx; /* malloc integration */ - +#if HAVE_ORTP_MEM_FUNC static void *osmo_ortp_malloc(size_t sz) { return talloc_size(tall_rtp_ctx, sz); @@ -68,6 +68,7 @@ .realloc_fun = osmo_ortp_realloc, .free_fun = osmo_ortp_free }; +#endif /* HAVE_ORTP_MEM_FUNC */ /* logging */ @@ -121,13 +122,14 @@ needs_endl = fmt[fmt_len - 1] != '\n' ? 1 : 0; - str = osmo_ortp_malloc(domain_len + 2 /*": "*/ + fmt_len + needs_endl + 1); - sprintf(str, "%s%s%s%s", domain_str, domain_len ? ": " : "", fmt, needs_endl ? "\n" : ""); + str = talloc_asprintf(tall_rtp_ctx, "%s%s%s%s", + domain_str, domain_len ? ": " : "", + fmt, needs_endl ? "\n" : ""); osmo_vlogp(DLMIB, ortp_to_osmo_lvl(lev), __FILE__, 0, 0, str, args); - osmo_ortp_free(str); + talloc_free(str); } @@ -315,7 +317,9 @@ void osmo_rtp_init(void *ctx) { tall_rtp_ctx = ctx; +#if HAVE_ORTP_MEM_FUNC ortp_set_memory_functions(&osmo_ortp_memfn); +#endif ortp_init(); ortp_set_log_level_mask( #if HAVE_ORTP_LOG_DOMAIN -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/35502?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I9fe6299fde81faeab86cd6645d67edd2f41e1873 Gerrit-Change-Number: 35502 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[M] Change in pysim[master]: pySim-shell: Update manual with examples for using with eUICC ISD-R
by laforge 08 Jan '24

08 Jan '24

Attention is currently required from: laforge. Hello Jenkins Builder, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/35499?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder The change is no longer submittable: Verified is unsatisfied now. Change subject: pySim-shell: Update manual with examples for using with eUICC ISD-R ...................................................................... pySim-shell: Update manual with examples for using with eUICC ISD-R Change-Id: I4a0acdad5c7478ee76f92c7610c0e2a5331dea46 --- M docs/shell.rst 1 file changed, 215 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/99/35499/3 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35499?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I4a0acdad5c7478ee76f92c7610c0e2a5331dea46 Gerrit-Change-Number: 35499 Gerrit-PatchSet: 3 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newpatchset

1 0

[XL] Change in pysim[master]: Initial proof-of-concept SM-DP+ for GSMA consumer eSIM RSP
by laforge 08 Jan '24

08 Jan '24

Attention is currently required from: dexter, fixeria, laforge, lynxis lazus. Hello Jenkins Builder, dexter, fixeria, lynxis lazus, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/35461?usp=email to look at the new patch set (#11). The following approvals got outdated and were removed: Verified-1 by Jenkins Builder Change subject: Initial proof-of-concept SM-DP+ for GSMA consumer eSIM RSP ...................................................................... Initial proof-of-concept SM-DP+ for GSMA consumer eSIM RSP This commit introduces * the osmo-smdpp.py program implementing the main procedures and the HTTP/REST based ES9+ * python modules for ES8+ and non-volatile RSP Session State storage * the ASN.1 source files required to parse/encode RSP * 3GPP test certificates from SGP.26 * an unsigned profile package (UPP) of a SAIP v2.3 TS48 test profile As I couldn't get the 'Klein' tls support to work, the SM-DP+ code currently does not support HTTPS/TLS but plan HTTP, so you either have to modify your LPA to use HTTP instead of HTTPS, or put a TLS proxy in front. I have successfully installed an eSIM profile on a test eUICC that contains certificate/key data within the test CI defined in GSMA SGP.26 Change-Id: I6232847432dc6920cd2bd08c84d7099c29ca1c11 --- A .checkpatch.conf M docs/index.rst A docs/osmo-smdpp.rst A osmo-smdpp.py M pySim/esim/__init__.py A pySim/esim/asn1/rsp/PKIX1Explicit88.asn A pySim/esim/asn1/rsp/PKIX1Implicit88.asn A pySim/esim/asn1/rsp/rsp.asn A pySim/esim/es8p.py A pySim/esim/rsp.py M requirements.txt A smdpp-data/certs/CertificateIssuer/CERT_CI_ECDSA_BRP.der A smdpp-data/certs/CertificateIssuer/CERT_CI_ECDSA_BRP.pem A smdpp-data/certs/CertificateIssuer/CERT_CI_ECDSA_NIST.der A smdpp-data/certs/CertificateIssuer/CERT_CI_ECDSA_NIST.pem A smdpp-data/certs/CertificateIssuer/CI-csr.cnf A smdpp-data/certs/DPauth/CERT_S_SM_DP2auth_ECDSA_BRP.der A smdpp-data/certs/DPauth/CERT_S_SM_DP2auth_ECDSA_NIST.der A smdpp-data/certs/DPauth/CERT_S_SM_DPauth_ECDSA_BRP.der A smdpp-data/certs/DPauth/CERT_S_SM_DPauth_ECDSA_NIST.der A smdpp-data/certs/DPauth/PK_S_SM_DP2auth_ECDSA_BRP.pem A smdpp-data/certs/DPauth/PK_S_SM_DP2auth_ECDSA_NIST.pem A smdpp-data/certs/DPauth/PK_S_SM_DPauth_ECDSA_BRP.pem A smdpp-data/certs/DPauth/PK_S_SM_DPauth_ECDSA_NIST.pem A smdpp-data/certs/DPauth/SK_S_SM_DP2auth_ECDSA_BRP.pem A smdpp-data/certs/DPauth/SK_S_SM_DP2auth_ECDSA_NIST.pem A smdpp-data/certs/DPauth/SK_S_SM_DPauth_ECDSA_BRP.pem A smdpp-data/certs/DPauth/SK_S_SM_DPauth_ECDSA_NIST.pem A smdpp-data/certs/DPauth/data_sig.der A smdpp-data/certs/DPpb/CERT_S_SM_DP2pb_ECDSA_BRP.der A smdpp-data/certs/DPpb/CERT_S_SM_DP2pb_ECDSA_NIST.der A smdpp-data/certs/DPpb/CERT_S_SM_DPpb_ECDSA_BRP.der A smdpp-data/certs/DPpb/CERT_S_SM_DPpb_ECDSA_NIST.der A smdpp-data/certs/DPpb/PK_S_SM_DP2pb_ECDSA_BRP.pem A smdpp-data/certs/DPpb/PK_S_SM_DP2pb_ECDSA_NIST.pem A smdpp-data/certs/DPpb/PK_S_SM_DPpb_ECDSA_BRP.pem A smdpp-data/certs/DPpb/PK_S_SM_DPpb_ECDSA_NIST.pem A smdpp-data/certs/DPpb/SK_S_SM_DP2pb_ECDSA_BRP.pem A smdpp-data/certs/DPpb/SK_S_SM_DP2pb_ECDSA_NIST.pem A smdpp-data/certs/DPpb/SK_S_SM_DPpb_ECDSA_BRP.pem A smdpp-data/certs/DPpb/SK_S_SM_DPpb_ECDSA_NIST.pem A smdpp-data/certs/DPtls/CERT_S_SM_DP2_TLS.csr.cnf A smdpp-data/certs/DPtls/CERT_S_SM_DP2_TLS.der A smdpp-data/certs/DPtls/CERT_S_SM_DP2_TLS.ext.cnf A smdpp-data/certs/DPtls/CERT_S_SM_DP4_TLS.csr.cnf A smdpp-data/certs/DPtls/CERT_S_SM_DP4_TLS.der A smdpp-data/certs/DPtls/CERT_S_SM_DP4_TLS.ext.cnf A smdpp-data/certs/DPtls/CERT_S_SM_DP8_TLS.csr.cnf A smdpp-data/certs/DPtls/CERT_S_SM_DP8_TLS.der A smdpp-data/certs/DPtls/CERT_S_SM_DP8_TLS.ext.cnf A smdpp-data/certs/DPtls/CERT_S_SM_DP_TLS.csr.cnf A smdpp-data/certs/DPtls/CERT_S_SM_DP_TLS.ext.cnf A smdpp-data/certs/DPtls/CERT_S_SM_DP_TLS_BRP.der A smdpp-data/certs/DPtls/CERT_S_SM_DP_TLS_NIST.der A smdpp-data/certs/DPtls/Old_TLS_Validity/Expired 2021/CERT_S_SM_DP2_TLS.der A smdpp-data/certs/DPtls/Old_TLS_Validity/Expired 2021/CERT_S_SM_DP4_TLS.der A smdpp-data/certs/DPtls/Old_TLS_Validity/Expired 2021/CERT_S_SM_DP8_TLS.der A smdpp-data/certs/DPtls/Old_TLS_Validity/Expired 2021/CERT_S_SM_DP_TLS_BRP.der A smdpp-data/certs/DPtls/Old_TLS_Validity/Expired 2021/CERT_S_SM_DP_TLS_NIST.der A smdpp-data/certs/DPtls/Old_TLS_Validity/Expired 2022/CERT_S_SM_DP2_TLS.der A smdpp-data/certs/DPtls/Old_TLS_Validity/Expired 2022/CERT_S_SM_DP4_TLS.der A smdpp-data/certs/DPtls/Old_TLS_Validity/Expired 2022/CERT_S_SM_DP8_TLS.der A smdpp-data/certs/DPtls/Old_TLS_Validity/Expired 2022/CERT_S_SM_DP_TLS_BRP.der A smdpp-data/certs/DPtls/Old_TLS_Validity/Expired 2022/CERT_S_SM_DP_TLS_NIST.der A smdpp-data/certs/DPtls/Old_TLS_Validity/Expired 2023/CERT_S_SM_DP2_TLS.der A smdpp-data/certs/DPtls/Old_TLS_Validity/Expired 2023/CERT_S_SM_DP4_TLS.der A smdpp-data/certs/DPtls/Old_TLS_Validity/Expired 2023/CERT_S_SM_DP8_TLS.der A smdpp-data/certs/DPtls/Old_TLS_Validity/Expired 2023/CERT_S_SM_DP_TLS_BRP.der A smdpp-data/certs/DPtls/Old_TLS_Validity/Expired 2023/CERT_S_SM_DP_TLS_NIST.der A smdpp-data/certs/DPtls/PK_S_SM_DP2_TLS_NIST.pem A smdpp-data/certs/DPtls/PK_S_SM_DP4_TLS.pem A smdpp-data/certs/DPtls/PK_S_SM_DP8_TLS.pem A smdpp-data/certs/DPtls/PK_S_SM_DP_TLS_BRP.pem A smdpp-data/certs/DPtls/PK_S_SM_DP_TLS_NIST.pem A smdpp-data/certs/DPtls/SK_S_SM_DP2_TLS_NIST.pem A smdpp-data/certs/DPtls/SK_S_SM_DP4_TLS.pem A smdpp-data/certs/DPtls/SK_S_SM_DP8_TLS.pem A smdpp-data/certs/DPtls/SK_S_SM_DP_TLS_BRP.pem A smdpp-data/certs/DPtls/SK_S_SM_DP_TLS_NIST.pem A smdpp-data/certs/README A smdpp-data/upp/TS48 V2 eSIM_GTP_SAIP2.1_NoBERTLV.rename2der A smdpp-data/upp/TS48 V2 eSIM_GTP_SAIP2.3_NoBERTLV.rename2der A tests/test_esim.py M tests/test_esim_bsp.py 84 files changed, 3,189 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/61/35461/11 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35461?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I6232847432dc6920cd2bd08c84d7099c29ca1c11 Gerrit-Change-Number: 35461 Gerrit-PatchSet: 11 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

[M] Change in osmo-ttcn3-hacks[master]: GTPv2_Emulation: Improve routing messages to client
by pespin 08 Jan '24

08 Jan '24

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35490?usp=email ) Change subject: GTPv2_Emulation: Improve routing messages to client ...................................................................... GTPv2_Emulation: Improve routing messages to client Before this patch, for instance, registering an IMSI would not necessarily mean the messaged ended up in the client registering it, due to how the code paths were being handled. Ideally the code should create a CLIENT candidate list based on all registered matches, and then remove duplicates and finally send message to each CLIENT in the resulting list. That's really not needed as of now though. Change-Id: If253a2b8991f0caf685058238df9a7c997983e27 --- M library/GTPv2_Emulation.ttcn 1 file changed, 53 insertions(+), 21 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/library/GTPv2_Emulation.ttcn b/library/GTPv2_Emulation.ttcn index 0b2cb4f..eb2b977 100644 --- a/library/GTPv2_Emulation.ttcn +++ b/library/GTPv2_Emulation.ttcn @@ -107,6 +107,16 @@ GTP2_ConnHdlr vc_conn }; +private function f_teid_known(OCT4 teid) runs on GTPv2_Emulation_CT return boolean { + var integer i; + for (i := 0; i < sizeof(TidTable); i := i+1) { + if (isbound(TidTable[i].teid) and TidTable[i].teid == teid) { + return true; + } + } + return false; +} + private function f_comp_by_teid(OCT4 teid) runs on GTPv2_Emulation_CT return GTP2_ConnHdlr { var integer i; for (i := 0; i < sizeof(TidTable); i := i+1) { @@ -139,6 +149,16 @@ mtc.stop; } +private function f_imsi_known(hexstring imsi) runs on GTPv2_Emulation_CT return boolean { + var integer i; + for (i := 0; i < sizeof(ImsiTable); i := i+1) { + if (isbound(ImsiTable[i].imsi) and ImsiTable[i].imsi == imsi) { + return true; + } + } + return false; +} + private function f_comp_by_imsi(hexstring imsi) runs on GTPv2_Emulation_CT return GTP2_ConnHdlr { var integer i; for (i := 0; i < sizeof(ImsiTable); i := i+1) { @@ -540,30 +560,24 @@ /* route inbound GTP2-C based on TEID, SEQ or IMSI */ [] GTP2C.receive(Gtp2cUnitdata:?) -> value g2c_ud { var template hexstring imsi_t := f_gtp2c_extract_imsi(g2c_ud.gtpc); - if (not ispresent(g2c_ud.gtpc.tEID) or g2c_ud.gtpc.tEID == int2oct(0, 4)) { - /* if this is a response, route by SEQ */ - if (match(g2c_ud.gtpc, tr_PDU_GTP2C_msgtypes(gtp2_responses)) - and f_seq_known(g2c_ud.gtpc.sequenceNumber)) { - vc_conn := f_comp_by_seq(g2c_ud.gtpc.sequenceNumber); - CLIENT.send(g2c_ud.gtpc) to vc_conn; - } else { - SendToUdMsgTable(g2c_ud); - TEID0.send(g2c_ud.gtpc); - } - } else if (ispresent(g2c_ud.gtpc.tEID) and g2c_ud.gtpc.tEID != int2oct(0, 4)) { - vc_conn := f_comp_by_teid(g2c_ud.gtpc.tEID); - CLIENT.send(g2c_ud.gtpc) to vc_conn; - } else if (isvalue(imsi_t)) { + if (isvalue(imsi_t) and f_imsi_known(valueof(imsi_t))) { vc_conn := f_comp_by_imsi(valueof(imsi_t)); CLIENT.send(g2c_ud.gtpc) to vc_conn; + } else if ((ispresent(g2c_ud.gtpc.tEID) and g2c_ud.gtpc.tEID != '00000000'O) + and f_teid_known(g2c_ud.gtpc.tEID)) { + vc_conn := f_comp_by_teid(g2c_ud.gtpc.tEID); + CLIENT.send(g2c_ud.gtpc) to vc_conn; + } else if ((not ispresent(g2c_ud.gtpc.tEID) or g2c_ud.gtpc.tEID == '00000000'O) + and f_teid_known('00000000'O)) { + vc_conn := f_comp_by_teid(g2c_ud.gtpc.tEID); + CLIENT.send(g2c_ud.gtpc) to vc_conn; + /* if this is a response, route by SEQ: */ + } else if (match(g2c_ud.gtpc, tr_PDU_GTP2C_msgtypes(gtp2_responses)) + and f_seq_known(g2c_ud.gtpc.sequenceNumber)) { + vc_conn := f_comp_by_seq(g2c_ud.gtpc.sequenceNumber); + CLIENT.send(g2c_ud.gtpc) to vc_conn; } else { - /* Send to all clients */ - var integer i; - for (i := 0; i < sizeof(TidTable); i := i+1) { - if (isbound(TidTable[i].teid) and TidTable[i].teid == teid) { - CLIENT.send(g2c_ud.gtpc) to TidTable[i].vc_conn; - } - } + SendToUdMsgTable(g2c_ud); } /* remove sequence number if response was received */ -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35490?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: If253a2b8991f0caf685058238df9a7c997983e27 Gerrit-Change-Number: 35490 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in pysim[master]: euicc: Fix eUICC list_notifications command
by laforge 08 Jan '24

08 Jan '24

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/35498?usp=email ) ( 2 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: euicc: Fix eUICC list_notifications command ...................................................................... euicc: Fix eUICC list_notifications command Prior to this patch, the command would always raise exceptions. Change-Id: I75a7840c3f4b68bfc164a43908b100dd6e41e575 --- M pySim/euicc.py 1 file changed, 15 insertions(+), 3 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/pySim/euicc.py b/pySim/euicc.py index e45476f..e405f30 100644 --- a/pySim/euicc.py +++ b/pySim/euicc.py @@ -141,12 +141,13 @@ # SGP.22 Section 5.7.9: ListNotification class ProfileMgmtOperation(BER_TLV_IE, tag=0x81): - _construct = FlagsEnum(Byte, install=1, enable=2, disable=4, delete=8) + # we have to ignore the first byte which tells us how many padding bits are used in the last octet + _construct = Struct(Byte, "pmo"/FlagsEnum(Byte, install=0x80, enable=0x40, disable=0x20, delete=0x10)) class ListNotificationReq(BER_TLV_IE, tag=0xbf28, nested=[ProfileMgmtOperation]): pass class SeqNumber(BER_TLV_IE, tag=0x80): - _construct = GreedyInteger -class NotificationAddress(BER_TLV_IE, tag=0x82): + _construct = GreedyInteger() +class NotificationAddress(BER_TLV_IE, tag=0x0c): _construct = Utf8Adapter(GreedyBytes) class Iccid(BER_TLV_IE, tag=0x5a): _construct = BcdAdapter(GreedyBytes) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35498?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I75a7840c3f4b68bfc164a43908b100dd6e41e575 Gerrit-Change-Number: 35498 Gerrit-PatchSet: 4 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

1 0

[S] Change in pysim[master]: euicc: Fix delete_profile command
by laforge 08 Jan '24

08 Jan '24

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/35497?usp=email ) ( 2 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: euicc: Fix delete_profile command ...................................................................... euicc: Fix delete_profile command Contrary to {enable,disable}_profile, the delete_profile does not use the ProfileIdentifier TLV, but directly the Iccid / IsdpAid. Change-Id: I43e298524048703264e16cbdd0b76d82ba976985 --- M pySim/euicc.py 1 file changed, 15 insertions(+), 3 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/pySim/euicc.py b/pySim/euicc.py index 19b1c57..e45476f 100644 --- a/pySim/euicc.py +++ b/pySim/euicc.py @@ -231,7 +231,7 @@ class DeleteResult(BER_TLV_IE, tag=0x80): _construct = Enum(Int8ub, ok=0, iccidOrAidNotFound=1, profileNotInDisabledState=2, disallowedByPolicy=3, undefinedError=127) -class DeleteProfileReq(BER_TLV_IE, tag=0xbf33, nested=[ProfileIdentifier]): +class DeleteProfileReq(BER_TLV_IE, tag=0xbf33, nested=[IsdpAid, Iccid]): pass class DeleteProfileResp(BER_TLV_IE, tag=0xbf33, nested=[DeleteResult]): pass @@ -444,9 +444,9 @@ def do_delete_profile(self, opts): """Perform an ES10c DeleteProfile function.""" if opts.isdp_aid: - p_id = ProfileIdentifier(children=[IsdpAid(decoded=opts.isdp_aid)]) + p_id = IsdpAid(decoded=opts.isdp_aid) if opts.iccid: - p_id = ProfileIdentifier(children=[Iccid(decoded=opts.iccid)]) + p_id = Iccid(decoded=opts.iccid) dp_cmd_contents = [p_id] dp_cmd = DeleteProfileReq(children=dp_cmd_contents) dp = ADF_ISDR.store_data_tlv(self._cmd.lchan.scc, dp_cmd, DeleteProfileResp) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35497?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I43e298524048703264e16cbdd0b76d82ba976985 Gerrit-Change-Number: 35497 Gerrit-PatchSet: 4 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

1 0

[S] Change in pysim[master]: Allow logger to do lazy evaluation of format strings
by laforge 08 Jan '24

08 Jan '24

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/35495?usp=email ) ( 4 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: Allow logger to do lazy evaluation of format strings ...................................................................... Allow logger to do lazy evaluation of format strings Change-Id: I39d26cdd5b85a61a06fd8c7a9d0a046e398819bd --- M pySim-trace.py M pySim/apdu/ts_102_221.py M pySim/apdu_source/pyshark_rspro.py 3 files changed, 16 insertions(+), 7 deletions(-) Approvals: fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/pySim-trace.py b/pySim-trace.py index eb29ed1..91f50a3 100755 --- a/pySim-trace.py +++ b/pySim-trace.py @@ -182,7 +182,7 @@ opts = option_parser.parse_args() - logger.info('Opening source %s...' % opts.source) + logger.info('Opening source %s...', opts.source) if opts.source == 'gsmtap-udp': s = GsmtapApduSource(opts.bind_ip, opts.bind_port) elif opts.source == 'rspro-pyshark-pcap': diff --git a/pySim/apdu/ts_102_221.py b/pySim/apdu/ts_102_221.py index 2d3ad82..443ae1e 100644 --- a/pySim/apdu/ts_102_221.py +++ b/pySim/apdu/ts_102_221.py @@ -77,7 +77,7 @@ pass # iterate to next element in path continue - logger.warning('SELECT UNKNOWN FID %s (%s)' % (file_hex, '/'.join([b2h(x) for x in path]))) + logger.warning('SELECT UNKNOWN FID %s (%s)', file_hex, '/'.join([b2h(x) for x in path])) elif mode == 'df_ef_or_mf_by_file_id': if len(self.cmd_data) != 2: raise ValueError('Expecting a 2-byte FID') @@ -91,7 +91,7 @@ #print("\tSELECT %s FAILED" % sels[file_hex]) pass else: - logger.warning('SELECT UNKNOWN FID %s' % (file_hex)) + logger.warning('SELECT UNKNOWN FID %s', file_hex) elif mode == 'df_name': # Select by AID (can be sub-string!) aid = self.cmd_dict['body'] @@ -102,7 +102,7 @@ lchan.selected_file = lchan.selected_adf #print("\tSELECT AID %s" % adf) else: - logger.warning('SELECT UNKNOWN AID %s' % aid) + logger.warning('SELECT UNKNOWN AID %s', aid) pass else: raise ValueError('Select Mode %s not implemented' % mode) @@ -490,7 +490,7 @@ elif self.p2 & 0xdf == 0x40: c['mode'] = 'retransmit_previous_block' else: - logger.warning('%s: invalid P2=%02x' % (self, self.p2)) + logger.warning('%s: invalid P2=%02x', self, self.p2) return c def _decode_cmd(self): diff --git a/pySim/apdu_source/pyshark_rspro.py b/pySim/apdu_source/pyshark_rspro.py index 8c614ff..039326a 100644 --- a/pySim/apdu_source/pyshark_rspro.py +++ b/pySim/apdu_source/pyshark_rspro.py @@ -89,7 +89,7 @@ bsl = self.get_bank_slot(bank_slot) self._set_or_verify_bank_slot(bsl) data = modem2card.get_field('data').replace(':','') - logger.debug("C(%u:%u) -> B(%u:%u): %s" % (csl[0], csl[1], bsl[0], bsl[1], data)) + logger.debug("C(%u:%u) -> B(%u:%u): %s", csl[0], csl[1], bsl[0], bsl[1], data) # store the CMD portion until the RSP portion arrives later self.cmd_tpdu = h2b(data) elif msg_type == '13': # tpduCardToModem @@ -101,7 +101,7 @@ bsl = self.get_bank_slot(bank_slot) self._set_or_verify_bank_slot(bsl) data = card2modem.get_field('data').replace(':','') - logger.debug("C(%u:%u) <- B(%u:%u): %s" % (csl[0], csl[1], bsl[0], bsl[1], data)) + logger.debug("C(%u:%u) <- B(%u:%u): %s", csl[0], csl[1], bsl[0], bsl[1], data) rsp_tpdu = h2b(data) if self.cmd_tpdu: # combine this R-TPDU with the C-TPDU we saw earlier -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35495?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I39d26cdd5b85a61a06fd8c7a9d0a046e398819bd Gerrit-Change-Number: 35495 Gerrit-PatchSet: 6 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

1 0

2026

2025

2024

2023

2022

gerrit-log