<p>laforge has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/pysim/+/23696">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">transport: Make all calls go through base class send_apdu_raw()<br><br>This allows us to add APDU tracing at one central location in the code<br><br>Change-Id: Id0593a2e6d846cc3151443f1022ae7ee030e6673<br>---<br>M pySim/transport/__init__.py<br>M pySim/transport/calypso.py<br>M pySim/transport/modem_atcmd.py<br>M pySim/transport/pcsc.py<br>M pySim/transport/serial.py<br>5 files changed, 5 insertions(+), 5 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/96/23696/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/pySim/transport/__init__.py b/pySim/transport/__init__.py</span><br><span>index fb8f31d..923787b 100644</span><br><span>--- a/pySim/transport/__init__.py</span><br><span>+++ b/pySim/transport/__init__.py</span><br><span>@@ -68,7 +68,7 @@</span><br><span>                            data : string (in hex) of returned data (ex. "074F4EFFFF")</span><br><span>                                 sw   : string (in hex) of status word (ex. "9000")</span><br><span>                 """</span><br><span style="color: hsl(0, 100%, 40%);">-              pass</span><br><span style="color: hsl(120, 100%, 40%);">+          return self._send_apdu_raw(pdu)</span><br><span> </span><br><span>  def send_apdu(self, pdu):</span><br><span>            """Sends an APDU and auto fetch response data</span><br><span>diff --git a/pySim/transport/calypso.py b/pySim/transport/calypso.py</span><br><span>index 467d5ee..3c223e6 100644</span><br><span>--- a/pySim/transport/calypso.py</span><br><span>+++ b/pySim/transport/calypso.py</span><br><span>@@ -115,7 +115,7 @@</span><br><span>      def wait_for_card(self, timeout = None, newcardonly = False):</span><br><span>                pass # Nothing to do really ...</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-     def send_apdu_raw(self, pdu):</span><br><span style="color: hsl(120, 100%, 40%);">+ def _send_apdu_raw(self, pdu):</span><br><span> </span><br><span>           # Request FULL reset</span><br><span>                 req_msg = L1CTLMessageSIM(h2b(pdu))</span><br><span>diff --git a/pySim/transport/modem_atcmd.py b/pySim/transport/modem_atcmd.py</span><br><span>index fccd388..f5a0f23 100644</span><br><span>--- a/pySim/transport/modem_atcmd.py</span><br><span>+++ b/pySim/transport/modem_atcmd.py</span><br><span>@@ -97,7 +97,7 @@</span><br><span>         def wait_for_card(self, timeout=None, newcardonly=False):</span><br><span>            pass # Nothing to do really ...</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-     def send_apdu_raw(self, pdu):</span><br><span style="color: hsl(120, 100%, 40%);">+ def _send_apdu_raw(self, pdu):</span><br><span>               # Prepare the command as described in 8.17</span><br><span>           cmd = 'AT+CSIM=%d,\"%s\"' % (len(pdu), pdu)</span><br><span> </span><br><span>diff --git a/pySim/transport/pcsc.py b/pySim/transport/pcsc.py</span><br><span>index f08f71a..2433e79 100644</span><br><span>--- a/pySim/transport/pcsc.py</span><br><span>+++ b/pySim/transport/pcsc.py</span><br><span>@@ -71,7 +71,7 @@</span><br><span>               self.connect()</span><br><span>               return 1</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-    def send_apdu_raw(self, pdu):</span><br><span style="color: hsl(120, 100%, 40%);">+ def _send_apdu_raw(self, pdu):</span><br><span> </span><br><span>           apdu = h2i(pdu)</span><br><span> </span><br><span>diff --git a/pySim/transport/serial.py b/pySim/transport/serial.py</span><br><span>index 6d39303..22788a9 100644</span><br><span>--- a/pySim/transport/serial.py</span><br><span>+++ b/pySim/transport/serial.py</span><br><span>@@ -180,7 +180,7 @@</span><br><span>   def _rx_byte(self):</span><br><span>          return self._sl.read()</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-      def send_apdu_raw(self, pdu):</span><br><span style="color: hsl(120, 100%, 40%);">+ def _send_apdu_raw(self, pdu):</span><br><span> </span><br><span>           pdu = h2b(pdu)</span><br><span>               data_len = ord(pdu[4])  # P3</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/pysim/+/23696">change 23696</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/+/23696"/><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: Id0593a2e6d846cc3151443f1022ae7ee030e6673 </div>
<div style="display:none"> Gerrit-Change-Number: 23696 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>