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

Change in libosmo-gprs[master]: rlcmac: Initial ul_tbf data support

by pespin

Attention is currently required from: pespin, fixeria. Hello Jenkins Builder, laforge, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-gprs/+/31170 to look at the new patch set (#10). Change subject: rlcmac: Initial ul_tbf data support ...................................................................... rlcmac: Initial ul_tbf data support This is basically an import of relevant code from osmo-pcu.git 08523c2286dfe27402f8e2eb4b98da5a529c7915 which allows encoding LLC frames into RLC/MAC uplink data blocks. A 1-to-1 import was not possible for several reasons: * osmo-pcu uses C++ in some places * osmo-pcu implements encoding of DL data blocks, not UL data blocks * Some osmo-pcu code is still not really polished and stuff is still mixed (for instance rlc_window(_ul).c/h were split into their own files here). Hence this was not a "copy all files and leave as they are" import, but rather looking at the encode path starting on osmo-pcu.git scheduler and see which code had to be pulled in to encode the RLC/MAC blocks. Due to the slightly different requerirements for UL and DL blocks, it is well possible that further work in needed in order to have the code produce correct blocks. This is only a first step to pull in all code so that stuff can be fixed in smallish incremental steps. Related: OS#5500 Change-Id: I0a01d79d16bbfc63aa88e6bb0f432f3772645730 --- M include/osmocom/gprs/rlcmac/Makefile.am A include/osmocom/gprs/rlcmac/coding_scheme.h A include/osmocom/gprs/rlcmac/rlc.h A include/osmocom/gprs/rlcmac/rlc_window.h A include/osmocom/gprs/rlcmac/rlc_window_ul.h M include/osmocom/gprs/rlcmac/rlcmac_enc.h M include/osmocom/gprs/rlcmac/rlcmac_private.h M include/osmocom/gprs/rlcmac/tbf.h M include/osmocom/gprs/rlcmac/tbf_ul.h M include/osmocom/gprs/rlcmac/tbf_ul_fsm.h M src/rlcmac/Makefile.am A src/rlcmac/coding_scheme.c A src/rlcmac/rlc.c A src/rlcmac/rlc_window.c A src/rlcmac/rlc_window_ul.c M src/rlcmac/rlcmac.c M src/rlcmac/rlcmac_enc.c M src/rlcmac/sched.c M src/rlcmac/tbf_ul.c M src/rlcmac/tbf_ul_ass_fsm.c M src/rlcmac/tbf_ul_fsm.c M tests/rlcmac/rlcmac_prim_test.c M tests/rlcmac/rlcmac_prim_test.err M tests/rlcmac/rlcmac_prim_test.ok 24 files changed, 2,587 insertions(+), 15 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-gprs refs/changes/70/31170/10 -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/31170 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I0a01d79d16bbfc63aa88e6bb0f432f3772645730 Gerrit-Change-Number: 31170 Gerrit-PatchSet: 10 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-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 4 months

1
0
0 0

Change in osmo-trx[master]: configure.ac: check if LIBTRXCON_DIR (submodule) exists

by pespin

Attention is currently required from: laforge, fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/30795 ) Change subject: configure.ac: check if LIBTRXCON_DIR (submodule) exists ...................................................................... Patch Set 3: (1 comment) Patchset: PS3: did you validate you can build the resulting tar.gz btw? -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/30795 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I06456c2087e160032f5bf8b36304477390f117d0 Gerrit-Change-Number: 30795 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 10 Feb 2023 15:43:04 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 4 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: library/GSM_Types: add {enc,dec}_BcdMccMnc() functions

by pespin

Attention is currently required from: osmith, fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/31278 ) Change subject: library/GSM_Types: add {enc,dec}_BcdMccMnc() functions ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/31278 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: Id501ea146eb596085c204a51387f1b92300d1285 Gerrit-Change-Number: 31278 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 10 Feb 2023 15:38:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 4 months

1
0
0 0

Change in osmo-trx[master]: configure.ac: check if LIBTRXCON_DIR (submodule) exists

by fixeria

Attention is currently required from: laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/30795 ) Change subject: configure.ac: check if LIBTRXCON_DIR (submodule) exists ...................................................................... Patch Set 3: (1 comment) Patchset: PS1: > The problem is that this check does not work as expected when srcdir != builddir (e.g. […] Yay, it worked. -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/30795 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I06456c2087e160032f5bf8b36304477390f117d0 Gerrit-Change-Number: 30795 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Fri, 10 Feb 2023 15:18:33 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 4 months

1
0
0 0

Change in osmo-trx[master]: configure.ac: check if LIBTRXCON_DIR (submodule) exists

by fixeria

Attention is currently required from: laforge. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-trx/+/30795 to look at the new patch set (#3). Change subject: configure.ac: check if LIBTRXCON_DIR (submodule) exists ...................................................................... configure.ac: check if LIBTRXCON_DIR (submodule) exists Fail during the configure stage if the submodule is not fetched. Change-Id: I06456c2087e160032f5bf8b36304477390f117d0 Related: OS#5599 --- M configure.ac 1 file changed, 6 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/95/30795/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/30795 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I06456c2087e160032f5bf8b36304477390f117d0 Gerrit-Change-Number: 30795 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newpatchset

2 years, 4 months

1
0
0 0

Change in osmo-trx[master]: configure.ac: check if LIBTRXCON_DIR (submodule) exists

by fixeria

Attention is currently required from: laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/30795 ) Change subject: configure.ac: check if LIBTRXCON_DIR (submodule) exists ...................................................................... Patch Set 2: (1 comment) Patchset: PS1: > what's the status here? patch doesn't pass V+1? The problem is that this check does not work as expected when srcdir != builddir (e.g. during make distcheck). I don't know how to overcome this. While writing this I tried using the $srcdir in configure.ac, and it seems to work. -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/30795 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I06456c2087e160032f5bf8b36304477390f117d0 Gerrit-Change-Number: 30795 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Fri, 10 Feb 2023 15:08:25 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Gerrit-MessageType: comment

2 years, 4 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: library/GSM_Types: add {enc,dec}_BcdMccMnc() functions

by fixeria

Attention is currently required from: osmith. Hello osmith, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/31278 to look at the new patch set (#2). Change subject: library/GSM_Types: add {enc,dec}_BcdMccMnc() functions ...................................................................... library/GSM_Types: add {enc,dec}_BcdMccMnc() functions Change-Id: Id501ea146eb596085c204a51387f1b92300d1285 Related: SYS#5602, OS#5901 --- M library/GSM_Types.ttcn 1 file changed, 11 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/78/31278/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/31278 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: Id501ea146eb596085c204a51387f1b92300d1285 Gerrit-Change-Number: 31278 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 4 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: library/GSM_Types: add {enc,dec}_BcdMccMnc() functions

by fixeria

Attention is currently required from: osmith. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/31278 ) Change subject: library/GSM_Types: add {enc,dec}_BcdMccMnc() functions ...................................................................... Patch Set 1: (1 comment) File library/GSM_Types.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/31278/comment/2e9330b7_06ca… PS1, Line 439: better the functions (emplying the TITAN's RAW codec) dclared > "better use"?, employing, declared Done -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/31278 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: Id501ea146eb596085c204a51387f1b92300d1285 Gerrit-Change-Number: 31278 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Fri, 10 Feb 2023 13:53:43 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 4 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: library/GSM_Types: rename f_{enc->build}_BcdMccMnc[_int]()

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/31277 ) Change subject: library/GSM_Types: rename f_{enc->build}_BcdMccMnc[_int]() ...................................................................... library/GSM_Types: rename f_{enc->build}_BcdMccMnc[_int]() The enc_* functions usually return an octetstring. However, both f_enc_BcdMccMnc[_int]() return a sub-type of hexstring (BcdMccMnc), so let's rename them to avoid confusion. A follow-up patch adds the actual encoding function for BcdMccMnc. Change-Id: I0332fe7396310da49910e89571f7181fb1604182 --- M library/GSM_Types.ttcn M pcu/PCU_Tests.ttcn 2 files changed, 16 insertions(+), 16 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, approved osmith: Looks good to me, approved Jenkins Builder: Verified diff --git a/library/GSM_Types.ttcn b/library/GSM_Types.ttcn index 0068cb8..d48dc6c 100644 --- a/library/GSM_Types.ttcn +++ b/library/GSM_Types.ttcn @@ -436,7 +436,7 @@ type GsmBcdString BcdMccMnc with { variant "FIELDLENGTH(6)" }; /* Compute BcdMccMnc from a pair of GsmMcc/GsmMnc values */ -function f_enc_BcdMccMnc(GsmMcc mcc, GsmMnc mnc) return BcdMccMnc { +function f_build_BcdMccMnc(GsmMcc mcc, GsmMnc mnc) return BcdMccMnc { if (lengthof(mnc) == 2) { mnc := mnc[0] & mnc[1] & 'F'H; } @@ -451,30 +451,30 @@ } /* Compute BcdMccMnc from integer values */ -function f_enc_BcdMccMnc_int(uint16_t mcc, uint16_t mnc, boolean mnc_3_digits) return BcdMccMnc { +function f_build_BcdMccMnc_int(uint16_t mcc, uint16_t mnc, boolean mnc_3_digits) return BcdMccMnc { var hexstring mcc_str := str2hex(int2str(mcc)); var hexstring mnc_str := str2hex(int2str(mnc)); if (mnc_3_digits == true) { - return f_enc_BcdMccMnc(mcc_str[0] & mcc_str[1] & mcc_str[2], - mnc_str[0] & mnc_str[1] & mnc_str[2]); + return f_build_BcdMccMnc(mcc_str[0] & mcc_str[1] & mcc_str[2], + mnc_str[0] & mnc_str[1] & mnc_str[2]); } else { - return f_enc_BcdMccMnc(mcc_str[0] & mcc_str[1] & mcc_str[2], - mnc_str[0] & mnc_str[1]); + return f_build_BcdMccMnc(mcc_str[0] & mcc_str[1] & mcc_str[2], + mnc_str[0] & mnc_str[1]); } } -testcase TC_selftest_enc_BcdMccMnc() runs on Dummy_CT { +testcase TC_selftest_BcdMccMnc() runs on Dummy_CT { if (not match('62F224'O, decmatch BcdMccMnc:'262F42'H)) { setverdict(fail); } if (not match('21F354'O, decmatch BcdMccMnc:'123F45'H)) { setverdict(fail); } if (not match('216354'O, decmatch BcdMccMnc:'123645'H)) { setverdict(fail); } - if (not match(f_enc_BcdMccMnc('262'H, '42'H), BcdMccMnc:'262F42'H)) { setverdict(fail); } - if (not match(f_enc_BcdMccMnc('123'H, '45'H), BcdMccMnc:'123F45'H)) { setverdict(fail); } - if (not match(f_enc_BcdMccMnc('123'H, '456'H), BcdMccMnc:'123645'H)) { setverdict(fail); } + if (not match(f_build_BcdMccMnc('262'H, '42'H), BcdMccMnc:'262F42'H)) { setverdict(fail); } + if (not match(f_build_BcdMccMnc('123'H, '45'H), BcdMccMnc:'123F45'H)) { setverdict(fail); } + if (not match(f_build_BcdMccMnc('123'H, '456'H), BcdMccMnc:'123645'H)) { setverdict(fail); } - if (not match(f_enc_BcdMccMnc_int(262, 42, false), BcdMccMnc:'262F42'H)) { setverdict(fail); } - if (not match(f_enc_BcdMccMnc_int(123, 45, false), BcdMccMnc:'123F45'H)) { setverdict(fail); } - if (not match(f_enc_BcdMccMnc_int(123, 456, true), BcdMccMnc:'123645'H)) { setverdict(fail); } + if (not match(f_build_BcdMccMnc_int(262, 42, false), BcdMccMnc:'262F42'H)) { setverdict(fail); } + if (not match(f_build_BcdMccMnc_int(123, 45, false), BcdMccMnc:'123F45'H)) { setverdict(fail); } + if (not match(f_build_BcdMccMnc_int(123, 456, true), BcdMccMnc:'123645'H)) { setverdict(fail); } setverdict(pass); } diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn index a537b96..affe41d 100644 --- a/pcu/PCU_Tests.ttcn +++ b/pcu/PCU_Tests.ttcn @@ -5134,7 +5134,7 @@ private function f_outbound_nacc_rim_tx_resp(PCUIF_info_ind info_ind) runs on RAW_PCU_Test_CT { - var BssgpCellId src := valueof(ts_BssgpCellId(ts_RAI(ts_LAI(f_enc_BcdMccMnc_int(info_ind.mcc, info_ind.mnc, info_ind.mnc_3_digits == 1), + var BssgpCellId src := valueof(ts_BssgpCellId(ts_RAI(ts_LAI(f_build_BcdMccMnc_int(info_ind.mcc, info_ind.mnc, info_ind.mnc_3_digits == 1), info_ind.lac), info_ind.rac), info_ind.cell_id)); @@ -5159,7 +5159,7 @@ altstep as_outbound_nacc_rim_resolve(PCUIF_info_ind info_ind, boolean do_answer := true, boolean do_repeat := false) runs on RAW_PCU_Test_CT { /* RIM procedure: */ - var BssgpCellId src := valueof(ts_BssgpCellId(ts_RAI(ts_LAI(f_enc_BcdMccMnc_int(info_ind.mcc, info_ind.mnc, info_ind.mnc_3_digits == 1), + var BssgpCellId src := valueof(ts_BssgpCellId(ts_RAI(ts_LAI(f_build_BcdMccMnc_int(info_ind.mcc, info_ind.mnc, info_ind.mnc_3_digits == 1), info_ind.lac), info_ind.rac), info_ind.cell_id)); @@ -5627,7 +5627,7 @@ var GsmArfcn req_arfcn := 862; var uint6_t req_bsic := 43; var boolean use_old_ctrl_iface := mp_ctrl_neigh_ip != ""; - var BssgpCellId src := valueof(ts_BssgpCellId(ts_RAI(ts_LAI(f_enc_BcdMccMnc_int(info_ind.mcc, info_ind.mnc, info_ind.mnc_3_digits == 1), /* '262F42'H */ + var BssgpCellId src := valueof(ts_BssgpCellId(ts_RAI(ts_LAI(f_build_BcdMccMnc_int(info_ind.mcc, info_ind.mnc, info_ind.mnc_3_digits == 1), /* '262F42'H */ info_ind.lac), info_ind.rac), info_ind.cell_id)); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/31277 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: I0332fe7396310da49910e89571f7181fb1604182 Gerrit-Change-Number: 31277 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(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, 4 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: Revert "library/GSM_Types: fix encoding of BcdMccMnc (3 octets)"

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/31276 ) Change subject: Revert "library/GSM_Types: fix encoding of BcdMccMnc (3 octets)" ...................................................................... Revert "library/GSM_Types: fix encoding of BcdMccMnc (3 octets)" This is a partial revert of e9858efb90a2997e2a54161d7b5213d8bac51b6e. I was confused by weird MCC/MNC values in the Destination RAI generated by the NACC testcases from the PCU_Tests.ttcn. As I figured out, these values are not from the INFO.ind, but some hard-coded literals: * SRC RAI: MCC=262/MNC=42/LAC=13135/RAC=0 (from ts_PCUIF_INFO_default); * DST RAI: MCC=023/MNC=43/LAC=00423/RAC=2 (resolved by test itself); so actually they're not incorrect: they're sent by the testsuite itself in response to the Neighbor Address Resolution Request, and then expected to be received in the Destination RAI from the PCU. Another important point is that TITAN produces different results when: a) converting BcdMccMnc to bytes using the hex2oct() function, b) converting BcdMccMnc to bytes using the RAW encoder. The key difference is that TITAN does swap nibbles in each byte when using the RAW encoder, but does not when using the hex2oct() function. Use the proper hexorder (low-to-high) in f_enc_BcdMccMnc(). Add a selftest to make sure we're encoding the input properly. This change makes the NACC testcases pass again. Change-Id: I6f497b97c4f1e270803e01530be8355beea740bb Related: SYS#5602 Fixes: OS#5901 --- M library/GSM_Types.ttcn 1 file changed, 21 insertions(+), 2 deletions(-) Approvals: laforge: 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 Jenkins Builder: Verified diff --git a/library/GSM_Types.ttcn b/library/GSM_Types.ttcn index 134edbd..0068cb8 100644 --- a/library/GSM_Types.ttcn +++ b/library/GSM_Types.ttcn @@ -443,8 +443,11 @@ /* 3GPP TS 24.008, Figure 10.5.13 * | MCC digit 2 | MCC digit 1 | octet 1 * | MNC digit 3 | MCC digit 3 | octet 2 - * | MNC digit 2 | MNC digit 1 | octet 3 */ - return mcc[1] & mcc[0] & mnc[2] & mcc[2] & mnc[1] & mnc[0]; + * | MNC digit 2 | MNC digit 1 | octet 3 + * + * NOTE: TITAN takes care of swapping the nibbles in octets, + * so we use the normal (low-to-high) ordering here. */ + return mcc[0] & mcc[1] & mcc[2] & mnc[2] & mnc[0] & mnc[1]; } /* Compute BcdMccMnc from integer values */ @@ -460,6 +463,22 @@ } } +testcase TC_selftest_enc_BcdMccMnc() runs on Dummy_CT { + if (not match('62F224'O, decmatch BcdMccMnc:'262F42'H)) { setverdict(fail); } + if (not match('21F354'O, decmatch BcdMccMnc:'123F45'H)) { setverdict(fail); } + if (not match('216354'O, decmatch BcdMccMnc:'123645'H)) { setverdict(fail); } + + if (not match(f_enc_BcdMccMnc('262'H, '42'H), BcdMccMnc:'262F42'H)) { setverdict(fail); } + if (not match(f_enc_BcdMccMnc('123'H, '45'H), BcdMccMnc:'123F45'H)) { setverdict(fail); } + if (not match(f_enc_BcdMccMnc('123'H, '456'H), BcdMccMnc:'123645'H)) { setverdict(fail); } + + if (not match(f_enc_BcdMccMnc_int(262, 42, false), BcdMccMnc:'262F42'H)) { setverdict(fail); } + if (not match(f_enc_BcdMccMnc_int(123, 45, false), BcdMccMnc:'123F45'H)) { setverdict(fail); } + if (not match(f_enc_BcdMccMnc_int(123, 456, true), BcdMccMnc:'123645'H)) { setverdict(fail); } + + setverdict(pass); +} + /* 24.008 10.5.1.3 */ type record LocationAreaIdentification { BcdMccMnc mcc_mnc, -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/31276 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: I6f497b97c4f1e270803e01530be8355beea740bb Gerrit-Change-Number: 31276 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(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, 4 months

1
0
0 0

2025

2024

2023

2022

gerrit-log February 2023