January 2023 - gerrit-log - lists.osmocom.org

Change in mncc-python[master]: rtpsourcec: Fix compilation on Debian 11 / gcc-10.2.1

by pespin

Attention is currently required from: laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/mncc-python/+/30858 ) Change subject: rtpsourcec: Fix compilation on Debian 11 / gcc-10.2.1 ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/mncc-python/+/30858 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: mncc-python Gerrit-Branch: master Gerrit-Change-Id: I57d13faa8052b6f15890ce9c6c74efa927d2e2ab Gerrit-Change-Number: 30858 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Wed, 04 Jan 2023 14:55:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 5 months

1
0
0 0

Change in mncc-python[master]: MNCC data size check: allow trailing data

by pespin

Attention is currently required from: laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/mncc-python/+/30857 ) Change subject: MNCC data size check: allow trailing data ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/mncc-python/+/30857 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: mncc-python Gerrit-Branch: master Gerrit-Change-Id: Ic8c24e6988ae2d3c4278c4adccae46e248c893b8 Gerrit-Change-Number: 30857 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Wed, 04 Jan 2023 14:55:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 5 months

1
0
0 0

Change in libosmo-gprs[master]: tests/llc: Test gprs_llc_is_retransmit()

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/30813 ) Change subject: tests/llc: Test gprs_llc_is_retransmit() ...................................................................... tests/llc: Test gprs_llc_is_retransmit() Imported from osmo-sgsn.git 4398ac073b7fc8363882b5f7414470b73d4f446a ./tests/gprs/gprs_test.c. Change-Id: I4104ee9cc458b7d169ee9761e02369442058675a --- M tests/llc/Makefile.am A tests/llc/llc_test.c A tests/llc/llc_test.err A tests/llc/llc_test.ok M tests/testsuite.at 5 files changed, 122 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/tests/llc/Makefile.am b/tests/llc/Makefile.am index aa7e3e7..ee57c5f 100644 --- a/tests/llc/Makefile.am +++ b/tests/llc/Makefile.am @@ -10,12 +10,15 @@ $(NULL) check_PROGRAMS = \ + llc_test \ llc_prim_test \ pdu_codec_test \ xid_codec_test \ $(NULL) EXTRA_DIST = \ + llc_test.err \ + llc_test.ok \ llc_prim_test.err \ llc_prim_test.ok \ pdu_codec_test.ok \ @@ -24,6 +27,13 @@ xid_codec_test.err \ $(NULL) +llc_test_SOURCES = llc_test.c +llc_test_LDADD = \ + $(LIBOSMOCORE_LIBS) \ + $(LIBOSMOGSM_LIBS) \ + $(top_builddir)/src/llc/libosmo-gprs-llc.la \ + $(NULL) + llc_prim_test_SOURCES = llc_prim_test.c llc_prim_test_LDADD = \ $(LIBOSMOCORE_LIBS) \ diff --git a/tests/llc/llc_test.c b/tests/llc/llc_test.c new file mode 100644 index 0000000..f6d8f12 --- /dev/null +++ b/tests/llc/llc_test.c @@ -0,0 +1,90 @@ +/* LLC stack miscellaneous tests + * + * (C) 2011 Holger Hans Peter Freyther <holger(a)moiji-mobile.com> + * (C) 2022 by sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#include <stdint.h> +#include <stdio.h> + +#include <osmocom/core/application.h> +#include <osmocom/core/logging.h> +#include <osmocom/core/utils.h> +#include <osmocom/core/msgb.h> + +#include <osmocom/gprs/llc/llc.h> +#include <osmocom/gprs/llc/llc_private.h> + +static void *tall_ctx = NULL; + +#define ASSERT_FALSE(x) do if (x) { printf("Should have returned false.\n"); abort(); } while (0) +#define ASSERT_TRUE(x) do if (!x) { printf("Should have returned true.\n"); abort(); } while (0) + +/** + * GSM 04.64 8.4.2 Receipt of unacknowledged information + */ +static int nu_is_retransmission(uint16_t nu, uint16_t vur) +{ + int ret = gprs_llc_is_retransmit(nu, vur); + printf("N(U) = %d, V(UR) = %d => %s\n", nu, vur, + ret == 1 ? "retransmit" : "new"); + return ret; +} + +static void test_8_4_2(void) +{ + printf("Testing gprs_llc_is_retransmit.\n"); + + ASSERT_FALSE(nu_is_retransmission(0, 0)); + ASSERT_TRUE(nu_is_retransmission(0, 1)); + + /* expect 1... check for retransmissions */ + ASSERT_TRUE(nu_is_retransmission(0, 1)); + ASSERT_TRUE(nu_is_retransmission(511, 1)); + ASSERT_TRUE(nu_is_retransmission(483, 1)); + ASSERT_TRUE(nu_is_retransmission(482, 1)); + ASSERT_FALSE(nu_is_retransmission(481, 1)); + + /* expect 511... check for retransmissions */ + ASSERT_FALSE(nu_is_retransmission(0, 240)); // ahead + ASSERT_FALSE(nu_is_retransmission(0, 511)); // ahead + ASSERT_FALSE(nu_is_retransmission(1, 511)); // ahead + ASSERT_FALSE(nu_is_retransmission(511, 511)); // same + ASSERT_TRUE(nu_is_retransmission(510, 511)); // behind + ASSERT_TRUE(nu_is_retransmission(481, 511)); // behind + ASSERT_FALSE(nu_is_retransmission(479, 511)); // wrapped +} + +static const struct log_info_cat test_log_categories[] = { }; +static const struct log_info test_log_info = { + .cat = test_log_categories, + .num_cat = ARRAY_SIZE(test_log_categories), +}; + +int main(int argc, char *argv[]) +{ + tall_ctx = talloc_named_const(NULL, 1, __FILE__); + + osmo_init_logging2(tall_ctx, &test_log_info); + log_parse_category_mask(osmo_stderr_target, "DLGLOBAL,1:"); + + log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE); + log_set_print_category_hex(osmo_stderr_target, 0); + log_set_print_category(osmo_stderr_target, 1); + log_set_print_level(osmo_stderr_target, 1); + log_set_use_color(osmo_stderr_target, 0); + + test_8_4_2(); + + talloc_free(tall_ctx); +} diff --git a/tests/llc/llc_test.err b/tests/llc/llc_test.err new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/tests/llc/llc_test.err diff --git a/tests/llc/llc_test.ok b/tests/llc/llc_test.ok new file mode 100644 index 0000000..9f54523 --- /dev/null +++ b/tests/llc/llc_test.ok @@ -0,0 +1,15 @@ +Testing gprs_llc_is_retransmit. +N(U) = 0, V(UR) = 0 => new +N(U) = 0, V(UR) = 1 => retransmit +N(U) = 0, V(UR) = 1 => retransmit +N(U) = 511, V(UR) = 1 => retransmit +N(U) = 483, V(UR) = 1 => retransmit +N(U) = 482, V(UR) = 1 => retransmit +N(U) = 481, V(UR) = 1 => new +N(U) = 0, V(UR) = 240 => new +N(U) = 0, V(UR) = 511 => new +N(U) = 1, V(UR) = 511 => new +N(U) = 511, V(UR) = 511 => new +N(U) = 510, V(UR) = 511 => retransmit +N(U) = 481, V(UR) = 511 => retransmit +N(U) = 479, V(UR) = 511 => new diff --git a/tests/testsuite.at b/tests/testsuite.at index 5bbedf5..84cbb4e 100644 --- a/tests/testsuite.at +++ b/tests/testsuite.at @@ -1,6 +1,13 @@ AT_INIT AT_BANNER([Regression tests]) +AT_SETUP([llc/llc]) +AT_KEYWORDS([llc llc]) +cat $abs_srcdir/llc/llc_test.ok > expout +cat $abs_srcdir/llc/llc_test.err > experr +AT_CHECK([$abs_top_builddir/tests/llc/llc_test], [0], [expout], [experr]) +AT_CLEANUP + AT_SETUP([llc/llc_prim]) AT_KEYWORDS([llc llc_prim]) cat $abs_srcdir/llc/llc_prim_test.ok > expout -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/30813 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I4104ee9cc458b7d169ee9761e02369442058675a Gerrit-Change-Number: 30813 Gerrit-PatchSet: 4 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: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 5 months

1
0
0 0

Change in libosmo-gprs[master]: sndcp: Initial libosmo-gprs-sndcp support

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/30490 ) Change subject: sndcp: Initial libosmo-gprs-sndcp support ...................................................................... sndcp: Initial libosmo-gprs-sndcp support This commit follows a similar approach to Change-Id I588eb576b2703262f4ab9566ec362920d8390cfd, this time targeting the SNDCP layer, creating a new library for it. This new library depends on headers from libosmo-gprs-llc since the SNDCP spec takes the interface towards lower interfaces from same llc_prim. It doesn't really call any API from the libosmo-gprs-llc library to dispatch the primitive, that's left for the application, so that it can be reused against other implementations. Most of the SNDCP data structures and APIs are kept private and used only internally. The Higher/lower layers are expected to interact with it through the sndcp_prim API. This commit also implements some of the code paths of the public API by means on importing SNDCP code from osmo-sgsn.git commit 57b63875c762a784127a13becd1c2549ca6c5454. The import of code cannot be done in a separate commit since existing code in osmo-sgsn.git is low quality and has tons of layer violations in all directions. Hence, this commit aims at being an initial point of having some working SNDCP stack by means of a few unit tests, but by no means aims to be a total working implementation. Some code paths are missing; bugs are expected at this point. Change-Id: Ie05b5d721cf0a6147ed45c1feb75ad829865252b --- M .checkpatch.conf M Makefile.am M configure.ac M contrib/libosmo-gprs.spec.in M debian/control M include/osmocom/gprs/Makefile.am M include/osmocom/gprs/llc/llc_private.h A include/osmocom/gprs/sndcp/Makefile.am A include/osmocom/gprs/sndcp/comp.h A include/osmocom/gprs/sndcp/dcomp.h A include/osmocom/gprs/sndcp/pcomp.h A include/osmocom/gprs/sndcp/slhc.h A include/osmocom/gprs/sndcp/sndcp.h A include/osmocom/gprs/sndcp/sndcp_prim.h A include/osmocom/gprs/sndcp/sndcp_private.h A include/osmocom/gprs/sndcp/v42bis.h A include/osmocom/gprs/sndcp/v42bis_private.h A include/osmocom/gprs/sndcp/xid.h A libosmo-gprs-sndcp.pc.in M src/Makefile.am A src/sndcp/Makefile.am A src/sndcp/misc.c A src/sndcp/slhc.c A src/sndcp/sndcp.c A src/sndcp/sndcp_comp.c A src/sndcp/sndcp_dcomp.c A src/sndcp/sndcp_pcomp.c A src/sndcp/sndcp_prim.c A src/sndcp/sndcp_xid.c A src/sndcp/v42bis.c M tests/Makefile.am A tests/sndcp/Makefile.am A tests/sndcp/slhc_test.c A tests/sndcp/slhc_test.ok A tests/sndcp/sndcp_prim_test.c A tests/sndcp/sndcp_prim_test.err A tests/sndcp/sndcp_prim_test.ok A tests/sndcp/sndcp_xid_test.c A tests/sndcp/sndcp_xid_test.ok M tests/testsuite.at 40 files changed, 8,774 insertions(+), 9 deletions(-) Approvals: laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified 13 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/30490 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: Ie05b5d721cf0a6147ed45c1feb75ad829865252b Gerrit-Change-Number: 30490 Gerrit-PatchSet: 15 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> Gerrit-MessageType: merged

2 years, 5 months

1
0
0 0

Change in osmo-bsc[master]: bsc_subscriber: Allow creating subscribers identified by IMEI

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/30843 ) Change subject: bsc_subscriber: Allow creating subscribers identified by IMEI ...................................................................... bsc_subscriber: Allow creating subscribers identified by IMEI IMEI may be used as MobileIdentity during MO emergency call establishment if the MS has no valid IMSI assigned. Related: OS#5849 Change-Id: I586b1ee30cbb26ddf58788168d56c962e03ccd5c --- M include/osmocom/bsc/bsc_subscriber.h M src/osmo-bsc/bsc_subscriber.c 2 files changed, 55 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/include/osmocom/bsc/bsc_subscriber.h b/include/osmocom/bsc/bsc_subscriber.h index 30b33dc..2beb998 100644 --- a/include/osmocom/bsc/bsc_subscriber.h +++ b/include/osmocom/bsc/bsc_subscriber.h @@ -17,6 +17,7 @@ struct osmo_use_count use_count; char imsi[GSM23003_IMSI_MAX_DIGITS+1]; + char imei[GSM23003_IMEI_NUM_DIGITS_NO_CHK+1]; uint32_t tmsi; /* List head of (struct gsm_paging_request).bsub_entry */ @@ -30,6 +31,9 @@ struct bsc_subscr *bsc_subscr_find_or_create_by_imsi(struct llist_head *list, const char *imsi, const char *use_token); +struct bsc_subscr *bsc_subscr_find_or_create_by_imei(struct llist_head *list, + const char *imei, + const char *use_token); struct bsc_subscr *bsc_subscr_find_or_create_by_tmsi(struct llist_head *list, uint32_t tmsi, const char *use_token); @@ -39,6 +43,9 @@ struct bsc_subscr *bsc_subscr_find_by_imsi(struct llist_head *list, const char *imsi, const char *use_token); +struct bsc_subscr *bsc_subscr_find_by_imei(struct llist_head *list, + const char *imei, + const char *use_token); struct bsc_subscr *bsc_subscr_find_by_tmsi(struct llist_head *list, uint32_t tmsi, const char *use_token); @@ -46,6 +53,7 @@ const char *use_token); void bsc_subscr_set_imsi(struct bsc_subscr *bsub, const char *imsi); +void bsc_subscr_set_imei(struct bsc_subscr *bsub, const char *imei); #define bsc_subscr_get(bsc_subscr, use) \ OSMO_ASSERT(osmo_use_count_get_put(&(bsc_subscr)->use_count, use, 1) == 0) diff --git a/src/osmo-bsc/bsc_subscriber.c b/src/osmo-bsc/bsc_subscriber.c index 15dc14f..9f4e82b 100644 --- a/src/osmo-bsc/bsc_subscriber.c +++ b/src/osmo-bsc/bsc_subscriber.c @@ -103,6 +103,24 @@ return NULL; } +struct bsc_subscr *bsc_subscr_find_by_imei(struct llist_head *list, + const char *imei, + const char *use_token) +{ + struct bsc_subscr *bsub; + + if (!imei || !*imei) + return NULL; + + llist_for_each_entry(bsub, list, entry) { + if (!strcmp(bsub->imei, imei)) { + bsc_subscr_get(bsub, use_token); + return bsub; + } + } + return NULL; +} + struct bsc_subscr *bsc_subscr_find_by_tmsi(struct llist_head *list, uint32_t tmsi, const char *use_token) @@ -129,6 +147,8 @@ switch (mi->type) { case GSM_MI_TYPE_IMSI: return bsc_subscr_find_by_imsi(list, mi->imsi, use_token); + case GSM_MI_TYPE_IMEI: + return bsc_subscr_find_by_imei(list, mi->imei, use_token); case GSM_MI_TYPE_TMSI: return bsc_subscr_find_by_tmsi(list, mi->tmsi, use_token); default: @@ -143,6 +163,13 @@ osmo_strlcpy(bsub->imsi, imsi, sizeof(bsub->imsi)); } +void bsc_subscr_set_imei(struct bsc_subscr *bsub, const char *imei) +{ + if (!bsub) + return; + osmo_strlcpy(bsub->imei, imei, sizeof(bsub->imei)); +} + struct bsc_subscr *bsc_subscr_find_or_create_by_imsi(struct llist_head *list, const char *imsi, const char *use_token) @@ -159,6 +186,22 @@ return bsub; } +struct bsc_subscr *bsc_subscr_find_or_create_by_imei(struct llist_head *list, + const char *imei, + const char *use_token) +{ + struct bsc_subscr *bsub; + bsub = bsc_subscr_find_by_imei(list, imei, use_token); + if (bsub) + return bsub; + bsub = bsc_subscr_alloc(list); + if (!bsub) + return NULL; + bsc_subscr_set_imei(bsub, imei); + bsc_subscr_get(bsub, use_token); + return bsub; +} + struct bsc_subscr *bsc_subscr_find_or_create_by_tmsi(struct llist_head *list, uint32_t tmsi, const char *use_token) @@ -183,6 +226,8 @@ switch (mi->type) { case GSM_MI_TYPE_IMSI: return bsc_subscr_find_or_create_by_imsi(list, mi->imsi, use_token); + case GSM_MI_TYPE_IMEI: + return bsc_subscr_find_or_create_by_imei(list, mi->imei, use_token); case GSM_MI_TYPE_TMSI: return bsc_subscr_find_or_create_by_tmsi(list, mi->tmsi, use_token); default: @@ -200,6 +245,8 @@ } if (bsub->imsi[0]) OSMO_STRBUF_PRINTF(sb, "-IMSI-%s", bsub->imsi); + else if (bsub->imei[0]) + OSMO_STRBUF_PRINTF(sb, "-IMEI-%s", bsub->imei); if (bsub->tmsi != GSM_RESERVED_TMSI) OSMO_STRBUF_PRINTF(sb, "-TMSI-0x%08x", bsub->tmsi); return sb.chars_needed; -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/30843 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I586b1ee30cbb26ddf58788168d56c962e03ccd5c Gerrit-Change-Number: 30843 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: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 5 months

1
0
0 0

Change in osmo-bsc[master]: bsc_compl_l3(): Update documentation regarding no bsc_subscr in conn

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/30851 ) Change subject: bsc_compl_l3(): Update documentation regarding no bsc_subscr in conn ...................................................................... bsc_compl_l3(): Update documentation regarding no bsc_subscr in conn TTCN3 have been improved in osmo-ttcn3-hacks.git Change-Id I6e99ac39f32c9a981420b73f8d7d1568d2fa1c54 to use valid l3 data. Related: SYS#6280 Change-Id: I4918f1741d465abf8b06a9c65199a44b09778299 --- M src/osmo-bsc/gsm_08_08.c 1 file changed, 6 insertions(+), 5 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/osmo-bsc/gsm_08_08.c b/src/osmo-bsc/gsm_08_08.c index 3e0683c..a2bab4b 100644 --- a/src/osmo-bsc/gsm_08_08.c +++ b/src/osmo-bsc/gsm_08_08.c @@ -389,11 +389,10 @@ if (osmo_mobile_identity_decode_from_l3(&mi, msg, false)) { LOG_COMPL_L3(pdisc, mtype, LOGL_ERROR, "Cannot extract Mobile Identity: %s\n", msgb_hexdump_c(OTC_SELECT, msg)); - /* Likely this is an invalid Complete Layer 3 message that deserves to be rejected. However, the current - * state of our ttcn3 tests does send invalid Layer 3 Info in some tests and expects osmo-bsc to not - * care about that. So, changing the behavior to rejecting on missing MI causes test failure and, if at - * all, should happen in a separate patch. - * See e.g. BSC_Tests.TC_chan_rel_rll_rel_ind: "dt := * f_est_dchan('23'O, 23, '00010203040506'O);" + /* Likely this is an invalid Complete Layer 3 message that deserves to be rejected. However, the BSC is + * not expected to look at this layer so it's duty of the MSC to reject it. + * Hence, keep on going with the conn without an assigned bsc_subscr, forwarding the L3 to the MSC and + * letting it take decision on the matter. */ } else { bsub = bsc_subscr_find_or_create_by_mi(bsc_gsmnet->bsc_subscribers, &mi, __func__); @@ -440,6 +439,8 @@ paged_from_msc = NULL; paging_reasons = BSC_PAGING_NONE; if (pdisc == GSM48_PDISC_RR && mtype == GSM48_MT_RR_PAG_RESP) { + /* It only makes sense to attempt to find a pending paging request if the subscriber from the + * Paging Response can be identified (bsub != NULL). */ if (conn->bsub) paging_request_stop(&paged_from_msc, &paging_reasons, bts, conn->bsub); if (!paged_from_msc) { -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/30851 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I4918f1741d465abf8b06a9c65199a44b09778299 Gerrit-Change-Number: 30851 Gerrit-PatchSet: 1 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: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 5 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: bsc: Move BSSAP handling of emergency call to helper function

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30846 ) Change subject: bsc: Move BSSAP handling of emergency call to helper function ...................................................................... bsc: Move BSSAP handling of emergency call to helper function Change-Id: I3a88efeae6710ba005496067ecb0c8f4035404ab --- M bsc/BSC_Tests.ttcn 1 file changed, 14 insertions(+), 44 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 469d7b6..45c319d 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -9156,15 +9156,13 @@ RSL.send(emerg_setup_data_ind); } -/* Test if the EMERGENCY SETUP gets passed on to the MSC via A when EMERGENCY - * CALLS are permitted by the BSC config. */ -private function f_TC_assignment_emerg_setup_allow(charstring id) runs on MSC_ConnHdlr { +/* expect EmergencySetup on BSSAP after calling f_assignment_emerg_setup() */ +private function f_assignment_emerg_setup_exp_bssap() +runs on MSC_ConnHdlr { var PDU_BSSAP emerg_setup_data_ind_bssap; var PDU_ML3_MS_NW emerg_setup; timer T := 3.0; - f_assignment_emerg_setup() - T.start; alt { [] BSSAP.receive(tr_BSSAP_DTAP) -> value emerg_setup_data_ind_bssap { @@ -9180,6 +9178,14 @@ setverdict(fail, "timout waiting for EMERGENCY SETUP!"); } } +} + +/* Test if the EMERGENCY SETUP gets passed on to the MSC via A when EMERGENCY + * CALLS are permitted by the BSC config. */ +private function f_TC_assignment_emerg_setup_allow(charstring id) runs on MSC_ConnHdlr { + + f_assignment_emerg_setup(); + f_assignment_emerg_setup_exp_bssap(); setverdict(pass); f_perform_clear(); @@ -9191,7 +9197,7 @@ var PDU_BSSAP emerg_setup_data_ind_bssap; timer T := 3.0; - f_assignment_emerg_setup() + f_assignment_emerg_setup(); T.start; alt { @@ -10468,25 +10474,7 @@ * another lchan. */ g_pars.ra := f_rnd_ra_emerg(); f_assignment_emerg_setup(); - - var PDU_BSSAP emerg_setup_data_ind_bssap; - timer T := 3.0; - T.start; - alt { - [] BSSAP.receive(tr_BSSAP_DTAP) -> value emerg_setup_data_ind_bssap { - var PDU_ML3_MS_NW verify_emerg_setup; - verify_emerg_setup := dec_PDU_ML3_MS_NW(emerg_setup_data_ind_bssap.pdu.dtap); - if (not isbound(verify_emerg_setup.msgs.cc.emergencySetup)) { - setverdict(fail, "no emergency setup"); - } - } - [] BSSAP.receive { - setverdict(fail, "unexpected BSSAP message!"); - } - [] T.timeout { - setverdict(fail, "timeout waiting for EMERGENCY SETUP!"); - } - } + f_assignment_emerg_setup_exp_bssap(); /* Here would usually be a CC Call Proceeding from the MSC, but what does the BSC care about DTAP. */ @@ -10576,25 +10564,7 @@ { g_pars.ra := f_rnd_ra_emerg(); f_assignment_emerg_setup(); - - var PDU_BSSAP emerg_setup_data_ind_bssap; - timer T := 3.0; - T.start; - alt { - [] BSSAP.receive(tr_BSSAP_DTAP) -> value emerg_setup_data_ind_bssap { - var PDU_ML3_MS_NW verify_emerg_setup; - verify_emerg_setup := dec_PDU_ML3_MS_NW(emerg_setup_data_ind_bssap.pdu.dtap); - if (not ischosen(verify_emerg_setup.msgs.cc.emergencySetup)) { - setverdict(fail, "no emergency setup"); - } - } - [] BSSAP.receive { - setverdict(fail, "unexpected BSSAP message!"); - } - [] T.timeout { - setverdict(fail, "timeout waiting for EMERGENCY SETUP!"); - } - } + f_assignment_emerg_setup_exp_bssap(); /* Start a Location Request to locate the emergency */ f_bssap_le_register_imsi(g_pars.imsi, omit); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30846 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: I3a88efeae6710ba005496067ecb0c8f4035404ab Gerrit-Change-Number: 30846 Gerrit-PatchSet: 1 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: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 5 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: bsc: Introduce test TC_assignment_emerg_setup_allow_imei

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30841 ) Change subject: bsc: Introduce test TC_assignment_emerg_setup_allow_imei ...................................................................... bsc: Introduce test TC_assignment_emerg_setup_allow_imei Related: OS#5849 Change-Id: I5a95cb0cd6903801db8cfcc1542bd6147461eebe --- M bsc/BSC_Tests.ttcn M bsc/MSC_ConnectionHandler.ttcn M library/Osmocom_Types.ttcn 3 files changed, 44 insertions(+), 5 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index ea73f4a..c3743df 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -759,6 +759,7 @@ pars.mscpool.bssap_idx := bssap_idx; pars.expect_tsc := c_BtsParams[0].tsc; pars.imsi := f_rnd_imsi('00101'H); + pars.imei := f_rnd_imei('00101'H); log(testcasename(), ": using IMSI ", pars.imsi); @@ -9223,6 +9224,26 @@ f_shutdown_helper(); } +/* Test MO emergency call using MobileIdentity=IMEI (possible for emergency + * calls from phones without SIM card). + * 3GPP TS 24.008 section 10.5.1.4, OS#5849 */ +testcase TC_assignment_emerg_setup_allow_imei() runs on test_CT { + var TestHdlrParams pars := f_gen_test_hdlr_pars(); + var MSC_ConnHdlr vc_conn; + + /* Remove IMSI set by f_gen_test_hdlr_pars(), then IMEI will be used to place the call */ + pars.imsi := omit; + + f_init(1, true); + f_sleep(1.0); + + f_vty_allow_emerg_msc(true); + f_vty_allow_emerg_bts(true, 0); + vc_conn := f_start_handler(refers(f_TC_assignment_emerg_setup_allow), pars); + vc_conn.done; + f_shutdown_helper(); +} + /* EMERGENCY CALL situation #2, forbidden globally but allowed by BTS */ testcase TC_assignment_emerg_setup_deny_msc() runs on test_CT { var TestHdlrParams pars := f_gen_test_hdlr_pars(); @@ -12387,6 +12408,7 @@ /* Emergency call handling (deny / allow) */ execute( TC_assignment_emerg_setup_allow() ); + execute( TC_assignment_emerg_setup_allow_imei() ); execute( TC_assignment_emerg_setup_deny_msc() ); execute( TC_assignment_emerg_setup_deny_bts() ); execute( TC_emerg_premption() ); diff --git a/bsc/MSC_ConnectionHandler.ttcn b/bsc/MSC_ConnectionHandler.ttcn index dd044e0..13fe723 100644 --- a/bsc/MSC_ConnectionHandler.ttcn +++ b/bsc/MSC_ConnectionHandler.ttcn @@ -730,7 +730,8 @@ type record TestHdlrParams { OCT1 ra, GsmFrameNumber fn, - hexstring imsi, + hexstring imsi optional, + hexstring imei optional, RslLinkId link_id, integer media_nr, /* determins MGCP EP, port numbers */ BSSMAP_IE_SpeechCodecList ass_codec_list optional, @@ -764,7 +765,8 @@ template (value) TestHdlrParams t_def_TestHdlrPars := { ra := '23'O, fn := 23, - imsi := '001019876543210'H, + imsi := omit, /* set to random in f_gen_test_hdlr_pars() */ + imei := omit, /* set to random in f_gen_test_hdlr_pars() */ link_id := valueof(ts_RslLinkID_DCCH(0)), media_nr := 1, ass_codec_list := omit, @@ -804,12 +806,23 @@ function f_create_chan_and_exp(template (present) PDU_BSSAP exp_l3_compl := ?) runs on MSC_ConnHdlr { - var MobileIdentityLV mi := valueof(ts_MI_IMSI_LV(g_pars.imsi)); - var PDU_ML3_MS_NW l3_info := valueof(ts_CM_SERV_REQ(CM_TYPE_MO_CALL, mi)); - var octetstring l3_enc := enc_PDU_ML3_MS_NW(l3_info); + var MobileIdentityLV mi; + var PDU_ML3_MS_NW l3_info; + var octetstring l3_enc; var template uint3_t tsc := ?; timer T; + if (ispresent(g_pars.imsi)) { + mi := valueof(ts_MI_IMSI_LV(g_pars.imsi)); + } else if (ispresent(g_pars.imei)) { + mi := valueof(ts_MI_IMEI_LV(g_pars.imei)); + } else { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + "Either imsi or imei must be set!"); + } + l3_info := valueof(ts_CM_SERV_REQ(CM_TYPE_MO_CALL, mi)); + l3_enc := enc_PDU_ML3_MS_NW(l3_info); + if (not istemplatekind(g_pars.expect_tsc, "omit")) { tsc := g_pars.expect_tsc; } diff --git a/library/Osmocom_Types.ttcn b/library/Osmocom_Types.ttcn index 2edec36..dc4fd65 100644 --- a/library/Osmocom_Types.ttcn +++ b/library/Osmocom_Types.ttcn @@ -105,6 +105,10 @@ return prefix & f_rnd_hexstring(15 - lengthof(prefix), 10); } +function f_rnd_imei(in hexstring prefix) return hexstring { + return prefix & f_rnd_hexstring(14 - lengthof(prefix), 10); +} + function f_rnd_msisdn(in octetstring prefix, integer len := 6) return octetstring { return prefix & f_rnd_octstring(len - lengthof(prefix)); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30841 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: I5a95cb0cd6903801db8cfcc1542bd6147461eebe Gerrit-Change-Number: 30841 Gerrit-PatchSet: 1 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: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 5 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: cosmetic: bsc: Fix typos in comments

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30845 ) Change subject: cosmetic: bsc: Fix typos in comments ...................................................................... cosmetic: bsc: Fix typos in comments Change-Id: I87f351fe2ab69120a3af8d6674f2738ef2d57a3a --- M bsc/BSC_Tests.ttcn 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 909b71f..469d7b6 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -1695,7 +1695,7 @@ /* send assignment without AoIP IEs */ BSSAP.send(ts_BSSAP_DATA_req(dt.sccp_conn_id, ts_BSSMAP_AssignmentReq(ts_BSSMAP_IE_CIC(0, 1)))); } else { - /* Send assignmetn without CIC in IPA case */ + /* Send assignment without CIC in IPA case */ var BSSMAP_IE_AoIP_TransportLayerAddress tla := valueof(ts_BSSMAP_IE_AoIP_TLA4('01020304'O, 2342)); BSSAP.send(ts_BSSAP_DATA_req(dt.sccp_conn_id, ts_BSSMAP_AssignmentReq(omit, tla))); @@ -9141,7 +9141,7 @@ f_vty_transceive(BSCVTY, "exit"); } -/* Begin assignmet procedure and send an EMERGENCY SETUP (RR) */ +/* Begin assignment procedure and send an EMERGENCY SETUP (RR) */ private function f_assignment_emerg_setup() runs on MSC_ConnHdlr { var PDU_ML3_MS_NW emerg_setup; var octetstring emerg_setup_enc; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30845 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: I87f351fe2ab69120a3af8d6674f2738ef2d57a3a Gerrit-Change-Number: 30845 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 5 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: bsc: Use f_rnd_ra_emerg() instead of hardcoded value

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30844 ) Change subject: bsc: Use f_rnd_ra_emerg() instead of hardcoded value ...................................................................... bsc: Use f_rnd_ra_emerg() instead of hardcoded value Change-Id: Id10d71868dc8ef427e0353ee4b7e51d5bebc6255 --- M bsc/BSC_Tests.ttcn 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index c3743df..909b71f 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -10466,7 +10466,7 @@ /* Make sure the CHAN RQD indicates an emergency call (0b101xxxxx). The difference is that osmo-bsc directly * assigns a TCH lchan and establishing voice for the emergency call will use Mode Modify, not reassignment to * another lchan. */ - g_pars.ra := 'b7'O; + g_pars.ra := f_rnd_ra_emerg(); f_assignment_emerg_setup(); var PDU_BSSAP emerg_setup_data_ind_bssap; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30844 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: Id10d71868dc8ef427e0353ee4b7e51d5bebc6255 Gerrit-Change-Number: 30844 Gerrit-PatchSet: 1 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: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 5 months

1
0
0 0

2025

2024

2023

2022

gerrit-log January 2023