November 2024 - gerrit-log - lists.osmocom.org

[M] Change in osmo-bts[master]: csd_v110: handle TCH/F14.4

by falconia

Attention is currently required from: fixeria. falconia has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/osmo-bts/+/38751?usp=email ) Change subject: csd_v110: handle TCH/F14.4 ...................................................................... Patch Set 3: (2 comments) Commit Message: https://gerrit.osmocom.org/c/osmo-bts/+/38751/comment/745b4206_41594baa?usp… : PS3, Line 15: E-TRAU frames (spoken over the air) Nitpick: E-TRAU frames are not spoken over the air, they are spoken over E1 Abis. However, the block of 290 bits is exactly the same between E-TRAU and the air interface, which is why the same RAA' functions work here as well as trau2rtp and rtp2trau functions in libosmotrau, and can be unit-tested for exact match against a historical hardware TRAU. Perhaps reword like this: "which converts between between 290-bit blocks used on Um and Abis-E1 interfaces (E-TRAU frames on the latter) and A-TRAU frames spoken over the A interface." File src/common/csd_v110.c: https://gerrit.osmocom.org/c/osmo-bts/+/38751/comment/d1524b0c_ca1bd39f?usp… : PS3, Line 113: memset(&ra_bits[0], 0x01, sizeof(ra_bits)); This code won't have the desired effect: `ra_bits[]` is the output buffer for `osmo_csd144_to_atrau_bits()`, not the input. Thus the memset itself will have no effect whatsoever (the buffer will be fully overwritten two lines later), while the A-TRAU encoding function will read from `&data[0]` and `&data[2]`, i.e., from non-existing memory, aka an out-of-bound read - obviously bad. We'll need a separate on-stack temporary buffer to hold the needed 290 dummy bits - yes, I know, it's ugly. Alternatively, perhaps have a const array that hard-codes the fixed A-TRAU output from all-1s data and M bits, and C5=1 - whichever you feel more comfortable implementing. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/38751?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I3c3bef0bd2f72b8381597b5699e2060165b702a0 Gerrit-Change-Number: 38751 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: falconia <falcon(a)freecalypso.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 13 Nov 2024 20:21:20 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

7 months, 2 weeks

1
0
0 0

[XS] Change in osmo-ttcn3-hacks[master]: epdg: fix a DTE in as_GSUP_rx_CL_REQ

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38745?usp=email ) Change subject: epdg: fix a DTE in as_GSUP_rx_CL_REQ ...................................................................... epdg: fix a DTE in as_GSUP_rx_CL_REQ Recent commit 51490419 uncovered a problem of passing 'dom := *' to tr_GSUP_CL_REQ, which calls f_gen_tr_ies(), which in its turn does not properly handle the '*' template kind: ''' Dynamic test case error: Restriction `present' on template of type @GSUP_Types.GSUP_CnDomain violated. ''' The old code was basically equivalent of passing 'dom := ?', i.e. expecting the OSMO_GSUP_CN_DOMAIN_IE to be present. Work the problem around by having two alternatives: * GSUP.receive(tr_GSUP_CL_REQ(dom := omit) * GSUP.receive(tr_GSUP_CL_REQ(dom := ?) This patch makes TC_hss_initiated_deregister_permanent_termination pass. Change-Id: I26738c8c2a0a4b9066bfb619149cbdbaf3e3b5e1 Related: 51490419 ("library/gsup: improve GSUP_IE templates") --- M epdg/EPDG_Tests.ttcn 1 file changed, 4 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve osmith: Looks good to me, but someone else must approve diff --git a/epdg/EPDG_Tests.ttcn b/epdg/EPDG_Tests.ttcn index d9300a6..b551b67 100644 --- a/epdg/EPDG_Tests.ttcn +++ b/epdg/EPDG_Tests.ttcn @@ -943,8 +943,10 @@ private altstep as_GSUP_rx_CL_REQ(template GSUP_CancelType ctype := omit) runs on EPDG_ConnHdlr { var GSUP_PDU rx_gsup; - [] GSUP.receive(tr_GSUP_CL_REQ(g_pars.imsi, dom := *, ctype := ctype)) -> value rx_gsup { - } + /* XXX: workaround for 'dom := *' causing a DTE: + * "Dynamic test case error: Restriction `present' on template of type @GSUP_Types.GSUP_CnDomain violated." */ + [] GSUP.receive(tr_GSUP_CL_REQ(g_pars.imsi, dom := omit, ctype := ctype)) -> value rx_gsup; + [] GSUP.receive(tr_GSUP_CL_REQ(g_pars.imsi, dom := ?, ctype := ctype)) -> value rx_gsup; [] GSUP.receive(GSUP_PDU:?) -> value rx_gsup { Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str("Unexpected GSUP msg rx: ", rx_gsup)); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38745?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I26738c8c2a0a4b9066bfb619149cbdbaf3e3b5e1 Gerrit-Change-Number: 38745 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(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>

7 months, 2 weeks

1
0
0 0

[XS] Change in osmo-ttcn3-hacks[master]: epdg: fix a DTE in as_GSUP_rx_CL_REQ

by fixeria

Attention is currently required from: lynxis lazus. fixeria has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38745?usp=email ) Change subject: epdg: fix a DTE in as_GSUP_rx_CL_REQ ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38745?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: I26738c8c2a0a4b9066bfb619149cbdbaf3e3b5e1 Gerrit-Change-Number: 38745 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(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: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Wed, 13 Nov 2024 20:00:09 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

7 months, 2 weeks

1
0
0 0

[S] Change in osmo-bts[master]: csd_v110: use osmo_csd_ra2_* API from libosmotrau

by falconia

Attention is currently required from: fixeria. falconia has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/osmo-bts/+/38750?usp=email ) Change subject: csd_v110: use osmo_csd_ra2_* API from libosmotrau ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/38750?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I0be44b15a812397377fe7772b988724dd205737c Gerrit-Change-Number: 38750 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: falconia <falcon(a)freecalypso.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 13 Nov 2024 19:58:48 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

7 months, 2 weeks

1
0
0 0

[M] Change in osmo-bts[master]: csd_v110: handle TCH/F14.4

by fixeria

Attention is currently required from: falconia. fixeria has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/osmo-bts/+/38751?usp=email ) Change subject: csd_v110: handle TCH/F14.4 ...................................................................... Patch Set 3: (1 comment) This change is ready for review. File src/common/csd_v110.c: https://gerrit.osmocom.org/c/osmo-bts/+/38751/comment/419a2454_32cadc86?usp… : PS2, Line 102: return -EINVAL; /* FIXME: send an IDLE frame */ > To fix this FIXME, feed an idle frame (all 290 bits set to 1) to `osmo_csd144_to_atrau_bits`, and se […] Done, thanks! I took a chance to update the COMMIT_MSG. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/38751?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I3c3bef0bd2f72b8381597b5699e2060165b702a0 Gerrit-Change-Number: 38751 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: falconia <falcon(a)freecalypso.org> Gerrit-Attention: falconia <falcon(a)freecalypso.org> Gerrit-Comment-Date: Wed, 13 Nov 2024 19:33:03 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: falconia <falcon(a)freecalypso.org>

7 months, 2 weeks

1
0
0 0

[S] Change in osmo-bts[master]: csd_v110: use osmo_csd_ra2_* API from libosmotrau

by fixeria

Attention is currently required from: falconia, fixeria. Hello Jenkins Builder, falconia, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/38750?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Code-Review+1 by falconia Change subject: csd_v110: use osmo_csd_ra2_* API from libosmotrau ...................................................................... csd_v110: use osmo_csd_ra2_* API from libosmotrau Change-Id: I0be44b15a812397377fe7772b988724dd205737c Depends: libosmo-abis.git I7b98b958651b3fc1a814d119d1b8644c91f98676 Related: OS#6167 --- M TODO-RELEASE M src/common/csd_v110.c 2 files changed, 10 insertions(+), 25 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/50/38750/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/38750?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I0be44b15a812397377fe7772b988724dd205737c Gerrit-Change-Number: 38750 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: falconia <falcon(a)freecalypso.org> Gerrit-Attention: falconia <falcon(a)freecalypso.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>

7 months, 2 weeks

1
0
0 0

[S] Change in libosmocore[master]: gsm_utils: add gprs_tlli2tmsi()

by Jenkins Builder

Jenkins Builder has posted comments on this change by lynxis lazus. ( https://gerrit.osmocom.org/c/libosmocore/+/38764?usp=email ) Change subject: gsm_utils: add gprs_tlli2tmsi() ...................................................................... Patch Set 1: (12 comments) File src/gsm/gsm_utils.c: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-19890): https://gerrit.osmocom.org/c/libosmocore/+/38764/comment/b7229cba_0228cc07?… : PS1, Line 1029: uint32_t ptmsi = (1 << 31) | (1 << 30); please, no spaces at the start of a line Robot Comment from checkpatch (run ID jenkins-gerrit-lint-19890): https://gerrit.osmocom.org/c/libosmocore/+/38764/comment/9e658a45_82673990?… : PS1, Line 1031: switch (gprs_tlli_type(tlli)) { please, no spaces at the start of a line Robot Comment from checkpatch (run ID jenkins-gerrit-lint-19890): https://gerrit.osmocom.org/c/libosmocore/+/38764/comment/96eccdf9_ba0eb744?… : PS1, Line 1032: case TLLI_LOCAL: please, no spaces at the start of a line Robot Comment from checkpatch (run ID jenkins-gerrit-lint-19890): https://gerrit.osmocom.org/c/libosmocore/+/38764/comment/5843f7c8_b23cca48?… : PS1, Line 1033: case TLLI_FOREIGN: please, no spaces at the start of a line Robot Comment from checkpatch (run ID jenkins-gerrit-lint-19890): https://gerrit.osmocom.org/c/libosmocore/+/38764/comment/71e9e9bf_a9c38e8b?… : PS1, Line 1034: break; code indent should use tabs where possible Robot Comment from checkpatch (run ID jenkins-gerrit-lint-19890): https://gerrit.osmocom.org/c/libosmocore/+/38764/comment/717ca6a2_e7fe2bb8?… : PS1, Line 1034: break; please, no spaces at the start of a line Robot Comment from checkpatch (run ID jenkins-gerrit-lint-19890): https://gerrit.osmocom.org/c/libosmocore/+/38764/comment/fbaf20b1_c001f60f?… : PS1, Line 1036: return 0xffffffff; code indent should use tabs where possible Robot Comment from checkpatch (run ID jenkins-gerrit-lint-19890): https://gerrit.osmocom.org/c/libosmocore/+/38764/comment/32009601_1cd58a59?… : PS1, Line 1036: return 0xffffffff; please, no spaces at the start of a line Robot Comment from checkpatch (run ID jenkins-gerrit-lint-19890): https://gerrit.osmocom.org/c/libosmocore/+/38764/comment/6333cc3c_a1618fa1?… : PS1, Line 1037: } please, no spaces at the start of a line Robot Comment from checkpatch (run ID jenkins-gerrit-lint-19890): https://gerrit.osmocom.org/c/libosmocore/+/38764/comment/97cb0019_be73c6ff?… : PS1, Line 1039: ptmsi |= tlli; please, no spaces at the start of a line Robot Comment from checkpatch (run ID jenkins-gerrit-lint-19890): https://gerrit.osmocom.org/c/libosmocore/+/38764/comment/a05572ea_41ab60d7?… : PS1, Line 1040: return ptmsi; please, no spaces at the start of a line File tests/gprs/gprs_test.c: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-19890): https://gerrit.osmocom.org/c/libosmocore/+/38764/comment/ec3800c3_b577f92f?… : PS1, Line 113: static void test_ptmsi_tlli() Bad function definition - void test_ptmsi_tlli() should probably be void test_ptmsi_tlli(void) -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/38764?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I9d3464922c89383099a5f3cdd1458c0ecc28ee18 Gerrit-Change-Number: 38764 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Wed, 13 Nov 2024 19:17:37 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

7 months, 2 weeks

1
0
0 0

[S] Change in libosmocore[master]: gprs/gsm23003: add osmo_mme_id_cmp & osmo_gummei_cmp

by Jenkins Builder

Jenkins Builder has posted comments on this change by lynxis lazus. ( https://gerrit.osmocom.org/c/libosmocore/+/38763?usp=email ) Change subject: gprs/gsm23003: add osmo_mme_id_cmp & osmo_gummei_cmp ...................................................................... Patch Set 1: (18 comments) File src/gsm/gsm23003.c: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-19889): https://gerrit.osmocom.org/c/libosmocore/+/38763/comment/bdd630ec_da86cea8?… : PS1, Line 666: if (a->group_id < b->group_id) please, no spaces at the start of a line Robot Comment from checkpatch (run ID jenkins-gerrit-lint-19889): https://gerrit.osmocom.org/c/libosmocore/+/38763/comment/061155dc_565c3cd0?… : PS1, Line 667: return -1; code indent should use tabs where possible Robot Comment from checkpatch (run ID jenkins-gerrit-lint-19889): https://gerrit.osmocom.org/c/libosmocore/+/38763/comment/d59d47de_c76d1cf2?… : PS1, Line 667: return -1; please, no spaces at the start of a line Robot Comment from checkpatch (run ID jenkins-gerrit-lint-19889): https://gerrit.osmocom.org/c/libosmocore/+/38763/comment/1167502f_3330eed8?… : PS1, Line 668: if (a->group_id > b->group_id) please, no spaces at the start of a line Robot Comment from checkpatch (run ID jenkins-gerrit-lint-19889): https://gerrit.osmocom.org/c/libosmocore/+/38763/comment/88a1fc4c_fd49eec7?… : PS1, Line 669: return 1; code indent should use tabs where possible Robot Comment from checkpatch (run ID jenkins-gerrit-lint-19889): https://gerrit.osmocom.org/c/libosmocore/+/38763/comment/cc7d5ea8_f5f0720a?… : PS1, Line 669: return 1; please, no spaces at the start of a line Robot Comment from checkpatch (run ID jenkins-gerrit-lint-19889): https://gerrit.osmocom.org/c/libosmocore/+/38763/comment/e6aaeae8_c0bbcafa?… : PS1, Line 671: if (a->code < b->code) please, no spaces at the start of a line Robot Comment from checkpatch (run ID jenkins-gerrit-lint-19889): https://gerrit.osmocom.org/c/libosmocore/+/38763/comment/3c0501dc_4f1ba89d?… : PS1, Line 672: return -1; code indent should use tabs where possible Robot Comment from checkpatch (run ID jenkins-gerrit-lint-19889): https://gerrit.osmocom.org/c/libosmocore/+/38763/comment/f6de698a_71f739c6?… : PS1, Line 672: return -1; please, no spaces at the start of a line Robot Comment from checkpatch (run ID jenkins-gerrit-lint-19889): https://gerrit.osmocom.org/c/libosmocore/+/38763/comment/4f42c6b5_7eb17492?… : PS1, Line 673: if (a->code > b->code) please, no spaces at the start of a line Robot Comment from checkpatch (run ID jenkins-gerrit-lint-19889): https://gerrit.osmocom.org/c/libosmocore/+/38763/comment/9737fef9_b799442a?… : PS1, Line 674: return 1; code indent should use tabs where possible Robot Comment from checkpatch (run ID jenkins-gerrit-lint-19889): https://gerrit.osmocom.org/c/libosmocore/+/38763/comment/833453fb_58c879e8?… : PS1, Line 674: return 1; please, no spaces at the start of a line Robot Comment from checkpatch (run ID jenkins-gerrit-lint-19889): https://gerrit.osmocom.org/c/libosmocore/+/38763/comment/9beb52ea_9baeb7b4?… : PS1, Line 676: return 0; please, no spaces at the start of a line Robot Comment from checkpatch (run ID jenkins-gerrit-lint-19889): https://gerrit.osmocom.org/c/libosmocore/+/38763/comment/eb6119aa_d0f4a029?… : PS1, Line 686: int rc = osmo_plmn_cmp(&a->plmn, &b->plmn); please, no spaces at the start of a line Robot Comment from checkpatch (run ID jenkins-gerrit-lint-19889): https://gerrit.osmocom.org/c/libosmocore/+/38763/comment/84bca2ed_68e992ab?… : PS1, Line 687: if (rc) please, no spaces at the start of a line Robot Comment from checkpatch (run ID jenkins-gerrit-lint-19889): https://gerrit.osmocom.org/c/libosmocore/+/38763/comment/e738c1d5_f32f674f?… : PS1, Line 688: return rc; code indent should use tabs where possible Robot Comment from checkpatch (run ID jenkins-gerrit-lint-19889): https://gerrit.osmocom.org/c/libosmocore/+/38763/comment/21f25b35_b90a2f46?… : PS1, Line 688: return rc; please, no spaces at the start of a line Robot Comment from checkpatch (run ID jenkins-gerrit-lint-19889): https://gerrit.osmocom.org/c/libosmocore/+/38763/comment/58f2d6c2_fba3d532?… : PS1, Line 690: return osmo_mme_id_cmp(&a->mme, &b->mme); please, no spaces at the start of a line -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/38763?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I9a6769b1bff16450046181b31a8762ff49955ae4 Gerrit-Change-Number: 38763 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Wed, 13 Nov 2024 19:17:34 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

7 months, 2 weeks

1
0
0 0

[S] Change in libosmocore[master]: gprs/gsm23003: add osmo_mme_id_cmp & osmo_gummei_cmp

by lynxis lazus

lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/38763?usp=email ) Change subject: gprs/gsm23003: add osmo_mme_id_cmp & osmo_gummei_cmp ...................................................................... gprs/gsm23003: add osmo_mme_id_cmp & osmo_gummei_cmp In order to support mobility between GERAN and EUTRAN, the SGSN need to route a SGSN Context Request towards a MME identified by the GUMMEI. Change-Id: I9a6769b1bff16450046181b31a8762ff49955ae4 --- M include/osmocom/gsm/gsm23003.h M src/gsm/gsm23003.c M src/gsm/libosmogsm.map 3 files changed, 38 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/63/38763/1 diff --git a/include/osmocom/gsm/gsm23003.h b/include/osmocom/gsm/gsm23003.h index 4070581..8b9bcfb 100644 --- a/include/osmocom/gsm/gsm23003.h +++ b/include/osmocom/gsm/gsm23003.h @@ -167,6 +167,8 @@ int osmo_rai_cmp(const struct osmo_routing_area_id *a, const struct osmo_routing_area_id *b); int osmo_cgi_cmp(const struct osmo_cell_global_id *a, const struct osmo_cell_global_id *b); int osmo_cgi_ps_cmp(const struct osmo_cell_global_id_ps *a, const struct osmo_cell_global_id_ps *b); +int osmo_mme_id_cmp(const struct osmo_mme_id *a, const struct osmo_mme_id *b); +int osmo_gummei_cmp(const struct osmo_gummei *a, const struct osmo_gummei *b); int osmo_gen_home_network_domain(char *out, const struct osmo_plmn_id *plmn); int osmo_parse_home_network_domain(struct osmo_plmn_id *out, const char *in); diff --git a/src/gsm/gsm23003.c b/src/gsm/gsm23003.c index 1eed41f..ba1b883 100644 --- a/src/gsm/gsm23003.c +++ b/src/gsm/gsm23003.c @@ -656,6 +656,40 @@ return 0; } +/* Compare two MME Ids + * The order of comparison is MME GroupId, MME Code. + * \param a[in] "Left" side MME Id. + * \param b[in] "Right" side MME Id. + * \returns 0 if the MME Ids are equal, -1 if a < b, 1 if a > b. */ +int osmo_mme_id_cmp(const struct osmo_mme_id *a, const struct osmo_mme_id *b) +{ + if (a->group_id < b->group_id) + return -1; + if (a->group_id > b->group_id) + return 1; + + if (a->code < b->code) + return -1; + if (a->code > b->code) + return 1; + + return 0; +} + +/* Compare two GUMMEI + * The order of comparison is MCC, MNC, MME GroupId, MME Code. + * \param a[in] "Left" side GUMMEI. + * \param b[in] "Right" side GUMMEI. + * \returns 0 if the GUMMEI are equal, -1 if a < b, 1 if a > b. */ +int osmo_gummei_cmp(const struct osmo_gummei *a, const struct osmo_gummei *b) +{ + int rc = osmo_plmn_cmp(&a->plmn, &b->plmn); + if (rc) + return rc; + + return osmo_mme_id_cmp(&a->mme, &b->mme); +} + /*! Generate TS 23.003 Section 19.2 Home Network Realm/Domain (text form) * \param out[out] caller-provided output buffer, at least 33 bytes long * \param plmn[in] Osmocom representation of PLMN ID (MCC + MNC) diff --git a/src/gsm/libosmogsm.map b/src/gsm/libosmogsm.map index 3bc8309..8d17ce3 100644 --- a/src/gsm/libosmogsm.map +++ b/src/gsm/libosmogsm.map @@ -502,6 +502,8 @@ osmo_gummei_name; osmo_gummei_name_buf; osmo_gummei_name_c; +osmo_gummei_cmp; +osmo_mme_id_cmp; osmo_mnc_from_str; osmo_mnc_cmp; osmo_plmn_cmp; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/38763?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I9a6769b1bff16450046181b31a8762ff49955ae4 Gerrit-Change-Number: 38763 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu>

7 months, 2 weeks

1
0
0 0

[S] Change in libosmocore[master]: gsm_utils: add gprs_tlli2tmsi()

by lynxis lazus

lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/38764?usp=email ) Change subject: gsm_utils: add gprs_tlli2tmsi() ...................................................................... gsm_utils: add gprs_tlli2tmsi() A converter function which converts from a TLLI into a TMSI. Change-Id: I9d3464922c89383099a5f3cdd1458c0ecc28ee18 --- M include/osmocom/gsm/gsm_utils.h M src/gsm/gsm_utils.c M src/gsm/libosmogsm.map M tests/gprs/gprs_test.c 4 files changed, 34 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/64/38764/1 diff --git a/include/osmocom/gsm/gsm_utils.h b/include/osmocom/gsm/gsm_utils.h index b250c59..72bd131 100644 --- a/include/osmocom/gsm/gsm_utils.h +++ b/include/osmocom/gsm/gsm_utils.h @@ -211,6 +211,7 @@ int gprs_tlli_type(uint32_t tlli); uint32_t gprs_tmsi2tlli(uint32_t p_tmsi, enum gprs_tlli_type type); +uint32_t gprs_tlli2tmsi(uint32_t tlli); /* Osmocom internal, not part of any gsm spec */ enum gsm_phys_chan_config { diff --git a/src/gsm/gsm_utils.c b/src/gsm/gsm_utils.c index bb40339..a0df49c 100644 --- a/src/gsm/gsm_utils.c +++ b/src/gsm/gsm_utils.c @@ -1019,6 +1019,27 @@ return TLLI_RESERVED; } +/*! Determine P-TMSI from foreign and local TLLIs + * + * \param[in] tlli P-TMSI + * \param[in] type TLLI Type we want to derive from \a p_tmsi + * \returns P-TMSI or 0xffffffff on error. */ +uint32_t gprs_tlli2tmsi(uint32_t tlli) +{ + uint32_t ptmsi = (1 << 31) | (1 << 30); + + switch (gprs_tlli_type(tlli)) { + case TLLI_LOCAL: + case TLLI_FOREIGN: + break; + default: + return 0xffffffff; + } + + ptmsi |= tlli; + return ptmsi; +} + /*! Determine TLLI from P-TMSI * \param[in] p_tmsi P-TMSI * \param[in] type TLLI Type we want to derive from \a p_tmsi diff --git a/src/gsm/libosmogsm.map b/src/gsm/libosmogsm.map index 8d17ce3..7c78347 100644 --- a/src/gsm/libosmogsm.map +++ b/src/gsm/libosmogsm.map @@ -73,6 +73,7 @@ gprs_cipher_key_length; gprs_tlli_type; gprs_tmsi2tlli; +gprs_tlli2tmsi; gprs_ms_net_cap_gea_supported; gprs_msgt_gmm_names; diff --git a/tests/gprs/gprs_test.c b/tests/gprs/gprs_test.c index 70e3009..51fe599 100644 --- a/tests/gprs/gprs_test.c +++ b/tests/gprs/gprs_test.c @@ -110,6 +110,16 @@ } } +static void test_ptmsi_tlli() +{ + OSMO_ASSERT(gprs_tlli2tmsi(0xc0010203) == 0x00010203); + OSMO_ASSERT(gprs_tlli2tmsi(0x80010203) == 0x00010203); + OSMO_ASSERT(gprs_tlli2tmsi(0xf0010203) == 0xffffffff); + + OSMO_ASSERT(gprs_tmsi2tlli(0x00010203, TLLI_LOCAL) == 0xc0010203); + OSMO_ASSERT(gprs_tmsi2tlli(0x00010203, TLLI_FOREIGN) == 0x80010203); +} + const struct log_info_cat default_categories[] = { }; @@ -124,6 +134,7 @@ osmo_init_logging2(ctx, &info); test_gsm_03_03_apn(); + test_ptmsi_tlli(); printf("Done.\n"); return EXIT_SUCCESS; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/38764?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I9d3464922c89383099a5f3cdd1458c0ecc28ee18 Gerrit-Change-Number: 38764 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu>

7 months, 2 weeks

1
0
0 0

2025

2024

2023

2022

gerrit-log November 2024