Attention is currently required from: dexter, fixeria.
laforge has posted comments on this change by dexter. ( https://gerrit.osmocom.org/c/pysim/+/38001?usp=email )
Change subject: pySim-shell: print cardinfo hexstrings in lowercase
......................................................................
Patch Set 3: Code-Review+1
(1 comment)
Patchset:
PS3:
let's merge this for now and convert over to the pyosmocore hexstr where likely large parts of pySim will need conversion/porting...
--
To view, visit https://gerrit.osmocom.org/c/pysim/+/38001?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: pysim
Gerrit-Branch: master
Gerrit-Change-Id: Ia6a8bd0e700c7fd933fb6c1b1050ed9494462d60
Gerrit-Change-Number: 38001
Gerrit-PatchSet: 3
Gerrit-Owner: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Attention: dexter <pmaier(a)sysmocom.de>
Gerrit-Comment-Date: Thu, 05 Sep 2024 11:31:39 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/38017?usp=email )
Change subject: transport: define TERMINAL RESPONSE content within ProactiveHandler
......................................................................
transport: define TERMINAL RESPONSE content within ProactiveHandler
So far the core proactive handling code would always generate a positive
response, with no way for the ProactiveHandler call-back to influence
that or to include additional IEs/TLVs.
Let's change that.
Change-Id: Ic772b3383533f845689ac97ad03fcf67cf59c208
---
M pySim/transport/__init__.py
1 file changed, 18 insertions(+), 15 deletions(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
diff --git a/pySim/transport/__init__.py b/pySim/transport/__init__.py
index 47f6547..97022ce 100644
--- a/pySim/transport/__init__.py
+++ b/pySim/transport/__init__.py
@@ -57,7 +57,18 @@
"""Default handler for not otherwise handled proactive commands."""
raise NotImplementedError('No handler method for %s' % pcmd.decoded)
-
+ def prepare_response(self, pcmd: ProactiveCommand, general_result: str = 'performed_successfully'):
+ # The Command Details are echoed from the command that has been processed.
+ (command_details,) = [c for c in pcmd.children if isinstance(c, CommandDetails)]
+ # invert the device identities
+ (command_dev_ids,) = [c for c in pcmd.children if isinstance(c, DeviceIdentities)]
+ rsp_dev_ids = DeviceIdentities()
+ rsp_dev_ids.from_dict({'device_identities': {
+ 'dest_dev_id': command_dev_ids.decoded['source_dev_id'],
+ 'source_dev_id': command_dev_ids.decoded['dest_dev_id']}})
+ result = Result()
+ result.from_dict({'result': {'general_result': general_result, 'additional_information': ''}})
+ return [command_details, rsp_dev_ids, result]
class LinkBase(abc.ABC):
"""Base class for link/transport to card."""
@@ -185,34 +196,26 @@
pcmd = ProactiveCommand()
parsed = pcmd.from_tlv(h2b(fetch_rv[0]))
print("FETCH: %s (%s)" % (fetch_rv[0], type(parsed).__name__))
- result = Result()
if self.proactive_handler:
# Extension point: If this does return a list of TLV objects,
# they could be appended after the Result; if the first is a
# Result, that cuold replace the one built here.
- self.proactive_handler.receive_fetch_raw(pcmd, parsed)
- result.from_dict({'result': {'general_result': 'performed_successfully',
- 'additional_information': ''}})
+ ti_list = self.proactive_handler.receive_fetch_raw(pcmd, parsed)
+ if not ti_list:
+ ti_list = self.proactive_handler.prepare_response(pcmd, 'FIXME')
else:
- result.from_dict({'result': {'general_result': 'command_beyond_terminal_capability',
- 'additional_information': ''}})
+ ti_list = self.proactive_handler.prepare_response(pcmd, 'command_beyond_terminal_capability')
# Send response immediately, thus also flushing out any further
# proactive commands that the card already wants to send
#
# Structure as per TS 102 223 V4.4.0 Section 6.8
- # The Command Details are echoed from the command that has been processed.
- (command_details,) = [c for c in pcmd.decoded.children if isinstance(c, CommandDetails)]
- # The Device Identities are fixed. (TS 102 223 V4.0.0 Section 6.8.2)
- device_identities = DeviceIdentities()
- device_identities.from_dict({'device_identities': {'source_dev_id': 'terminal', 'dest_dev_id':
- 'uicc'}})
-
# Testing hint: The value of tail does not influence the behavior
# of an SJA2 that sent ans SMS, so this is implemented only
# following TS 102 223, and not fully tested.
- tail = command_details.to_tlv() + device_identities.to_tlv() + result.to_tlv()
+ ti_list_bin = [x.to_tlv() for x in ti_list]
+ tail = b''.join(ti_list_bin)
# Testing hint: In contrast to the above, this part is positively
# essential to get the SJA2 to provide the later parts of a
# multipart SMS in response to an OTA RFM command.
--
To view, visit https://gerrit.osmocom.org/c/pysim/+/38017?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: pysim
Gerrit-Branch: master
Gerrit-Change-Id: Ic772b3383533f845689ac97ad03fcf67cf59c208
Gerrit-Change-Number: 38017
Gerrit-PatchSet: 4
Gerrit-Owner: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Attention is currently required from: fixeria.
laforge has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38032?usp=email )
Change subject: library/PFCP_Emulation: look up by SeqNr and SEID separately
......................................................................
Patch Set 2: Code-Review+1
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38032?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: Ic7912d944e94852a587993708d51439ec90f08cd
Gerrit-Change-Number: 38032
Gerrit-PatchSet: 2
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Comment-Date: Thu, 05 Sep 2024 11:25:33 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Attention is currently required from: fixeria.
laforge has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38031?usp=email )
Change subject: hnbgw: move vc_PFCP from ConnHdlr to test_CT
......................................................................
Patch Set 2:
(1 comment)
Patchset:
PS2:
as I see every so often: the commit log describes accurately what is done, but gives no rationale, why. The latter is often the more improtant part, as the "what" can be seen from the code, but not the intention.
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38031?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: Iaf7a54c674f2dc549572d918beb6f355f48ee700
Gerrit-Change-Number: 38031
Gerrit-PatchSet: 2
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-CC: laforge <laforge(a)osmocom.org>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Comment-Date: Thu, 05 Sep 2024 11:25:05 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Attention is currently required from: fixeria, laforge, pespin.
Hello fixeria, pespin,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/python/pyosmocom/+/38023?usp=email
to look at the new patch set (#3).
The following approvals got outdated and were removed:
Code-Review+1 by fixeria, Code-Review+1 by pespin
Change subject: Introduce a new 'hexstr' type to represent hex-strings
......................................................................
Introduce a new 'hexstr' type to represent hex-strings
hexstr differs from str in that comparisons are case-insensitive, and it
offers encoding-free conversion from hexstr to bytes and vice-versa.
Change-Id: I16c0df809bc11ec0f98e8ade404f9b82072e3a06
---
M src/osmocom/utils.py
A tests/test_utils.py
2 files changed, 88 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/python/pyosmocom refs/changes/23/38023/3
--
To view, visit https://gerrit.osmocom.org/c/python/pyosmocom/+/38023?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newpatchset
Gerrit-Project: python/pyosmocom
Gerrit-Branch: master
Gerrit-Change-Id: I16c0df809bc11ec0f98e8ade404f9b82072e3a06
Gerrit-Change-Number: 38023
Gerrit-PatchSet: 3
Gerrit-Owner: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-CC: Jenkins Builder
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>