<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/pysim/+/24010">View Change</a></p><div style="white-space:pre-wrap">Approvals:
laforge: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">utils: split string formatting from dec_addr_tlv<br><br>The function dec_addr_tlv() takes an encoded FQDN or IPv4 address and<br>fromats it into a human readable string that contains the human readable<br>form and the encoded hex form. Unfortunately this limits the usecase of<br>dec_addr_tlv. Lets split the string generation into a separate function<br>so that we can use dec_addr_tlv universally<br><br>Change-Id: Id017b0786089adac4d6c5be688742eaa9699e529<br>Related: OS#4963<br>---<br>M pySim/cards.py<br>M pySim/utils.py<br>2 files changed, 36 insertions(+), 7 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/pySim/cards.py b/pySim/cards.py</span><br><span>index 7744c7a..c41f343 100644</span><br><span>--- a/pySim/cards.py</span><br><span>+++ b/pySim/cards.py</span><br><span>@@ -32,6 +32,24 @@</span><br><span> from smartcard.util import toBytes</span><br><span> from pytlv.TLV import *</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+def format_addr(addr:str, addr_type:str) -> str:</span><br><span style="color: hsl(120, 100%, 40%);">+ """</span><br><span style="color: hsl(120, 100%, 40%);">+ helper function to format an FQDN (addr_type = '00') or IPv4</span><br><span style="color: hsl(120, 100%, 40%);">+ (addr_type = '01') address string into a printable string that</span><br><span style="color: hsl(120, 100%, 40%);">+ contains the hexadecimal representation and the original address</span><br><span style="color: hsl(120, 100%, 40%);">+ string (addr)</span><br><span style="color: hsl(120, 100%, 40%);">+ """</span><br><span style="color: hsl(120, 100%, 40%);">+ res = ""</span><br><span style="color: hsl(120, 100%, 40%);">+ if addr_type == '00': #FQDN</span><br><span style="color: hsl(120, 100%, 40%);">+ res += "\t%s # %s\n" % (s2h(addr), addr)</span><br><span style="color: hsl(120, 100%, 40%);">+ elif addr_type == '01': #IPv4</span><br><span style="color: hsl(120, 100%, 40%);">+ octets = addr.split(".")</span><br><span style="color: hsl(120, 100%, 40%);">+ addr_hex = ""</span><br><span style="color: hsl(120, 100%, 40%);">+ for o in octets:</span><br><span style="color: hsl(120, 100%, 40%);">+ addr_hex += ("%02x" % int(o))</span><br><span style="color: hsl(120, 100%, 40%);">+ res += "\t%s # %s\n" % (addr_hex, addr)</span><br><span style="color: hsl(120, 100%, 40%);">+ return res</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> class Card(object):</span><br><span> </span><br><span> name = 'SIM'</span><br><span>@@ -316,7 +334,12 @@</span><br><span> def read_epdgid(self):</span><br><span> (res, sw) = self._scc.read_binary(EF_USIM_ADF_map['ePDGId'])</span><br><span> if sw == '9000':</span><br><span style="color: hsl(0, 100%, 40%);">- return (dec_addr_tlv(res), sw)</span><br><span style="color: hsl(120, 100%, 40%);">+ try:</span><br><span style="color: hsl(120, 100%, 40%);">+ addr, addr_type = dec_addr_tlv(res)</span><br><span style="color: hsl(120, 100%, 40%);">+ except:</span><br><span style="color: hsl(120, 100%, 40%);">+ addr = None</span><br><span style="color: hsl(120, 100%, 40%);">+ addr_type = None</span><br><span style="color: hsl(120, 100%, 40%);">+ return (format_addr(addr, addr_type), sw)</span><br><span> else:</span><br><span> return (None, sw)</span><br><span> </span><br><span>@@ -378,7 +401,12 @@</span><br><span> for i in range(0, rec_cnt):</span><br><span> (res, sw) = self._scc.read_record(EF_ISIM_ADF_map['PCSCF'], i + 1)</span><br><span> if sw == '9000':</span><br><span style="color: hsl(0, 100%, 40%);">- content = dec_addr_tlv(res)</span><br><span style="color: hsl(120, 100%, 40%);">+ try:</span><br><span style="color: hsl(120, 100%, 40%);">+ addr, addr_type = dec_addr_tlv(res)</span><br><span style="color: hsl(120, 100%, 40%);">+ except:</span><br><span style="color: hsl(120, 100%, 40%);">+ addr = None</span><br><span style="color: hsl(120, 100%, 40%);">+ addr_type = None</span><br><span style="color: hsl(120, 100%, 40%);">+ content = format_addr(addr, addr_type)</span><br><span> pcscf_recs += "%s" % (len(content) and content or '\tNot available\n')</span><br><span> else:</span><br><span> pcscf_recs += "\tP-CSCF: Can't read, response code = %s\n" % (sw)</span><br><span>diff --git a/pySim/utils.py b/pySim/utils.py</span><br><span>index 3a8ddac..ff55642 100644</span><br><span>--- a/pySim/utils.py</span><br><span>+++ b/pySim/utils.py</span><br><span>@@ -692,8 +692,6 @@</span><br><span> # Convert from hex str to int bytes list</span><br><span> addr_tlv_bytes = h2i(hexstr)</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- s = ""</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> # Get list of tuples containing parsed TLVs</span><br><span> tlvs = TLV_parser(addr_tlv_bytes)</span><br><span> </span><br><span>@@ -718,15 +716,18 @@</span><br><span> if addr_type == 0x00: #FQDN</span><br><span> # Skip address tye byte i.e. first byte in value list</span><br><span> content = tlv[2][1:]</span><br><span style="color: hsl(0, 100%, 40%);">- s += "\t%s # %s\n" % (i2h(content), i2s(content))</span><br><span style="color: hsl(120, 100%, 40%);">+ return (i2s(content), '00')</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> elif addr_type == 0x01: #IPv4</span><br><span> # Skip address tye byte i.e. first byte in value list</span><br><span> # Skip the unused byte in Octect 4 after address type byte as per 3GPP TS 31.102</span><br><span> ipv4 = tlv[2][2:]</span><br><span> content = '.'.join(str(x) for x in ipv4)</span><br><span style="color: hsl(0, 100%, 40%);">- s += "\t%s # %s\n" % (i2h(ipv4), content)</span><br><span style="color: hsl(120, 100%, 40%);">+ return (content, '01')</span><br><span style="color: hsl(120, 100%, 40%);">+ else:</span><br><span style="color: hsl(120, 100%, 40%);">+ raise ValueError("Invalid address type")</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- return s</span><br><span style="color: hsl(120, 100%, 40%);">+ return (None, None)</span><br><span> </span><br><span> def enc_addr_tlv(addr, addr_type='00'):</span><br><span> """</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/pysim/+/24010">change 24010</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/+/24010"/><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: Id017b0786089adac4d6c5be688742eaa9699e529 </div>
<div style="display:none"> Gerrit-Change-Number: 24010 </div>
<div style="display:none"> Gerrit-PatchSet: 8 </div>
<div style="display:none"> Gerrit-Owner: dexter <pmaier@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </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-CC: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>