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

Change in osmo-upf[master]: osmo_pfcp_tool: make usable again

by neels

Attention is currently required from: pespin. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-upf/+/31193 ) Change subject: osmo_pfcp_tool: make usable again ...................................................................... Patch Set 4: (1 comment) File src/osmo-pfcp-tool/pfcp_tool.h: https://gerrit.osmocom.org/c/osmo-upf/+/31193/comment/649f0bde_2ee6f797 PS1, Line 92: #if 0 > why is this now commented out? sorry, was just wip cruft, gone now. -- To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/31193 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-upf Gerrit-Branch: master Gerrit-Change-Id: I22cfaa4aedd465c81de85e673b9960eaf99c426b Gerrit-Change-Number: 31193 Gerrit-PatchSet: 4 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 10 Feb 2023 02:28:07 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 4 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: PCU_Tests: use real values for c_BssgpCell{Mcc,Mnc}

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/31281 ) Change subject: PCU_Tests: use real values for c_BssgpCell{Mcc,Mnc} ...................................................................... PCU_Tests: use real values for c_BssgpCell{Mcc,Mnc} There is no such country/operator with MCC=023/MNC=43. Wireshark complains about that when looking at the BSSGP messahes: Mobile Country Code (MCC): Unknown (23) Mobile Network Code (MNC): Unknown (43) This may look confusing, let's better use some real country/operator: Mobile Country Code (MCC): Central African Rep. (623) Mobile Network Code (MNC): Celca (Socatel) (03) Change-Id: Idc22128657d10893aa5c6d8ec80538a764de5c42 Related: OS#5901 --- M pcu/PCU_Tests.ttcn 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/81/31281/1 diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn index 6e858d5..15ea195 100644 --- a/pcu/PCU_Tests.ttcn +++ b/pcu/PCU_Tests.ttcn @@ -5132,8 +5132,8 @@ return dl_block; } -private const GsmMcc c_BssgpCellMcc := '023'H; -private const GsmMnc c_BssgpCellMnc := '43'H; +private const GsmMcc c_BssgpCellMcc := '623'H; /* MCC: Central African Republic */ +private const GsmMnc c_BssgpCellMnc := '03'H; /* MNC: Celca (Socatel) */ private template (value) BssgpCellId ts_BssgpCellIdDstAddr_default := { ra_id := { lai := { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/31281 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: Idc22128657d10893aa5c6d8ec80538a764de5c42 Gerrit-Change-Number: 31281 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

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 uploaded this change for review. ( 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(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/76/31276/1 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: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

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 uploaded this change for review. ( 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(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/77/31277/1 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: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 4 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: pcu/osmo-pcu.cfg: use the PCUIF for neighbor resolution

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/31275 ) Change subject: pcu/osmo-pcu.cfg: use the PCUIF for neighbor resolution ...................................................................... pcu/osmo-pcu.cfg: use the PCUIF for neighbor resolution This config is out of sync with the one in docker-playground.git. The 'neighbor resolution' param makes osmo-pcu use the CTRL interface. Change-Id: I8d59096644afd5a5278bc7bb1335670edad72576 Related: OS#5901 --- M pcu/osmo-pcu.cfg 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/75/31275/1 diff --git a/pcu/osmo-pcu.cfg b/pcu/osmo-pcu.cfg index f33dfd8..68ea521 100644 --- a/pcu/osmo-pcu.cfg +++ b/pcu/osmo-pcu.cfg @@ -31,6 +31,7 @@ alloc-algorithm dynamic gamma 0 pcu-socket /tmp/pcu_bts - neighbor resolution 127.0.0.1 +! By default, use the PCUIF for neighbor resolution +! neighbor resolution 127.0.0.1 gsmtap-remote-host 127.0.0.1 gsmtap-category enable-all -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/31275 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: I8d59096644afd5a5278bc7bb1335670edad72576 Gerrit-Change-Number: 31275 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 4 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: PCU_Tests: define ts_BssgpCellIdDstAddr_default

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/31280 ) Change subject: PCU_Tests: define ts_BssgpCellIdDstAddr_default ...................................................................... PCU_Tests: define ts_BssgpCellIdDstAddr_default Define hard-coded default Destination Cell ID in one place. Change-Id: I8f400ba52d4d32447e0b4a640a2f4b73699937c8 Related: OS#5901 --- M pcu/PCU_Tests.ttcn 1 file changed, 29 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/80/31280/1 diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn index ad93b5c..6e858d5 100644 --- a/pcu/PCU_Tests.ttcn +++ b/pcu/PCU_Tests.ttcn @@ -5132,6 +5132,19 @@ return dl_block; } +private const GsmMcc c_BssgpCellMcc := '023'H; +private const GsmMnc c_BssgpCellMnc := '43'H; +private template (value) BssgpCellId ts_BssgpCellIdDstAddr_default := { + ra_id := { + lai := { + mcc_mnc := f_build_BcdMccMnc(c_BssgpCellMcc, c_BssgpCellMnc), + lac := 423 + }, + rac := 2 + }, + cell_id := 5 +} + private function f_outbound_nacc_rim_tx_resp(PCUIF_info_ind info_ind) runs on RAW_PCU_Test_CT { /* Source Cell Identifier IE is generated by osmo-pcu based on the INFO.ind */ @@ -5139,7 +5152,7 @@ var BssgpCellId src := valueof(ts_BssgpCellId(ts_RAI(ts_LAI(src_mcc_mnc, info_ind.lac), info_ind.rac), info_ind.cell_id)); /* Destination Cell Identifier IE is resolved by the testsuite itself (emulating BSC) */ - var BssgpCellId dst := valueof(ts_BssgpCellId(ts_RAI(ts_LAI(f_build_BcdMccMnc('023'H, '43'H), 423), 2), 5)); + var BssgpCellId dst := valueof(ts_BssgpCellIdDstAddr_default); var RIM_Routing_Address src_addr := valueof(t_RIM_Routing_Address_cid(src)); var RIM_Routing_Address dst_addr := valueof(t_RIM_Routing_Address_cid(dst)); var template (value) RAN_Information_RIM_Container res_cont := @@ -5161,7 +5174,7 @@ var BssgpCellId src := valueof(ts_BssgpCellId(ts_RAI(ts_LAI(src_mcc_mnc, info_ind.lac), info_ind.rac), info_ind.cell_id)); /* Destination Cell Identifier IE is resolved by the testsuite itself (emulating BSC) */ - var BssgpCellId dst := valueof(ts_BssgpCellId(ts_RAI(ts_LAI(f_build_BcdMccMnc('023'H, '43'H), 423), 2), 5)); + var BssgpCellId dst := valueof(ts_BssgpCellIdDstAddr_default); var RIM_Routing_Address src_addr := valueof(t_RIM_Routing_Address_cid(src)); var RIM_Routing_Address dst_addr := valueof(t_RIM_Routing_Address_cid(dst)); [] RIM.receive(tr_RAN_INFORMATION_REQUEST(tr_RIM_Routing_Information(RIM_ADDR_GERAN_CELL_ID, dst_addr), @@ -5187,7 +5200,12 @@ int2str(req_arfcn) & "." & int2str(req_bsic); if (answer) { - f_ctrl_exp_get(IPA_CTRL, ctrl_var, "023-43-423-2-5"); + var BssgpCellId addr := valueof(ts_BssgpCellIdDstAddr_default); + f_ctrl_exp_get(IPA_CTRL, ctrl_var, hex2str(c_BssgpCellMcc) & "-" & + hex2str(c_BssgpCellMnc) & "-" & + int2str(addr.ra_id.lai.lac) & "-" & + int2str(addr.ra_id.rac) & "-" & + int2str(addr.cell_id)); } else { f_ctrl_exp_get(IPA_CTRL, ctrl_var, omit); } @@ -5195,7 +5213,14 @@ var PCUIF_Message pcu_msg; BTS.receive(tr_PCUIF_NEIGH_ADDR_REQ(0, info_ind.lac, info_ind.cell_id, req_arfcn, req_bsic)) -> value pcu_msg; if (answer) { - BTS.send(ts_PCUIF_NEIGH_ADDR_CNF(0, pcu_msg.u.container.u.neigh_addr_req, 0, 23, 43, 0, 423, 2, 5)); + var BssgpCellId addr := valueof(ts_BssgpCellIdDstAddr_default); + BTS.send(ts_PCUIF_NEIGH_ADDR_CNF(0, pcu_msg.u.container.u.neigh_addr_req, 0, + str2int(hex2str(c_BssgpCellMcc)), + str2int(hex2str(c_BssgpCellMnc)), + lengthof(c_BssgpCellMnc) - 2, + addr.ra_id.lai.lac, + addr.ra_id.rac, + addr.cell_id)); } } } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/31280 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: I8f400ba52d4d32447e0b4a640a2f4b73699937c8 Gerrit-Change-Number: 31280 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 4 months

1
0
0 0

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

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/31278 ) 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/1 diff --git a/library/GSM_Types.ttcn b/library/GSM_Types.ttcn index d48dc6c..f47d719 100644 --- a/library/GSM_Types.ttcn +++ b/library/GSM_Types.ttcn @@ -435,6 +435,13 @@ type hexstring GsmBcdString with { variant "HEXORDER(low)" }; type GsmBcdString BcdMccMnc with { variant "FIELDLENGTH(6)" }; +/* hex2oct()/oct2hex() do not respect the HEXORDER/FIELDLENGTH attributes, + * so better the functions (emplying the TITAN's RAW codec) dclared below. */ +external function enc_BcdMccMnc(in BcdMccMnc str) return octetstring + with { extension "prototype(convert) encode(RAW)" }; +external function dec_BcdMccMnc(in octetstring str) return BcdMccMnc + with { extension "prototype(convert) decode(RAW)" }; + /* Compute BcdMccMnc from a pair of GsmMcc/GsmMnc values */ function f_build_BcdMccMnc(GsmMcc mcc, GsmMnc mnc) return BcdMccMnc { if (lengthof(mnc) == 2) { @@ -468,6 +475,10 @@ 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(enc_BcdMccMnc('262F42'H), '62F224'O)) { setverdict(fail); } + if (not match(enc_BcdMccMnc('123F45'H), '21F354'O)) { setverdict(fail); } + if (not match(enc_BcdMccMnc('123645'H), '216354'O)) { 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); } -- 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-MessageType: newchange

2 years, 4 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: PCU_Tests: improve coding style, use f_build_BcdMccMnc()

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/31279 ) Change subject: PCU_Tests: improve coding style, use f_build_BcdMccMnc() ...................................................................... PCU_Tests: improve coding style, use f_build_BcdMccMnc() Change-Id: Ia7066c6f36678650ada61c1633977b824777194d Related: OS#5901 --- M pcu/PCU_Tests.ttcn 1 file changed, 10 insertions(+), 15 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/79/31279/1 diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn index affe41d..ad93b5c 100644 --- a/pcu/PCU_Tests.ttcn +++ b/pcu/PCU_Tests.ttcn @@ -5134,14 +5134,12 @@ 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_build_BcdMccMnc_int(info_ind.mcc, info_ind.mnc, info_ind.mnc_3_digits == 1), - info_ind.lac), - info_ind.rac), + /* Source Cell Identifier IE is generated by osmo-pcu based on the INFO.ind */ + var BcdMccMnc src_mcc_mnc := f_build_BcdMccMnc_int(info_ind.mcc, info_ind.mnc, info_ind.mnc_3_digits == 1); + var BssgpCellId src := valueof(ts_BssgpCellId(ts_RAI(ts_LAI(src_mcc_mnc, info_ind.lac), info_ind.rac), info_ind.cell_id)); - var BssgpCellId dst := valueof(ts_BssgpCellId(ts_RAI(ts_LAI('023F43'H, /* Decided by test itself (emulating BSC) */ - 423), - 2), - 5)); + /* Destination Cell Identifier IE is resolved by the testsuite itself (emulating BSC) */ + var BssgpCellId dst := valueof(ts_BssgpCellId(ts_RAI(ts_LAI(f_build_BcdMccMnc('023'H, '43'H), 423), 2), 5)); var RIM_Routing_Address src_addr := valueof(t_RIM_Routing_Address_cid(src)); var RIM_Routing_Address dst_addr := valueof(t_RIM_Routing_Address_cid(dst)); var template (value) RAN_Information_RIM_Container res_cont := @@ -5158,15 +5156,12 @@ 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_build_BcdMccMnc_int(info_ind.mcc, info_ind.mnc, info_ind.mnc_3_digits == 1), - info_ind.lac), - info_ind.rac), + /* Source Cell Identifier IE is generated by osmo-pcu based on the INFO.ind */ + var BcdMccMnc src_mcc_mnc := f_build_BcdMccMnc_int(info_ind.mcc, info_ind.mnc, info_ind.mnc_3_digits == 1); + var BssgpCellId src := valueof(ts_BssgpCellId(ts_RAI(ts_LAI(src_mcc_mnc, info_ind.lac), info_ind.rac), info_ind.cell_id)); - var BssgpCellId dst := valueof(ts_BssgpCellId(ts_RAI(ts_LAI('023F43'H, /* Decided by test itself (emulating BSC) */ - 423), - 2), - 5)); + /* Destination Cell Identifier IE is resolved by the testsuite itself (emulating BSC) */ + var BssgpCellId dst := valueof(ts_BssgpCellId(ts_RAI(ts_LAI(f_build_BcdMccMnc('023'H, '43'H), 423), 2), 5)); var RIM_Routing_Address src_addr := valueof(t_RIM_Routing_Address_cid(src)); var RIM_Routing_Address dst_addr := valueof(t_RIM_Routing_Address_cid(dst)); [] RIM.receive(tr_RAN_INFORMATION_REQUEST(tr_RIM_Routing_Information(RIM_ADDR_GERAN_CELL_ID, dst_addr), -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/31279 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: Ia7066c6f36678650ada61c1633977b824777194d Gerrit-Change-Number: 31279 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 4 months

1
0
0 0

Change in libosmo-pfcp[master]: clarify API doc for osmo_pfcp_endpoint_tx()

by neels

neels has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-pfcp/+/31260 ) Change subject: clarify API doc for osmo_pfcp_endpoint_tx() ...................................................................... clarify API doc for osmo_pfcp_endpoint_tx() I recently discovered some use-after-free in osmo-upf by wrong API usage of osmo_pfcp_endpoint_tx(). Highlight this pitfall in API doc. Change-Id: I637e7bb5d1296b5ad8db8ab0b8151fdbb9e7be03 --- M src/libosmo-pfcp/pfcp_endpoint.c 1 file changed, 6 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/libosmo-pfcp/pfcp_endpoint.c b/src/libosmo-pfcp/pfcp_endpoint.c index 83a689f..7e08d8e 100644 --- a/src/libosmo-pfcp/pfcp_endpoint.c +++ b/src/libosmo-pfcp/pfcp_endpoint.c @@ -326,7 +326,12 @@ * Store the message in the local message queue for possible retransmissions. * On success, return zero, and pass ownership of m to ep. ep deallocates m when all retransmissions are done / a reply * has been received. - * On error, return nonzero, and immediately deallocate m. */ + * On error, return nonzero, and immediately deallocate m. + * + * WARNING: Do not access the osmo_pfcp_msg m after calling this function! In most cases, m will still remain allocated, + * and accessing it will work, but especially when an error occurs, m will be deallocated immediately. Hence, you will + * see no problem during normal successful operation, but your program will crash with use-after-free on any error! + */ int osmo_pfcp_endpoint_tx(struct osmo_pfcp_endpoint *ep, struct osmo_pfcp_msg *m) { struct osmo_pfcp_ie_node_id *node_id; -- To view, visit https://gerrit.osmocom.org/c/libosmo-pfcp/+/31260 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-pfcp Gerrit-Branch: master Gerrit-Change-Id: I637e7bb5d1296b5ad8db8ab0b8151fdbb9e7be03 Gerrit-Change-Number: 31260 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 4 months

1
0
0 0

Change in osmo-upf[master]: tunmap: refactor nft ruleset: fix "martians" and "1024"

by pespin

Attention is currently required from: neels. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-upf/+/31165 ) Change subject: tunmap: refactor nft ruleset: fix "martians" and "1024" ...................................................................... Patch Set 6: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/31165 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-upf Gerrit-Branch: master Gerrit-Change-Id: Iccb975a1c0f8a2087f7b7dc4942a6b41f5675a13 Gerrit-Change-Number: 31165 Gerrit-PatchSet: 6 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Thu, 09 Feb 2023 17:19:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 4 months

1
0
0 0

2025

2024

2023

2022

gerrit-log February 2023