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

Change in osmo-ttcn3-hacks[master]: Add test for RABAssingResponse with FailedList

by daniel

daniel has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27297 ) Change subject: Add test for RABAssingResponse with FailedList ...................................................................... Add test for RABAssingResponse with FailedList Change-Id: I043014929de5145f06d0a650f36d59c15e0d4044 Related: OS#5152 --- M hnbgw/HNBGW_Tests.ttcn 1 file changed, 50 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/97/27297/1 diff --git a/hnbgw/HNBGW_Tests.ttcn b/hnbgw/HNBGW_Tests.ttcn index 959fe87..314b0df 100644 --- a/hnbgw/HNBGW_Tests.ttcn +++ b/hnbgw/HNBGW_Tests.ttcn @@ -758,11 +758,15 @@ return mgcp_resp; } -friend function f_create_rab(MgcpParameters pars) runs on ConnHdlr { +friend function f_create_rab(inout MgcpParameters pars) runs on ConnHdlr { + f_rab_ass_req(pars); + f_rab_ass_resp(pars); +} + +friend function f_rab_ass_req(inout MgcpParameters pars) runs on ConnHdlr { var MgcpCommand mgcp_cmd; var RANAP_PDU tx; var template RAB_SetupOrModifyList rab_sml; - var template RAB_SetupOrModifiedList rab_smdl; timer T := 5.0; /* Send RAB Assignment Request */ @@ -795,6 +799,13 @@ setverdict(fail, "Timeout waiting for Iuh ", tx); } } +} + +friend function f_rab_ass_resp(inout MgcpParameters pars) runs on ConnHdlr { + var MgcpCommand mgcp_cmd; + var RANAP_PDU tx; + var template RAB_SetupOrModifiedList rab_smdl; + timer T := 5.0; /* Send back RAB Assignment Response via Iuh */ rab_smdl := ts_RAB_SMdL(t_RAB_id(23), f_ts_RAB_TLA(pars.hnb_rtp_ip), t_RAB_binding_port(pars.hnb_rtp_port)); @@ -842,7 +853,7 @@ log("DLCX", mgcp_cmd); MGCP.send(ts_DLCX_ACK2(mgcp_cmd.line.trans_id)); pars.mgcp_pars.got_dlcx_count := pars.mgcp_pars.got_dlcx_count + 1; - if (pars.mgcp_pars.got_dlcx_count == 1) { + if (pars.mgcp_pars.got_dlcx_count != pars.mgcp_pars.got_crcx_count) { repeat; } setverdict(pass); @@ -887,6 +898,41 @@ vc_conn.done; } +friend function f_tc_rab_assign_fail(charstring id, TestHdlrParams pars) runs on ConnHdlr { + var MgcpCommand mgcp_cmd; + var RANAP_PDU tx; + timer T := 5.0; + + f_init_handler(pars); + f_create_mgcp_expect(ExpectCriteria:{omit,omit,omit}); + + tx := f_build_initial_ue(g_pars); + f_iuh2iu_connect(tx); + + f_rab_ass_req(pars.mgcp_pars); + + /* Send RAB failed list in response */ + tx := valueof(ts_RANAP_RabAssResp(rab_fl := ts_RAB_FL(t_RAB_id(23), ts_RanapCause_om_intervention))); + f_iuh2iu(tx); + + T.start; + alt { + [] as_mgcp_dlcx(pars) {} + [] T.timeout { + setverdict(fail, "Timeout waiting for DLCX"); + } + } +} + +testcase TC_rab_assign_fail() runs on test_CT { + var ConnHdlr vc_conn; + f_init(); + f_start_hnbs(); + + vc_conn := f_start_handler_with_pars(refers(f_tc_rab_assign_fail), t_pars(4)); + vc_conn.done; +} + friend function f_tc_rab_release(charstring id, TestHdlrParams pars) runs on ConnHdlr { var MgcpCommand mgcp_cmd; var RANAP_PDU tx; @@ -1012,6 +1058,7 @@ execute(TC_ranap_ps_bidir()); execute(TC_rab_assignment()); execute(TC_rab_release()); + execute(TC_rab_assign_fail()); execute(TC_ranap_cs_mo_disconnect()); execute(TC_ranap_ps_mo_disconnect()); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27297 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: I043014929de5145f06d0a650f36d59c15e0d4044 Gerrit-Change-Number: 27297 Gerrit-PatchSet: 1 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 2 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: ranap: Fix criticality in IuReleaseRequest

by daniel

daniel has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27298 ) Change subject: ranap: Fix criticality in IuReleaseRequest ...................................................................... ranap: Fix criticality in IuReleaseRequest Change-Id: Ib636f5d5ca02962b1592f64d0af30b4b3c9f0053 Related: OS#5152 --- M library/ranap/RANAP_Templates.ttcn 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/98/27298/1 diff --git a/library/ranap/RANAP_Templates.ttcn b/library/ranap/RANAP_Templates.ttcn index 6b4699e..caccdc7 100644 --- a/library/ranap/RANAP_Templates.ttcn +++ b/library/ranap/RANAP_Templates.ttcn @@ -451,7 +451,7 @@ protocolIEs := { { id := id_Cause, - criticality := reject, + criticality := ignore, value_ := { cause := cause } @@ -473,7 +473,7 @@ protocolIEs := { { id := id_Cause, - criticality := reject, + criticality := ignore, value_ := { cause := cause } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27298 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: Ib636f5d5ca02962b1592f64d0af30b4b3c9f0053 Gerrit-Change-Number: 27298 Gerrit-PatchSet: 1 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 2 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: hnbgw: Test behaviour when CRCX times out

by daniel

daniel has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27299 ) Change subject: hnbgw: Test behaviour when CRCX times out ...................................................................... hnbgw: Test behaviour when CRCX times out Change-Id: Iba219641498aeacbba742de926cd7f15e3fe9d06 Related: OS#5152 --- M hnbgw/HNBGW_Tests.ttcn 1 file changed, 49 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/99/27299/1 diff --git a/hnbgw/HNBGW_Tests.ttcn b/hnbgw/HNBGW_Tests.ttcn index 314b0df..7b9a49c 100644 --- a/hnbgw/HNBGW_Tests.ttcn +++ b/hnbgw/HNBGW_Tests.ttcn @@ -979,6 +979,54 @@ vc_conn.done; } +friend function f_tc_rab_assign_mgcp_to(charstring id, TestHdlrParams pars) runs on ConnHdlr { + var MgcpCommand mgcp_cmd; + var RANAP_PDU tx; + var template RAB_SetupOrModifyList rab_sml; + timer T := 15.0; + + T.start; + f_init_handler(pars); + f_create_mgcp_expect(ExpectCriteria:{omit,omit,omit}); + + tx := f_build_initial_ue(g_pars); + f_iuh2iu_connect(tx); + + + /* Send RAB Assignment Request */ + rab_sml := ts_RAB_SML(t_RAB_id(23), f_ts_RAB_TLA(pars.mgcp_pars.cn_rtp_ip), t_RAB_binding_port(pars.mgcp_pars.cn_rtp_port)); + tx := valueof(ts_RANAP_RabAssReq(rab_sml)); + BSSAP.send(tx); + + /* Ignore MGCP CRCX */ + alt { + [] MGCP.receive(tr_CRCX) -> value mgcp_cmd { + log("Ignoreing CRCX1", mgcp_cmd); + repeat; + } + [] BSSAP.receive(tr_RANAP_IuReleaseRequest(?)) { } + [] T.timeout { + setverdict(fail, "Timeout waiting for IuRelease"); + } + } + + /* Send Iu Release */ + tx := valueof(ts_RANAP_IuReleaseCommand(ts_RanapCause_om_intervention)); + f_iu2iuh(tx); + + tx := valueof(ts_RANAP_IuReleaseComplete()); + f_iuh2iu(tx); +} + +testcase TC_rab_assign_mgcp_to() runs on test_CT { + var ConnHdlr vc_conn; + f_init(); + f_start_hnbs(); + + vc_conn := f_start_handler_with_pars(refers(f_tc_rab_assign_mgcp_to), t_pars(6)); + vc_conn.done; +} + /* Create an Iuh connection; send InitialUE; transceive data both directions */ friend function f_tc_ranap_bidir(charstring id, TestHdlrParams pars) runs on ConnHdlr { f_init_handler(pars); @@ -1059,6 +1107,7 @@ execute(TC_rab_assignment()); execute(TC_rab_release()); execute(TC_rab_assign_fail()); + execute(TC_rab_assign_mgcp_to()); execute(TC_ranap_cs_mo_disconnect()); execute(TC_ranap_ps_mo_disconnect()); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27299 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: Iba219641498aeacbba742de926cd7f15e3fe9d06 Gerrit-Change-Number: 27299 Gerrit-PatchSet: 1 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 2 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: RANAP_Templates: add sending of RAB_FailedList to tx_RANAP_RabAssResp

by daniel

daniel has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27296 ) Change subject: RANAP_Templates: add sending of RAB_FailedList to tx_RANAP_RabAssResp ...................................................................... RANAP_Templates: add sending of RAB_FailedList to tx_RANAP_RabAssResp The templates ts_RANAP_RabAssResp and tr_RANAP_RabAssResp miss the option to send a RAB_FailedList. This is needed to simulate a RAB assignment that fails at the HNB Change-Id: I95c7c51587981d9f478b9d31fcde139f228fa87f Related: OS#5152 --- M library/ranap/RANAP_Templates.ttcn 1 file changed, 136 insertions(+), 35 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/96/27296/1 diff --git a/library/ranap/RANAP_Templates.ttcn b/library/ranap/RANAP_Templates.ttcn index 0aa1fad..6b4699e 100644 --- a/library/ranap/RANAP_Templates.ttcn +++ b/library/ranap/RANAP_Templates.ttcn @@ -1331,6 +1331,36 @@ } } } +template (value) RAB_FailedList ts_RAB_FL(template (value) RAB_ID rab_id, + template (value) Cause cause) := { { + { + id := id_RAB_FailedItem, + criticality := ignore, + value_ := { + rAB_FailedItem := { + rAB_ID := rab_id, + cause := cause, + iE_Extensions := omit + } + } + } +} } + +template RAB_FailedList tr_RAB_FL(template RAB_ID rab_id, + template Cause cause) := { { + { + id := id_RAB_FailedItem, + criticality := ignore, + value_ := { + rAB_FailedItem := { + rAB_ID := rab_id, + cause := cause, + iE_Extensions := * + } + } + } +} } + template (value) RANAP_PDU ts_RANAP_RabAssReq(template (value) RAB_SetupOrModifyList rab_sml, template (omit) RAB_AssignmentRequest.protocolExtensions exts := omit) := { @@ -1376,58 +1406,130 @@ } } +function +ts_RANAP_RabAssResp(template (omit) RAB_SetupOrModifiedList rab_sml := omit, + template (omit) RAB_FailedList rab_fl := omit, + template (omit) RAB_AssignmentResponse.protocolExtensions exts := omit) return template RANAP_PDU { + var template RANAP_PDU ret; + var template RAB_AssignmentResponse.protocolIEs protocolIEs := {}; + var integer ie_pos := 0; -template (value) RANAP_PDU -ts_RANAP_RabAssResp(template (value) RAB_SetupOrModifiedList rab_sml, - template (omit) RAB_AssignmentResponse.protocolExtensions exts := omit) := { - outcome := { + var template RAB_AssignmentResponse.protocolIEs protocolIEs_rab_sml; + var template RAB_AssignmentResponse.protocolIEs protocolIEs_rab_fl; + + /* RAB-SetupOrModifiedList */ + if (istemplatekind(rab_sml, "value")) { + protocolIEs_rab_sml := { + { + id := id_RAB_SetupOrModifiedList, + criticality := ignore, + value_ := { + rAB_SetupOrModifiedList := rab_sml + } + } + } + + protocolIEs[ie_pos] := protocolIEs_rab_sml[0]; + ie_pos := ie_pos + 1; + } + + /* TODO: RAB-ReleasedList */ + /* TODO: RAB-QueuedList */ + + /* RAB-FailedList */ + if (istemplatekind(rab_fl, "value")) { + protocolIEs_rab_fl := { + { + id := id_RAB_FailedList, + criticality := ignore, + value_ := { + rAB_FailedList := rab_fl + } + } + } + + protocolIEs[ie_pos] := protocolIEs_rab_fl[0]; + ie_pos := ie_pos + 1; + } + + /* TODO: RAB-ReleaseFailedList */ + + ret.outcome := { procedureCode := id_RAB_Assignment, criticality := reject, value_ := { rAB_AssignmentResponse := { - protocolIEs := { - { - id := id_RAB_SetupOrModifiedList, - criticality := ignore, - value_ := { - rAB_SetupOrModifiedList := rab_sml - } - } - /* RAB-ReleasedList */ - /* RAB-QueuedList */ - /* RAB-FailedList */ - /* RAB-ReleaseFailedList */ - }, + protocolIEs := protocolIEs, protocolExtensions := exts } } } + + return ret; } -template RANAP_PDU -tr_RANAP_RabAssResp(template RAB_SetupOrModifiedList rab_sml, - template RAB_AssignmentResponse.protocolExtensions exts := *) := { - outcome := { + +function +tr_RANAP_RabAssResp(template RAB_SetupOrModifiedList rab_sml := omit, + template RAB_FailedList rab_fl := omit, + template RAB_AssignmentResponse.protocolExtensions exts := *) return template RANAP_PDU { + var template RANAP_PDU ret; + var template RAB_AssignmentResponse.protocolIEs protocolIEs := {}; + var integer ie_pos := 0; + + var template RAB_AssignmentResponse.protocolIEs protocolIEs_rab_sml; + var template RAB_AssignmentResponse.protocolIEs protocolIEs_rab_fl; + + /* RAB-SetupOrModifiedList */ + if (not istemplatekind(rab_sml, "omit")) { + protocolIEs_rab_sml := { + { + id := id_RAB_SetupOrModifiedList, + criticality := ignore, + value_ := { + rAB_SetupOrModifiedList := rab_sml + } + } + } + + protocolIEs[ie_pos] := protocolIEs_rab_sml[0]; + ie_pos := ie_pos + 1; + } + + /* TODO: RAB-ReleasedList */ + /* TODO: RAB-QueuedList */ + + /* RAB-FailedList */ + if (not istemplatekind(rab_fl, "omit")) { + protocolIEs_rab_fl := { + { + id := id_RAB_FailedList, + criticality := ignore, + value_ := { + rAB_FailedList := rab_fl + } + } + } + + protocolIEs[ie_pos] := protocolIEs_rab_fl[0]; + ie_pos := ie_pos + 1; + } + + /* TODO: RAB-ReleaseFailedList */ + + protocolIEs[ie_pos] := *; + + ret.outcome := { procedureCode := id_RAB_Assignment, criticality := reject, value_ := { rAB_AssignmentResponse := { - protocolIEs := { - { - id := id_RAB_SetupOrModifiedList, - criticality := ignore, - value_ := { - rAB_SetupOrModifiedList := rab_sml - } - }, * - /* RAB-ReleasedList */ - /* RAB-QueuedList */ - /* RAB-FailedList */ - /* RAB-ReleaseFailedList */ - }, + protocolIEs := protocolIEs, protocolExtensions := exts } } } + + return ret; } template (value) RAB_ReleaseList ts_RAB_RL(template (value) RAB_ID rab_id, @@ -1506,7 +1608,6 @@ } } - /***************************************************************************************************** * *****************************************************************************************************/ -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27296 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: I95c7c51587981d9f478b9d31fcde139f228fa87f Gerrit-Change-Number: 27296 Gerrit-PatchSet: 1 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 2 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: pcu: Start PCUIF related components as alive-type

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27295 ) Change subject: pcu: Start PCUIF related components as alive-type ...................................................................... pcu: Start PCUIF related components as alive-type This should prevent following race conditions at shutdown: """ 131 - Terminating component type PCUIF_Components.RAW_PCU_BTS_CT. ... PCUIF_Components.ttcn:642 Dynamic test case error: Sending data on the connection of port BTS to 131:PCUIF failed. (Broken pipe) """ Change-Id: I17b2cfed2edbea7427e608380059bb1b422ca600 --- M pcu/PCU_Tests.ttcn 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/95/27295/1 diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn index 01113ab..0a67486 100644 --- a/pcu/PCU_Tests.ttcn +++ b/pcu/PCU_Tests.ttcn @@ -279,12 +279,12 @@ activate(as_Tguard_RAW()); /* Init PCU interface component */ - vc_PCUIF := RAW_PCUIF_CT.create("PCUIF"); + vc_PCUIF := RAW_PCUIF_CT.create("PCUIF") alive; connect(vc_PCUIF:MTC, self:PCUIF); map(vc_PCUIF:PCU, system:PCU); /* Create one BTS component (we may want more some day) */ - vc_BTS := RAW_PCU_BTS_CT.create("BTS"); + vc_BTS := RAW_PCU_BTS_CT.create("BTS") alive; connect(vc_BTS:PCUIF, vc_PCUIF:BTS); connect(vc_BTS:TC, self:BTS); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27295 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: I17b2cfed2edbea7427e608380059bb1b422ca600 Gerrit-Change-Number: 27295 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 2 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: Start BSSGP_CT and NS_CT as alive-type component in all testsuites

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27294 ) Change subject: Start BSSGP_CT and NS_CT as alive-type component in all testsuites ...................................................................... Start BSSGP_CT and NS_CT as alive-type component in all testsuites This was already done in PCU_Tests and Gbproxy_Tests, let's to it everywhere. Change-Id: I6e3b08710b4502e2b9805f7c9f7bd89f34e4085c --- M fr-net/FRNET_Tests.ttcn M fr/FR_Tests.ttcn M sgsn/SGSN_Tests.ttcn 3 files changed, 6 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/94/27294/1 diff --git a/fr-net/FRNET_Tests.ttcn b/fr-net/FRNET_Tests.ttcn index 614750f..0a6af59 100644 --- a/fr-net/FRNET_Tests.ttcn +++ b/fr-net/FRNET_Tests.ttcn @@ -88,8 +88,8 @@ private function f_init_gb(inout GbInstance gb, charstring id, integer offset) runs on test_CT { var charstring id_idx := id & int2str(offset); - gb.vc_NS := NS_CT.create(id_idx & "-NSemu"); - gb.vc_BSSGP := BSSGP_CT.create(id_idx & "-BSSGPemu"); + gb.vc_NS := NS_CT.create(id_idx & "-NSemu") alive; + gb.vc_BSSGP := BSSGP_CT.create(id_idx & "-BSSGPemu") alive; connect(gb.vc_BSSGP:BSCP, gb.vc_NS:NS_SP); gb.vc_NS.start(NSStart(mp_nsconfig[offset], id_idx)); gb.vc_BSSGP.start(BssgpStart(gb.cfg, testcasename())); diff --git a/fr/FR_Tests.ttcn b/fr/FR_Tests.ttcn index 1e662fe..b7a56c3 100644 --- a/fr/FR_Tests.ttcn +++ b/fr/FR_Tests.ttcn @@ -89,8 +89,8 @@ /* initialize one Gb interface */ private function f_init_gb(inout GbInstance gb, charstring id, integer offset) runs on test_CT { var charstring id_idx := id & int2str(offset); - gb.vc_NS := NS_CT.create(id_idx & "-NSemu"); - gb.vc_BSSGP := BSSGP_CT.create(id_idx & "-BSSGPemu"); + gb.vc_NS := NS_CT.create(id_idx & "-NSemu") alive; + gb.vc_BSSGP := BSSGP_CT.create(id_idx & "-BSSGPemu") alive; connect(gb.vc_BSSGP:BSCP, gb.vc_NS:NS_SP); gb.vc_NS.start(NSStart(mp_nsconfig[offset], id_idx)); connect(self:BSSGP_PROC[offset], gb.vc_BSSGP:PROC); diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn index 3386f71..c29095f 100644 --- a/sgsn/SGSN_Tests.ttcn +++ b/sgsn/SGSN_Tests.ttcn @@ -257,8 +257,8 @@ } private function f_init_gb(inout GbInstance gb, charstring id, integer offset) runs on test_CT { - gb.vc_NS := NS_CT.create(id & "-NS" & int2str(offset)); - gb.vc_BSSGP := BSSGP_CT.create(id & "-BSSGP" & int2str(offset)); + gb.vc_NS := NS_CT.create(id & "-NS" & int2str(offset)) alive; + gb.vc_BSSGP := BSSGP_CT.create(id & "-BSSGP" & int2str(offset)) alive; /* connect lower end of BSSGP emulation with NS upper port */ connect(gb.vc_BSSGP:BSCP, gb.vc_NS:NS_SP); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27294 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: I6e3b08710b4502e2b9805f7c9f7bd89f34e4085c Gerrit-Change-Number: 27294 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 2 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: pcu: usse alive-type for NS and BSSGP created components

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27293 ) Change subject: pcu: usse alive-type for NS and BSSGP created components ...................................................................... pcu: usse alive-type for NS and BSSGP created components Internal BVC components in BSSGP are now created as alive. We have to create also BSSGP one as alive in order to avoid having the BVC component sending stuff to the BSSGP when it has already been killed: BSSGP_Emulation.ttcnpp:1133 Dynamic test case error: Sending data on the connection of port BVC to 486:BVC failed. (Broken pipe) Change-Id: I369a5e2246204416c2f29a114bde6bc21f7eaf4f --- M pcu/SGSN_Components.ttcn 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/93/27293/1 diff --git a/pcu/SGSN_Components.ttcn b/pcu/SGSN_Components.ttcn index a55d791..bbac9b0 100644 --- a/pcu/SGSN_Components.ttcn +++ b/pcu/SGSN_Components.ttcn @@ -108,8 +108,8 @@ g_initialized := true; /* create a new NS component */ - ns_component := NS_CT.create; - bssgp_component := BSSGP_CT.create; + ns_component := NS_CT.create alive; + bssgp_component := BSSGP_CT.create alive; /* connect lower-end of BSSGP with BSSGP_CODEC_PORT (maps to NS_PT*/ connect(bssgp_component:BSCP, ns_component:NS_SP); connect(self:PROC, bssgp_component:PROC); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27293 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: I369a5e2246204416c2f29a114bde6bc21f7eaf4f Gerrit-Change-Number: 27293 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 2 months

1
0
0 0

Change in osmo-bsc[2021q4]: cosmetics around select_best_cipher()

by dexter

dexter has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27292 ) Change subject: cosmetics around select_best_cipher() ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27292 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: 2021q4 Gerrit-Change-Id: Iaed6b97c31e4ccb1f28ca7e64596d5e20563b392 Gerrit-Change-Number: 27292 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: abandon

2 years, 2 months

1
0
0 0

Change in osmo-bsc[2021q4]: cosmetics around select_best_cipher()

by pespin

Attention is currently required from: dexter. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27292 ) Change subject: cosmetics around select_best_cipher() ...................................................................... Patch Set 1: Code-Review-1 (1 comment) Patchset: PS1: This one doesn't seem to be needed for a backport. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27292 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: 2021q4 Gerrit-Change-Id: Iaed6b97c31e4ccb1f28ca7e64596d5e20563b392 Gerrit-Change-Number: 27292 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Tue, 22 Feb 2022 15:48:25 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 2 months

1
0
0 0

Change in osmo-bsc[2021q4]: fix inter-BSC-in handover encryption

by pespin

Attention is currently required from: dexter. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27291 ) Change subject: fix inter-BSC-in handover encryption ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27291 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: 2021q4 Gerrit-Change-Id: Iffedc981b60d309ed2e5decd5efedee07a757b53 Gerrit-Change-Number: 27291 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Tue, 22 Feb 2022 15:47:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 2 months

1
0
0 0

Change in osmo-bsc[2021q4]: rename RSL_ENC_ALG_A5 to ALG_A5_NR_TO_RSL, clarify

by pespin

Attention is currently required from: dexter. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27290 ) Change subject: rename RSL_ENC_ALG_A5 to ALG_A5_NR_TO_RSL, clarify ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27290 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: 2021q4 Gerrit-Change-Id: I7557ae97764bba09c906748a18e9031dfb362611 Gerrit-Change-Number: 27290 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Tue, 22 Feb 2022 15:47:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 2 months

1
0
0 0

Change in osmo-bsc[2021q4]: fix inter-BSC-in handover encryption

by dexter

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27291 ) Change subject: fix inter-BSC-in handover encryption ...................................................................... fix inter-BSC-in handover encryption In the field we saw Handover Requests without any Chosen Encryption Algorithm IE, and osmo-bsc completely failed on those. This made me understand my mistake from when I wrote this handover code. So far, from a BSSMAP Handover Request, we (I) used only the Chosen Encryption Algorithm IE to pick the encryption to use on the target lchan. That is very wrong. Instead, figure out the intersection of permitted algorithms MSC & BSC, and pick the best of those. Which means, actually, completely ignore the Chosen Encryption Algorithm IE. In the message, the permitted algorithms are passed as a bitmask. The current code using gsm0808_dec_encrypt_info() passes this on as an array. In order to select_best_cipher(), I could convert that array back to a bitmask. Instead pass the bitmask on from message decoding alongside the struct gsm0808_encrypt_info in req->ei_as_bitmask. In handover_end(), change the condition so that we can also pass HO_RESULT_FAIL_RR_HO_FAIL to emit a Handover Failure. Related: SYS#5839 Change-Id: Iffedc981b60d309ed2e5decd5efedee07a757b53 --- M include/osmocom/bsc/gsm_data.h M src/osmo-bsc/handover_fsm.c M src/osmo-bsc/osmo_bsc_bssap.c 3 files changed, 26 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/91/27291/1 diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h index 7657a5f..a1aa2df 100644 --- a/include/osmocom/bsc/gsm_data.h +++ b/include/osmocom/bsc/gsm_data.h @@ -250,6 +250,8 @@ struct gsm0808_channel_type ct; struct gsm0808_speech_codec_list scl; struct gsm0808_encrypt_info ei; + /* The same information as in 'ei' but as the handy bitmask as on the wire. */ + uint8_t ei_as_bitmask; bool kc128_present; uint8_t kc128[16]; struct gsm_classmark classmark; @@ -1435,4 +1437,6 @@ enum rsl_cmod_spd chan_mode_to_rsl_cmod_spd(enum gsm48_chan_mode chan_mode); +int select_best_cipher(uint8_t msc_mask, uint8_t bsc_mask); + #endif /* _GSM_DATA_H */ diff --git a/src/osmo-bsc/handover_fsm.c b/src/osmo-bsc/handover_fsm.c index 37e7417..487135b 100644 --- a/src/osmo-bsc/handover_fsm.c +++ b/src/osmo-bsc/handover_fsm.c @@ -490,6 +490,7 @@ LOG_HO(conn, LOGL_ERROR, "Failed to parse Encryption Information IE\n"); return false; } + req->ei_as_bitmask = *e->val; if ((e = TLVP_GET(tp, GSM0808_IE_KC_128))) { if (e->len != 16) { @@ -630,6 +631,7 @@ int match_idx; struct osmo_fsm_inst *fi; struct channel_mode_and_rate ch_mode_rate = {}; + int chosen_a5_n; handover_fsm_alloc(conn); @@ -717,16 +719,28 @@ .msc_assigned_cic = req->msc_assigned_cic, }; - if (req->chosen_encr_alg) { - info.encr.alg_id = req->chosen_encr_alg; - if (info.encr.alg_id > 1 && !req->ei.key_len) { - ho_fail(HO_RESULT_ERROR, "Chosen Encryption Algorithm (Serving) reflects A5/%u" - " but there is no key (Encryption Information)", info.encr.alg_id - 1); + /* Figure out the encryption algorithm */ + chosen_a5_n = select_best_cipher(req->ei_as_bitmask, bsc_gsmnet->a5_encryption_mask); + if (chosen_a5_n < 0) { + ho_fail(HO_RESULT_FAIL_RR_HO_FAIL, + "There is no A5 encryption mode that both BSC and MSC permit: MSC 0x%x & BSC 0x%x = 0\n", + req->ei_as_bitmask, bsc_gsmnet->a5_encryption_mask); + return; + } + if (chosen_a5_n > 0 && !req->ei.key_len) { + /* There is no key. Is A5/0 permitted? */ + if ((req->ei_as_bitmask & bsc_gsmnet->a5_encryption_mask & 0x1) == 0x1) { + chosen_a5_n = 0; + } else { + ho_fail(HO_RESULT_ERROR, + "Encryption is required, but there is no key (Encryption Information)"); return; } } - if (req->ei.key_len) { + /* Put encryption info in the chan activation info */ + info.encr.alg_id = ALG_A5_NR_TO_RSL(chosen_a5_n); + if (chosen_a5_n > 0) { if (req->ei.key_len > sizeof(info.encr.key)) { ho_fail(HO_RESULT_ERROR, "Encryption Information IE key length is too large: %u\n", req->ei.key_len); @@ -965,7 +979,7 @@ result = bsc_tx_bssmap_ho_complete(conn, ho->new_lchan); } /* Not 'else': above checks may still result in HO_RESULT_ERROR. */ - if (result == HO_RESULT_ERROR) { + if (result != HO_RESULT_OK) { /* Return a BSSMAP Handover Failure, as described in 3GPP TS 48.008 3.1.5.2.2 * "Handover Resource Allocation Failure" */ bsc_tx_bssmap_ho_failure(conn); diff --git a/src/osmo-bsc/osmo_bsc_bssap.c b/src/osmo-bsc/osmo_bsc_bssap.c index cf8254c..9d7b89f 100644 --- a/src/osmo-bsc/osmo_bsc_bssap.c +++ b/src/osmo-bsc/osmo_bsc_bssap.c @@ -394,7 +394,7 @@ } /* select the best cipher permitted by the intersection of both masks */ -static int select_best_cipher(uint8_t msc_mask, uint8_t bsc_mask) +int select_best_cipher(uint8_t msc_mask, uint8_t bsc_mask) { /* A5/7 ... A5/3: We assume higher is better, * but: A5/1 is better than A5/2, which is better than A5/0 */ -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27291 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: 2021q4 Gerrit-Change-Id: Iffedc981b60d309ed2e5decd5efedee07a757b53 Gerrit-Change-Number: 27291 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 2 months

1
0
0 0

Change in osmo-bsc[2021q4]: cosmetics around select_best_cipher()

by dexter

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27292 ) Change subject: cosmetics around select_best_cipher() ...................................................................... cosmetics around select_best_cipher() Improve the function doc. Remove a comment at a caller, because that information is what the function doc is for. Rename the array to codec_by_strength, because it is not the codec strength but the codec number listed in the array. Related: SYS#5839 Change-Id: Iaed6b97c31e4ccb1f28ca7e64596d5e20563b392 --- M src/osmo-bsc/osmo_bsc_bssap.c 1 file changed, 5 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/92/27292/1 diff --git a/src/osmo-bsc/osmo_bsc_bssap.c b/src/osmo-bsc/osmo_bsc_bssap.c index 9d7b89f..a4c2a3c 100644 --- a/src/osmo-bsc/osmo_bsc_bssap.c +++ b/src/osmo-bsc/osmo_bsc_bssap.c @@ -393,17 +393,18 @@ return 0; } -/* select the best cipher permitted by the intersection of both masks */ +/* Select the best cipher permitted by the intersection of both masks. Return as the n in A5/n, or -1 if the + * intersection is empty. */ int select_best_cipher(uint8_t msc_mask, uint8_t bsc_mask) { /* A5/7 ... A5/3: We assume higher is better, * but: A5/1 is better than A5/2, which is better than A5/0 */ - const uint8_t codec_strength[8] = { 7, 6, 5, 4, 3, 1, 2, 0 }; + const uint8_t codec_by_strength[8] = { 7, 6, 5, 4, 3, 1, 2, 0 }; uint8_t intersection = msc_mask & bsc_mask; int i; - for (i = 0; i < ARRAY_SIZE(codec_strength); i++) { - uint8_t codec = codec_strength[i]; + for (i = 0; i < ARRAY_SIZE(codec_by_strength); i++) { + uint8_t codec = codec_by_strength[i]; if (intersection & (1 << codec)) return codec; } @@ -509,9 +510,6 @@ * a5_encryption == 2 --> 0x04 ... */ enc_bits_msc = data[0]; - /* The bit-mask of permitted ciphers from the MSC (sent in ASSIGNMENT COMMAND) is intersected - * with the vty-configured mask a the BSC. Finally, the best (highest) possible cipher is - * chosen. */ chosen_cipher = select_best_cipher(enc_bits_msc, bsc_gsmnet->a5_encryption_mask); if (chosen_cipher < 0) { LOGP(DMSC, LOGL_ERROR, "Reject: no overlapping A5 ciphers between BSC (0x%02x) " -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27292 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: 2021q4 Gerrit-Change-Id: Iaed6b97c31e4ccb1f28ca7e64596d5e20563b392 Gerrit-Change-Number: 27292 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 2 months

1
0
0 0

Change in osmo-bsc[2021q4]: rename RSL_ENC_ALG_A5 to ALG_A5_NR_TO_RSL, clarify

by dexter

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27290 ) Change subject: rename RSL_ENC_ALG_A5 to ALG_A5_NR_TO_RSL, clarify ...................................................................... rename RSL_ENC_ALG_A5 to ALG_A5_NR_TO_RSL, clarify The naming confused me so that I wrote buggy code again. Hopefully this clarifies which representations the code paths are using. In the macro code, highlight the error case of n <= -1 explicitly. Also add ALG_A5_NR_TO_PERM_ALG_BITS. I need the 1<<n case in an upcoming patch. Related: SYS#5839 Change-Id: I7557ae97764bba09c906748a18e9031dfb362611 --- M include/osmocom/bsc/gsm_data.h M src/osmo-bsc/abis_rsl.c M src/osmo-bsc/gsm_04_08_rr.c M src/osmo-bsc/osmo_bsc_bssap.c 4 files changed, 22 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/90/27290/1 diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h index 238b2f7..7657a5f 100644 --- a/include/osmocom/bsc/gsm_data.h +++ b/include/osmocom/bsc/gsm_data.h @@ -506,7 +506,24 @@ #define A38_XOR_MIN_KEY_LEN 12 #define A38_XOR_MAX_KEY_LEN 16 #define A38_COMP128_KEY_LEN 16 -#define RSL_ENC_ALG_A5(x) (x+1) + +/* There are these representations of A5/n: + * + * - (uint8_t)(1<<n), either as a single bit, or combined as a list of + * permitted algorithms. + * A5/0 == 0x01, A5/3 == 0x08, none = 0 + * + * - n+1, used on the RSL wire. + * A5/0 == 1, A5/3 == 4, none = 0 + * + * - n, used for human interaction and returned by select_best_cipher(). + * A5/0 == 0, A5/3 == 3, none <= -1 + * + * These macros convert from n to the other representations: + */ +#define ALG_A5_NR_TO_RSL(A5_N) ((A5_N) >= 0 ? (A5_N)+1 : 0) +#define ALG_A5_NR_TO_PERM_ALG_BITS(A5_N) ((A5_N) >= 0 ? 1<<(A5_N) : 0) + /* Up to 16 SI2quater are multiplexed; each fits 3 EARFCNS, so the practical maximum is 3*16. * The real maximum that fits in a total of 16 SI2quater rest octets also depends on the bits left by other SI2quater * rest octets elements, so to really fit 48 EARFCNs most other SI2quater elements need to be omitted. */ diff --git a/src/osmo-bsc/abis_rsl.c b/src/osmo-bsc/abis_rsl.c index 402ea27..a49cc65 100644 --- a/src/osmo-bsc/abis_rsl.c +++ b/src/osmo-bsc/abis_rsl.c @@ -660,7 +660,7 @@ msg->l3h = len + 1; *len = msgb_l3len(msg); - if (lchan->encr.alg_id > RSL_ENC_ALG_A5(0)) { + if (lchan->encr.alg_id > ALG_A5_NR_TO_RSL(0)) { uint8_t encr_info[MAX_A5_KEY_LEN+2]; rc = build_encr_info(encr_info, lchan); if (rc > 0) @@ -764,7 +764,7 @@ msgb_tlv_put(msg, RSL_IE_CHAN_MODE, sizeof(cm), (uint8_t *) &cm); - if (lchan->encr.alg_id > RSL_ENC_ALG_A5(0)) { + if (lchan->encr.alg_id > ALG_A5_NR_TO_RSL(0)) { uint8_t encr_info[MAX_A5_KEY_LEN+2]; rc = build_encr_info(encr_info, lchan); if (rc > 0) diff --git a/src/osmo-bsc/gsm_04_08_rr.c b/src/osmo-bsc/gsm_04_08_rr.c index 6c0615e..03b1e98 100644 --- a/src/osmo-bsc/gsm_04_08_rr.c +++ b/src/osmo-bsc/gsm_04_08_rr.c @@ -374,7 +374,7 @@ DEBUGP(DRR, "TX CIPHERING MODE CMD\n"); - if (lchan->encr.alg_id <= RSL_ENC_ALG_A5(0)) + if (lchan->encr.alg_id <= ALG_A5_NR_TO_RSL(0)) ciph_mod_set = 0; else ciph_mod_set = (lchan->encr.alg_id-2)<<1 | 1; diff --git a/src/osmo-bsc/osmo_bsc_bssap.c b/src/osmo-bsc/osmo_bsc_bssap.c index 904da62..cf8254c 100644 --- a/src/osmo-bsc/osmo_bsc_bssap.c +++ b/src/osmo-bsc/osmo_bsc_bssap.c @@ -534,7 +534,7 @@ goto reject; } - conn->lchan->encr.alg_id = RSL_ENC_ALG_A5(chosen_cipher); + conn->lchan->encr.alg_id = ALG_A5_NR_TO_RSL(chosen_cipher); if (enc_key_len) { conn->lchan->encr.key_len = enc_key_len; memcpy(conn->lchan->encr.key, enc_key, enc_key_len); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27290 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: 2021q4 Gerrit-Change-Id: I7557ae97764bba09c906748a18e9031dfb362611 Gerrit-Change-Number: 27290 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 2 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: BSSGP_Emulation: usse alive-type for internal BVC created components

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27289 ) Change subject: BSSGP_Emulation: usse alive-type for internal BVC created components ...................................................................... BSSGP_Emulation: usse alive-type for internal BVC created components Otherwise, during shutdown of all components we may end up in a situation where the BVC is already killed and BSSGP Emulation receives a packet which tries to forward to BVC and fails. This can be seen quite a lot in PCU_Tests.TC_pcuif_suspend: """ PCU_Tests.ttcn:394 setverdict(pass): none -> pass ... PCUIF_Components.ttcn:246 Stopping test component execution. ... GPRS_Components.ttcn:222 Connection of port BSSGP[0] to TC_pcuif_suspend-BVCI1234(6):BSSGP_SP was closed unexpectedly by the peer. ... GPRS_Components.ttcn:222 Port BSSGP[0] was disconnected from TC_pcuif_suspend-BVCI1234(6):BSSGP_SP. ... Component type BSSGP_Emulation.BSSGP_BVC_CT was shut down inside testcase TC_pcuif_suspend ... BSSGP_Emulation.ttcnpp:317 Dynamic test case error: Sending data on the connection of port BVC to 6:BVC failed. (Broken pipe) """ Change-Id: Ib0adcf64eb5ca876cd9e9b91f2b597804c03bdc2 --- M library/BSSGP_Emulation.ttcnpp 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/89/27289/1 diff --git a/library/BSSGP_Emulation.ttcnpp b/library/BSSGP_Emulation.ttcnpp index e0b5dee..1b628b3 100644 --- a/library/BSSGP_Emulation.ttcnpp +++ b/library/BSSGP_Emulation.ttcnpp @@ -198,7 +198,7 @@ var BssgpBvcConfig bvc_cfg := g_cfg.bvc[i]; var charstring bvc_id := id & "-BVCI" & int2str(bvc_cfg.bvci); /* create, connect and start the BVC component */ - var BSSGP_BVC_CT bvc_ct := BSSGP_BVC_CT.create(bvc_id); + var BSSGP_BVC_CT bvc_ct := BSSGP_BVC_CT.create(bvc_id) alive; connect(bvc_ct:BVC, self:BVC); bvc_ct.start(f_bssgp_bvc_main(bvc_cfg, g_cfg.sgsn_role, g_cfg.nsei, bvc_id)); /* populate the BVC state table */ -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27289 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: Ib0adcf64eb5ca876cd9e9b91f2b597804c03bdc2 Gerrit-Change-Number: 27289 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 2 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: BSSGP_Emulation: Fix ttcn3 runtime warning

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27288 ) Change subject: BSSGP_Emulation: Fix ttcn3 runtime warning ...................................................................... BSSGP_Emulation: Fix ttcn3 runtime warning Should fix following TTCN3 warning during runtime of PCU_Tests.TC_pcuif_suspend: """ BSSGP_Emulation.ttcnpp:462 Timeout operation on timer g_T2 failed: The timer is not started. """ Change-Id: Ic74572a21b5abee8e530741466360ff7e16a357d --- M library/BSSGP_Emulation.ttcnpp 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/88/27288/1 diff --git a/library/BSSGP_Emulation.ttcnpp b/library/BSSGP_Emulation.ttcnpp index 23c8d03..e0b5dee 100644 --- a/library/BSSGP_Emulation.ttcnpp +++ b/library/BSSGP_Emulation.ttcnpp @@ -459,7 +459,7 @@ } } } - [] g_T2.timeout { + [g_T2.running] g_T2.timeout { setverdict(fail, "Timeout waiting for BVC-RESET-ACK on BVCI=0"); BSCP.send(f_BnsUdReq(ts_BSSGP_STATUS(udi.bvci, BSSGP_CAUSE_BVCI_UNKNOWN, udi.bssgp), 0, 0)); g_T2.start; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27288 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: Ic74572a21b5abee8e530741466360ff7e16a357d Gerrit-Change-Number: 27288 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 2 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: pcu: Fix race condition in TC_t3141

by pespin

pespin has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27287 ) Change subject: pcu: Fix race condition in TC_t3141 ...................................................................... pcu: Fix race condition in TC_t3141 The test was expecting to always receive at least 1 DL packet with USF_UNUSED, but since we implemented idle blocks in PCUIF that may not always be the case anymore. If the TBF is freed in between last requested block and next one, there may be no TBF and hence no MS listening on the TS, so PCU will optimize and send an idle block. Change-Id: Ia301c01a3f5c3fd0b11d8f20e39061aa7abc6127 --- M pcu/PCU_Tests.ttcn 1 file changed, 9 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/87/27287/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27287 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: Ia301c01a3f5c3fd0b11d8f20e39061aa7abc6127 Gerrit-Change-Number: 27287 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-MessageType: newpatchset

2 years, 2 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: pcu: Fix race conditio in TC_t3141

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27287 ) Change subject: pcu: Fix race conditio in TC_t3141 ...................................................................... pcu: Fix race conditio in TC_t3141 The test was expecting to always receive at least 1 DL packet with USF_UNUSED, but since we implemented idle blocks in PCUIF that may not always be the case anymore. If the TBF is freed in between last requested block and next one, there may be no TBF and hence no MS listening on the TS, so PCU will optimize and send an idle block. Change-Id: Ia301c01a3f5c3fd0b11d8f20e39061aa7abc6127 --- M pcu/PCU_Tests.ttcn 1 file changed, 9 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/87/27287/1 diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn index 7fcab4a..01113ab 100644 --- a/pcu/PCU_Tests.ttcn +++ b/pcu/PCU_Tests.ttcn @@ -1428,6 +1428,15 @@ block_nr := nr.blk_nr)); repeat; } + [ul_tbf_usf_req] BTS.receive(tr_PCUIF_DATA_PDTCH(nr.bts_nr, + tr_PCUIF_DATA(nr.trx_nr, nr.ts_nr, sapi := PCU_IF_SAPI_PDTCH), + omit)) { + /* TBF was dropped by T3141, and PCU answered with an IDLE block to + our last RTS.req because there's no longer any MS listening on + the TS. */ + setverdict(pass); + break; + } [] T_3141.timeout { log("T_3141 expired but TBF is still active, unexpected"); f_shutdown(__BFILE__, __LINE__); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27287 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: Ia301c01a3f5c3fd0b11d8f20e39061aa7abc6127 Gerrit-Change-Number: 27287 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 2 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: msc: Avoid race condition when setting osmux options via VTY

by pespin

Attention is currently required from: fixeria, daniel. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27286 ) Change subject: msc: Avoid race condition when setting osmux options via VTY ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27286 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: Ife23f70c6523034f3c3c53b6c1c81428566fd43e Gerrit-Change-Number: 27286 Gerrit-PatchSet: 1 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Tue, 22 Feb 2022 13:35:48 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 2 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: msc: Avoid race condition when setting osmux options via VTY

by daniel

daniel has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27286 ) Change subject: msc: Avoid race condition when setting osmux options via VTY ...................................................................... msc: Avoid race condition when setting osmux options via VTY If the RAN_Emulation is started before the VTY reconfiguration we could get a BSSMAP Reset/ResetAck with Osmux support advertised even though the test expects it to be disabled (or vice versa). Do the VTY configuration before starting the RAN_Emulation. Fixes sporadic/load-related TTCN3 failures with message "BSSMAP: Timeout waiting for RESET-ACK after sending RESET" (e.g. TC_iu_and_mt_call_osmux, TC_iu_and_mo_sms in run +1567) Change-Id: Ife23f70c6523034f3c3c53b6c1c81428566fd43e --- M msc/MSC_Tests.ttcn 1 file changed, 24 insertions(+), 22 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/86/27286/1 diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn index db96d60..dd31daf 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -304,29 +304,7 @@ testcase.stop("excess number of BSC instances requested"); } - for (var integer i := 0; i < num_bsc; i := i + 1) { - if (isbound(mp_bssap_cfg[i])) { - var RanOps ranops := BSC_RanOps; - ranops.use_osmux := osmux; - f_ran_adapter_init(g_bssap[i], mp_bssap_cfg[i], "MSC_Test_" & int2str(i), ranops); - f_ran_adapter_start(g_bssap[i]); - } else { - testcase.stop("missing BSSAP configuration"); - } - } - f_ipa_ctrl_start_client(mp_msc_ip, mp_msc_ctrl_port); - f_init_mncc("MSC_Test"); - f_init_mgcp("MSC_Test"); - - if (gsup == true) { - f_init_gsup("MSC_Test"); - } - f_init_smpp("MSC_Test"); - - if (sgsap == true) { - f_init_sgsap("MSC_Test"); - } map(self:MSCVTY, system:MSCVTY); f_vty_set_prompts(MSCVTY); @@ -344,6 +322,30 @@ } else { f_vty_config(MSCVTY, "msc", "osmux off"); } + + for (var integer i := 0; i < num_bsc; i := i + 1) { + if (isbound(mp_bssap_cfg[i])) { + var RanOps ranops := BSC_RanOps; + ranops.use_osmux := osmux; + f_ran_adapter_init(g_bssap[i], mp_bssap_cfg[i], "MSC_Test_" & int2str(i), ranops); + f_ran_adapter_start(g_bssap[i]); + } else { + testcase.stop("missing BSSAP configuration"); + } + } + + f_init_mncc("MSC_Test"); + f_init_mgcp("MSC_Test"); + + if (gsup == true) { + f_init_gsup("MSC_Test"); + } + f_init_smpp("MSC_Test"); + + if (sgsap == true) { + f_init_sgsap("MSC_Test"); + } + } /* Initialize for a direct connection to BSSAP. This function is an alternative -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27286 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: Ife23f70c6523034f3c3c53b6c1c81428566fd43e Gerrit-Change-Number: 27286 Gerrit-PatchSet: 1 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 2 months

1
0
0 0

Change in docker-playground[master]: ttcn3-fr-test/jenkins.sh: revert docker run --rm

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/27283 ) Change subject: ttcn3-fr-test/jenkins.sh: revert docker run --rm ...................................................................... ttcn3-fr-test/jenkins.sh: revert docker run --rm Revert the change of adding a --rm to the "docker run" commands done in I48b01c43fedf379b8a565eaab0369806d7831bd8. This script runs the containers in the background, waits until they are done, copies the logs and then removes them afterwards. Fix for: + docker kill jenkins-ttcn3-fr-test-384-frnet jenkins-ttcn3-fr-test-384-frnet + docker logs --timestamps jenkins-ttcn3-fr-test-384-ttcn3-fr-test Error: No such container: jenkins-ttcn3-fr-test-384-ttcn3-fr-test Change-Id: I56dc07820ccfa8ad6936764262a7c6c272e59c37 --- M ttcn3-fr-test/jenkins.sh 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/ttcn3-fr-test/jenkins.sh b/ttcn3-fr-test/jenkins.sh index 34aa740..4531e3a 100755 --- a/ttcn3-fr-test/jenkins.sh +++ b/ttcn3-fr-test/jenkins.sh @@ -25,7 +25,7 @@ echo Starting container with FRNET docker run \ - --rm \ + `# --rm is done in below` \ --cap-add=NET_RAW --cap-add=SYS_RAWIO \ $(docker_network_params $SUBNET 10) \ --ulimit core=-1 \ @@ -45,7 +45,7 @@ echo Starting container with FR testsuite docker run \ - --rm \ + `# --rm is done in below` \ --cap-add=NET_RAW --cap-add=SYS_RAWIO \ $(docker_network_params $SUBNET 103) \ --ulimit core=-1 \ -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27283 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I56dc07820ccfa8ad6936764262a7c6c272e59c37 Gerrit-Change-Number: 27283 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 2 months

1
0
0 0

Change in docker-playground[master]: ttcn3-fr-test/jenkins.sh: make use of clean_up()

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/27284 ) Change subject: ttcn3-fr-test/jenkins.sh: make use of clean_up() ...................................................................... ttcn3-fr-test/jenkins.sh: make use of clean_up() Move cleaning up logic to clean_up(), so it runs as part of the clean_up_trap if any command in the previous code fails. For example, if the first docker container started properly, but the second docker container failed to start: without this patch, it would just stop the script without running the clean up code. Change-Id: I4624e37d5d2fa90b71b32d72067b3645f69805da --- M ttcn3-fr-test/jenkins.sh 1 file changed, 12 insertions(+), 9 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/ttcn3-fr-test/jenkins.sh b/ttcn3-fr-test/jenkins.sh index 4531e3a..182f512 100755 --- a/ttcn3-fr-test/jenkins.sh +++ b/ttcn3-fr-test/jenkins.sh @@ -8,6 +8,16 @@ set_clean_up_trap set -e +clean_up() { + # kill the frnet container to avoid "You cannot remove a running container " below in 'rm' + docker kill ${BUILD_TAG}-frnet || true + + # store execution logs for both containers + docker logs --timestamps ${BUILD_TAG}-ttcn3-fr-test > $VOL_BASE_DIR/fr-tester/exec.log || true + docker logs --timestamps ${BUILD_TAG}-frnet > $VOL_BASE_DIR/frnet/exec.log || true + docker container rm ${BUILD_TAG}-frnet ${BUILD_TAG}-ttcn3-fr-test +} + SUBNET=26 network_create $SUBNET @@ -25,7 +35,7 @@ echo Starting container with FRNET docker run \ - `# --rm is done in below` \ + `# --rm is done in clean_up()` \ --cap-add=NET_RAW --cap-add=SYS_RAWIO \ $(docker_network_params $SUBNET 10) \ --ulimit core=-1 \ @@ -45,7 +55,7 @@ echo Starting container with FR testsuite docker run \ - `# --rm is done in below` \ + `# --rm is done in clean_up()` \ --cap-add=NET_RAW --cap-add=SYS_RAWIO \ $(docker_network_params $SUBNET 103) \ --ulimit core=-1 \ @@ -66,10 +76,3 @@ # emulate running container in foreground, which is no longer possible as we # must shift the net-devices into the container _after_ it is started docker logs -f ${BUILD_TAG}-ttcn3-fr-test -# kill the frnet container to avoid "You cannot remove a running container " below in 'rm' -docker kill ${BUILD_TAG}-frnet - -# store execution logs for both containers -docker logs --timestamps ${BUILD_TAG}-ttcn3-fr-test > $VOL_BASE_DIR/fr-tester/exec.log -docker logs --timestamps ${BUILD_TAG}-frnet > $VOL_BASE_DIR/frnet/exec.log -docker container rm ${BUILD_TAG}-frnet ${BUILD_TAG}-ttcn3-fr-test -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27284 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I4624e37d5d2fa90b71b32d72067b3645f69805da Gerrit-Change-Number: 27284 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 2 months

1
0
0 0

Change in docker-playground[master]: ttcn3-fr-test/jenkins.sh: revert docker run --rm

by laforge

Attention is currently required from: osmith. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/27283 ) Change subject: ttcn3-fr-test/jenkins.sh: revert docker run --rm ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27283 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I56dc07820ccfa8ad6936764262a7c6c272e59c37 Gerrit-Change-Number: 27283 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Tue, 22 Feb 2022 11:56:17 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 2 months

1
0
0 0

Change in docker-playground[master]: ttcn3-fr-test/jenkins.sh: make use of clean_up()

by laforge

Attention is currently required from: osmith. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/27284 ) Change subject: ttcn3-fr-test/jenkins.sh: make use of clean_up() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27284 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I4624e37d5d2fa90b71b32d72067b3645f69805da Gerrit-Change-Number: 27284 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Tue, 22 Feb 2022 11:56:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 2 months

1
0
0 0

Change in osmo-ci[master]: jobs/ttcn3-testsuites.yml: add ttcn3-fr-test

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/27285 ) Change subject: jobs/ttcn3-testsuites.yml: add ttcn3-fr-test ...................................................................... jobs/ttcn3-testsuites.yml: add ttcn3-fr-test Add a configuration for the job to the yml file. It looks like this job was created manually, or the configuration was just not pushed to gerrit. This makes e-mail notifications consistent and fixes missing colors in build output. Change-Id: I14995dea0a0d223b78e20b49953d5c814c1ad4a1 --- M jobs/ttcn3-testsuites.yml 1 file changed, 4 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/jobs/ttcn3-testsuites.yml b/jobs/ttcn3-testsuites.yml index dbf162b..5b915c7 100644 --- a/jobs/ttcn3-testsuites.yml +++ b/jobs/ttcn3-testsuites.yml @@ -151,6 +151,10 @@ blocking: "^(ttcn3|TTCN3-.*)-hnbgw-test.*" timer: 40 13 * * * disabled: true + - ttcn3-fr-test: + blocking: "^(ttcn3|TTCN3-.*)-fr-test.*" + timer: 40 10 * * * + node: hdlc # debian-stretch latest stable - nplab-m3ua-test-latest: -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/27285 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I14995dea0a0d223b78e20b49953d5c814c1ad4a1 Gerrit-Change-Number: 27285 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 2 months

1
0
0 0

Change in osmo-ci[master]: jobs/ttcn3-testsuites.yml: add ttcn3-fr-test

by laforge

Attention is currently required from: osmith. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/27285 ) Change subject: jobs/ttcn3-testsuites.yml: add ttcn3-fr-test ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/27285 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I14995dea0a0d223b78e20b49953d5c814c1ad4a1 Gerrit-Change-Number: 27285 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Tue, 22 Feb 2022 11:55:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 2 months

1
0
0 0

Change in dahdi-linux[master]: enable PPP and DAHDI_MIRROR by default.

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/dahdi-linux/+/27264 ) Change subject: enable PPP and DAHDI_MIRROR by default. ...................................................................... enable PPP and DAHDI_MIRROR by default. There's not really any reason to disable those, from what I can tell. Change-Id: Ib03074062ada7b6da485afac53b1550d31f1a5ca --- M include/dahdi/dahdi_config.h 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved tnt: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/include/dahdi/dahdi_config.h b/include/dahdi/dahdi_config.h index 0a8f5a9..c441b62 100644 --- a/include/dahdi/dahdi_config.h +++ b/include/dahdi/dahdi_config.h @@ -80,6 +80,7 @@ * support. */ #define CONFIG_DAHDI_NET +#define CONFIG_DAHDI_PPP /* * Uncomment for Generic PPP support (i.e. DAHDIRAS) @@ -187,7 +188,7 @@ /* * Creates an interface for mirroring the raw channel data out to a pseudo-chan */ -/* #define CONFIG_DAHDI_MIRROR */ +#define CONFIG_DAHDI_MIRROR /* * Adds support for conference links. There are some non-Asterisk users of this -- To view, visit https://gerrit.osmocom.org/c/dahdi-linux/+/27264 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: dahdi-linux Gerrit-Branch: master Gerrit-Change-Id: Ib03074062ada7b6da485afac53b1550d31f1a5ca Gerrit-Change-Number: 27264 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 2 months

1
0
0 0

Change in dahdi-linux[master]: enable PPP and DAHDI_MIRROR by default.

by laforge

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/dahdi-linux/+/27264 ) Change subject: enable PPP and DAHDI_MIRROR by default. ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/dahdi-linux/+/27264 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: dahdi-linux Gerrit-Branch: master Gerrit-Change-Id: Ib03074062ada7b6da485afac53b1550d31f1a5ca Gerrit-Change-Number: 27264 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 22 Feb 2022 11:54:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 2 months

1
0
0 0

Change in osmo-bsc[master]: cosmetics around select_best_cipher()

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27250 ) Change subject: cosmetics around select_best_cipher() ...................................................................... cosmetics around select_best_cipher() Improve the function doc. Remove a comment at a caller, because that information is what the function doc is for. Rename the array to codec_by_strength, because it is not the codec strength but the codec number listed in the array. Related: SYS#5839 Change-Id: Iaed6b97c31e4ccb1f28ca7e64596d5e20563b392 --- M src/osmo-bsc/osmo_bsc_bssap.c 1 file changed, 5 insertions(+), 7 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bsc/osmo_bsc_bssap.c b/src/osmo-bsc/osmo_bsc_bssap.c index 8acf293..cab78ed 100644 --- a/src/osmo-bsc/osmo_bsc_bssap.c +++ b/src/osmo-bsc/osmo_bsc_bssap.c @@ -393,17 +393,18 @@ return 0; } -/* select the best cipher permitted by the intersection of both masks */ +/* Select the best cipher permitted by the intersection of both masks. Return as the n in A5/n, or -1 if the + * intersection is empty. */ int select_best_cipher(uint8_t msc_mask, uint8_t bsc_mask) { /* A5/7 ... A5/3: We assume higher is better, * but: A5/1 is better than A5/2, which is better than A5/0 */ - const uint8_t codec_strength[8] = { 7, 6, 5, 4, 3, 1, 2, 0 }; + const uint8_t codec_by_strength[8] = { 7, 6, 5, 4, 3, 1, 2, 0 }; uint8_t intersection = msc_mask & bsc_mask; int i; - for (i = 0; i < ARRAY_SIZE(codec_strength); i++) { - uint8_t codec = codec_strength[i]; + for (i = 0; i < ARRAY_SIZE(codec_by_strength); i++) { + uint8_t codec = codec_by_strength[i]; if (intersection & (1 << codec)) return codec; } @@ -509,9 +510,6 @@ * a5_encryption == 2 --> 0x04 ... */ enc_bits_msc = data[0]; - /* The bit-mask of permitted ciphers from the MSC (sent in ASSIGNMENT COMMAND) is intersected - * with the vty-configured mask a the BSC. Finally, the best (highest) possible cipher is - * chosen. */ chosen_cipher = select_best_cipher(enc_bits_msc, bsc_gsmnet->a5_encryption_mask); if (chosen_cipher < 0) { LOGP(DMSC, LOGL_ERROR, "Reject: no overlapping A5 ciphers between BSC (0x%02x) " -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27250 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Iaed6b97c31e4ccb1f28ca7e64596d5e20563b392 Gerrit-Change-Number: 27250 Gerrit-PatchSet: 4 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 2 months

1
0
0 0

Change in osmo-bsc[master]: fix inter-BSC-in handover encryption

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27249 ) Change subject: fix inter-BSC-in handover encryption ...................................................................... fix inter-BSC-in handover encryption In the field we saw Handover Requests without any Chosen Encryption Algorithm IE, and osmo-bsc completely failed on those. This made me understand my mistake from when I wrote this handover code. So far, from a BSSMAP Handover Request, we (I) used only the Chosen Encryption Algorithm IE to pick the encryption to use on the target lchan. That is very wrong. Instead, figure out the intersection of permitted algorithms MSC & BSC, and pick the best of those. Which means, actually, completely ignore the Chosen Encryption Algorithm IE. In the message, the permitted algorithms are passed as a bitmask. The current code using gsm0808_dec_encrypt_info() passes this on as an array. In order to select_best_cipher(), I could convert that array back to a bitmask. Instead pass the bitmask on from message decoding alongside the struct gsm0808_encrypt_info in req->ei_as_bitmask. In handover_end(), change the condition so that we can also pass HO_RESULT_FAIL_RR_HO_FAIL to emit a Handover Failure. Related: SYS#5839 Change-Id: Iffedc981b60d309ed2e5decd5efedee07a757b53 --- M include/osmocom/bsc/gsm_data.h M src/osmo-bsc/handover_fsm.c M src/osmo-bsc/osmo_bsc_bssap.c 3 files changed, 26 insertions(+), 8 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h index 07d141d..4fe97a2 100644 --- a/include/osmocom/bsc/gsm_data.h +++ b/include/osmocom/bsc/gsm_data.h @@ -270,6 +270,8 @@ struct gsm0808_channel_type ct; struct gsm0808_speech_codec_list scl; struct gsm0808_encrypt_info ei; + /* The same information as in 'ei' but as the handy bitmask as on the wire. */ + uint8_t ei_as_bitmask; bool kc128_present; uint8_t kc128[16]; struct gsm_classmark classmark; @@ -1457,4 +1459,6 @@ enum rsl_cmod_spd chan_mode_to_rsl_cmod_spd(enum gsm48_chan_mode chan_mode); +int select_best_cipher(uint8_t msc_mask, uint8_t bsc_mask); + #endif /* _GSM_DATA_H */ diff --git a/src/osmo-bsc/handover_fsm.c b/src/osmo-bsc/handover_fsm.c index 37e7417..487135b 100644 --- a/src/osmo-bsc/handover_fsm.c +++ b/src/osmo-bsc/handover_fsm.c @@ -490,6 +490,7 @@ LOG_HO(conn, LOGL_ERROR, "Failed to parse Encryption Information IE\n"); return false; } + req->ei_as_bitmask = *e->val; if ((e = TLVP_GET(tp, GSM0808_IE_KC_128))) { if (e->len != 16) { @@ -630,6 +631,7 @@ int match_idx; struct osmo_fsm_inst *fi; struct channel_mode_and_rate ch_mode_rate = {}; + int chosen_a5_n; handover_fsm_alloc(conn); @@ -717,16 +719,28 @@ .msc_assigned_cic = req->msc_assigned_cic, }; - if (req->chosen_encr_alg) { - info.encr.alg_id = req->chosen_encr_alg; - if (info.encr.alg_id > 1 && !req->ei.key_len) { - ho_fail(HO_RESULT_ERROR, "Chosen Encryption Algorithm (Serving) reflects A5/%u" - " but there is no key (Encryption Information)", info.encr.alg_id - 1); + /* Figure out the encryption algorithm */ + chosen_a5_n = select_best_cipher(req->ei_as_bitmask, bsc_gsmnet->a5_encryption_mask); + if (chosen_a5_n < 0) { + ho_fail(HO_RESULT_FAIL_RR_HO_FAIL, + "There is no A5 encryption mode that both BSC and MSC permit: MSC 0x%x & BSC 0x%x = 0\n", + req->ei_as_bitmask, bsc_gsmnet->a5_encryption_mask); + return; + } + if (chosen_a5_n > 0 && !req->ei.key_len) { + /* There is no key. Is A5/0 permitted? */ + if ((req->ei_as_bitmask & bsc_gsmnet->a5_encryption_mask & 0x1) == 0x1) { + chosen_a5_n = 0; + } else { + ho_fail(HO_RESULT_ERROR, + "Encryption is required, but there is no key (Encryption Information)"); return; } } - if (req->ei.key_len) { + /* Put encryption info in the chan activation info */ + info.encr.alg_id = ALG_A5_NR_TO_RSL(chosen_a5_n); + if (chosen_a5_n > 0) { if (req->ei.key_len > sizeof(info.encr.key)) { ho_fail(HO_RESULT_ERROR, "Encryption Information IE key length is too large: %u\n", req->ei.key_len); @@ -965,7 +979,7 @@ result = bsc_tx_bssmap_ho_complete(conn, ho->new_lchan); } /* Not 'else': above checks may still result in HO_RESULT_ERROR. */ - if (result == HO_RESULT_ERROR) { + if (result != HO_RESULT_OK) { /* Return a BSSMAP Handover Failure, as described in 3GPP TS 48.008 3.1.5.2.2 * "Handover Resource Allocation Failure" */ bsc_tx_bssmap_ho_failure(conn); diff --git a/src/osmo-bsc/osmo_bsc_bssap.c b/src/osmo-bsc/osmo_bsc_bssap.c index b18627c..8acf293 100644 --- a/src/osmo-bsc/osmo_bsc_bssap.c +++ b/src/osmo-bsc/osmo_bsc_bssap.c @@ -394,7 +394,7 @@ } /* select the best cipher permitted by the intersection of both masks */ -static int select_best_cipher(uint8_t msc_mask, uint8_t bsc_mask) +int select_best_cipher(uint8_t msc_mask, uint8_t bsc_mask) { /* A5/7 ... A5/3: We assume higher is better, * but: A5/1 is better than A5/2, which is better than A5/0 */ 3 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27249 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Iffedc981b60d309ed2e5decd5efedee07a757b53 Gerrit-Change-Number: 27249 Gerrit-PatchSet: 4 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 2 months

1
0
0 0

Change in osmo-ci[master]: jobs/gerrit-lint: don't verify dahdi-linux

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/27282 ) Change subject: jobs/gerrit-lint: don't verify dahdi-linux ...................................................................... jobs/gerrit-lint: don't verify dahdi-linux Closes: OS#5465 Change-Id: I41ede04849da033a497daf39b34828bed00ab724 --- M jobs/gerrit-lint.yml 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/jobs/gerrit-lint.yml b/jobs/gerrit-lint.yml index 69b1c0e..2256e60 100644 --- a/jobs/gerrit-lint.yml +++ b/jobs/gerrit-lint.yml @@ -14,7 +14,6 @@ repos: - asn1c - cellmgr-ng - - dahdi-linux - docker-playground - libasn1c - libgtpnl -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/27282 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I41ede04849da033a497daf39b34828bed00ab724 Gerrit-Change-Number: 27282 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 2 months

1
0
0 0

Change in osmo-ci[master]: jobs/gerrit-lint: don't verify dahdi-linux

by laforge

Attention is currently required from: osmith. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/27282 ) Change subject: jobs/gerrit-lint: don't verify dahdi-linux ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/27282 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I41ede04849da033a497daf39b34828bed00ab724 Gerrit-Change-Number: 27282 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Tue, 22 Feb 2022 11:53:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 2 months

1
0
0 0

Change in osmo-ci[master]: jobs/gerrit-lint: don't verify dahdi-linux

by pespin

Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/27282 ) Change subject: jobs/gerrit-lint: don't verify dahdi-linux ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/27282 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I41ede04849da033a497daf39b34828bed00ab724 Gerrit-Change-Number: 27282 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Tue, 22 Feb 2022 11:41:15 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 2 months

1
0
0 0

Change in osmo-ci[master]: jobs/ttcn3-testsuites.yml: add ttcn3-fr-test

by pespin

Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/27285 ) Change subject: jobs/ttcn3-testsuites.yml: add ttcn3-fr-test ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/27285 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I14995dea0a0d223b78e20b49953d5c814c1ad4a1 Gerrit-Change-Number: 27285 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Tue, 22 Feb 2022 11:39:51 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 2 months

1
0
0 0

Change in docker-playground[master]: ttcn3-fr-test/jenkins.sh: make use of clean_up()

by pespin

Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/27284 ) Change subject: ttcn3-fr-test/jenkins.sh: make use of clean_up() ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27284 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I4624e37d5d2fa90b71b32d72067b3645f69805da Gerrit-Change-Number: 27284 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Tue, 22 Feb 2022 11:39:18 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 2 months

1
0
0 0

Change in docker-playground[master]: ttcn3-fr-test/jenkins.sh: revert docker run --rm

by pespin

Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/27283 ) Change subject: ttcn3-fr-test/jenkins.sh: revert docker run --rm ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27283 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I56dc07820ccfa8ad6936764262a7c6c272e59c37 Gerrit-Change-Number: 27283 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Tue, 22 Feb 2022 11:38:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 2 months

1
0
0 0

Change in osmo-ci[master]: jobs/ttcn3-testsuites.yml: add ttcn3-fr-test

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/27285 ) Change subject: jobs/ttcn3-testsuites.yml: add ttcn3-fr-test ...................................................................... jobs/ttcn3-testsuites.yml: add ttcn3-fr-test Add a configuration for the job to the yml file. It looks like this job was created manually, or the configuration was just not pushed to gerrit. This makes e-mail notifications consistent and fixes missing colors in build output. Change-Id: I14995dea0a0d223b78e20b49953d5c814c1ad4a1 --- M jobs/ttcn3-testsuites.yml 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/85/27285/1 diff --git a/jobs/ttcn3-testsuites.yml b/jobs/ttcn3-testsuites.yml index dbf162b..5b915c7 100644 --- a/jobs/ttcn3-testsuites.yml +++ b/jobs/ttcn3-testsuites.yml @@ -151,6 +151,10 @@ blocking: "^(ttcn3|TTCN3-.*)-hnbgw-test.*" timer: 40 13 * * * disabled: true + - ttcn3-fr-test: + blocking: "^(ttcn3|TTCN3-.*)-fr-test.*" + timer: 40 10 * * * + node: hdlc # debian-stretch latest stable - nplab-m3ua-test-latest: -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/27285 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I14995dea0a0d223b78e20b49953d5c814c1ad4a1 Gerrit-Change-Number: 27285 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 2 months

1
0
0 0

Change in docker-playground[master]: ttcn3-fr-test/jenkins.sh: revert docker run --rm

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/27283 ) Change subject: ttcn3-fr-test/jenkins.sh: revert docker run --rm ...................................................................... ttcn3-fr-test/jenkins.sh: revert docker run --rm Revert the change of adding a --rm to the "docker run" commands done in I48b01c43fedf379b8a565eaab0369806d7831bd8. This script runs the containers in the background, waits until they are done, copies the logs and then removes them afterwards. Fix for: + docker kill jenkins-ttcn3-fr-test-384-frnet jenkins-ttcn3-fr-test-384-frnet + docker logs --timestamps jenkins-ttcn3-fr-test-384-ttcn3-fr-test Error: No such container: jenkins-ttcn3-fr-test-384-ttcn3-fr-test Change-Id: I56dc07820ccfa8ad6936764262a7c6c272e59c37 --- M ttcn3-fr-test/jenkins.sh 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/83/27283/1 diff --git a/ttcn3-fr-test/jenkins.sh b/ttcn3-fr-test/jenkins.sh index 34aa740..4531e3a 100755 --- a/ttcn3-fr-test/jenkins.sh +++ b/ttcn3-fr-test/jenkins.sh @@ -25,7 +25,7 @@ echo Starting container with FRNET docker run \ - --rm \ + `# --rm is done in below` \ --cap-add=NET_RAW --cap-add=SYS_RAWIO \ $(docker_network_params $SUBNET 10) \ --ulimit core=-1 \ @@ -45,7 +45,7 @@ echo Starting container with FR testsuite docker run \ - --rm \ + `# --rm is done in below` \ --cap-add=NET_RAW --cap-add=SYS_RAWIO \ $(docker_network_params $SUBNET 103) \ --ulimit core=-1 \ -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27283 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I56dc07820ccfa8ad6936764262a7c6c272e59c37 Gerrit-Change-Number: 27283 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 2 months

1
0
0 0

Change in docker-playground[master]: ttcn3-fr-test/jenkins.sh: make use of clean_up()

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/27284 ) Change subject: ttcn3-fr-test/jenkins.sh: make use of clean_up() ...................................................................... ttcn3-fr-test/jenkins.sh: make use of clean_up() Move cleaning up logic to clean_up(), so it runs as part of the clean_up_trap if any command in the previous code fails. For example, if the first docker container started properly, but the second docker container failed to start: without this patch, it would just stop the script without running the clean up code. Change-Id: I4624e37d5d2fa90b71b32d72067b3645f69805da --- M ttcn3-fr-test/jenkins.sh 1 file changed, 12 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/84/27284/1 diff --git a/ttcn3-fr-test/jenkins.sh b/ttcn3-fr-test/jenkins.sh index 4531e3a..182f512 100755 --- a/ttcn3-fr-test/jenkins.sh +++ b/ttcn3-fr-test/jenkins.sh @@ -8,6 +8,16 @@ set_clean_up_trap set -e +clean_up() { + # kill the frnet container to avoid "You cannot remove a running container " below in 'rm' + docker kill ${BUILD_TAG}-frnet || true + + # store execution logs for both containers + docker logs --timestamps ${BUILD_TAG}-ttcn3-fr-test > $VOL_BASE_DIR/fr-tester/exec.log || true + docker logs --timestamps ${BUILD_TAG}-frnet > $VOL_BASE_DIR/frnet/exec.log || true + docker container rm ${BUILD_TAG}-frnet ${BUILD_TAG}-ttcn3-fr-test +} + SUBNET=26 network_create $SUBNET @@ -25,7 +35,7 @@ echo Starting container with FRNET docker run \ - `# --rm is done in below` \ + `# --rm is done in clean_up()` \ --cap-add=NET_RAW --cap-add=SYS_RAWIO \ $(docker_network_params $SUBNET 10) \ --ulimit core=-1 \ @@ -45,7 +55,7 @@ echo Starting container with FR testsuite docker run \ - `# --rm is done in below` \ + `# --rm is done in clean_up()` \ --cap-add=NET_RAW --cap-add=SYS_RAWIO \ $(docker_network_params $SUBNET 103) \ --ulimit core=-1 \ @@ -66,10 +76,3 @@ # emulate running container in foreground, which is no longer possible as we # must shift the net-devices into the container _after_ it is started docker logs -f ${BUILD_TAG}-ttcn3-fr-test -# kill the frnet container to avoid "You cannot remove a running container " below in 'rm' -docker kill ${BUILD_TAG}-frnet - -# store execution logs for both containers -docker logs --timestamps ${BUILD_TAG}-ttcn3-fr-test > $VOL_BASE_DIR/fr-tester/exec.log -docker logs --timestamps ${BUILD_TAG}-frnet > $VOL_BASE_DIR/frnet/exec.log -docker container rm ${BUILD_TAG}-frnet ${BUILD_TAG}-ttcn3-fr-test -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27284 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I4624e37d5d2fa90b71b32d72067b3645f69805da Gerrit-Change-Number: 27284 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 2 months

1
0
0 0

Change in osmo-bsc[master]: cosmetics around select_best_cipher()

by laforge

Attention is currently required from: neels. laforge has removed a vote from this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27250 ) Change subject: cosmetics around select_best_cipher() ...................................................................... Removed Verified+1 by laforge <laforge(a)osmocom.org> -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27250 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Iaed6b97c31e4ccb1f28ca7e64596d5e20563b392 Gerrit-Change-Number: 27250 Gerrit-PatchSet: 4 Gerrit-Owner: neels <nhofmeyr(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-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: deleteVote

2 years, 2 months

1
0
0 0

Change in osmo-bsc[master]: cosmetics around select_best_cipher()

by laforge

Attention is currently required from: neels. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27250 ) Change subject: cosmetics around select_best_cipher() ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27250 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Iaed6b97c31e4ccb1f28ca7e64596d5e20563b392 Gerrit-Change-Number: 27250 Gerrit-PatchSet: 4 Gerrit-Owner: neels <nhofmeyr(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-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Tue, 22 Feb 2022 11:27:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 2 months

1
0
0 0

Change in osmo-bsc[master]: cosmetics around select_best_cipher()

by laforge

Attention is currently required from: neels. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27250 ) Change subject: cosmetics around select_best_cipher() ...................................................................... Patch Set 4: Verified+1 Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27250 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Iaed6b97c31e4ccb1f28ca7e64596d5e20563b392 Gerrit-Change-Number: 27250 Gerrit-PatchSet: 4 Gerrit-Owner: neels <nhofmeyr(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-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Tue, 22 Feb 2022 11:27:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 2 months

1
0
0 0

Change in osmo-bsc[master]: rename RSL_ENC_ALG_A5 to ALG_A5_NR_TO_RSL, clarify

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27248 ) Change subject: rename RSL_ENC_ALG_A5 to ALG_A5_NR_TO_RSL, clarify ...................................................................... rename RSL_ENC_ALG_A5 to ALG_A5_NR_TO_RSL, clarify The naming confused me so that I wrote buggy code again. Hopefully this clarifies which representations the code paths are using. In the macro code, highlight the error case of n <= -1 explicitly. Also add ALG_A5_NR_TO_PERM_ALG_BITS. I need the 1<<n case in an upcoming patch. Related: SYS#5839 Change-Id: I7557ae97764bba09c906748a18e9031dfb362611 --- M include/osmocom/bsc/gsm_data.h M src/osmo-bsc/abis_rsl.c M src/osmo-bsc/gsm_04_08_rr.c M src/osmo-bsc/osmo_bsc_bssap.c 4 files changed, 22 insertions(+), 5 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h index 910c3d3..07d141d 100644 --- a/include/osmocom/bsc/gsm_data.h +++ b/include/osmocom/bsc/gsm_data.h @@ -528,7 +528,24 @@ #define A38_XOR_MIN_KEY_LEN 12 #define A38_XOR_MAX_KEY_LEN 16 #define A38_COMP128_KEY_LEN 16 -#define RSL_ENC_ALG_A5(x) (x+1) + +/* There are these representations of A5/n: + * + * - (uint8_t)(1<<n), either as a single bit, or combined as a list of + * permitted algorithms. + * A5/0 == 0x01, A5/3 == 0x08, none = 0 + * + * - n+1, used on the RSL wire. + * A5/0 == 1, A5/3 == 4, none = 0 + * + * - n, used for human interaction and returned by select_best_cipher(). + * A5/0 == 0, A5/3 == 3, none <= -1 + * + * These macros convert from n to the other representations: + */ +#define ALG_A5_NR_TO_RSL(A5_N) ((A5_N) >= 0 ? (A5_N)+1 : 0) +#define ALG_A5_NR_TO_PERM_ALG_BITS(A5_N) ((A5_N) >= 0 ? 1<<(A5_N) : 0) + /* Up to 16 SI2quater are multiplexed; each fits 3 EARFCNS, so the practical maximum is 3*16. * The real maximum that fits in a total of 16 SI2quater rest octets also depends on the bits left by other SI2quater * rest octets elements, so to really fit 48 EARFCNs most other SI2quater elements need to be omitted. */ diff --git a/src/osmo-bsc/abis_rsl.c b/src/osmo-bsc/abis_rsl.c index 402ea27..a49cc65 100644 --- a/src/osmo-bsc/abis_rsl.c +++ b/src/osmo-bsc/abis_rsl.c @@ -660,7 +660,7 @@ msg->l3h = len + 1; *len = msgb_l3len(msg); - if (lchan->encr.alg_id > RSL_ENC_ALG_A5(0)) { + if (lchan->encr.alg_id > ALG_A5_NR_TO_RSL(0)) { uint8_t encr_info[MAX_A5_KEY_LEN+2]; rc = build_encr_info(encr_info, lchan); if (rc > 0) @@ -764,7 +764,7 @@ msgb_tlv_put(msg, RSL_IE_CHAN_MODE, sizeof(cm), (uint8_t *) &cm); - if (lchan->encr.alg_id > RSL_ENC_ALG_A5(0)) { + if (lchan->encr.alg_id > ALG_A5_NR_TO_RSL(0)) { uint8_t encr_info[MAX_A5_KEY_LEN+2]; rc = build_encr_info(encr_info, lchan); if (rc > 0) diff --git a/src/osmo-bsc/gsm_04_08_rr.c b/src/osmo-bsc/gsm_04_08_rr.c index 6c0615e..03b1e98 100644 --- a/src/osmo-bsc/gsm_04_08_rr.c +++ b/src/osmo-bsc/gsm_04_08_rr.c @@ -374,7 +374,7 @@ DEBUGP(DRR, "TX CIPHERING MODE CMD\n"); - if (lchan->encr.alg_id <= RSL_ENC_ALG_A5(0)) + if (lchan->encr.alg_id <= ALG_A5_NR_TO_RSL(0)) ciph_mod_set = 0; else ciph_mod_set = (lchan->encr.alg_id-2)<<1 | 1; diff --git a/src/osmo-bsc/osmo_bsc_bssap.c b/src/osmo-bsc/osmo_bsc_bssap.c index 3f56052..b18627c 100644 --- a/src/osmo-bsc/osmo_bsc_bssap.c +++ b/src/osmo-bsc/osmo_bsc_bssap.c @@ -534,7 +534,7 @@ goto reject; } - conn->lchan->encr.alg_id = RSL_ENC_ALG_A5(chosen_cipher); + conn->lchan->encr.alg_id = ALG_A5_NR_TO_RSL(chosen_cipher); if (enc_key_len) { conn->lchan->encr.key_len = enc_key_len; memcpy(conn->lchan->encr.key, enc_key, enc_key_len); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27248 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I7557ae97764bba09c906748a18e9031dfb362611 Gerrit-Change-Number: 27248 Gerrit-PatchSet: 3 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 2 months

1
0
0 0

Change in osmo-bsc[master]: rename RSL_ENC_ALG_A5 to ALG_A5_NR_TO_RSL, clarify

by laforge

Attention is currently required from: neels. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27248 ) Change subject: rename RSL_ENC_ALG_A5 to ALG_A5_NR_TO_RSL, clarify ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27248 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I7557ae97764bba09c906748a18e9031dfb362611 Gerrit-Change-Number: 27248 Gerrit-PatchSet: 3 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Tue, 22 Feb 2022 11:26:19 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 2 months

1
0
0 0

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

by laforge

Attention is currently required from: neels, fixeria. laforge has removed a vote from this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27247 ) Change subject: bsc: add TC_ho_into_this_bsc_a5_mismatch ...................................................................... Removed Code-Review+2 by laforge <laforge(a)osmocom.org> -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27247 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: I44b464a0bedbff09c467c4bccd7c985480fb883a Gerrit-Change-Number: 27247 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: deleteVote

2 years, 2 months

1
0
0 0

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

by laforge

Attention is currently required from: neels, fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27247 ) Change subject: bsc: add TC_ho_into_this_bsc_a5_mismatch ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27247 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: I44b464a0bedbff09c467c4bccd7c985480fb883a Gerrit-Change-Number: 27247 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 22 Feb 2022 11:23:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 2 months

1
0
0 0

Change in osmo-ci[master]: jobs/gerrit-lint: don't verify dahdi-linux

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/27282 ) Change subject: jobs/gerrit-lint: don't verify dahdi-linux ...................................................................... jobs/gerrit-lint: don't verify dahdi-linux Closes: OS#5465 Change-Id: I41ede04849da033a497daf39b34828bed00ab724 --- M jobs/gerrit-lint.yml 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/82/27282/1 diff --git a/jobs/gerrit-lint.yml b/jobs/gerrit-lint.yml index 69b1c0e..2256e60 100644 --- a/jobs/gerrit-lint.yml +++ b/jobs/gerrit-lint.yml @@ -14,7 +14,6 @@ repos: - asn1c - cellmgr-ng - - dahdi-linux - docker-playground - libasn1c - libgtpnl -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/27282 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I41ede04849da033a497daf39b34828bed00ab724 Gerrit-Change-Number: 27282 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 2 months

1
0
0 0

Change in pysim[master]: Initial support for GlobalPlatform

by laforge

Attention is currently required from: laforge. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/27271 to look at the new patch set (#2). Change subject: Initial support for GlobalPlatform ...................................................................... Initial support for GlobalPlatform One can now select the Issuer Security Domain (hard-coded to a000000003000000) and issue get_data requests. FCI and other TLV objects are dcoded, e.g. pySIM-shell (MF)> select ADF.ISD { "application_id": "a000000003000000", "proprietary_data": { "maximum_length_of_data_field_in_command_message": 255 } } pySIM-shell (MF/ADF.ISD)> get_data CardData { "card_data": [ { "card_recognition_data": [ { "object_identifier": "2a864886fc6b01" }, { "card_management_type_and_version": [ { "object_identifier": "2a864886fc6b02020101" } ] }, { "card_identification_scheme": [ { "object_identifier": "2a864886fc6b03" } ] }, { "secure_channel_protocol_of_isd": [ { "object_identifier": "2a864886fc6b040215" } ] } ] } ] } Change-Id: If11267d45ab7aa371eea8c143abd9320c32b54d0 --- M pySim-shell.py M pySim/commands.py A pySim/global_platform.py 3 files changed, 262 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/71/27271/2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27271 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: If11267d45ab7aa371eea8c143abd9320c32b54d0 Gerrit-Change-Number: 27271 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newpatchset

2 years, 2 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: GTP_Codec_Port: Check length field of GTPV1C received packets

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27270 ) Change subject: GTP_Codec_Port: Check length field of GTPV1C received packets ...................................................................... GTP_Codec_Port: Check length field of GTPV1C received packets Change-Id: Ie9447b7ec7f7f5ee35cd0393265f5edb5578bdaf --- M library/GTP_CodecPort.ttcn 1 file changed, 5 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/library/GTP_CodecPort.ttcn b/library/GTP_CodecPort.ttcn index 317210e..b516611 100644 --- a/library/GTP_CodecPort.ttcn +++ b/library/GTP_CodecPort.ttcn @@ -14,6 +14,7 @@ import from IPL4asp_Types all; import from GTPC_Types all; import from GTPU_Types all; + import from Misc_Helpers all; modulepar { SystemUnderTest mp_pl_SystemUnderTest := SGSN; @@ -63,6 +64,10 @@ out_ud.peer.remName := in_ud.remName; out_ud.peer.remPort := in_ud.remPort; out_ud.gtpc := dec_PDU_GTPC(in_ud.msg, pl_SystemUnderTest := mp_pl_SystemUnderTest); + if (lengthof(in_ud.msg) != out_ud.gtpc.lengthf + 8) { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str("Rx GTPv1-C with field length ", out_ud.gtpc.lengthf, " + 8 != exp ", lengthof(in_ud.msg))); + } } with { extension "prototype(fast)" }; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27270 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: Ie9447b7ec7f7f5ee35cd0393265f5edb5578bdaf Gerrit-Change-Number: 27270 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

2 years, 2 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: GTP_Codec_Port: Check length field of GTPV1C received packets

by laforge

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27270 ) Change subject: GTP_Codec_Port: Check length field of GTPV1C received packets ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27270 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: Ie9447b7ec7f7f5ee35cd0393265f5edb5578bdaf Gerrit-Change-Number: 27270 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 22 Feb 2022 07:40:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 2 months

1
0
0 0

2024

2023

2022

gerrit-log February 2022