<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/pysim/+/24454">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">filesystem: Introduce support for TLV parser<br><br>This adds an easy way for files to make use of the pySim.tlv parser.<br><br>All a file has to do is to specify a _tlv member which points to<br>either a TLV_IE or a TLV_IE_Collection instance.<br><br>Change-Id: I59f456b4223ec88081e91cee168b654c69bcb5f4<br>---<br>M pySim/filesystem.py<br>M pySim/tlv.py<br>2 files changed, 40 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/pySim/filesystem.py b/pySim/filesystem.py</span><br><span>index 9a2f4e1..170429b 100644</span><br><span>--- a/pySim/filesystem.py</span><br><span>+++ b/pySim/filesystem.py</span><br><span>@@ -468,6 +468,7 @@</span><br><span> """</span><br><span> super().__init__(fid=fid, sfid=sfid, name=name, desc=desc, parent=parent)</span><br><span> self._construct = None</span><br><span style="color: hsl(120, 100%, 40%);">+ self._tlv = None</span><br><span> self.size = size</span><br><span> self.shell_commands = [self.ShellCommands()]</span><br><span> </span><br><span>@@ -491,6 +492,9 @@</span><br><span> return method(b2h(raw_bin_data))</span><br><span> if self._construct:</span><br><span> return parse_construct(self._construct, raw_bin_data)</span><br><span style="color: hsl(120, 100%, 40%);">+ elif self._tlv:</span><br><span style="color: hsl(120, 100%, 40%);">+ self._tlv.from_tlv(raw_bin_data)</span><br><span style="color: hsl(120, 100%, 40%);">+ return self._tlv.to_dict()</span><br><span> return {'raw': raw_bin_data.hex()}</span><br><span> </span><br><span> def decode_hex(self, raw_hex_data:str) -> dict:</span><br><span>@@ -514,6 +518,9 @@</span><br><span> return method(raw_bin_data)</span><br><span> if self._construct:</span><br><span> return parse_construct(self._construct, raw_bin_data)</span><br><span style="color: hsl(120, 100%, 40%);">+ elif self._tlv:</span><br><span style="color: hsl(120, 100%, 40%);">+ self._tlv.from_tlv(raw_bin_data)</span><br><span style="color: hsl(120, 100%, 40%);">+ return self._tlv.to_dict()</span><br><span> return {'raw': raw_bin_data.hex()}</span><br><span> </span><br><span> def encode_bin(self, abstract_data:dict) -> bytearray:</span><br><span>@@ -536,6 +543,9 @@</span><br><span> return h2b(method(abstract_data))</span><br><span> if self._construct:</span><br><span> return self._construct.build(abstract_data)</span><br><span style="color: hsl(120, 100%, 40%);">+ elif self._tlv:</span><br><span style="color: hsl(120, 100%, 40%);">+ self._tlv.from_dict(abstract_data)</span><br><span style="color: hsl(120, 100%, 40%);">+ return self._tlv.to_tlv()</span><br><span> raise NotImplementedError</span><br><span> </span><br><span> def encode_hex(self, abstract_data:dict) -> str:</span><br><span>@@ -559,6 +569,9 @@</span><br><span> return b2h(raw_bin_data)</span><br><span> if self._construct:</span><br><span> return b2h(self._construct.build(abstract_data))</span><br><span style="color: hsl(120, 100%, 40%);">+ elif self._tlv:</span><br><span style="color: hsl(120, 100%, 40%);">+ self._tlv.from_dict(abstract_data)</span><br><span style="color: hsl(120, 100%, 40%);">+ return b2h(self._tlv.to_tlv())</span><br><span> raise NotImplementedError</span><br><span> </span><br><span> </span><br><span>@@ -691,6 +704,7 @@</span><br><span> self.rec_len = rec_len</span><br><span> self.shell_commands = [self.ShellCommands()]</span><br><span> self._construct = None</span><br><span style="color: hsl(120, 100%, 40%);">+ self._tlv = None</span><br><span> </span><br><span> def decode_record_hex(self, raw_hex_data:str) -> dict:</span><br><span> """Decode raw (hex string) data into abstract representation.</span><br><span>@@ -713,6 +727,9 @@</span><br><span> return method(raw_bin_data)</span><br><span> if self._construct:</span><br><span> return parse_construct(self._construct, raw_bin_data)</span><br><span style="color: hsl(120, 100%, 40%);">+ elif self._tlv:</span><br><span style="color: hsl(120, 100%, 40%);">+ self._tlv.from_tlv(raw_bin_data)</span><br><span style="color: hsl(120, 100%, 40%);">+ return self._tlv.to_dict()</span><br><span> return {'raw': raw_bin_data.hex()}</span><br><span> </span><br><span> def decode_record_bin(self, raw_bin_data:bytearray) -> dict:</span><br><span>@@ -736,6 +753,9 @@</span><br><span> return method(raw_hex_data)</span><br><span> if self._construct:</span><br><span> return parse_construct(self._construct, raw_bin_data)</span><br><span style="color: hsl(120, 100%, 40%);">+ elif self._tlv:</span><br><span style="color: hsl(120, 100%, 40%);">+ self._tlv.from_tlv(raw_bin_data)</span><br><span style="color: hsl(120, 100%, 40%);">+ return self._tlv.to_dict()</span><br><span> return {'raw': raw_hex_data}</span><br><span> </span><br><span> def encode_record_hex(self, abstract_data:dict) -> str:</span><br><span>@@ -759,6 +779,9 @@</span><br><span> return b2h(raw_bin_data)</span><br><span> if self._construct:</span><br><span> return b2h(self._construct.build(abstract_data))</span><br><span style="color: hsl(120, 100%, 40%);">+ elif self._tlv:</span><br><span style="color: hsl(120, 100%, 40%);">+ self._tlv.from_dict(abstract_data)</span><br><span style="color: hsl(120, 100%, 40%);">+ return b2h(self._tlv.to_tlv())</span><br><span> raise NotImplementedError</span><br><span> </span><br><span> def encode_record_bin(self, abstract_data:dict) -> bytearray:</span><br><span>@@ -781,6 +804,9 @@</span><br><span> return h2b(method(abstract_data))</span><br><span> if self._construct:</span><br><span> return self._construct.build(abstract_data)</span><br><span style="color: hsl(120, 100%, 40%);">+ elif self._tlv:</span><br><span style="color: hsl(120, 100%, 40%);">+ self._tlv.from_dict(abstract_data)</span><br><span style="color: hsl(120, 100%, 40%);">+ return self._tlv.to_tlv()</span><br><span> raise NotImplementedError</span><br><span> </span><br><span> class CyclicEF(LinFixedEF):</span><br><span>@@ -835,6 +861,9 @@</span><br><span> return method(raw_bin_data)</span><br><span> if self._construct:</span><br><span> return parse_construct(self._construct, raw_bin_data)</span><br><span style="color: hsl(120, 100%, 40%);">+ elif self._tlv:</span><br><span style="color: hsl(120, 100%, 40%);">+ self._tlv.from_tlv(raw_bin_data)</span><br><span style="color: hsl(120, 100%, 40%);">+ return self._tlv.to_dict()</span><br><span> return {'raw': raw_hex_data}</span><br><span> </span><br><span> def decode_record_bin(self, raw_bin_data:bytearray) -> dict:</span><br><span>@@ -858,6 +887,9 @@</span><br><span> return method(raw_hex_data)</span><br><span> if self._construct:</span><br><span> return parse_construct(self._construct, raw_bin_data)</span><br><span style="color: hsl(120, 100%, 40%);">+ elif self._tlv:</span><br><span style="color: hsl(120, 100%, 40%);">+ self._tlv.from_tlv(raw_bin_data)</span><br><span style="color: hsl(120, 100%, 40%);">+ return self._tlv.to_dict()</span><br><span> return {'raw': raw_hex_data}</span><br><span> </span><br><span> def encode_record_hex(self, abstract_data:dict) -> str:</span><br><span>@@ -880,6 +912,9 @@</span><br><span> return b2h(method(abstract_data))</span><br><span> if self._construct:</span><br><span> return b2h(filter_dict(self._construct.build(abstract_data)))</span><br><span style="color: hsl(120, 100%, 40%);">+ elif self._tlv:</span><br><span style="color: hsl(120, 100%, 40%);">+ self._tlv.from_dict(abstract_data)</span><br><span style="color: hsl(120, 100%, 40%);">+ return b2h(self._tlv.to_tlv())</span><br><span> raise NotImplementedError</span><br><span> </span><br><span> def encode_record_bin(self, abstract_data:dict) -> bytearray:</span><br><span>@@ -902,6 +937,9 @@</span><br><span> return h2b(method(abstract_data))</span><br><span> if self._construct:</span><br><span> return filter_dict(self._construct.build(abstract_data))</span><br><span style="color: hsl(120, 100%, 40%);">+ elif self._tlv:</span><br><span style="color: hsl(120, 100%, 40%);">+ self._tlv.from_dict(abstract_data)</span><br><span style="color: hsl(120, 100%, 40%);">+ return self._tlv.to_tlv()</span><br><span> raise NotImplementedError</span><br><span> </span><br><span> def _decode_bin(self, raw_bin_data:bytearray):</span><br><span>diff --git a/pySim/tlv.py b/pySim/tlv.py</span><br><span>index 3b27b5e..05f824e 100644</span><br><span>--- a/pySim/tlv.py</span><br><span>+++ b/pySim/tlv.py</span><br><span>@@ -338,6 +338,8 @@</span><br><span> while len(remainder):</span><br><span> # obtain the tag at the start of the remainder</span><br><span> tag, r = first._parse_tag_raw(remainder)</span><br><span style="color: hsl(120, 100%, 40%);">+ if tag == None:</span><br><span style="color: hsl(120, 100%, 40%);">+ return res</span><br><span> if tag in self.members_by_tag:</span><br><span> cls = self.members_by_tag[tag]</span><br><span> # create an instance and parse accordingly</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/pysim/+/24454">change 24454</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/pysim/+/24454"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: pysim </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I59f456b4223ec88081e91cee168b654c69bcb5f4 </div>
<div style="display:none"> Gerrit-Change-Number: 24454 </div>
<div style="display:none"> Gerrit-PatchSet: 5 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: dexter <pmaier@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>