- gerrit-log - lists.osmocom.org

Change in osmo-ttcn3-hacks[master]: bsc: improve encryption testing config TestHdlrEncrParams

by neels

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27234 ) Change subject: bsc: improve encryption testing config TestHdlrEncrParams ...................................................................... bsc: improve encryption testing config TestHdlrEncrParams Clean up: absorb pars.encr_exp_enc_alg into TestHdlrEncrParams as pars.encr.alg_expect. Add separate alg_chosen for BSSMAP: So far, we have only one algorithm field for both the mask of permitted algorithms in the Encryption Information IS and the Chosen Encryption Algorithm IE. However, in the Chosen Enc Alg there must be only one bit set. Thus we cannot easily run a test where more than one alg is permitted and where the BSSMAP Chosen Enc Alg IE is involved. We've recently come to realize that the Chosen Encryption Algorithm IE may also be omitted from BSSMAP messages, in which case osmo-bsc should still work. To be able to test BSSMAP messages with omitted Chosen Encryption Algorithm, allow to set alg_chosen == omit. Keep t_EncrParams() in a way that all current tests (that set only one bit in alg_permitted) still run the same as they always did. Add t_EncrParams2() for a proper template. Add a convenience function to configure encryption testing. Related: SYS#5839 Change-Id: I6590ecf4a146dbed494d9d72f5a79441877e9010 --- M bsc/BSC_Tests.ttcn M bsc/MSC_ConnectionHandler.ttcn 2 files changed, 93 insertions(+), 39 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/34/27234/1 diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index dadd5bf..69e187c 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -1673,10 +1673,12 @@ var template BSSMAP_IE_KC128 kc128 := omit; if (ispresent(enc)) { var TestHdlrEncrParams v_enc := valueof(enc); - encryptionInformation := valueof(ts_BSSMAP_IE_EncrInfo(v_enc.enc_key, v_enc.enc_alg)); - chosenEncryptionAlgorithm := valueof( - ts_BSSMAP_IE_ChosenEncryptionAlgorithm(int2oct(enum2int( - f_cipher_mode_bssmap_to_rsl(v_enc.enc_alg)), 1))); + encryptionInformation := valueof(ts_BSSMAP_IE_EncrInfo(v_enc.enc_key, v_enc.enc_alg_permitted)); + if (ispresent(v_enc.enc_alg_chosen)) { + chosenEncryptionAlgorithm := valueof( + ts_BSSMAP_IE_ChosenEncryptionAlgorithm(int2oct(enum2int( + f_cipher_mode_bssmap_to_rsl(v_enc.enc_alg_chosen)), 1))); + } if (ispresent(v_enc.enc_kc128)) { kc128 := ts_BSSMAP_IE_Kc128(v_enc.enc_kc128); } @@ -3781,8 +3783,7 @@ var MSC_ConnHdlr vc_conn; var TestHdlrParams pars := f_gen_test_hdlr_pars(); - pars.encr := valueof(t_EncrParams('05'O, f_rnd_octstring(8))); /* A5/0 and A5/2 (0x01|0x04)*/ - pars.encr_exp_enc_alg := '04'O; /* A5/2 */ + pars.encr := f_encr_params('05'O, '04'O); /* A5/0 and A5/2 (0x01|0x04)*/ f_init(1, true); f_vty_encryption_a5("0 1 2 3"); @@ -3797,8 +3798,7 @@ var MSC_ConnHdlr vc_conn; var TestHdlrParams pars := f_gen_test_hdlr_pars(); - pars.encr := valueof(t_EncrParams('06'O, f_rnd_octstring(8))); /* A5/1 and A5/2 (0x02|0x04)*/ - pars.encr_exp_enc_alg := '02'O; /* A5/1 */ + pars.encr := f_encr_params('06'O, '02'O); /* A5/1 and A5/2 (0x02|0x04)*/ f_init(1, true); f_vty_encryption_a5("1 2"); @@ -6108,27 +6108,27 @@ f_shutdown_helper(); } -function f_tc_ho_into_this_bsc_a5(OCT1 encr_alg) runs on test_CT { +function f_tc_ho_into_this_bsc_a5(TestHdlrEncrParams encr) runs on test_CT { var TestHdlrParams pars := f_gen_test_hdlr_pars(); - pars.encr := valueof(t_EncrParams(encr_alg, f_rnd_octstring(8), f_rnd_octstring(16))); + pars.encr := encr; f_tc_ho_into_this_bsc_main(pars); f_shutdown_helper(); } testcase TC_ho_into_this_bsc_a5_0() runs on test_CT { - f_tc_ho_into_this_bsc_a5('01'O); + f_tc_ho_into_this_bsc_a5(f_encr_params('01'O)); } testcase TC_ho_into_this_bsc_a5_1() runs on test_CT { - f_tc_ho_into_this_bsc_a5('02'O); + f_tc_ho_into_this_bsc_a5(f_encr_params('02'O)); } testcase TC_ho_into_this_bsc_a5_3() runs on test_CT { - f_tc_ho_into_this_bsc_a5('08'O); + f_tc_ho_into_this_bsc_a5(f_encr_params('08'O)); } testcase TC_ho_into_this_bsc_a5_4() runs on test_CT { - f_tc_ho_into_this_bsc_a5('10'O); + f_tc_ho_into_this_bsc_a5(f_encr_params('10'O)); } testcase TC_ho_into_this_bsc_tla_v6() runs on test_CT { diff --git a/bsc/MSC_ConnectionHandler.ttcn b/bsc/MSC_ConnectionHandler.ttcn index 109194b..c2b49c8 100644 --- a/bsc/MSC_ConnectionHandler.ttcn +++ b/bsc/MSC_ConnectionHandler.ttcn @@ -550,17 +550,85 @@ } type record TestHdlrEncrParams { - OCT1 enc_alg, + /* A mask of multiple encryption algorithms, for Encryption Information IE. */ + OCT1 enc_alg_permitted, + /* Expect this encryption algorithm in Channel Activation from the BSC. + * To expect no encryption, set to '01'O == A5/0. */ + OCT1 enc_alg_expect, + /* In BSSMAP, the Chosen Encryption Algorithm IE that the test sends to the BSC. + * When set to omit, the MSC will not send a Chosen Encryption Algorithm IE. */ + OCT1 enc_alg_chosen optional, octetstring enc_key, octetstring enc_kc128 optional }; -template (value) TestHdlrEncrParams t_EncrParams(OCT1 alg, octetstring key, template (omit) octetstring kc128 := omit) := { - enc_alg := alg, +template (value) TestHdlrEncrParams t_EncrParams(OCT1 alg_permitted, + octetstring key, template (omit) octetstring kc128 := omit) := { + enc_alg_permitted := alg_permitted, + enc_alg_expect := alg_permitted, /* <- for compat with tests before enc_alg_expect was added */ + enc_alg_chosen := alg_permitted, /* <- for compat with tests before enc_alg_chosen was added */ enc_key := key, enc_kc128 := kc128 } +template (value) TestHdlrEncrParams t_EncrParams2(OCT1 alg_permitted, + OCT1 alg_expect, + template(omit) OCT1 alg_chosen, + octetstring key, + template (omit) octetstring kc128 := omit) := { + enc_alg_permitted := alg_permitted, + enc_alg_expect := alg_expect, + enc_alg_chosen := alg_chosen, + enc_key := key, + enc_kc128 := kc128 +} + +/* Convenience for common t_EncrParams2 usage. + * + * To test a scenario where only A5/3 is permitted: + * f_encr_params('08'O); + * To test a scenario where A5/3 is chosen from A5/0,A5/1,A5/3 (1 | 2 | 8 = 11 = 0xb): + * f_encr_params('0b'O, '08'O); + * To test the same, but the Chosen Encryption Algorithm IE should reflect A5/1: + * f_encr_params('0b'O, '08'O, '02'O); + * To test the same, but the MSC sends no Chosen Encryption Algorithm IE: + * f_encr_params('0b'O, '08'O, omit); + * + * Set alg_chosen and alg_expect magically when == '00'O: + * - enc_alg_expect is set to alg_chosen if present, else to alg_permitted. + * - enc_alg_chosen is set to alg_permitted. + * When only alg_permitted is given, alg_permitted must reflect only one algorithm, or f_cipher_mode_bssmap_to_rsl() + * will fail. + * When alg_chosen is passed as omit, the messages from the MSC will not contain a Chosen Encryption Algorithm IE. + */ +function f_encr_params(OCT1 alg_permitted, OCT1 alg_expect := '00'O, template (omit) OCT1 alg_chosen := '00'O, + boolean kc128 := false) + return TestHdlrEncrParams +{ + if (not istemplatekind(alg_chosen, "omit")) { + if (valueof(alg_chosen) == '00'O) { + if (alg_expect != '00'O) { + alg_chosen := alg_expect; + } else { + /* In this case, alg_permitted should have only one permitted algo */ + alg_chosen := alg_permitted; + } + } + if (alg_expect == '00'O) { + alg_expect := valueof(alg_chosen); + } + } + if (alg_expect == '00'O) { + /* In this case, alg_permitted should have only one permitted algo */ + alg_expect := valueof(alg_permitted); + } + var template octetstring kc := omit; + if (kc128) { + kc := f_rnd_octstring(16); + } + return valueof(t_EncrParams2(alg_permitted, alg_expect, alg_chosen, f_rnd_octstring(8), kc)); +} + type record TestHdlrParamsLcls { GlobalCallReferenceValue gcr optional, /* LCLS Configuration */ @@ -588,7 +656,6 @@ RSL_IE_Body expect_mr_conf_ie optional, /* typically present for AMR codecs */ bitstring expect_mr_s0_s7 optional, /* typically present for AMR codecs */ TestHdlrEncrParams encr optional, - OCT1 encr_exp_enc_alg optional, /* if set, expect a different enc_alg than encr.enc_alg */ TestHdlrParamsLcls lcls, SCCP_PAR_Address sccp_addr_msc optional, SCCP_PAR_Address sccp_addr_bsc optional, @@ -618,7 +685,6 @@ expect_mr_conf_ie := omit, expect_mr_s0_s7 := omit, encr := omit, - encr_exp_enc_alg := omit, lcls := { gcr := omit, cfg := omit, @@ -740,24 +806,12 @@ else if (alg_bssmap == '80'O) { return RSL_ALG_ID_A5_7; } else { - Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Unexpected Encryption Algorithm"); + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Unexpected Encryption Algorithm: " & + oct2str(alg_bssmap)); return RSL_ALG_ID_A5_0; } } -function f_cipher_mode_bssmap_to_rsl_exp_enc_alg() runs on MSC_ConnHdlr return RSL_AlgId -{ - var OCT1 enc_alg; - - if (ispresent(g_pars.encr_exp_enc_alg)) { - enc_alg := g_pars.encr_exp_enc_alg; - } else { - enc_alg := g_pars.encr.enc_alg; - } - - return f_cipher_mode_bssmap_to_rsl(enc_alg); -} - function f_verify_encr_info(RSL_Message rsl) runs on MSC_ConnHdlr { var RSL_IE_Body encr_info; var RSL_AlgId alg_rsl; @@ -776,7 +830,7 @@ /* RSL uses a different representation of the encryption algorithm, * so we need to convert first */ - alg_rsl := f_cipher_mode_bssmap_to_rsl_exp_enc_alg(); + alg_rsl := f_cipher_mode_bssmap_to_rsl(g_pars.encr.enc_alg_expect); if (alg_rsl == RSL_ALG_ID_A5_4 and ispresent(g_pars.encr.enc_kc128)) { expect_kc := g_pars.encr.enc_kc128; @@ -820,9 +874,9 @@ var RSL_Message rsl; if (isvalue(enc.enc_kc128)) { - BSSAP.send(ts_BSSMAP_CipherModeCmdKc128(enc.enc_alg, enc.enc_key, valueof(enc.enc_kc128))); + BSSAP.send(ts_BSSMAP_CipherModeCmdKc128(enc.enc_alg_permitted, enc.enc_key, valueof(enc.enc_kc128))); } else { - BSSAP.send(ts_BSSMAP_CipherModeCmd(enc.enc_alg, enc.enc_key)); + BSSAP.send(ts_BSSMAP_CipherModeCmd(enc.enc_alg_permitted, enc.enc_key)); } alt { @@ -843,7 +897,7 @@ Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Unexpected Cipher Mode Complete"); } else { setverdict(pass); - var RSL_AlgId alg_rsl := f_cipher_mode_bssmap_to_rsl_exp_enc_alg(); + var RSL_AlgId alg_rsl := f_cipher_mode_bssmap_to_rsl(g_pars.encr.enc_alg_expect); if (oct2int(bssap.pdu.bssmap.cipherModeComplete.chosenEncryptionAlgorithm.algorithmIdentifier) != enum2int(alg_rsl)) { setverdict(fail, "Unexpected Encryption Algorithm ID in BSSMAP Cipher Mode Complete"); } @@ -941,11 +995,11 @@ var RSL_IE_Body ms_power_param; var RSL_IE_Body ms_power; - if (ispresent(g_pars.encr) and g_pars.encr.enc_alg != '01'O) { + if (ispresent(g_pars.encr) and g_pars.encr.enc_alg_permitted != '01'O) { if (not f_rsl_find_ie(chan_act, RSL_IE_ENCR_INFO, encr_info)) { Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Missing Encryption IE in CHAN ACT"); } else { - var RSL_AlgId alg := f_cipher_mode_bssmap_to_rsl_exp_enc_alg(); + var RSL_AlgId alg := f_cipher_mode_bssmap_to_rsl(g_pars.encr.enc_alg_expect); var octetstring expect_key; if (alg == RSL_ALG_ID_A5_4) { expect_key := g_pars.encr.enc_kc128; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27234 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: I6590ecf4a146dbed494d9d72f5a79441877e9010 Gerrit-Change-Number: 27234 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 4 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: bsc: add TC_ho_into_this_bsc_a5_1_3_no_chosen_enc_alg

by neels

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27233 ) Change subject: bsc: add TC_ho_into_this_bsc_a5_1_3_no_chosen_enc_alg ...................................................................... bsc: add TC_ho_into_this_bsc_a5_1_3_no_chosen_enc_alg Report: in inter-BSC incoming handover, when the MSC omits the Chosen Encryption Algorithm IE in the Handover Request message, then osmo-bsc starts an unencrypted lchan even if A5/0 is not permitted. This test verifies that the Encryption Information is present in the Channel Activation when the Chosen Enc Alg is omitted. Related: SYS#5839 Change-Id: Ia94cc29bf66339ed782cb5101f3640f69cf73131 --- M bsc/BSC_Tests.ttcn M bsc/MSC_ConnectionHandler.ttcn 2 files changed, 26 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/33/27233/1 diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index dadd5bf..43236b3 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -1674,9 +1674,11 @@ if (ispresent(enc)) { var TestHdlrEncrParams v_enc := valueof(enc); encryptionInformation := valueof(ts_BSSMAP_IE_EncrInfo(v_enc.enc_key, v_enc.enc_alg)); - chosenEncryptionAlgorithm := valueof( - ts_BSSMAP_IE_ChosenEncryptionAlgorithm(int2oct(enum2int( - f_cipher_mode_bssmap_to_rsl(v_enc.enc_alg)), 1))); + if (v_enc.msc_sends_chosen_encr_alg_ie) { + chosenEncryptionAlgorithm := valueof( + ts_BSSMAP_IE_ChosenEncryptionAlgorithm(int2oct(enum2int( + f_cipher_mode_bssmap_to_rsl(v_enc.enc_alg)), 1))); + } if (ispresent(v_enc.enc_kc128)) { kc128 := ts_BSSMAP_IE_Kc128(v_enc.enc_kc128); } @@ -6108,9 +6110,10 @@ f_shutdown_helper(); } -function f_tc_ho_into_this_bsc_a5(OCT1 encr_alg) runs on test_CT { +function f_tc_ho_into_this_bsc_a5(OCT1 encr_alg, boolean msc_sends_chosen_encr_alg_ie := true) runs on test_CT { var TestHdlrParams pars := f_gen_test_hdlr_pars(); - pars.encr := valueof(t_EncrParams(encr_alg, f_rnd_octstring(8), f_rnd_octstring(16))); + pars.encr := valueof(t_EncrParams(encr_alg, f_rnd_octstring(8), f_rnd_octstring(16), + msc_sends_chosen_encr_alg_ie)); f_tc_ho_into_this_bsc_main(pars); f_shutdown_helper(); } @@ -6131,6 +6134,18 @@ f_tc_ho_into_this_bsc_a5('10'O); } +/* Report: in inter-BSC incoming handover, when the MSC omits the Chosen Encryption Algorithm IE in the Handover Request + * message, then osmo-bsc starts an unencrypted lchan even if A5/0 is not permitted. + * + * This test verifies that the Encryption Information is present in the Channel Activation when the Chosen Enc Alg is + * omitted. + * + * Related: SYS#5839 + */ +testcase TC_ho_into_this_bsc_a5_1_3_no_chosen_enc_alg() runs on test_CT { + f_tc_ho_into_this_bsc_a5('0a'O, false); +} + testcase TC_ho_into_this_bsc_tla_v6() runs on test_CT { var TestHdlrParams pars := f_gen_test_hdlr_pars(); pars.host_aoip_tla := "::6"; diff --git a/bsc/MSC_ConnectionHandler.ttcn b/bsc/MSC_ConnectionHandler.ttcn index 109194b..df84d93 100644 --- a/bsc/MSC_ConnectionHandler.ttcn +++ b/bsc/MSC_ConnectionHandler.ttcn @@ -552,13 +552,16 @@ type record TestHdlrEncrParams { OCT1 enc_alg, octetstring enc_key, - octetstring enc_kc128 optional + octetstring enc_kc128 optional, + boolean msc_sends_chosen_encr_alg_ie }; -template (value) TestHdlrEncrParams t_EncrParams(OCT1 alg, octetstring key, template (omit) octetstring kc128 := omit) := { +template (value) TestHdlrEncrParams t_EncrParams(OCT1 alg, octetstring key, template (omit) octetstring kc128 := omit, + boolean msc_sends_chosen_encr_alg_ie := true) := { enc_alg := alg, enc_key := key, - enc_kc128 := kc128 + enc_kc128 := kc128, + msc_sends_chosen_encr_alg_ie := msc_sends_chosen_encr_alg_ie } type record TestHdlrParamsLcls { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27233 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: Ia94cc29bf66339ed782cb5101f3640f69cf73131 Gerrit-Change-Number: 27233 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 4 months

1
0
0 0

Change in docker-playground[master]: Remove debian-buster-erlang

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/27215 ) Change subject: Remove debian-buster-erlang ...................................................................... Remove debian-buster-erlang We don't need the image anymore, we use debian-bullseye-erlang. Change-Id: I6f22642f5f67a173b17db55aa7a7bda3d9debd54 --- D debian-buster-erlang/Dockerfile D debian-buster-erlang/Makefile 2 files changed, 0 insertions(+), 57 deletions(-) Approvals: laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/debian-buster-erlang/Dockerfile b/debian-buster-erlang/Dockerfile deleted file mode 100644 index 10b2c88..0000000 --- a/debian-buster-erlang/Dockerfile +++ /dev/null @@ -1,54 +0,0 @@ -ARG REGISTRY=docker.io -FROM ${REGISTRY}/debian:buster -# Arguments used after FROM must be specified again -ARG OSMOCOM_REPO_MIRROR="http://download.opensuse.org" -ARG OSMOCOM_REPO_PATH="repositories/network:/osmocom:" - -MAINTAINER Harald Welte <laforge(a)gnumonks.org> - -ARG OSMOCOM_REPO="${OSMOCOM_REPO_MIRROR}/${OSMOCOM_REPO_PATH}/latest/Debian_10/" - -# install the erlang vm and rebar (2) -RUN apt-get update && \ - apt-get upgrade -y && \ - apt-get -y install \ - erlang \ - rebar - -# add rebar3 -ADD https://s3.amazonaws.com/rebar3/rebar3 /usr/bin/rebar3 -RUN chmod 0755 /usr/bin/rebar3 - -# install ninimal build utilities as well as system utilities -RUN apt-get update && \ - apt-get -y install \ - build-essential \ - git \ - procps \ - tcpdump \ - vim \ - netcat-openbsd \ - wget \ - && \ - apt-get clean - -# install additional C-language / system dependencies of our Erlang projects -RUN apt-get update && \ - apt-get -y install \ - libpcap-dev \ - && \ - apt-get clean - -# add osmocom latest repo, should we ever require packages from there -RUN apt-get update && apt-get install -y \ - gnupg -COPY .common/Release.key /tmp/Release.key -RUN apt-key add /tmp/Release.key && \ - rm /tmp/Release.key && \ - echo "deb " $OSMOCOM_REPO " ./" > /etc/apt/sources.list.d/osmocom-latest.list -ADD $OSMOCOM_REPO/Release /tmp/Release - -# add a non-root user under which we will normaly execute build tests -RUN useradd -m build -WORKDIR /home/build -USER build diff --git a/debian-buster-erlang/Makefile b/debian-buster-erlang/Makefile deleted file mode 100644 index 67066b3..0000000 --- a/debian-buster-erlang/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -UPSTREAM_DISTRO=debian:buster -DISTRO=debian-buster -include ../make/Makefile -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27215 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I6f22642f5f67a173b17db55aa7a7bda3d9debd54 Gerrit-Change-Number: 27215 Gerrit-PatchSet: 3 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

3 years, 4 months

1
0
0 0

Change in osmo-ci[master]: Use docker image debian-bullseye-erlang instead of debian-buster-erlang

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/27216 ) Change subject: Use docker image debian-bullseye-erlang instead of debian-buster-erlang ...................................................................... Use docker image debian-bullseye-erlang instead of debian-buster-erlang Let's use newer debian to avoid problems with older erlang. Furthermore, the new image builds rebar3 to avoid issues with unmatching erlang versions. Change-Id: I7b1956c515daccf6ab1ff87031c6fec649cadb4b --- M jobs/gerrit-verifications.yml M scripts/osmo-ci-docker-rebuild.sh 2 files changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml index 84fe805..32c3e3b 100644 --- a/jobs/gerrit-verifications.yml +++ b/jobs/gerrit-verifications.yml @@ -41,7 +41,7 @@ -v "$PWD:/build" \ -v "$ARTIFACT_STORE:/artifact_store" \ docker_img: '$USER/debian-stretch-jenkins' - docker_img_erlang: '$USER/debian-buster-erlang' + docker_img_erlang: '$USER/debian-bullseye-erlang' timeout_cmd: '/usr/bin/timeout 30m' cmd: '{docker_run} {docker_img} {timeout_cmd} /build/contrib/jenkins.sh' gerrit_url: 'ssh://jenkins@gerrit.osmocom.org:29418' diff --git a/scripts/osmo-ci-docker-rebuild.sh b/scripts/osmo-ci-docker-rebuild.sh index 73b3508..cf0b102 100755 --- a/scripts/osmo-ci-docker-rebuild.sh +++ b/scripts/osmo-ci-docker-rebuild.sh @@ -5,7 +5,7 @@ docker_images_require \ "debian-stretch-jenkins" \ "debian-buster-jenkins" \ - "debian-buster-erlang" \ + "debian-bullseye-erlang" \ if [ "$(arch)" = "x86_64" ]; then docker_images_require \ -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/27216 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I7b1956c515daccf6ab1ff87031c6fec649cadb4b Gerrit-Change-Number: 27216 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

3 years, 4 months

1
0
0 0

Change in osmo-bsc[2021q4]: bts: Add explicit switch case for Cell Id SAI

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27232 ) Change subject: bts: Add explicit switch case for Cell Id SAI ...................................................................... bts: Add explicit switch case for Cell Id SAI This patch imposes no logical change in the code on itself, but makes sure people compiling osmo-bsc uses an old enough libosmocore implementing Cell Identifier SAI. This is important since adding the SAI ID (CELL_IDENT_SAI) displaced CELL_IDENT_WHOLE_GLOBAL_PS to a new number outside of the 3GPP range for cell IDS (4 bits, this way we garantee we won't have the same problem again). This means there was an ABI breakage (see Depends below). As a result, using an osmo-bsc compiled against an older libosmocore , and then using at runtime against a newer version of libosmocore, will most probably provoke some RIM features to not work properly, since libosmocore will handle CGI-PS cell ids sent by osmo-bsc as SAI ones, and most probably do wrong comparisons when matching (they only match up to LAI included). ABI break analysis: osmo-bsc uses CELL_IDENT_WHOLE_GLOBAL_PS in: * gsm0808_dec_cell_id_list2() -> this is called on stuff received from the network, so it's actually fine handling it correctly as CELL_IDENT_UTRAN_SAI instead of CGI_PS. * gsm0808_cell_id_list_add same_cell_id_list_entries gsm0808_enc_cell_id_list2 cell_id_to_cgi-> On old osmo-bsc, When CELL_IDENT_WHOLE_GLOBAL_PS is passed to be encoded as CGI, RAC byte is taken for encoding instead of 2nd CI byte. * gsm0808_cell_ids_match gsm0808_cell_id_u_match cell_id_to_cgi -> If CELL_IDENT_WHOLE_GLOBAL_PS as 0x11 (CELL_IDENT_UTRAN_SAI), 1 byte offset when comparing (1 byte of RAC is taken converting to CGI instead of the 2nd byte of CI). That means match would be wrong if 2nd byte of CI differs. Related: SYS#5838 Depends: libosmocore.git Change-Id Id25e563febdb7640174540136225f399515a0089 Change-Id: I70972efffefd57fd36332fab539683696c32f4a5 --- M TODO-RELEASE M src/osmo-bsc/bts.c 2 files changed, 2 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/TODO-RELEASE b/TODO-RELEASE index d0852fc..e0c43d9 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 +libosmogsm >1.6.0 required due to CELL_IDENT_WHOLE_GLOBAL_PS/SAI ABI breakage diff --git a/src/osmo-bsc/bts.c b/src/osmo-bsc/bts.c index 1461585..c3e87b3 100644 --- a/src/osmo-bsc/bts.c +++ b/src/osmo-bsc/bts.c @@ -524,6 +524,7 @@ case CELL_IDENT_UTRAN_PLMN_LAC_RNC: case CELL_IDENT_UTRAN_RNC: case CELL_IDENT_UTRAN_LAC_RNC: + case CELL_IDENT_SAI: return false; default: OSMO_ASSERT(false); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27232 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: 2021q4 Gerrit-Change-Id: I70972efffefd57fd36332fab539683696c32f4a5 Gerrit-Change-Number: 27232 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 4 months

1
0
0 0

Change in osmo-bsc[2021q4]: bts: Add explicit switch case for Cell Id SAI

by pespin

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27232 ) Change subject: bts: Add explicit switch case for Cell Id SAI ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: backport from master to 2021q4 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27232 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: 2021q4 Gerrit-Change-Id: I70972efffefd57fd36332fab539683696c32f4a5 Gerrit-Change-Number: 27232 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 16 Feb 2022 18:16:38 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

3 years, 4 months

1
0
0 0

Change in osmo-bsc[2021q4]: bts: Add explicit switch case for Cell Id SAI

by pespin

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27232 ) Change subject: bts: Add explicit switch case for Cell Id SAI ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27232 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: 2021q4 Gerrit-Change-Id: I70972efffefd57fd36332fab539683696c32f4a5 Gerrit-Change-Number: 27232 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 16 Feb 2022 18:16:11 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 4 months

1
0
0 0

Change in osmo-bsc[2021q4]: bts: Add explicit switch case for Cell Id SAI

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27232 ) Change subject: bts: Add explicit switch case for Cell Id SAI ...................................................................... bts: Add explicit switch case for Cell Id SAI This patch imposes no logical change in the code on itself, but makes sure people compiling osmo-bsc uses an old enough libosmocore implementing Cell Identifier SAI. This is important since adding the SAI ID (CELL_IDENT_SAI) displaced CELL_IDENT_WHOLE_GLOBAL_PS to a new number outside of the 3GPP range for cell IDS (4 bits, this way we garantee we won't have the same problem again). This means there was an ABI breakage (see Depends below). As a result, using an osmo-bsc compiled against an older libosmocore , and then using at runtime against a newer version of libosmocore, will most probably provoke some RIM features to not work properly, since libosmocore will handle CGI-PS cell ids sent by osmo-bsc as SAI ones, and most probably do wrong comparisons when matching (they only match up to LAI included). ABI break analysis: osmo-bsc uses CELL_IDENT_WHOLE_GLOBAL_PS in: * gsm0808_dec_cell_id_list2() -> this is called on stuff received from the network, so it's actually fine handling it correctly as CELL_IDENT_UTRAN_SAI instead of CGI_PS. * gsm0808_cell_id_list_add same_cell_id_list_entries gsm0808_enc_cell_id_list2 cell_id_to_cgi-> On old osmo-bsc, When CELL_IDENT_WHOLE_GLOBAL_PS is passed to be encoded as CGI, RAC byte is taken for encoding instead of 2nd CI byte. * gsm0808_cell_ids_match gsm0808_cell_id_u_match cell_id_to_cgi -> If CELL_IDENT_WHOLE_GLOBAL_PS as 0x11 (CELL_IDENT_UTRAN_SAI), 1 byte offset when comparing (1 byte of RAC is taken converting to CGI instead of the 2nd byte of CI). That means match would be wrong if 2nd byte of CI differs. Related: SYS#5838 Depends: libosmocore.git Change-Id Id25e563febdb7640174540136225f399515a0089 Change-Id: I70972efffefd57fd36332fab539683696c32f4a5 --- M TODO-RELEASE M src/osmo-bsc/bts.c 2 files changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/32/27232/1 diff --git a/TODO-RELEASE b/TODO-RELEASE index d0852fc..e0c43d9 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 +libosmogsm >1.6.0 required due to CELL_IDENT_WHOLE_GLOBAL_PS/SAI ABI breakage diff --git a/src/osmo-bsc/bts.c b/src/osmo-bsc/bts.c index 1461585..c3e87b3 100644 --- a/src/osmo-bsc/bts.c +++ b/src/osmo-bsc/bts.c @@ -524,6 +524,7 @@ case CELL_IDENT_UTRAN_PLMN_LAC_RNC: case CELL_IDENT_UTRAN_RNC: case CELL_IDENT_UTRAN_LAC_RNC: + case CELL_IDENT_SAI: return false; default: OSMO_ASSERT(false); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27232 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: 2021q4 Gerrit-Change-Id: I70972efffefd57fd36332fab539683696c32f4a5 Gerrit-Change-Number: 27232 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 4 months

1
0
0 0

Change in libosmocore[2021q4]: gsm0808: Test if we properly decode a SRVCC cell identifier list

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/27230 ) Change subject: gsm0808: Test if we properly decode a SRVCC cell identifier list ...................................................................... gsm0808: Test if we properly decode a SRVCC cell identifier list We don't handle this correctly, as we decided to overload the meaning of 0b1011 in a cell identifier list (defined by 3GPP as used in SRVCC) with something osmocom proprietary. Change-Id: I608220e8e5dd5a44f85c6bc5ea04622a2cad24ec --- M tests/gsm0808/gsm0808_test.c 1 file changed, 13 insertions(+), 0 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/tests/gsm0808/gsm0808_test.c b/tests/gsm0808/gsm0808_test.c index 3fff005..d0560d5 100644 --- a/tests/gsm0808/gsm0808_test.c +++ b/tests/gsm0808/gsm0808_test.c @@ -1072,6 +1072,18 @@ msgb_free(msg); } +static void test_gsm0808_dec_cell_id_list_srvcc() +{ + /* taken from a pcap file of a real-world 3rd party MSC (SYS#5838) */ + const uint8_t enc_cil[] = { 0x0b, 0x2, 0xf2, 0x10, 0x4e, 0x20, 0x15, 0xbe}; + struct gsm0808_cell_id_list2 dec_cil; + int rc; + + rc = gsm0808_dec_cell_id_list2(&dec_cil, enc_cil, sizeof(enc_cil)); + /* Not yet supported: */ + OSMO_ASSERT(rc == -EINVAL); +} + static void test_gsm0808_enc_dec_cell_id_list_lac() { struct gsm0808_cell_id_list2 enc_cil; @@ -2490,6 +2502,7 @@ test_gsm0808_enc_dec_cell_id_list_multi_ci(); test_gsm0808_enc_dec_cell_id_list_multi_lac_and_ci(); test_gsm0808_enc_dec_cell_id_list_multi_global(); + test_gsm0808_dec_cell_id_list_srvcc(); test_cell_id_list_add(); -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/27230 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: 2021q4 Gerrit-Change-Id: I608220e8e5dd5a44f85c6bc5ea04622a2cad24ec Gerrit-Change-Number: 27230 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

3 years, 4 months

1
0
0 0

Change in libosmocore[2021q4]: gsm: [ABI BREAK] Support CellId SAI, change CellId CGI-PS id number

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/27231 ) Change subject: gsm: [ABI BREAK] Support CellId SAI, change CellId CGI-PS id number ...................................................................... gsm: [ABI BREAK] Support CellId SAI, change CellId CGI-PS id number Those are available in 3GPP TS 48.008 version 16.0.0 Release 16, section 3.2.2.17 Cell Identifier. It can be seen that we have a collision between the osmocom non-standard format and the SAI standard one. This is because CGI-PS is not really a TS 48.008 Cell Identifier, but only specified in TS 48.018 and has no ID number assigned. The CGI-PS was added there because the whole osmo-bsc neighbour configuration works with CellIds to manage neighbours, so it felt natural to extend the APIs to also provide means to use CGI-PS format (TS 48.018 even refers 48.008 existance and mentions there's no explicit ID). At the time this Cell Identifier was added, the firstly available number (11) was taken, which was of course a really bad idea since newer versions of the spec can at some point use it, which is the case if one checks for instance TS 48.008 Release 16 SAI Cell Id. There no perfect way to fix this bad decision at the time, but the CGI-PS is only used in osmo-bsc and only for RIM related purposes, so by changing the ID of CELL_IDENT_WHOLE_GLOBAL_PS, we only break RIM under some specific CIs being used, and when an osmo-bsc is built against older libosmocore and then used at runtime against a newer libosmocore (which should be rare). Hence, the downside is acceptable, and by moving the new ID number to be ouside of the spec proto TS 48.008 range (4 bits), we make sure we don't have the same problem again in the future. Related: SYS#5838 Fixes: ca33a71ca8eeaee98b1b53d5394b147a4ff0b429 Change-Id: Id25e563febdb7640174540136225f399515a0089 --- M TODO-RELEASE M include/osmocom/gsm/gsm0808_utils.h M include/osmocom/gsm/gsm23003.h M include/osmocom/gsm/protocol/gsm_08_08.h M src/gsm/gsm0808_utils.c M src/gsm/gsm23003.c M tests/gsm0808/gsm0808_test.c 7 files changed, 127 insertions(+), 4 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/TODO-RELEASE b/TODO-RELEASE index 8ccfa49..3855145 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 +libosmogsm ABI BREAKAGE CELL_IDENT_WHOLE_GLOBAL_PS changed enum number diff --git a/include/osmocom/gsm/gsm0808_utils.h b/include/osmocom/gsm/gsm0808_utils.h index 60e665b..6abfeec 100644 --- a/include/osmocom/gsm/gsm0808_utils.h +++ b/include/osmocom/gsm/gsm0808_utils.h @@ -44,6 +44,8 @@ uint16_t ci; struct osmo_location_area_id lai_and_lac; uint16_t lac; + struct osmo_service_area_id sai; + /* osmocom specific: */ struct osmo_cell_global_id_ps global_ps; }; diff --git a/include/osmocom/gsm/gsm23003.h b/include/osmocom/gsm/gsm23003.h index 487379a..4070581 100644 --- a/include/osmocom/gsm/gsm23003.h +++ b/include/osmocom/gsm/gsm23003.h @@ -30,6 +30,9 @@ uint16_t cell_identity; }; +/* 3GPP TS 48.018: + * 8c.1.4.1.1 GERAN BSS identification (RIM) + * sec 11.3.9 Cell Identifier */ struct osmo_cell_global_id_ps { struct osmo_routing_area_id rai; uint16_t cell_identity; @@ -134,6 +137,10 @@ const char *osmo_cgi_ps_name2(const struct osmo_cell_global_id_ps *cgi_ps); char *osmo_cgi_ps_name_buf(char *buf, size_t buf_len, const struct osmo_cell_global_id_ps *cgi_ps); char *osmo_cgi_ps_name_c(const void *ctx, const struct osmo_cell_global_id_ps *cgi_ps); +const char *osmo_sai_name(const struct osmo_service_area_id *sai); +const char *osmo_sai_name2(const struct osmo_service_area_id *sai); +char *osmo_sai_name_buf(char *buf, size_t buf_len, const struct osmo_service_area_id *sai); +char *osmo_sai_name_c(const void *ctx, const struct osmo_service_area_id *sai); const char *osmo_gummei_name(const struct osmo_gummei *gummei); char *osmo_gummei_name_buf(char *buf, size_t buf_len, const struct osmo_gummei *gummei); char *osmo_gummei_name_c(const void *ctx, const struct osmo_gummei *gummei); diff --git a/include/osmocom/gsm/protocol/gsm_08_08.h b/include/osmocom/gsm/protocol/gsm_08_08.h index 983783e..2162c2a 100644 --- a/include/osmocom/gsm/protocol/gsm_08_08.h +++ b/include/osmocom/gsm/protocol/gsm_08_08.h @@ -25,9 +25,10 @@ CELL_IDENT_UTRAN_PLMN_LAC_RNC = 8, CELL_IDENT_UTRAN_RNC = 9, CELL_IDENT_UTRAN_LAC_RNC = 10, + CELL_IDENT_SAI = 11, - /* Not in 03.03 nor 08.08 */ - CELL_IDENT_WHOLE_GLOBAL_PS = 11, /* CGI with + RAC */ + /* Not in 03.03 nor 08.08. Place them > 0x0f (discr_id is 4 bits) */ + CELL_IDENT_WHOLE_GLOBAL_PS = 128, /* CGI + RAC, TS 48.018 8c.1.4.1.1 */ }; /* Keep this misnamed CELL_IDENT for API backwards compatibility (see OS#3124). */ #define CELL_IDENT_LAI_AND_LAC CELL_IDENT_LAI diff --git a/src/gsm/gsm0808_utils.c b/src/gsm/gsm0808_utils.c index 78cbe92..040872b 100644 --- a/src/gsm/gsm0808_utils.c +++ b/src/gsm/gsm0808_utils.c @@ -831,6 +831,10 @@ dst->lai.lac = u->lac; return; + case CELL_IDENT_SAI: + dst->lai = u->sai.lai; + return; + case CELL_IDENT_NO_CELL: case CELL_IDENT_BSS: case CELL_IDENT_UTRAN_PLMN_LAC_RNC: @@ -858,6 +862,8 @@ case CELL_IDENT_BSS: case CELL_IDENT_NO_CELL: return 0; + case CELL_IDENT_SAI: + return 7; case CELL_IDENT_WHOLE_GLOBAL_PS: return 8; default: @@ -904,6 +910,12 @@ case CELL_IDENT_NO_CELL: /* Does not have any list items */ break; + case CELL_IDENT_SAI: + if (len < 7) + return -EINVAL; + decode_lai(buf, &out->sai.lai); + out->sai.sac = osmo_load16be(buf + sizeof(struct gsm48_loc_area_id)); + break; case CELL_IDENT_WHOLE_GLOBAL_PS: /* 3GPP TS 48.018 sec 11.3.9 "Cell Identifier" */ if (len < 8) @@ -953,6 +965,16 @@ case CELL_IDENT_NO_CELL: /* Does not have any list items */ break; + + case CELL_IDENT_SAI: { + const struct osmo_service_area_id *id = &u->sai; + struct gsm48_loc_area_id lai; + gsm48_generate_lai2(&lai, &id->lai); + memcpy(msgb_put(msg, sizeof(lai)), &lai, sizeof(lai)); + msgb_put_u16(msg, id->sac); + break; + } + case CELL_IDENT_WHOLE_GLOBAL_PS: { /* 3GPP TS 48.018 sec 11.3.9 "Cell Identifier" */ const struct osmo_cell_global_id_ps *id = &u->global_ps; @@ -1166,6 +1188,31 @@ return i; } +static int parse_cell_id_sai_list(struct gsm0808_cell_id_list2 *cil, const uint8_t *data, size_t remain, size_t *consumed) +{ + struct osmo_service_area_id *id; + uint16_t *sac_be; + size_t lai_offset; + int i = 0; + const size_t elemlen = sizeof(struct gsm48_loc_area_id) + sizeof(*sac_be); + + *consumed = 0; + while (remain >= elemlen) { + if (i >= GSM0808_CELL_ID_LIST2_MAXLEN) + return -ENOSPC; + id = &cil->id_list[i].sai; + lai_offset = i * elemlen; + decode_lai(&data[lai_offset], &id->lai); + sac_be = (uint16_t *)(&data[lai_offset + sizeof(struct gsm48_loc_area_id)]); + id->sac = osmo_load16be(sac_be); + *consumed += elemlen; + remain -= elemlen; + i++; + } + + return i; +} + /*! Decode Cell Identifier List IE * \param[out] cil Caller-provided memory to store Cell ID list * \param[in] elem IE value to be decoded @@ -1210,6 +1257,12 @@ case CELL_IDENT_NO_CELL: /* Does not have any list items */ break; + case CELL_IDENT_SAI: + list_len = parse_cell_id_sai_list(cil, elem, len, &bytes_elem); + break; + case CELL_IDENT_UTRAN_PLMN_LAC_RNC: + case CELL_IDENT_UTRAN_RNC: + case CELL_IDENT_UTRAN_LAC_RNC: default: /* Remaining cell identification types are not implemented. */ return -EINVAL; @@ -1703,6 +1756,8 @@ return snprintf(buf, buflen, "%s", osmo_cgi_name(&u->global)); case CELL_IDENT_WHOLE_GLOBAL_PS: return snprintf(buf, buflen, "%s", osmo_cgi_ps_name(&u->global_ps)); + case CELL_IDENT_SAI: + return snprintf(buf, buflen, "%s", osmo_sai_name(&u->sai)); default: /* For CELL_IDENT_BSS and CELL_IDENT_NO_CELL, just print the discriminator. * Same for kinds we have no string representation of yet. */ @@ -1859,6 +1914,12 @@ cid->id.lac = cgi->lai.lac; return; + case CELL_IDENT_SAI: + cid->id.sai = (struct osmo_service_area_id){ + .lai = cgi->lai, + }; + return; + case CELL_IDENT_NO_CELL: case CELL_IDENT_BSS: case CELL_IDENT_UTRAN_PLMN_LAC_RNC: @@ -1905,6 +1966,10 @@ cgi->lai.lac = cid->id.lac; return OSMO_CGI_PART_LAC; + case CELL_IDENT_SAI: + cgi->lai = cid->id.sai.lai; + return OSMO_CGI_PART_PLMN | OSMO_CGI_PART_LAC; + case CELL_IDENT_NO_CELL: case CELL_IDENT_BSS: case CELL_IDENT_UTRAN_PLMN_LAC_RNC: @@ -1927,6 +1992,7 @@ { CELL_IDENT_UTRAN_PLMN_LAC_RNC, "UTRAN-PLMN-LAC-RNC" }, { CELL_IDENT_UTRAN_RNC, "UTRAN-RNC" }, { CELL_IDENT_UTRAN_LAC_RNC, "UTRAN-LAC-RNC" }, + { CELL_IDENT_SAI, "SAI" }, { CELL_IDENT_WHOLE_GLOBAL_PS, "CGI-PS"}, { 0, NULL } }; diff --git a/src/gsm/gsm23003.c b/src/gsm/gsm23003.c index 71d44fb..56c0cc8 100644 --- a/src/gsm/gsm23003.c +++ b/src/gsm/gsm23003.c @@ -368,6 +368,51 @@ return osmo_cgi_ps_name_buf(buf, 32, cgi_ps); } +/*! Return MCC-MNC-LAC-SAC as string, in caller-provided output buffer. + * \param[out] buf caller-allocated output buffer + * \param[in] buf_len size of buf in bytes + * \param[in] sai SAI to encode. + * \returns buf + */ +char *osmo_sai_name_buf(char *buf, size_t buf_len, const struct osmo_service_area_id *sai) +{ + snprintf(buf, buf_len, "%s-%u", osmo_lai_name(&sai->lai), sai->sac); + return buf; +} + +/*! Return MCC-MNC-LAC-SAC as string, in a static buffer. + * \param[in] sai SAI to encode. + * \returns Static string buffer. + */ +const char *osmo_sai_name(const struct osmo_service_area_id *sai) +{ + static __thread char buf[32]; + return osmo_sai_name_buf(buf, sizeof(buf), sai); +} + +/*! Same as osmo_cgi_name(), but uses a different static buffer. + * Useful for printing two distinct CGIs in the same printf format. + * \param[in] sai SAI to encode. + * \returns Static string buffer. + */ +const char *osmo_sai_name2(const struct osmo_service_area_id *sai) +{ + static __thread char buf[32]; + return osmo_sai_name_buf(buf, sizeof(buf), sai); +} + +/*! Return MCC-MNC-LAC-SAC as string, in a talloc-allocated output buffer. + * \param[in] ctx talloc context from which to allocate output buffer + * \param[in] sai SAI to encode. + * \returns string representation of CGI in dynamically-allocated buffer. + */ +char *osmo_sai_name_c(const void *ctx, const struct osmo_service_area_id *sai) +{ + char *buf = talloc_size(ctx, 32); + return osmo_sai_name_buf(buf, 32, sai); +} + + static void to_bcd(uint8_t *bcd, uint16_t val) { bcd[2] = val % 10; diff --git a/tests/gsm0808/gsm0808_test.c b/tests/gsm0808/gsm0808_test.c index d0560d5..b823a15 100644 --- a/tests/gsm0808/gsm0808_test.c +++ b/tests/gsm0808/gsm0808_test.c @@ -1080,8 +1080,9 @@ int rc; rc = gsm0808_dec_cell_id_list2(&dec_cil, enc_cil, sizeof(enc_cil)); - /* Not yet supported: */ - OSMO_ASSERT(rc == -EINVAL); + OSMO_ASSERT(rc == sizeof(enc_cil)); + OSMO_ASSERT(dec_cil.id_discr = CELL_IDENT_SAI); + OSMO_ASSERT(dec_cil.id_list_len = 1); } static void test_gsm0808_enc_dec_cell_id_list_lac() -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/27231 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: 2021q4 Gerrit-Change-Id: Id25e563febdb7640174540136225f399515a0089 Gerrit-Change-Number: 27231 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 4 months

1
0
0 0

2025

2024

2023

2022

gerrit-log