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

[M] Change in osmo-ttcn3-hacks[master]: msc: Use template ts_RAB_SMdL

by pespin

Attention is currently required from: pespin. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37552?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified-1 by Jenkins Builder Change subject: msc: Use template ts_RAB_SMdL ...................................................................... msc: Use template ts_RAB_SMdL Change-Id: I768aad762c4fa6c0d3a6d0effd7a7a1aabb3488f --- M msc/BSC_ConnectionHandler.ttcn 1 file changed, 15 insertions(+), 39 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/52/37552/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37552?usp=email 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: I768aad762c4fa6c0d3a6d0effd7a7a1aabb3488f Gerrit-Change-Number: 37552 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

11 months, 1 week

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: msc: Introduce template ts_RAB_SetupOrModifiedList

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37552?usp=email ) Change subject: msc: Introduce template ts_RAB_SetupOrModifiedList ...................................................................... msc: Introduce template ts_RAB_SetupOrModifiedList Change-Id: I768aad762c4fa6c0d3a6d0effd7a7a1aabb3488f --- M library/ranap/RANAP_Templates.ttcn M msc/BSC_ConnectionHandler.ttcn 2 files changed, 39 insertions(+), 39 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/52/37552/1 diff --git a/library/ranap/RANAP_Templates.ttcn b/library/ranap/RANAP_Templates.ttcn index 7fb374d..fce113b 100644 --- a/library/ranap/RANAP_Templates.ttcn +++ b/library/ranap/RANAP_Templates.ttcn @@ -1698,6 +1698,28 @@ return ret; } +template (value) RAB_SetupOrModifiedList ts_RAB_SetupOrModifiedListCS(template (value) RAB_ID rab_id, + template (value) octetstring transportLayerAddress, + template (value) OCT4 bindingID) := { + { + { + id := id_RAB_SetupOrModifiedItem, + criticality := ignore, + value_ := { + rAB_SetupOrModifiedItem := { + rAB_ID := rab_id, + transportLayerAddress := oct2bit(valueof(transportLayerAddress)), + iuTransportAssociation := { + bindingID := bindingID + }, + dl_dataVolumes := omit, + iE_Extensions := omit + } + } + } + } +}; + function ts_RANAP_RabAssResp(template (omit) RAB_SetupOrModifiedList rab_sml := omit, template (omit) RAB_FailedList rab_fl := omit, diff --git a/msc/BSC_ConnectionHandler.ttcn b/msc/BSC_ConnectionHandler.ttcn index c82d36a..06cdcb4 100644 --- a/msc/BSC_ConnectionHandler.ttcn +++ b/msc/BSC_ConnectionHandler.ttcn @@ -1298,27 +1298,11 @@ [] BSSAP.receive(tr_RANAP_RabAssReq(?)) -> value ranap { log("f_mt_call_complete 6.iu"); var RAB_ID rab_id := f_ranap_rab_ass_req_extract_rab_id(ranap); - var RAB_SetupOrModifiedList l := { - { - { - id := id_RAB_SetupOrModifiedItem, - criticality := ignore, - value_ := { - rAB_SetupOrModifiedItem := { - rAB_ID := rab_id, - transportLayerAddress := hex2bit( '350001c0a8021500000000000000000000000000'H), - iuTransportAssociation := { - bindingID := '040c0000'O - }, - dl_dataVolumes := omit, - iE_Extensions := omit - } - } - } - } - }; + var RAB_SetupOrModifiedList l := + ts_RAB_SetupOrModifiedListCS(rab_id, + hex2oct('350001c0a8021500000000000000000000000000'H), + '040c0000'O); BSSAP.send(ts_RANAP_RabAssResp(l)); - BSSAP.send(ts_PDU_DTAP_MO(ts_ML3_MO_CC_CONNECT(cpars.transaction_id))); } @@ -1780,25 +1764,10 @@ [] BSSAP.receive(tr_RANAP_RabAssReq(*)) -> value ranap { log("f_mo_call_establish 4.iu: rx RANAP RAB Assignment Request"); var RAB_ID rab_id := f_ranap_rab_ass_req_extract_rab_id(ranap); - var RAB_SetupOrModifiedList l := { - { - { - id := id_RAB_SetupOrModifiedItem, - criticality := ignore, - value_ := { - rAB_SetupOrModifiedItem := { - rAB_ID := rab_id, - transportLayerAddress := hex2bit( '350001c0a8021500000000000000000000000000'H), - iuTransportAssociation := { - bindingID := '040c0000'O - }, - dl_dataVolumes := omit, - iE_Extensions := omit - } - } - } - } - }; + var RAB_SetupOrModifiedList l := + ts_RAB_SetupOrModifiedListCS(rab_id, + hex2oct('350001c0a8021500000000000000000000000000'H), + '040c0000'O); BSSAP.send(ts_RANAP_RabAssResp(l)); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37552?usp=email 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: I768aad762c4fa6c0d3a6d0effd7a7a1aabb3488f Gerrit-Change-Number: 37552 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

11 months, 1 week

1
0
0 0

[S] Change in pysim[master]: pySim.apdu: Fix APDU CLA matching

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/37532?usp=email ) Change subject: pySim.apdu: Fix APDU CLA matching ...................................................................... pySim.apdu: Fix APDU CLA matching The cla values as hex strings must be compared in case insensitive manner Change-Id: I890bc385d6209e6cfe9b0c38bd9deee7ae50e5f5 --- M pySim/apdu/__init__.py 1 file changed, 13 insertions(+), 2 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified dexter: Looks good to me, approved; Verified diff --git a/pySim/apdu/__init__.py b/pySim/apdu/__init__.py index 6613e91..fbe7e6b 100644 --- a/pySim/apdu/__init__.py +++ b/pySim/apdu/__init__.py @@ -272,7 +272,7 @@ """Does the given CLA match the CLA list of the command?.""" if not isinstance(cla, str): cla = '%02X' % cla - cla = cla.lower() + cla = cla.upper() # see https://github.com/PyCQA/pylint/issues/7219 # pylint: disable=no-member for cla_match in cls._cla: @@ -282,7 +282,7 @@ cla_masked += 'X' else: cla_masked += cla[i] - if cla_masked == cla_match: + if cla_masked == cla_match.upper(): return True return False -- To view, visit https://gerrit.osmocom.org/c/pysim/+/37532?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I890bc385d6209e6cfe9b0c38bd9deee7ae50e5f5 Gerrit-Change-Number: 37532 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

11 months, 1 week

1
0
0 0

[S] Change in pysim[master]: pySim.apdu: Refactor cmd_to_dict() method

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/37531?usp=email ) Change subject: pySim.apdu: Refactor cmd_to_dict() method ...................................................................... pySim.apdu: Refactor cmd_to_dict() method Let's factor out the "automatic processing using _tlv / _construct" as a separate method. This way we enable a derived class to first call that automatic processing method, and then amend its output in a second step. Change-Id: I1f066c0f1502020c88d99026c25bf2e283c3b4f5 --- M pySim/apdu/__init__.py 1 file changed, 32 insertions(+), 15 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/pySim/apdu/__init__.py b/pySim/apdu/__init__.py index 02ccbad..6613e91 100644 --- a/pySim/apdu/__init__.py +++ b/pySim/apdu/__init__.py @@ -292,22 +292,26 @@ if callable(method): return method() else: - r = {} - method = getattr(self, '_decode_p1p2', None) - if callable(method): - r = self._decode_p1p2() + return self._cmd_to_dict() + + def _cmd_to_dict(self) -> Dict: + """back-end function performing automatic decoding using _construct / _tlv.""" + r = {} + method = getattr(self, '_decode_p1p2', None) + if callable(method): + r = self._decode_p1p2() + else: + r['p1'] = parse_construct(self._construct_p1, self.p1.to_bytes(1, 'big')) + r['p2'] = parse_construct(self._construct_p2, self.p2.to_bytes(1, 'big')) + r['p3'] = self.p3 + if self.cmd_data: + if self._tlv: + ie = self._tlv() + ie.from_tlv(self.cmd_data) + r['body'] = ie.to_dict() else: - r['p1'] = parse_construct(self._construct_p1, self.p1.to_bytes(1, 'big')) - r['p2'] = parse_construct(self._construct_p2, self.p2.to_bytes(1, 'big')) - r['p3'] = self.p3 - if self.cmd_data: - if self._tlv: - ie = self._tlv() - ie.from_tlv(self.cmd_data) - r['body'] = ie.to_dict() - else: - r['body'] = parse_construct(self._construct, self.cmd_data) - return r + r['body'] = parse_construct(self._construct, self.cmd_data) + return r def rsp_to_dict(self) -> Dict: """Convert the Response part of the APDU to a dict.""" -- To view, visit https://gerrit.osmocom.org/c/pysim/+/37531?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I1f066c0f1502020c88d99026c25bf2e283c3b4f5 Gerrit-Change-Number: 37531 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

11 months, 1 week

1
0
0 0

[S] Change in pysim[master]: pySim.apdu: Refactor cmd_to_dict() method

by laforge

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/37531?usp=email ) Change subject: pySim.apdu: Refactor cmd_to_dict() method ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/37531?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I1f066c0f1502020c88d99026c25bf2e283c3b4f5 Gerrit-Change-Number: 37531 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Tue, 23 Jul 2024 14:47:06 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

11 months, 1 week

1
0
0 0

[M] Change in pysim[master]: pySim-shell: add "fsdump" command

by laforge

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/37543?usp=email ) Change subject: pySim-shell: add "fsdump" command ...................................................................... Patch Set 1: Code-Review-1 (1 comment) Patchset: PS1: I noticed we actually forget to dump the DF and ADD, but those also have FCP with security attributes etc. I'll implement this and resubmit -- To view, visit https://gerrit.osmocom.org/c/pysim/+/37543?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ib179f57bc04d394efe11003ba191dca6098192d3 Gerrit-Change-Number: 37543 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Tue, 23 Jul 2024 14:46:45 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

11 months, 1 week

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: msc: Use RAB_ID obtained from RAB-AssReq

by laforge

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37551?usp=email ) Change subject: msc: Use RAB_ID obtained from RAB-AssReq ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37551?usp=email 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: If532c41304803d223591ce8e0c10dda4a562dfb8 Gerrit-Change-Number: 37551 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: Jenkins Builder Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 23 Jul 2024 14:45:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

11 months, 1 week

1
0
0 0

[S] Change in osmo-pcu[master]: fix E1 TS output when used with osmo-e1d

by laforge

Attention is currently required from: dexter. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/37550?usp=email ) Change subject: fix E1 TS output when used with osmo-e1d ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/37550?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ia2e0fa27195fc1ae75e441038eb4adeb4cf1d6cf Gerrit-Change-Number: 37550 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Tue, 23 Jul 2024 14:45:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

11 months, 1 week

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: msc: Use RAB_ID obtained from RAB-AssReq

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37551?usp=email ) Change subject: msc: Use RAB_ID obtained from RAB-AssReq ...................................................................... msc: Use RAB_ID obtained from RAB-AssReq The helper function will be used too by follow-up patches. Change-Id: If532c41304803d223591ce8e0c10dda4a562dfb8 --- M library/ranap/RANAP_Templates.ttcn M msc/BSC_ConnectionHandler.ttcn 2 files changed, 24 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/51/37551/1 diff --git a/library/ranap/RANAP_Templates.ttcn b/library/ranap/RANAP_Templates.ttcn index 8e6c8f3..7fb374d 100644 --- a/library/ranap/RANAP_Templates.ttcn +++ b/library/ranap/RANAP_Templates.ttcn @@ -1870,5 +1870,12 @@ return omit; } +function f_ranap_rab_ass_req_extract_rab_id(RANAP_PDU ranap) return RAB_ID +{ + var RAB_AssignmentRequest.protocolIEs ies := ranap.initiatingMessage.value_.rAB_AssignmentRequest.protocolIEs; + var RAB_ID rab_id := ies[0].value_.rAB_SetupOrModifyList[0][0].firstValue.rAB_SetupOrModifyItemFirst.rAB_ID; + return rab_id; +} + } diff --git a/msc/BSC_ConnectionHandler.ttcn b/msc/BSC_ConnectionHandler.ttcn index 16309ed..c82d36a 100644 --- a/msc/BSC_ConnectionHandler.ttcn +++ b/msc/BSC_ConnectionHandler.ttcn @@ -1122,6 +1122,7 @@ var template MgcpResponse mgcp_resp; var MgcpOsmuxCID osmux_cid; var PDU_BSSAP bssap; + var RANAP_PDU ranap; f_ran_register_imsi(g_pars.imsi, g_pars.tmsi); @@ -1294,8 +1295,9 @@ log("f_mt_call_complete 5.iu"); } - [] BSSAP.receive(tr_RANAP_RabAssReq(?)) { + [] BSSAP.receive(tr_RANAP_RabAssReq(?)) -> value ranap { log("f_mt_call_complete 6.iu"); + var RAB_ID rab_id := f_ranap_rab_ass_req_extract_rab_id(ranap); var RAB_SetupOrModifiedList l := { { { @@ -1303,7 +1305,7 @@ criticality := ignore, value_ := { rAB_SetupOrModifiedItem := { - rAB_ID := int2bit(23, 8), + rAB_ID := rab_id, transportLayerAddress := hex2bit( '350001c0a8021500000000000000000000000000'H), iuTransportAssociation := { bindingID := '040c0000'O @@ -1777,6 +1779,7 @@ } [] BSSAP.receive(tr_RANAP_RabAssReq(*)) -> value ranap { log("f_mo_call_establish 4.iu: rx RANAP RAB Assignment Request"); + var RAB_ID rab_id := f_ranap_rab_ass_req_extract_rab_id(ranap); var RAB_SetupOrModifiedList l := { { { @@ -1784,7 +1787,7 @@ criticality := ignore, value_ := { rAB_SetupOrModifiedItem := { - rAB_ID := int2bit(23, 8), + rAB_ID := rab_id, transportLayerAddress := hex2bit( '350001c0a8021500000000000000000000000000'H), iuTransportAssociation := { bindingID := '040c0000'O -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37551?usp=email 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: If532c41304803d223591ce8e0c10dda4a562dfb8 Gerrit-Change-Number: 37551 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

11 months, 1 week

1
0
0 0

[S] Change in osmo-mgw[master]: fix E1 TS output when used with osmo-e1d

by falconia

falconia has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/37311?usp=email ) Change subject: fix E1 TS output when used with osmo-e1d ...................................................................... fix E1 TS output when used with osmo-e1d The original code did E1 raw TS output by posting directly to &ts->raw.tx_queue instead of calling e1inp_ts_send_raw(); doing so bypasses the call to driver->want_write performed in e1inp layer. This approach worked for DAHDI where no select-for-write is used; however, e1inp interface to osmo-e1d does use select-for-write, hence applications like osmo-mgw do need to use e1inp_ts_send_raw() API in order to work correctly. Change-Id: I6ce9a1dea6834632faf75059e85ca9a0c25d57c2 --- M src/libosmo-mgcp/mgcp_e1.c 1 file changed, 19 insertions(+), 1 deletion(-) Approvals: dexter: Looks good to me, approved neels: Looks good to me, but someone else must approve Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve diff --git a/src/libosmo-mgcp/mgcp_e1.c b/src/libosmo-mgcp/mgcp_e1.c index 1180e03..1428824 100644 --- a/src/libosmo-mgcp/mgcp_e1.c +++ b/src/libosmo-mgcp/mgcp_e1.c @@ -324,7 +324,7 @@ msgb_length(msg) > DEBUG_BYTES_MAX ? DEBUG_BYTES_MAX : msgb_length(msg))); #endif /* Hand data over to the E1 stack */ - msgb_enqueue(&ts->raw.tx_queue, msg); + e1inp_ts_send_raw(ts, msg); return; } -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/37311?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I6ce9a1dea6834632faf75059e85ca9a0c25d57c2 Gerrit-Change-Number: 37311 Gerrit-PatchSet: 2 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: merged

11 months, 1 week

1
0
0 0

2025

2024

2023

2022

gerrit-log July 2024