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

[S] Change in osmo-msc[master]: iu: Fix encoding of IPv6 RTP address in RAB Ass Req
by pespin 18 Aug '26

18 Aug '26

Attention is currently required from: fixeria, lynxis lazus, osmith. pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-msc/+/43259?usp=email ) Change subject: iu: Fix encoding of IPv6 RTP address in RAB Ass Req ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/43259?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: I23298235f4457bd556d2291d81c4aed3f009af0f Gerrit-Change-Number: 43259 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Tue, 18 Aug 2026 15:32:39 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[S] Change in osmo-ttcn3-hacks[master]: IPA: Start (and stop) IPAd from test cases
by dexter 18 Aug '26

18 Aug '26

Attention is currently required from: jolly. dexter has posted comments on this change by jolly. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43268?usp=email ) Change subject: IPA: Start (and stop) IPAd from test cases ...................................................................... Patch Set 1: Code-Review+1 (1 comment) File ipad/ipad/nvstate.bin: PS1: We need to generate nvstate.bin dynamically before each testrun. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43268?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: I178f8e8750bcd8e1ddbe9a16c615be4bb3e64c1c Gerrit-Change-Number: 43268 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Comment-Date: Tue, 18 Aug 2026 15:32:03 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes

1 0

[M] Change in simtrace2[master]: Add osmo_apdu_segment_in2() to ensure correct parsing of GP GET DATA
by lynxis lazus 18 Aug '26

18 Aug '26

lynxis lazus has submitted this change. ( https://gerrit.osmocom.org/c/simtrace2/+/43185?usp=email ) Change subject: Add osmo_apdu_segment_in2() to ensure correct parsing of GP GET DATA ...................................................................... Add osmo_apdu_segment_in2() to ensure correct parsing of GP GET DATA osmo_apdu_segment_in() doesn't have the context of the previous APDU, for nearly all calls this is fine, except for GP GET DATA, which can be a case 2 or case 4 APDU. GP GET DATA defines the Le field as 0x00 which is used by osmo_apdu_segment_in to detect if it is a case 2 or case 4. However a card can respond with the SW 6cXX, which means the previous command must be resend with a Le field XX, which got misinterpreted by the osmo_apdu_segment_in() as a case 4 resulting in a timeout waiting for more data. Modem <-> Card 81cadf2000 -> <- 6c0b 81cadf200b -> -- Simtrace waits for more data because it wrongly decodes it as APDU case 4 instead of case 2. Related: SYS#8147 Change-Id: Ie238662e7e6a10dd4283ede0c8d8d73bc375c247 --- M TODO-RELEASE M host/Makefile.am M host/configure.ac M host/include/osmocom/simtrace2/apdu_dispatch.h M host/lib/apdu_dispatch.c A host/tests/Makefile.am A host/tests/apdu_dispatch/Makefile.am A host/tests/apdu_dispatch/apdu_dispatch_test.c A host/tests/apdu_dispatch/apdu_dispatch_test.ok A host/tests/testsuite.at 10 files changed, 197 insertions(+), 1 deletion(-) Approvals: dexter: Looks good to me, approved; Verified Jenkins Builder: Verified diff --git a/TODO-RELEASE b/TODO-RELEASE index 0ed7189..5922210 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -7,3 +7,4 @@ # If any interfaces have been added since the last public release: c:r:a + 1. # If any interfaces have been removed or changed since the last public release: c:r:0. #library what description / commit summary line +libosmo-simtrace2 added osmo_apdu_segment_in2() diff --git a/host/Makefile.am b/host/Makefile.am index 338a46b..465a4e0 100644 --- a/host/Makefile.am +++ b/host/Makefile.am @@ -1,7 +1,7 @@ AUTOMAKE_OPTIONS = foreign dist-bzip2 1.6 AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -SUBDIRS = include lib src contrib #tests examples doc +SUBDIRS = include lib src contrib tests # examples doc EXTRA_DIST = .version diff --git a/host/configure.ac b/host/configure.ac index 83a2b23..84b4147 100644 --- a/host/configure.ac +++ b/host/configure.ac @@ -100,4 +100,6 @@ src/Makefile lib/Makefile contrib/Makefile + tests/Makefile + tests/apdu_dispatch/Makefile Makefile) diff --git a/host/include/osmocom/simtrace2/apdu_dispatch.h b/host/include/osmocom/simtrace2/apdu_dispatch.h index 62ff762..f3c0ada 100644 --- a/host/include/osmocom/simtrace2/apdu_dispatch.h +++ b/host/include/osmocom/simtrace2/apdu_dispatch.h @@ -45,3 +45,6 @@ int osmo_apdu_segment_in(struct osmo_apdu_context *ac, const uint8_t *apdu_buf, unsigned int apdu_len, bool new_apdu); + +int osmo_apdu_segment_in2(struct osmo_apdu_context *ac, struct osmo_apdu_context *prev_ac, + const uint8_t *apdu_buf, unsigned int apdu_len, bool new_apdu); diff --git a/host/lib/apdu_dispatch.c b/host/lib/apdu_dispatch.c index f2fa64e..8233507 100644 --- a/host/lib/apdu_dispatch.c +++ b/host/lib/apdu_dispatch.c @@ -78,14 +78,52 @@ int osmo_apdu_segment_in(struct osmo_apdu_context *ac, const uint8_t *apdu_buf, unsigned int apdu_len, bool new_apdu) { + return osmo_apdu_segment_in2(ac, NULL, apdu_buf, apdu_len, new_apdu); +} + +/*! \brief input function for APDU segmentation + * \param ac APDU context across successive calls + * \param prev_ac Previous APDU context across successive calls + * \param[in] apdu_buf APDU input data buffer + * \param[in] apdu_len Length of apdu_buf + * \param[in] new_apdu Is this the beginning of a new APDU? + * + * The function returns APDU_ACT_TX_CAPDU_TO_CARD once there is + * sufficient data of the APDU received to transmit the command-APDU to + * the actual card. + * + * The function returns APDU_ACT_RX_MORE_CAPDU_FROM_READER when there + * is more data to be received from the card reader (GSM Phone). + */ +int osmo_apdu_segment_in2(struct osmo_apdu_context *ac, struct osmo_apdu_context *prev_ac, + const uint8_t *apdu_buf, unsigned int apdu_len, + bool new_apdu) +{ int rc = 0; if (new_apdu) { + if (prev_ac) + memcpy(prev_ac, ac, sizeof(*ac)); /* initialize the apdu context structure */ memset(ac, 0, sizeof(*ac)); /* copy APDU header over */ memcpy(&ac->hdr, apdu_buf, sizeof(ac->hdr)); ac->apdu_case = osim_determine_apdu_case(&osim_uicc_sim_cic_profile, apdu_buf); + + /* Corner case when card returns SW 6CXX (resend previous command with Le = XX). + * Especial GP APDU defines Le to be 0x00, except if card returned SW 6cXX, + * Le must be set to XX. osim_determine_apdu_case() might return the wrong + * APDU case because osim_determine_apdu_case() uses the Le field to determine if the APDU + */ + if (prev_ac && prev_ac->sw[0] == 0x6c && /* check if Le was invalid and must be set to sw[1] */ + (prev_ac->apdu_case >= 1 && prev_ac->apdu_case < 4) && /* handling only valid for apdu case 1..3 */ + ac->hdr.cla == prev_ac->hdr.cla && /* check if CLA, INS, P1, P2 are equal */ + ac->hdr.ins == prev_ac->hdr.ins && + ac->hdr.p1 == prev_ac->hdr.p1 && + ac->hdr.p2 == prev_ac->hdr.p2) { + ac->apdu_case = prev_ac->apdu_case; + } + switch (ac->apdu_case) { case 1: /* P3 == 0, No Lc/Le */ ac->le.tot = ac->lc.tot = 0; diff --git a/host/tests/Makefile.am b/host/tests/Makefile.am new file mode 100644 index 0000000..e58a286 --- /dev/null +++ b/host/tests/Makefile.am @@ -0,0 +1,40 @@ +SUBDIRS = apdu_dispatch + +# The `:;' works around a Bash 3.2 bug when the output is not writeable. +$(srcdir)/package.m4: $(top_srcdir)/configure.ac + :;{ \ + echo '# Signature of the current package.' && \ + echo 'm4_define([AT_PACKAGE_NAME],' && \ + echo ' [$(PACKAGE_NAME)])' && \ + echo 'm4_define([AT_PACKAGE_TARNAME],' && \ + echo ' [$(PACKAGE_TARNAME)])' && \ + echo 'm4_define([AT_PACKAGE_VERSION],' && \ + echo ' [$(PACKAGE_VERSION)])' && \ + echo 'm4_define([AT_PACKAGE_STRING],' && \ + echo ' [$(PACKAGE_STRING)])' && \ + echo 'm4_define([AT_PACKAGE_BUGREPORT],' && \ + echo ' [$(PACKAGE_BUGREPORT)])'; \ + echo 'm4_define([AT_PACKAGE_URL],' && \ + echo ' [$(PACKAGE_URL)])'; \ + } >'$(srcdir)/package.m4' + +EXTRA_DIST = testsuite.at $(srcdir)/package.m4 $(TESTSUITE) +TESTSUITE = $(srcdir)/testsuite +DISTCLEANFILES = atconfig + +check-local: atconfig $(TESTSUITE) + $(SHELL) '$(TESTSUITE)' $(TESTSUITEFLAGS) + +installcheck-local: atconfig $(TESTSUITE) + $(SHELL) '$(TESTSUITE)' AUTOTEST_PATH='$(bindir)' \ + $(TESTSUITEFLAGS) + +clean-local: + test ! -f '$(TESTSUITE)' || \ + $(SHELL) '$(TESTSUITE)' --clean + +AUTOM4TE = $(SHELL) $(top_srcdir)/missing --run autom4te +AUTOTEST = $(AUTOM4TE) --language=autotest +$(TESTSUITE): $(srcdir)/testsuite.at $(srcdir)/package.m4 + $(AUTOTEST) -I '$(srcdir)' -o $@.tmp $@.at + mv $@.tmp $@ diff --git a/host/tests/apdu_dispatch/Makefile.am b/host/tests/apdu_dispatch/Makefile.am new file mode 100644 index 0000000..06a07b5 --- /dev/null +++ b/host/tests/apdu_dispatch/Makefile.am @@ -0,0 +1,13 @@ +AM_LDFLAGS = -no-install +AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include +AM_CFLAGS=-Wall $(LIBOSMONETIF_CFLAGS) $(LIBOSMOCORE_CFLAGS) $(LIBOSMOVTY_CFLAGS) +LDADD = $(top_builddir)/lib/.libs/libosmo-simtrace2.la \ + $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOVTY_LIBS) $(LIBOSMONETIF_LIBS) $(LIBSCTP_LIBS) + +EXTRA_DIST = \ + apdu_dispatch_test.ok \ + $(NULL) + +check_PROGRAMS = apdu_dispatch_test + +apdu_dispatch_test_SOURCES = apdu_dispatch_test.c diff --git a/host/tests/apdu_dispatch/apdu_dispatch_test.c b/host/tests/apdu_dispatch/apdu_dispatch_test.c new file mode 100644 index 0000000..280736f --- /dev/null +++ b/host/tests/apdu_dispatch/apdu_dispatch_test.c @@ -0,0 +1,83 @@ +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <stdint.h> + +#include <osmocom/simtrace2/apdu_dispatch.h> + +const uint8_t get_data_c2_ca[] = { 0x81, 0xCA, 0x00, 0x5A, 0x00 }; +const uint8_t get_data_c2_cb[] = { 0x81, 0xCB, 0x00, 0x5A, 0x00 }; + +/* teset data for 6cXX test */ +const uint8_t get_data_c2_ca_le_23[] = { 0x81, 0xCA, 0x00, 0x5A, 0x23 }; +const uint8_t get_data_c2_cb_le_23[] = { 0x81, 0xCb, 0x00, 0x5A, 0x23 }; + +#define APDU_SEGMENT_IN(apdu, exp_rc) \ + do { \ + memset(&ac, 0, sizeof(ac)); \ + printf("Testing " #apdu "\n"); \ + int rc = osmo_apdu_segment_in(&ac, apdu, ARRAY_SIZE(apdu), true); \ + if (rc != exp_rc) \ + printf("%d (actual) != %d (expected)\n", rc, exp_rc);\ + OSMO_ASSERT(rc == exp_rc); \ + } while (0) + +#define APDU_SEGMENT_IN2(apdu, exp_rc) \ + do { \ + memset(&ac, 0, sizeof(ac)); \ + memset(&prev_ac, 0, sizeof(prev_ac)); \ + printf("Testing " #apdu "\n"); \ + int rc = osmo_apdu_segment_in2(&ac, &prev_ac, apdu, ARRAY_SIZE(apdu), true); \ + if (rc != exp_rc) \ + printf("%d (actual) != %d (expected)\n", rc, exp_rc);\ + OSMO_ASSERT(rc == exp_rc); \ + } while (0) + +void test_apdu_dispatch_simple(void) +{ + struct osmo_apdu_context ac, prev_ac; + APDU_SEGMENT_IN(get_data_c2_ca, APDU_ACT_TX_CAPDU_TO_CARD); + APDU_SEGMENT_IN(get_data_c2_cb, APDU_ACT_TX_CAPDU_TO_CARD); + + APDU_SEGMENT_IN2(get_data_c2_ca, APDU_ACT_TX_CAPDU_TO_CARD); + APDU_SEGMENT_IN2(get_data_c2_cb, APDU_ACT_TX_CAPDU_TO_CARD); +} + +void test_apdu_dispatch_context(void) +{ + struct osmo_apdu_context ac, prev_ac; + int rc; + + printf("Testing GET DATA / 0xCA with SW 6Cxx\n"); + memset(&ac, 0, sizeof(ac)); + memset(&prev_ac, 0, sizeof(prev_ac)); + rc = osmo_apdu_segment_in2(&ac, &prev_ac, get_data_c2_ca, ARRAY_SIZE(get_data_c2_ca), 1); + OSMO_ASSERT(rc == APDU_ACT_TX_CAPDU_TO_CARD); + OSMO_ASSERT(ac.apdu_case == 2) + ac.sw[0] = 0x6c; + ac.sw[1] = 0x23; + rc = osmo_apdu_segment_in2(&ac, &prev_ac, get_data_c2_ca_le_23, ARRAY_SIZE(get_data_c2_ca_le_23), 1); + OSMO_ASSERT(rc == APDU_ACT_TX_CAPDU_TO_CARD); + OSMO_ASSERT(ac.apdu_case == 2) + + printf("Testing GET DATA / 0xCB with SW 6Cxx\n"); + memset(&ac, 0, sizeof(ac)); + memset(&prev_ac, 0, sizeof(prev_ac)); + rc = osmo_apdu_segment_in2(&ac, &prev_ac, get_data_c2_cb, ARRAY_SIZE(get_data_c2_cb), 1); + OSMO_ASSERT(rc == APDU_ACT_TX_CAPDU_TO_CARD); + OSMO_ASSERT(ac.apdu_case == 2) + ac.sw[0] = 0x6c; + ac.sw[1] = 0x23; + rc = osmo_apdu_segment_in2(&ac, &prev_ac, get_data_c2_cb_le_23, ARRAY_SIZE(get_data_c2_cb_le_23), 1); + OSMO_ASSERT(rc == APDU_ACT_TX_CAPDU_TO_CARD); + OSMO_ASSERT(ac.apdu_case == 2) +} + +int main(int argc, char **argv) +{ + test_apdu_dispatch_simple(); + test_apdu_dispatch_context(); + + printf("All tests passed.\n"); + return 0; +} diff --git a/host/tests/apdu_dispatch/apdu_dispatch_test.ok b/host/tests/apdu_dispatch/apdu_dispatch_test.ok new file mode 100644 index 0000000..108450f --- /dev/null +++ b/host/tests/apdu_dispatch/apdu_dispatch_test.ok @@ -0,0 +1,7 @@ +Testing get_data_c2_ca +Testing get_data_c2_cb +Testing get_data_c2_ca +Testing get_data_c2_cb +Testing GET DATA / 0xCA with SW 6Cxx +Testing GET DATA / 0xCB with SW 6Cxx +All tests passed. diff --git a/host/tests/testsuite.at b/host/tests/testsuite.at new file mode 100644 index 0000000..22fcdc4 --- /dev/null +++ b/host/tests/testsuite.at @@ -0,0 +1,9 @@ +AT_INIT +AT_BANNER([Regression tests.]) + +AT_SETUP([apdu_dispatch]) +AT_KEYWORDS([apdu_dispatch]) +cat $abs_srcdir/apdu_dispatch/apdu_dispatch_test.ok > expout +AT_CHECK([$abs_top_builddir/tests/apdu_dispatch/apdu_dispatch_test], [], [expout], [ignore]) +AT_CLEANUP + -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/43185?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: Ie238662e7e6a10dd4283ede0c8d8d73bc375c247 Gerrit-Change-Number: 43185 Gerrit-PatchSet: 10 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu>

1 0

[S] Change in osmo-msc[master]: iu: Fix encoding of IPv6 RTP address in RAB Ass Req
by pespin 18 Aug '26

18 Aug '26

Attention is currently required from: fixeria, lynxis lazus, osmith, pespin. Hello Jenkins Builder, fixeria, lynxis lazus, osmith, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-msc/+/43259?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Code-Review+1 by osmith, Code-Review+2 by fixeria, Verified+1 by Jenkins Builder The change is no longer submittable: Code-Review and Verified are unsatisfied now. Change subject: iu: Fix encoding of IPv6 RTP address in RAB Ass Req ...................................................................... iu: Fix encoding of IPv6 RTP address in RAB Ass Req Use the newly added ranap_new_msg_rab_assign_voice2() API from osmo-iuh, which allows passing a struct osmo_sockaddr hence supporting IPv6. This way we get rid of the use of deprecated inet_addr() API. Also make sure to avoid crashing if the function fails (return NULL). Depends: osmo-iuh.git I3a8800afd03b94349c8acec778ab7003819e80af Change-Id: I23298235f4457bd556d2291d81c4aed3f009af0f --- M TODO-RELEASE M src/libmsc/ran_msg_iu.c 2 files changed, 16 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/59/43259/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/43259?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I23298235f4457bd556d2291d81c4aed3f009af0f Gerrit-Change-Number: 43259 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu>

1 0

[S] Change in osmo-sgsn[master]: ranap: Avoid write buffer overflow on GTPv1U outter IPv6 addr
by pespin 18 Aug '26

18 Aug '26

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/43260?usp=email ) Change subject: ranap: Avoid write buffer overflow on GTPv1U outter IPv6 addr ...................................................................... ranap: Avoid write buffer overflow on GTPv1U outter IPv6 addr If an IPv6 address was passed by libgtp in pdp->lib->gsnru, sgsn_pdp_ctx_iu_rab_activate() would write 16 bytes to an uint32_t variable, overflowing it and writing further on the stack. Fix it by simply using the new osmo-iuh API ranap_new_msg_rab_assign_data2() which expects an osmo_sockaddr instead of a uint32_t (which then supports IPv6 too). Using the new APIs to convert the GSNA to an osmo_sockaddr and passing it to osmo-iuh new API then we make sure there's no buffer overflow anymore. Depends: osmo-iuh.git I3a8800afd03b94349c8acec778ab7003819e80af Related: OS#7060 Reported-By: Adam Bedard <adam.bedard(a)gmail.com> Change-Id: I3beb8afcabad8d74b12a6aad845b455ed95761d4 --- M include/osmocom/sgsn/gprs_ranap.h M include/osmocom/sgsn/gtp.h M src/sgsn/gprs_ranap.c M src/sgsn/pdpctx.c 4 files changed, 29 insertions(+), 11 deletions(-) Approvals: fixeria: Looks good to me, approved osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/include/osmocom/sgsn/gprs_ranap.h b/include/osmocom/sgsn/gprs_ranap.h index b959b57..9185b39 100644 --- a/include/osmocom/sgsn/gprs_ranap.h +++ b/include/osmocom/sgsn/gprs_ranap.h @@ -3,6 +3,7 @@ #include "config.h" #include <osmocom/core/msgb.h> +#include <osmocom/core/socket.h> #ifdef BUILD_IU #include <osmocom/ranap/ranap_ies_defs.h> @@ -26,7 +27,9 @@ int sgsn_ranap_iu_tx(struct msgb *msg, uint8_t sapi); int sgsn_ranap_iu_tx_rab_ps_ass_req(struct ranap_ue_conn_ctx *ue_ctx, - uint8_t rab_id, uint32_t gtp_ip, uint32_t gtp_tei); + uint8_t rab_id, + const struct osmo_sockaddr *gtp_addr, + uint32_t gtp_tei); int sgsn_ranap_iu_tx_sec_mode_cmd(struct ranap_ue_conn_ctx *uectx, struct osmo_auth_vector *vec, int send_ck, int new_key); int sgsn_ranap_iu_tx_common_id(struct ranap_ue_conn_ctx *ue_ctx, const char *imsi); diff --git a/include/osmocom/sgsn/gtp.h b/include/osmocom/sgsn/gtp.h index 0f77a18..aba4f0a 100644 --- a/include/osmocom/sgsn/gtp.h +++ b/include/osmocom/sgsn/gtp.h @@ -3,9 +3,12 @@ #include <stddef.h> #include <stdint.h> +#include <osmocom/core/socket.h> #include <osmocom/gsm/tlv.h> #include <osmocom/gprs/gprs_bssgp_rim.h> +#include <osmocom/gtp/pdp.h> + struct gprs_ra_id; struct sgsn_instance; struct sgsn_ggsn_ctx; @@ -27,3 +30,8 @@ struct msgb *msg, uint32_t npdu_len, uint8_t *npdu); int sgsn_delete_pdp_ctx(struct sgsn_pdp_ctx *pctx); int send_act_pdp_cont_acc(struct sgsn_pdp_ctx *pctx); + +static inline int gsna_to_osa(struct osmo_sockaddr *dst, const struct ul16_t *in) +{ + return osmo_sockaddr_from_octets(dst, &in->v[0], in->l); +} diff --git a/src/sgsn/gprs_ranap.c b/src/sgsn/gprs_ranap.c index 1cdb72b..4445235 100644 --- a/src/sgsn/gprs_ranap.c +++ b/src/sgsn/gprs_ranap.c @@ -252,16 +252,19 @@ } int sgsn_ranap_iu_tx_rab_ps_ass_req(struct ranap_ue_conn_ctx *ue_ctx, - uint8_t rab_id, uint32_t gtp_ip, uint32_t gtp_tei) + uint8_t rab_id, + const struct osmo_sockaddr *gtp_addr, + uint32_t gtp_tei) { struct msgb *msg; bool use_x213_nsap = (ue_ctx->rab_assign_addr_enc == RANAP_NSAP_ADDR_ENC_X213); + char ip_str[INET6_ADDRSTRLEN]; LOGP(DRANAP, LOGL_DEBUG, - "Assigning RAB: rab_id=%u, ggsn_ip=%x, teid_gn=%x, use_x213_nsap=%d\n", - rab_id, gtp_ip, gtp_tei, use_x213_nsap); + "Assigning RAB: rab_id=%u, ggsn_ip=%s, teid_gn=%x, use_x213_nsap=%d\n", + rab_id, osmo_sockaddr_ntop(&gtp_addr->u.sa, ip_str), gtp_tei, use_x213_nsap); - msg = ranap_new_msg_rab_assign_data(rab_id, gtp_ip, gtp_tei, use_x213_nsap); + msg = ranap_new_msg_rab_assign_data2(rab_id, gtp_addr, gtp_tei, use_x213_nsap); return sgsn_scu_iups_tx_data_req(ue_ctx->rnc->scu_iups, ue_ctx->conn_id, msg); } diff --git a/src/sgsn/pdpctx.c b/src/sgsn/pdpctx.c index 1fbddab..da825e6 100644 --- a/src/sgsn/pdpctx.c +++ b/src/sgsn/pdpctx.c @@ -173,19 +173,23 @@ { struct sgsn_mm_ctx *mm = pdp->mm; struct ranap_ue_conn_ctx *ue_ctx; - uint32_t ggsn_ip; + struct osmo_sockaddr gtp_addr; + char ip_str[INET6_ADDRSTRLEN]; OSMO_ASSERT(mm->ran_type == MM_CTX_T_UTRAN_Iu); ue_ctx = mm->iu.ue_ctx; /* Get the IP address for ggsn user plane */ - memcpy(&ggsn_ip, pdp->lib->gsnru.v, pdp->lib->gsnru.l); - ggsn_ip = htonl(ggsn_ip); + if (gsna_to_osa(&gtp_addr, &pdp->lib->gsnru) < 0) { + LOGPDPCTXP(LOGL_INFO, pdp, "Activate RAB: rab_id=%u, teid_gn=%x: Invalid GTP1U address! len=%u\n", + rab_id, pdp->lib->teid_gn, pdp->lib->gsnru.l); + return -EINVAL; + } - LOGPDPCTXP(LOGL_INFO, pdp, "Activate RAB: rab_id=%u, ggsn_ip=%x, teid_gn=%x\n", - rab_id, ggsn_ip, pdp->lib->teid_gn); + LOGPDPCTXP(LOGL_INFO, pdp, "Activate RAB: rab_id=%u, ggsn_ip=%s, teid_gn=%x\n", + rab_id, osmo_sockaddr_ntop(&gtp_addr.u.sa, ip_str), pdp->lib->teid_gn); - return sgsn_ranap_iu_tx_rab_ps_ass_req(ue_ctx, rab_id, ggsn_ip, pdp->lib->teid_gn); + return sgsn_ranap_iu_tx_rab_ps_ass_req(ue_ctx, rab_id, &gtp_addr, pdp->lib->teid_gn); } int sgsn_pdp_ctx_iu_rab_deactivate(struct sgsn_pdp_ctx *pdp, uint8_t rab_id) -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/43260?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I3beb8afcabad8d74b12a6aad845b455ed95761d4 Gerrit-Change-Number: 43260 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in osmo-msc[master]: smpp: Fix potential write buffer overflow on sms->user_data
by pespin 18 Aug '26

18 Aug '26

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/43253?usp=email ) Change subject: smpp: Fix potential write buffer overflow on sms->user_data ...................................................................... smpp: Fix potential write buffer overflow on sms->user_data The writes to sms->user_data in submit_to_sms() were not being validated against the maximum size of the buffer, which could lead into writing past the buffer limits. In order to assure safe encdoing of septets into the buffer, the new libosmocore gsm_septet_pack2() is required. Related: OS#7059 Reported-By: Adam Bedard <adam.bedard(a)gmail.com> Depends: libosmocore.git Change-Id I4baa19007c65275ead3d1fc92462bfb8ab68e036 Change-Id: Iee701a3b033d78244fc10dd8563a094b8de385c0 --- M TODO-RELEASE M src/libsmpputil/smpp_msc.c 2 files changed, 25 insertions(+), 5 deletions(-) Approvals: osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/TODO-RELEASE b/TODO-RELEASE index c8858d8..84a2985 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -9,3 +9,4 @@ #library what description / commit summary line libosmovty >=1.12.1 working optional-multi-choice libosmocore >1.12.0 log_get_context(), log_{get,set}_filter(_data)() +libosmogsm >1.14.1 gsm_septet_pack2() diff --git a/src/libsmpputil/smpp_msc.c b/src/libsmpputil/smpp_msc.c index d68dcc0..5fdba36 100644 --- a/src/libsmpputil/smpp_msc.c +++ b/src/libsmpputil/smpp_msc.c @@ -132,6 +132,7 @@ struct tlv_t *t; int mode; int can_store_sms = ((submit->esm_class & SMPP34_MSG_MODE_MASK) != 2); /* != forward mode */ + int rc; dest = subscr_by_dst(net, submit->dest_addr_npi, submit->dest_addr_ton, @@ -247,21 +248,39 @@ ud_len = *sms_msg + 1; if (ud_len > sms_msg_len) { sms_free(sms); - LOGP(DLSMS, LOGL_ERROR, "invalid ud_len=%u > sms_msg_len=%u\n", ud_len, - sms_msg_len); + LOGP(DLSMS, LOGL_ERROR, "invalid ud_len=%u > sms_msg_len=%u\n", + ud_len, sms_msg_len); + return ESME_RINVPARLEN; + } + if (ud_len > sizeof(sms->user_data)) { + sms_free(sms); + LOGP(DLSMS, LOGL_ERROR, "invalid sms_msg_len=%u > %zu\n", + sms_msg_len, sizeof(sms->user_data)); return ESME_RINVPARLEN; } printf("copying %u bytes user data...\n", ud_len); - memcpy(sms->user_data, sms_msg, - OSMO_MIN(ud_len, sizeof(sms->user_data))); + memcpy(sms->user_data, sms_msg, ud_len); sms_msg += ud_len; sms_msg_len -= ud_len; padbits = 7 - (ud_len % 7); } - gsm_septet_pack(sms->user_data+ud_len, sms_msg, sms_msg_len, padbits); + rc = gsm_septet_pack2(sms->user_data + ud_len, sizeof(sms->user_data) - ud_len, + sms_msg, sms_msg_len, padbits); + if (rc < 0) { + sms_free(sms); + LOGP(DLSMS, LOGL_ERROR, "invalid ud_len=%u + sms_msg_len=%u > %zu\n", + ud_len, sms_msg_len, sizeof(sms->user_data)); + return ESME_RINVPARLEN; + } sms->user_data_len = (ud_len*8 + padbits)/7 + sms_msg_len;/* SEPTETS */ /* FIXME: sms->text */ } else { + if (sms_msg_len > sizeof(sms->user_data)) { + sms_free(sms); + LOGP(DLSMS, LOGL_ERROR, "invalid sms_msg_len=%u > %zu\n", + sms_msg_len, sizeof(sms->user_data)); + return ESME_RINVPARLEN; + } memcpy(sms->user_data, sms_msg, sms_msg_len); sms->user_data_len = sms_msg_len; } -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/43253?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Iee701a3b033d78244fc10dd8563a094b8de385c0 Gerrit-Change-Number: 43253 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[L] Change in osmo-ttcn3-hacks[master]: DIAMETER: Get Rid of DIAMETER_ConnHdlr_CT in several testsuites
by pespin 18 Aug '26

18 Aug '26

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43284?usp=email ) Change subject: DIAMETER: Get Rid of DIAMETER_ConnHdlr_CT in several testsuites ...................................................................... DIAMETER: Get Rid of DIAMETER_ConnHdlr_CT in several testsuites A man-in-the-middle component DIAMETER_ConnHdlr_CT was used so far for tests willing to use multiple DIAMETER_ConnHdlr connected to a single component served by multiple DIAMETER_Emulation. Remove the need for this component by modifying the DIAMETER_ConnHdlr component to have an array of ports. This way the same ConnHdlr can be registered on multiple DIAMETER_Emulation components directly. Change-Id: Id88b88d2f3472e1f4daa8344ca1fc6d408edfb62 --- M epdg/EPDG_Tests.ttcn M hss/HSS_Tests.ttcn M library/DIAMETER_Emulation.ttcn M pcrf/PCRF_Tests.ttcn M pgw/PGW_Tests.ttcn 5 files changed, 125 insertions(+), 276 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/84/43284/1 diff --git a/epdg/EPDG_Tests.ttcn b/epdg/EPDG_Tests.ttcn index e4aed42..0127988 100644 --- a/epdg/EPDG_Tests.ttcn +++ b/epdg/EPDG_Tests.ttcn @@ -68,6 +68,9 @@ integer mp_diam_watchdog_initial_wait_sec := 6*3; } +const integer DIA_SWx := 0; +const integer DIA_S6b := 1; + type port Coord_PT message { inout charstring; @@ -107,43 +110,8 @@ } } -type component DIAMETER_ConnHdlr_CT extends DIAMETER_ConnHdlr { - port DIAMETER_Conn_PT DIAMETER_CLIENT; - port DIAMETEREM_PROC_PT DIAMETER_PROC_CLIENT; -} - -function f_diam_connhldr_ct_main(hexstring imsi) runs on DIAMETER_ConnHdlr_CT { - var DIAMETER_ConnHdlr vc_conn_unused; - var PDU_DIAMETER msg; - var UINT32 ete_id; - - f_diameter_expect_imsi(imsi); - - while (true) { - alt { - [] DIAMETER_CLIENT.receive(PDU_DIAMETER:?) -> value msg { - DIAMETER.send(msg); - } - [] DIAMETER.receive(PDU_DIAMETER:?) -> value msg { - DIAMETER_CLIENT.send(msg); - } - [] DIAMETER_PROC_CLIENT.getcall(DIAMETEREM_register_eteid:{?,?}) -> param(ete_id, vc_conn_unused) { - DIAMETER_PROC.call(DIAMETEREM_register_eteid:{ete_id, self}) { - [] DIAMETER_PROC.getreply(DIAMETEREM_register_eteid:{?,?}) {}; - } - DIAMETER_PROC_CLIENT.reply(DIAMETEREM_register_eteid:{ete_id, vc_conn_unused}); - } - } - } -} - type component EPDG_ConnHdlr extends DIAMETER_ConnHdlr, GSUP_ConnHdlr, GTP2_ConnHdlr, GTP1U_ConnHdlr { var EPDG_ConnHdlrPars g_pars; - - port DIAMETER_Conn_PT SWx; - port DIAMETEREM_PROC_PT SWx_PROC; - port DIAMETER_Conn_PT S6b; - port DIAMETEREM_PROC_PT S6b_PROC; port Coord_PT COORD; }; type record of EPDG_ConnHdlr EPDG_ConnHdlrList; @@ -174,17 +142,6 @@ AuthVector vec optional }; -private function f_epdg_connhldr_SWx_expect_eteid(UINT32 ete_id) runs on EPDG_ConnHdlr { - SWx_PROC.call(DIAMETEREM_register_eteid:{ete_id, null}) { - [] SWx_PROC.getreply(DIAMETEREM_register_eteid:{?,?}) {}; - } -} -private function f_epdg_connhldr_S6b_expect_eteid(UINT32 ete_id) runs on EPDG_ConnHdlr { - S6b_PROC.call(DIAMETEREM_register_eteid:{ete_id, null}) { - [] S6b_PROC.getreply(DIAMETEREM_register_eteid:{?,?}) {}; - } -} - private function f_gen_addr_in_pool(integer idx := 0) return charstring { /* Skip first 2 addresses reserved for TUN */ @@ -346,6 +303,10 @@ private function f_init_handler(void_fn fn, charstring id, EPDG_ConnHdlrPars pars) runs on EPDG_ConnHdlr { g_pars := pars; + + f_diameter_expect_imsi(g_pars.imsi, idx := DIA_SWx); + f_diameter_expect_imsi(g_pars.imsi, idx := DIA_S6b); + /* tell GSUP dispatcher to send this IMSI to us */ f_create_gsup_expect(hex2str(g_pars.imsi)); @@ -359,7 +320,6 @@ runs on MTC_CT return EPDG_ConnHdlr { var EPDG_ConnHdlr vc_conn; var charstring id := testcasename(); - var DIAMETER_ConnHdlr_CT vc_conn_swx, vc_conn_s6b; vc_conn := EPDG_ConnHdlr.create(id); @@ -375,20 +335,12 @@ connect(vc_conn:GTP1U_PROC[0], vc_GTP1U:CLIENT_PROC); /* SWx */ - vc_conn_swx := DIAMETER_ConnHdlr_CT.create(id); - connect(vc_conn_swx:DIAMETER, vc_SWx:DIAMETER_CLIENT); - connect(vc_conn_swx:DIAMETER_PROC, vc_SWx:DIAMETER_PROC); - connect(vc_conn:SWx, vc_conn_swx:DIAMETER_CLIENT); - connect(vc_conn:SWx_PROC, vc_conn_swx:DIAMETER_PROC_CLIENT); - vc_conn_swx.start(f_diam_connhldr_ct_main(pars.imsi)); + connect(vc_conn:DIAMETER[DIA_SWx], vc_SWx:DIAMETER_CLIENT); + connect(vc_conn:DIAMETER_PROC[DIA_SWx], vc_SWx:DIAMETER_PROC); /* S6b */ - vc_conn_s6b := DIAMETER_ConnHdlr_CT.create(id); - connect(vc_conn_s6b:DIAMETER, vc_S6b:DIAMETER_CLIENT); - connect(vc_conn_s6b:DIAMETER_PROC, vc_S6b:DIAMETER_PROC); - connect(vc_conn:S6b, vc_conn_s6b:DIAMETER_CLIENT); - connect(vc_conn:S6b_PROC, vc_conn_s6b:DIAMETER_PROC_CLIENT); - vc_conn_s6b.start(f_diam_connhldr_ct_main(pars.imsi)); + connect(vc_conn:DIAMETER[DIA_S6b], vc_S6b:DIAMETER_CLIENT); + connect(vc_conn:DIAMETER_PROC[DIA_S6b], vc_S6b:DIAMETER_PROC); /* COORD */ connect(vc_conn:COORD, self:COORD); @@ -415,7 +367,7 @@ g_pars.vec.autn, g_pars.vec.auts); /* Send MAA to translator; expect it to show up on GSUP side */ - SWx.send(ts_DIA_SWx_MAA(g_pars.imsi, sip_auth_data_item, + DIAMETER[DIA_SWx].send(ts_DIA_SWx_MAA(g_pars.imsi, sip_auth_data_item, sess_id := sess_id, hbh_id := rx_mar.hop_by_hop_id, ete_id := rx_mar.end_to_end_id)); @@ -434,7 +386,7 @@ g_pars.vec.ck, g_pars.vec.autn, g_pars.vec.auts); - SWx.send(ts_DIA_SWx_MAA_result(g_pars.imsi, result, + DIAMETER[DIA_SWx].send(ts_DIA_SWx_MAA_result(g_pars.imsi, result, sess_id := sess_id, hbh_id := rx_mar.hop_by_hop_id, ete_id := rx_mar.end_to_end_id)); @@ -443,7 +395,7 @@ /* Diameter SWx MAR + MAA. */ private altstep as_DIA_SWx_MA_success(boolean exp_req_resync := false) runs on EPDG_ConnHdlr { var PDU_DIAMETER rx_dia; - [] SWx.receive(tr_DIA_SWx_MAR(g_pars.imsi)) -> value rx_dia { + [] DIAMETER[DIA_SWx].receive(tr_DIA_SWx_MAR(g_pars.imsi)) -> value rx_dia { if (exp_req_resync) { var octetstring rand_autn_concatenated := g_pars.vec.rand & g_pars.vec.auts; var AVP avp_grp; @@ -462,7 +414,7 @@ f_DIA_SWx_tx_MAA_success(rx_dia); setverdict(pass); } - [] SWx.receive(PDU_DIAMETER:?) -> value rx_dia { + [] DIAMETER[DIA_SWx].receive(PDU_DIAMETER:?) -> value rx_dia { Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str("Unexpected Diameter msg rx: ", rx_dia)); } } @@ -472,11 +424,11 @@ var PDU_DIAMETER rx_dia; var template (omit) AVP avp; var octetstring sess_id; - [] SWx.receive(tr_DIA_SWx_SAR(g_pars.imsi)) -> value rx_dia { + [] DIAMETER[DIA_SWx].receive(tr_DIA_SWx_SAR(g_pars.imsi)) -> value rx_dia { avp := f_DIAMETER_get_avp(rx_dia, c_AVP_Code_BASE_NONE_Session_Id); sess_id := valueof(avp.avp_data.avp_BASE_NONE_Session_Id); /* Send SAA to translator; expect it to show up on GSUP side */ - SWx.send(ts_DIA_SWx_SAA(g_pars.imsi, + DIAMETER[DIA_SWx].send(ts_DIA_SWx_SAA(g_pars.imsi, IPv4, g_pars.apn, sess_id := sess_id, @@ -484,7 +436,7 @@ ete_id := rx_dia.end_to_end_id)); setverdict(pass); } - [] SWx.receive(PDU_DIAMETER:?) -> value rx_dia { + [] DIAMETER[DIA_SWx].receive(PDU_DIAMETER:?) -> value rx_dia { Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str("Unexpected Diameter msg rx: ", rx_dia)); } } @@ -500,9 +452,9 @@ /* Unlike PPR, PPA contains no IMSI. Register ete_id in DIAMETER_Emulation, * so PPA is forwarded back to us in DIAMETER port instead of MTC_CT.DIAMETER_UNIT. */ - f_epdg_connhldr_SWx_expect_eteid(ete_id); + f_diameter_expect_eteid(ete_id, idx := DIA_SWx); - SWx.send(ts_DIA_SWx_PPR(g_pars.imsi, + DIAMETER[DIA_SWx].send(ts_DIA_SWx_PPR(g_pars.imsi, IPv4, g_pars.apn, hbh_id := hbh_id, @@ -527,8 +479,8 @@ } alt { - [] SWx.receive(tr_DIA_SWx_PPA(exp_result_tmpl, hbh_id := hbh_id, ete_id := ete_id)) -> value rx_dia {} - [] SWx.receive(PDU_DIAMETER:?) -> value rx_dia { + [] DIAMETER[DIA_SWx].receive(tr_DIA_SWx_PPA(exp_result_tmpl, hbh_id := hbh_id, ete_id := ete_id)) -> value rx_dia {} + [] DIAMETER[DIA_SWx].receive(PDU_DIAMETER:?) -> value rx_dia { Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str("Unexpected Diameter SWx msg rx: ", rx_dia)); } } @@ -547,9 +499,9 @@ /* Unlike STR, STA contains no IMSI. Register ete_id in DIAMETER_Emulation, * so AIA is forwarded back to us in DIAMETER port instead of MTC_CT.DIAMETER_UNIT. */ - f_epdg_connhldr_SWx_expect_eteid(ete_id); + f_diameter_expect_eteid(ete_id, idx := DIA_SWx); - SWx.send(ts_DIA_SWx_RTR(g_pars.imsi, reason_code, reason_info, + DIAMETER[DIA_SWx].send(ts_DIA_SWx_RTR(g_pars.imsi, reason_code, reason_info, hbh_id := hbh_id, ete_id := ete_id)); @@ -564,8 +516,8 @@ } alt { - [] SWx.receive(tr_DIA_SWx_RTA(exp_result_tmpl, hbh_id := hbh_id, ete_id := ete_id)) -> value rx_dia {} - [] SWx.receive(PDU_DIAMETER:?) -> value rx_dia { + [] DIAMETER[DIA_SWx].receive(tr_DIA_SWx_RTA(exp_result_tmpl, hbh_id := hbh_id, ete_id := ete_id)) -> value rx_dia {} + [] DIAMETER[DIA_SWx].receive(PDU_DIAMETER:?) -> value rx_dia { Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str("Unexpected Diameter SWx msg rx: ", rx_dia)); } } @@ -584,9 +536,9 @@ /* Unlike AAR, AAA contains no IMSI. Register ete_id in DIAMETER_Emulation, * so AIA is forwarded back to us in DIAMETER port instead of MTC_CT.DIAMETER_UNIT. */ - f_epdg_connhldr_S6b_expect_eteid(ete_id); + f_diameter_expect_eteid(ete_id, idx := DIA_S6b) - S6b.send(ts_DIA_S6b_AAR(f_nai(), + DIAMETER[DIA_S6b].send(ts_DIA_S6b_AAR(f_nai(), int2oct(DIA_TS29_373_MIP6_Feature_Vector_GTPv2_SUPPORTED, 8), g_pars.apn, pgw_addr, @@ -598,8 +550,8 @@ } alt { - [] S6b.receive(tr_DIA_S6b_AAA) -> value rx_dia {} - [] S6b.receive(PDU_DIAMETER:?) -> value rx_dia { + [] DIAMETER[DIA_S6b].receive(tr_DIA_S6b_AAA) -> value rx_dia {} + [] DIAMETER[DIA_S6b].receive(PDU_DIAMETER:?) -> value rx_dia { Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str("Unexpected Diameter S6b msg rx: ", rx_dia)); } } @@ -614,13 +566,13 @@ /* Unlike STR, STA contains no IMSI. Register ete_id in DIAMETER_Emulation, * so AIA is forwarded back to us in DIAMETER port instead of MTC_CT.DIAMETER_UNIT. */ - f_epdg_connhldr_S6b_expect_eteid(ete_id); + f_diameter_expect_eteid(ete_id, idx := DIA_S6b) - S6b.send(ts_DIA_S6b_STR(g_pars.imsi, DIAMETER_LOGOUT, + DIAMETER[DIA_S6b].send(ts_DIA_S6b_STR(g_pars.imsi, DIAMETER_LOGOUT, hbh_id := hbh_id, ete_id := ete_id)); alt { - [] S6b.receive(tr_DIA_S6b_STA(DIAMETER_SUCCESS)) -> value rx_dia {} - [] S6b.receive(PDU_DIAMETER:?) -> value rx_dia { + [] DIAMETER[DIA_S6b].receive(tr_DIA_S6b_STA(DIAMETER_SUCCESS)) -> value rx_dia {} + [] DIAMETER[DIA_S6b].receive(PDU_DIAMETER:?) -> value rx_dia { Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str("Unexpected Diameter S6b msg rx: ", rx_dia)); } } @@ -631,16 +583,16 @@ var PDU_DIAMETER rx_dia; var template (omit) AVP avp; var octetstring sess_id; - [] S6b.receive(tr_DIA_S6b_RAR(f_nai())) -> value rx_dia { + [] DIAMETER[DIA_S6b].receive(tr_DIA_S6b_RAR(f_nai())) -> value rx_dia { avp := f_DIAMETER_get_avp(rx_dia, c_AVP_Code_BASE_NONE_Session_Id); sess_id := valueof(avp.avp_data.avp_BASE_NONE_Session_Id); - S6b.send(ts_DIA_S6b_RAA(DIAMETER_SUCCESS, - sess_id := sess_id, - hbh_id := rx_dia.hop_by_hop_id, - ete_id := rx_dia.end_to_end_id)); + DIAMETER[DIA_S6b].send(ts_DIA_S6b_RAA(DIAMETER_SUCCESS, + sess_id := sess_id, + hbh_id := rx_dia.hop_by_hop_id, + ete_id := rx_dia.end_to_end_id)); setverdict(pass); } - [] S6b.receive(PDU_DIAMETER:?) -> value rx_dia { + [] DIAMETER[DIA_S6b].receive(PDU_DIAMETER:?) -> value rx_dia { Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str("Unexpected Diameter S6b msg rx: ", rx_dia)); } } @@ -650,16 +602,16 @@ var PDU_DIAMETER rx_dia; var template (omit) AVP avp; var octetstring sess_id; - [] S6b.receive(tr_DIA_S6b_ASR(f_nai())) -> value rx_dia { + [] DIAMETER[DIA_S6b].receive(tr_DIA_S6b_ASR(f_nai())) -> value rx_dia { avp := f_DIAMETER_get_avp(rx_dia, c_AVP_Code_BASE_NONE_Session_Id); sess_id := valueof(avp.avp_data.avp_BASE_NONE_Session_Id); - S6b.send(ts_DIA_S6b_ASA(DIAMETER_SUCCESS, - sess_id := sess_id, - hbh_id := rx_dia.hop_by_hop_id, - ete_id := rx_dia.end_to_end_id)); + DIAMETER[DIA_S6b].send(ts_DIA_S6b_ASA(DIAMETER_SUCCESS, + sess_id := sess_id, + hbh_id := rx_dia.hop_by_hop_id, + ete_id := rx_dia.end_to_end_id)); setverdict(pass); } - [] S6b.receive(PDU_DIAMETER:?) -> value rx_dia { + [] DIAMETER[DIA_S6b].receive(PDU_DIAMETER:?) -> value rx_dia { Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str("Unexpected Diameter S6b msg rx: ", rx_dia)); } } @@ -1096,7 +1048,7 @@ var DIAMETER_ExperimentalResultcode exp_result_code := DIAMETER_ERROR_USER_UNKNOWN; f_GSUP_tx_SAI_REQ(); - SWx.receive(tr_DIA_SWx_MAR(g_pars.imsi)) -> value rx_dia; + DIAMETER[DIA_SWx].receive(tr_DIA_SWx_MAR(g_pars.imsi)) -> value rx_dia; f_DIA_SWx_tx_MAA_error(rx_dia, ts_AVP_ExperimentalResult(vendor_id_3GPP, int2oct(enum2int(exp_result_code), 4))); diff --git a/hss/HSS_Tests.ttcn b/hss/HSS_Tests.ttcn index 1ebb673..7e55968 100644 --- a/hss/HSS_Tests.ttcn +++ b/hss/HSS_Tests.ttcn @@ -39,6 +39,8 @@ HSS_Impl mp_hss_impl := HSS_IMPL_OPEN5GS; } +const integer DIA_S6a := 0; + /* main component, we typically have one per testcase */ type component MTC_CT { @@ -58,48 +60,9 @@ } } -type component DIAMETER_ConnHdlr_CT extends DIAMETER_ConnHdlr { - port DIAMETER_Conn_PT DIAMETER_CLIENT; - port DIAMETEREM_PROC_PT DIAMETER_PROC_CLIENT; -} - -function f_diam_connhldr_ct_main(hexstring imsi) runs on DIAMETER_ConnHdlr_CT { - var DIAMETER_ConnHdlr vc_conn_unused; - var PDU_DIAMETER msg; - var UINT32 ete_id; - - f_diameter_expect_imsi(imsi); - - while (true) { - alt { - [] DIAMETER_CLIENT.receive(PDU_DIAMETER:?) -> value msg { - DIAMETER.send(msg); - } - [] DIAMETER.receive(PDU_DIAMETER:?) -> value msg { - DIAMETER_CLIENT.send(msg); - } - [] DIAMETER_PROC_CLIENT.getcall(DIAMETEREM_register_eteid:{?,?}) -> param(ete_id, vc_conn_unused) { - DIAMETER_PROC.call(DIAMETEREM_register_eteid:{ete_id, self}) { - [] DIAMETER_PROC.getreply(DIAMETEREM_register_eteid:{?,?}) {}; - } - DIAMETER_PROC_CLIENT.reply(DIAMETEREM_register_eteid:{ete_id, vc_conn_unused}); - } - } - } -} - /* per-session component; we typically have 1..N per testcase */ -type component Cli_Session_CT extends Prometheus_Checker_CT { +type component Cli_Session_CT extends DIAMETER_ConnHdlr, Prometheus_Checker_CT { var SessionPars g_pars; - - port DIAMETER_Conn_PT S6a; - port DIAMETEREM_PROC_PT S6a_PROC; - -} -function f_diam_connhldr_expect_eteid(UINT32 ete_id) runs on Cli_Session_CT { - S6a_PROC.call(DIAMETEREM_register_eteid:{ete_id, null}) { - [] S6a_PROC.getreply(DIAMETEREM_register_eteid:{?,?}) {}; - } } /* configuration data for a given Session */ @@ -167,7 +130,6 @@ function f_start_handler(void_fn fn, template (omit) SessionPars pars_tmpl := omit) runs on MTC_CT return Cli_Session_CT { var charstring id := testcasename(); - var DIAMETER_ConnHdlr_CT vc_conn_s6a; var Cli_Session_CT vc_conn; var SessionPars pars; @@ -179,12 +141,8 @@ vc_conn := Cli_Session_CT.create(id); - vc_conn_s6a := DIAMETER_ConnHdlr_CT.create(id); - connect(vc_conn_s6a:DIAMETER, vc_S6a:DIAMETER_CLIENT); - connect(vc_conn_s6a:DIAMETER_PROC, vc_S6a:DIAMETER_PROC); - connect(vc_conn:S6a, vc_conn_s6a:DIAMETER_CLIENT); - connect(vc_conn:S6a_PROC, vc_conn_s6a:DIAMETER_PROC_CLIENT); - vc_conn_s6a.start(f_diam_connhldr_ct_main(pars.imsi)); + connect(vc_conn:DIAMETER[DIA_S6a], vc_S6a:DIAMETER_CLIENT); + connect(vc_conn:DIAMETER_PROC[DIA_S6a], vc_S6a:DIAMETER_PROC); vc_conn.start(f_handler_init(fn, pars)); return vc_conn; @@ -193,6 +151,7 @@ private function f_handler_init(void_fn fn, SessionPars pars) runs on Cli_Session_CT { g_pars := valueof(pars); + f_diameter_expect_imsi(g_pars.imsi, idx := DIA_S6a); f_prometheus_init(mp_hss_prometheus_hostname, mp_hss_prometheus_port); fn.apply(); } @@ -207,20 +166,20 @@ /* Unlike ULR, ULA contains no IMSI. Register ete_id in DIAMETER_Emulation, * so AIA is forwarded back to us in DIAMETER port instead of MTC_CT.DIAMETER_UNIT. */ - f_diam_connhldr_expect_eteid(ete_id); + f_diameter_expect_eteid(ete_id, idx := DIA_S6a) /* TODO: change this into a ts_DIA_ULR */ - S6a.send(ts_DIA_ULR(g_pars.imsi, '111F11'O, sess_id, - mp_diam_orig_host, mp_diam_orig_realm, - mp_diam_dest_realm, hbh_id, ete_id)); + DIAMETER[DIA_S6a].send(ts_DIA_ULR(g_pars.imsi, '111F11'O, sess_id, + mp_diam_orig_host, mp_diam_orig_realm, + mp_diam_dest_realm, hbh_id, ete_id)); g_pars.s6a_next_hbh_id := g_pars.s6a_next_hbh_id + 1; g_pars.s6a_next_ete_id := g_pars.s6a_next_ete_id + 1; alt { - [] S6a.receive(tr_DIA_ULA(ula_sub_data, sess_id, ?, ?, hbh_id, ete_id)) -> value rx_dia { + [] DIAMETER[DIA_S6a].receive(tr_DIA_ULA(ula_sub_data, sess_id, ?, ?, hbh_id, ete_id)) -> value rx_dia { setverdict(pass); } - [] S6a.receive(PDU_DIAMETER:?) -> value rx_dia { + [] DIAMETER[DIA_S6a].receive(PDU_DIAMETER:?) -> value rx_dia { Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str("Received unexpected DIAMETER ", rx_dia)); } diff --git a/library/DIAMETER_Emulation.ttcn b/library/DIAMETER_Emulation.ttcn index e5698fd..6e79fd6 100644 --- a/library/DIAMETER_Emulation.ttcn +++ b/library/DIAMETER_Emulation.ttcn @@ -49,10 +49,11 @@ PDU_DIAMETER tx }; +const integer DIAMETER_ConnHdlr_MAX_PORTS := 3; type component DIAMETER_ConnHdlr { - port DIAMETER_Conn_PT DIAMETER; + port DIAMETER_Conn_PT DIAMETER[DIAMETER_ConnHdlr_MAX_PORTS]; /* procedure based port to register for incoming connections */ - port DIAMETEREM_PROC_PT DIAMETER_PROC; + port DIAMETEREM_PROC_PT DIAMETER_PROC[DIAMETER_ConnHdlr_MAX_PORTS]; } /* port between individual per-connection components and this dispatcher */ @@ -468,9 +469,9 @@ signature DIAMETEREM_register_eteid(in UINT32 ete_id, in DIAMETER_ConnHdlr hdlr); /* client/conn_hdlr side function to use procedure port to create expect in emulation */ -function f_diameter_expect_eteid(UINT32 ete_id) runs on DIAMETER_ConnHdlr { - DIAMETER_PROC.call(DIAMETEREM_register_eteid:{ete_id, self}) { - [] DIAMETER_PROC.getreply(DIAMETEREM_register_eteid:{?,?}) {}; +function f_diameter_expect_eteid(UINT32 ete_id, integer idx := 0) runs on DIAMETER_ConnHdlr { + DIAMETER_PROC[idx].call(DIAMETEREM_register_eteid:{ete_id, self}) { + [] DIAMETER_PROC[idx].getreply(DIAMETEREM_register_eteid:{?,?}) {}; } } @@ -529,9 +530,9 @@ } /* client/conn_hdlr side function to use procedure port to create expect in emulation */ -function f_diameter_expect_imsi(hexstring imsi) runs on DIAMETER_ConnHdlr { - DIAMETER_PROC.call(DIAMETEREM_register_imsi:{imsi, self}) { - [] DIAMETER_PROC.getreply(DIAMETEREM_register_imsi:{?,?}) {}; +function f_diameter_expect_imsi(hexstring imsi, integer idx := 0) runs on DIAMETER_ConnHdlr { + DIAMETER_PROC[idx].call(DIAMETEREM_register_imsi:{imsi, self}) { + [] DIAMETER_PROC[idx].getreply(DIAMETEREM_register_imsi:{?,?}) {}; } } diff --git a/pcrf/PCRF_Tests.ttcn b/pcrf/PCRF_Tests.ttcn index 7979d75..c62880d 100644 --- a/pcrf/PCRF_Tests.ttcn +++ b/pcrf/PCRF_Tests.ttcn @@ -34,6 +34,8 @@ }; } +const integer DIA_Gx := 0; + /* main component, we typically have one per testcase */ type component MTC_CT { @@ -53,48 +55,9 @@ } } -type component DIAMETER_ConnHdlr_CT extends DIAMETER_ConnHdlr { - port DIAMETER_Conn_PT DIAMETER_CLIENT; - port DIAMETEREM_PROC_PT DIAMETER_PROC_CLIENT; -} - -function f_diam_connhldr_ct_main(hexstring imsi) runs on DIAMETER_ConnHdlr_CT { - var DIAMETER_ConnHdlr vc_conn_unused; - var PDU_DIAMETER msg; - var UINT32 ete_id; - - f_diameter_expect_imsi(imsi); - - while (true) { - alt { - [] DIAMETER_CLIENT.receive(PDU_DIAMETER:?) -> value msg { - DIAMETER.send(msg); - } - [] DIAMETER.receive(PDU_DIAMETER:?) -> value msg { - DIAMETER_CLIENT.send(msg); - } - [] DIAMETER_PROC_CLIENT.getcall(DIAMETEREM_register_eteid:{?,?}) -> param(ete_id, vc_conn_unused) { - DIAMETER_PROC.call(DIAMETEREM_register_eteid:{ete_id, self}) { - [] DIAMETER_PROC.getreply(DIAMETEREM_register_eteid:{?,?}) {}; - } - DIAMETER_PROC_CLIENT.reply(DIAMETEREM_register_eteid:{ete_id, vc_conn_unused}); - } - } - } -} - /* per-session component; we typically have 1..N per testcase */ -type component Cli_Session_CT extends Prometheus_Checker_CT { +type component Cli_Session_CT extends DIAMETER_ConnHdlr, Prometheus_Checker_CT { var SessionPars g_pars; - - port DIAMETER_Conn_PT Gx; - port DIAMETEREM_PROC_PT Gx_PROC; - -} -function f_diam_connhldr_expect_eteid(UINT32 ete_id) runs on Cli_Session_CT { - Gx_PROC.call(DIAMETEREM_register_eteid:{ete_id, null}) { - [] Gx_PROC.getreply(DIAMETEREM_register_eteid:{?,?}) {}; - } } /* configuration data for a given Session */ @@ -162,7 +125,6 @@ function f_start_handler(void_fn fn, template (omit) SessionPars pars_tmpl := omit) runs on MTC_CT return Cli_Session_CT { var charstring id := testcasename(); - var DIAMETER_ConnHdlr_CT vc_conn_gx; var Cli_Session_CT vc_conn; var SessionPars pars; @@ -174,12 +136,8 @@ vc_conn := Cli_Session_CT.create(id); - vc_conn_gx := DIAMETER_ConnHdlr_CT.create(id); - connect(vc_conn_gx:DIAMETER, vc_Gx:DIAMETER_CLIENT); - connect(vc_conn_gx:DIAMETER_PROC, vc_Gx:DIAMETER_PROC); - connect(vc_conn:Gx, vc_conn_gx:DIAMETER_CLIENT); - connect(vc_conn:Gx_PROC, vc_conn_gx:DIAMETER_PROC_CLIENT); - vc_conn_gx.start(f_diam_connhldr_ct_main(pars.imsi)); + connect(vc_conn:DIAMETER[DIA_Gx], vc_Gx:DIAMETER_CLIENT); + connect(vc_conn:DIAMETER_PROC[DIA_Gx], vc_Gx:DIAMETER_PROC); vc_conn.start(f_handler_init(fn, pars)); return vc_conn; @@ -188,6 +146,7 @@ private function f_handler_init(void_fn fn, SessionPars pars) runs on Cli_Session_CT { g_pars := valueof(pars); + f_diameter_expect_imsi(g_pars.imsi, idx := DIA_Gx); f_prometheus_init(mp_pcrf_prometheus_hostname, mp_pcrf_prometheus_port); fn.apply(); } @@ -204,24 +163,24 @@ /* Unlike CCR, CCA contains no IMSI. Register ete_id in DIAMETER_Emulation, * so CCA is forwarded back to us in DIAMETER port instead of MTC_CT.DIAMETER_UNIT. */ - f_diam_connhldr_expect_eteid(ete_id); + f_diameter_expect_eteid(ete_id, idx := DIA_Gx); /* TODO: change this into a ts_DIA_ULR */ - Gx.send(ts_DIA_Gx_CCR(hbh_id, ete_id, - sess_id, - {ts_AVP_SubcrIdType(END_USER_IMSI), ts_AVP_SubcrIdData(imsi)}, - apn, - INITIAL_REQUEST, - req_num := '00000000'O - )); + DIAMETER[DIA_Gx].send(ts_DIA_Gx_CCR(hbh_id, ete_id, + sess_id, + {ts_AVP_SubcrIdType(END_USER_IMSI), ts_AVP_SubcrIdData(imsi)}, + apn, + INITIAL_REQUEST, + req_num := '00000000'O + )); g_pars.gx_next_hbh_id := g_pars.gx_next_hbh_id + 1; g_pars.gx_next_ete_id := g_pars.gx_next_ete_id + 1; alt { - [] Gx.receive(tr_DIA_Gx_CCA(sess_id)) -> value rx_dia { + [] DIAMETER[DIA_Gx].receive(tr_DIA_Gx_CCA(sess_id)) -> value rx_dia { setverdict(pass); } - [] Gx.receive(PDU_DIAMETER:?) -> value rx_dia { + [] DIAMETER[DIA_Gx].receive(PDU_DIAMETER:?) -> value rx_dia { Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str("Received unexpected DIAMETER ", rx_dia)); } diff --git a/pgw/PGW_Tests.ttcn b/pgw/PGW_Tests.ttcn index 85d5820..9dd759b 100644 --- a/pgw/PGW_Tests.ttcn +++ b/pgw/PGW_Tests.ttcn @@ -26,7 +26,6 @@ import from DIAMETER_ts32_299_Templates all; import from DIAMETER_Emulation all; - modulepar { charstring mp_pgw_hostname := "127.0.0.4"; charstring mp_local_hostname_c := "127.0.0.1"; @@ -49,6 +48,10 @@ charstring mp_diam_realm := "localdomain"; } +const integer DIA_Gx := 0; +const integer DIA_Gy := 1; +const integer DIA_S6b := 2; + /* main component, we typically have one per testcase */ type component PGW_Test_CT extends GTP2_ConnHdlr, GTP1U_ConnHdlr { var GTPv2_Emulation_CT vc_GTP2; @@ -80,38 +83,10 @@ } } -type component DIAMETER_ConnHdlr_CT extends DIAMETER_ConnHdlr { - port DIAMETER_Conn_PT DIAMETER_CLIENT; -} - -function f_diam_connhldr_ct_main(hexstring imsi) runs on DIAMETER_ConnHdlr_CT { - var PDU_DIAMETER msg; - - if (DIAMETER_PROC.checkstate("Connected")) { - f_diameter_expect_imsi(imsi); - } - - while (true) { - alt { - [] DIAMETER_CLIENT.receive(PDU_DIAMETER:?) -> value msg { - DIAMETER.send(msg); - } - [] DIAMETER.receive(PDU_DIAMETER:?) -> value msg { - DIAMETER_CLIENT.send(msg); - } - } - } -} - - /* per-session component; we typically have 1..N per testcase */ -type component PGW_Session_CT extends GTP2_ConnHdlr, GTP1U_ConnHdlr { +type component PGW_Session_CT extends GTP2_ConnHdlr, GTP1U_ConnHdlr, DIAMETER_ConnHdlr { var SessionPars g_pars; - port DIAMETER_Conn_PT Gx; - port DIAMETER_Conn_PT Gy; - port DIAMETER_Conn_PT S6b; - /* GTP-U IPv4 address remote sie */ var OCT4 g_gtpu4_remote; var OCT16 g_gtpu6_remote; @@ -332,7 +307,6 @@ function f_start_handler(void_fn fn, template (omit) SessionPars pars_tmpl := omit) runs on PGW_Test_CT return PGW_Session_CT { var charstring id := testcasename(); - var DIAMETER_ConnHdlr_CT vc_conn_gx, vc_conn_gy, vc_conn_s6b; var PGW_Session_CT vc_conn; var SessionPars pars; @@ -349,27 +323,18 @@ connect(vc_conn:GTP1U_PROC[0], vc_GTP1U:CLIENT_PROC); if (isbound(vc_Gx)) { - vc_conn_gx := DIAMETER_ConnHdlr_CT.create(id); - connect(vc_conn_gx:DIAMETER, vc_Gx:DIAMETER_CLIENT); - connect(vc_conn_gx:DIAMETER_PROC, vc_Gx:DIAMETER_PROC); - connect(vc_conn:Gx, vc_conn_gx:DIAMETER_CLIENT); - vc_conn_gx.start(f_diam_connhldr_ct_main(pars.imsi)); + connect(vc_conn:DIAMETER_PROC[DIA_Gx], vc_Gx:DIAMETER_PROC); + connect(vc_conn:DIAMETER[DIA_Gx], vc_Gx:DIAMETER_CLIENT); } if (isbound(vc_Gy)) { - vc_conn_gy := DIAMETER_ConnHdlr_CT.create(id); - connect(vc_conn_gy:DIAMETER, vc_Gy:DIAMETER_CLIENT); - connect(vc_conn_gy:DIAMETER_PROC, vc_Gy:DIAMETER_PROC); - connect(vc_conn:Gy, vc_conn_gy:DIAMETER_CLIENT); - vc_conn_gy.start(f_diam_connhldr_ct_main(pars.imsi)); + connect(vc_conn:DIAMETER_PROC[DIA_Gy], vc_Gy:DIAMETER_PROC); + connect(vc_conn:DIAMETER[DIA_Gy], vc_Gy:DIAMETER_CLIENT); } if (isbound(vc_S6b)) { - vc_conn_s6b := DIAMETER_ConnHdlr_CT.create(id); - connect(vc_conn_s6b:DIAMETER, vc_S6b:DIAMETER_CLIENT); - connect(vc_conn_s6b:DIAMETER_PROC, vc_S6b:DIAMETER_PROC); - connect(vc_conn:S6b, vc_conn_s6b:DIAMETER_CLIENT); - vc_conn_s6b.start(f_diam_connhldr_ct_main(pars.imsi)); + connect(vc_conn:DIAMETER_PROC[DIA_S6b], vc_S6b:DIAMETER_PROC); + connect(vc_conn:DIAMETER[DIA_S6b], vc_S6b:DIAMETER_CLIENT); } vc_conn.start(f_handler_init(fn, pars)); @@ -379,6 +344,19 @@ private function f_handler_init(void_fn fn, SessionPars pars) runs on PGW_Session_CT { g_pars := valueof(pars); + + if (DIAMETER_PROC[DIA_Gx].checkstate("Connected")) { + f_diameter_expect_imsi(g_pars.imsi, idx := DIA_Gx); + } + + if (DIAMETER_PROC[DIA_Gy].checkstate("Connected")) { + f_diameter_expect_imsi(g_pars.imsi, idx := DIA_Gy); + } + + if (DIAMETER_PROC[DIA_S6b].checkstate("Connected")) { + f_diameter_expect_imsi(g_pars.imsi, idx := DIA_S6b); + } + /* allocate + register TEI{C,D} on local side */ g_pars.teic_local := f_gtp2_allocate_teic(); g_pars.bearer.teid_local := f_gtp1u_allocate_teid(); @@ -404,19 +382,19 @@ /* S6b emulation (AAA-Server) */ private altstep as_DIA_S6b_AAR() runs on PGW_Session_CT { var PDU_DIAMETER rx_dia; - [] S6b.receive(tr_DIA_S6b_AAR()) -> value rx_dia { + [] DIAMETER[DIA_S6b].receive(tr_DIA_S6b_AAR()) -> value rx_dia { var template (omit) AVP avp; var octetstring sess_id; avp := f_DIAMETER_get_avp(rx_dia, c_AVP_Code_BASE_NONE_Session_Id); sess_id := valueof(avp.avp_data.avp_BASE_NONE_Session_Id); - S6b.send(ts_DIA_S6b_AAA(sess_id, "aaa." & mp_diam_realm, - mp_diam_realm, mp_diam_realm, - rx_dia.hop_by_hop_id, rx_dia.end_to_end_id)); + DIAMETER[DIA_S6b].send(ts_DIA_S6b_AAA(sess_id, "aaa." & mp_diam_realm, + mp_diam_realm, mp_diam_realm, + rx_dia.hop_by_hop_id, rx_dia.end_to_end_id)); setverdict(pass); } - [] S6b.receive(PDU_DIAMETER:?) -> value rx_dia { + [] DIAMETER[DIA_S6b].receive(PDU_DIAMETER:?) -> value rx_dia { Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str("Received unexpected DIAMETER ", rx_dia)); } @@ -425,7 +403,7 @@ /* Gx emulation (PCRF)*/ private altstep as_DIA_Gx_CCR(DCC_NONE_CC_Request_Type req_type) runs on PGW_Session_CT { var PDU_DIAMETER rx_dia; - [] Gx.receive(tr_DIA_Gx_CCR(req_type := req_type)) -> value rx_dia { + [] DIAMETER[DIA_Gx].receive(tr_DIA_Gx_CCR(req_type := req_type)) -> value rx_dia { var template (omit) AVP avp; var octetstring sess_id; var AVP_Unsigned32 req_num; @@ -436,10 +414,10 @@ avp := f_DIAMETER_get_avp(rx_dia, c_AVP_Code_DCC_NONE_CC_Request_Number); req_num := valueof(avp.avp_data.avp_DCC_NONE_CC_Request_Number); - Gx.send(ts_DIA_Gx_CCA(rx_dia.hop_by_hop_id, rx_dia.end_to_end_id, sess_id, - req_type, req_num)); + DIAMETER[DIA_Gx].send(ts_DIA_Gx_CCA(rx_dia.hop_by_hop_id, rx_dia.end_to_end_id, sess_id, + req_type, req_num)); } - [] Gx.receive(PDU_DIAMETER:?) -> value rx_dia { + [] DIAMETER[DIA_Gx].receive(PDU_DIAMETER:?) -> value rx_dia { Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str("Received unexpected DIAMETER ", rx_dia)); } @@ -643,12 +621,12 @@ private altstep as_DIA_Gy_CCR(DCC_NONE_CC_Request_Type req_type) runs on PGW_Session_CT { - [] Gy.receive(f_tr_DIA_Gy_CCR(req_type := req_type)) -> value g_rx_gy { + [] DIAMETER[DIA_Gy].receive(f_tr_DIA_Gy_CCR(req_type := req_type)) -> value g_rx_gy { var template (value) PDU_DIAMETER tx_dia; tx_dia := f_ts_DIA_Gy_CCA(g_rx_gy); - Gy.send(tx_dia); + DIAMETER[DIA_Gy].send(tx_dia); } - [] Gy.receive(PDU_DIAMETER:?) -> value g_rx_gy { + [] DIAMETER[DIA_Gy].receive(PDU_DIAMETER:?) -> value g_rx_gy { Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str("Received unexpected DIAMETER Gy", g_rx_gy)); } @@ -794,14 +772,14 @@ g2c.gtpcv2_pdu.createSessionRequest.servingNetwork := ts_GTP2C_ServingNetwork('001'H, '01F'H); GTP2.send(g2c); - if (do_s6b and S6b.checkstate("Connected")) { + if (do_s6b and DIAMETER[DIA_S6b].checkstate("Connected")) { as_DIA_S6b_AAR(); } - if (Gx.checkstate("Connected")) { + if (DIAMETER[DIA_Gx].checkstate("Connected")) { as_DIA_Gx_CCR(INITIAL_REQUEST); } /* FIXME: When on S2b interface, SMF is not using the Gy interface, unknown reason. */ - if (Gy.checkstate("Connected")) { + if (DIAMETER[DIA_Gy].checkstate("Connected")) { as_DIA_Gy_CCR(INITIAL_REQUEST); } alt { @@ -920,10 +898,10 @@ teid_list := {}, bearer_id := g_pars.bearer.ebi); GTP2.send(g2c); - if (Gx.checkstate("Connected") and expect_diameter) { + if (DIAMETER[DIA_Gx].checkstate("Connected") and expect_diameter) { as_DIA_Gx_CCR(TERMINATION_REQUEST); } - if (Gy.checkstate("Connected") and expect_diameter) { + if (DIAMETER[DIA_Gy].checkstate("Connected") and expect_diameter) { as_DIA_Gy_CCR(TERMINATION_REQUEST); } alt { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43284?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: Id88b88d2f3472e1f4daa8344ca1fc6d408edfb62 Gerrit-Change-Number: 43284 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[M] Change in osmo-ttcn3-hacks[master]: IPAd: Add test for function ES10b.ExecuteFallbackMechanism
by laforge 18 Aug '26

18 Aug '26

Attention is currently required from: jolly. laforge has posted comments on this change by jolly. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43269?usp=email ) Change subject: IPAd: Add test for function ES10b.ExecuteFallbackMechanism ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43269?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: I66745a24e227ac5c638f6dc5228f7f3fbe2deea1 Gerrit-Change-Number: 43269 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Comment-Date: Tue, 18 Aug 2026 15:06:41 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[S] Change in osmo-ttcn3-hacks[master]: IPA: Start (and stop) IPAd from test cases
by laforge 18 Aug '26

18 Aug '26

Attention is currently required from: jolly. laforge has posted comments on this change by jolly. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43268?usp=email ) Change subject: IPA: Start (and stop) IPAd from test cases ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43268?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: I178f8e8750bcd8e1ddbe9a16c615be4bb3e64c1c Gerrit-Change-Number: 43268 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Comment-Date: Tue, 18 Aug 2026 15:06:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[L] Change in osmo-ttcn3-hacks[master]: testenv: vendor the open5gs-dbctl script
by daniel 18 Aug '26

18 Aug '26

Attention is currently required from: fixeria, osmith. daniel has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43262?usp=email ) Change subject: testenv: vendor the open5gs-dbctl script ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43262?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: If30273899d7ee498c160b723f2425a033ae4d971 Gerrit-Change-Number: 43262 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 18 Aug 2026 15:05:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

2026

2025

2024

2023

2022

gerrit-log August 2026