<p>Vadim Yanitskiy <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/12431">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">layer23/sap_interface.c: return rc from osmosap_send_apdu()<br><br>Change-Id: I3965843c4d49e31b1b5156d9ee8439eef6ecaab1<br>---<br>M src/host/layer23/src/common/sap_interface.c<br>1 file changed, 10 insertions(+), 7 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/host/layer23/src/common/sap_interface.c b/src/host/layer23/src/common/sap_interface.c</span><br><span>index a32c3aa..23b482a 100644</span><br><span>--- a/src/host/layer23/src/common/sap_interface.c</span><br><span>+++ b/src/host/layer23/src/common/sap_interface.c</span><br><span>@@ -474,10 +474,11 @@</span><br><span>  ms->sap_entity.sap_state = SAP_NOT_CONNECTED;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void sap_apdu(struct osmocom_ms *ms, uint8_t *data, uint16_t len)</span><br><span style="color: hsl(120, 100%, 40%);">+static int sap_apdu(struct osmocom_ms *ms, uint8_t *data, uint16_t len)</span><br><span> {</span><br><span>      struct msgb *msg;</span><br><span>    struct sap_param params[1];</span><br><span style="color: hsl(120, 100%, 40%);">+   int rc;</span><br><span> </span><br><span>  params[0].id = SAP_COMMAND_APDU;</span><br><span>     params[0].len = len;</span><br><span>@@ -485,16 +486,20 @@</span><br><span> </span><br><span>     if(ms->sap_entity.sap_state != SAP_IDLE){</span><br><span>                 LOGP(DSAP, LOGL_ERROR, "Attempting to send APDU request while not being idle.\n");</span><br><span style="color: hsl(0, 100%, 40%);">-            return;</span><br><span style="color: hsl(120, 100%, 40%);">+               return -EIO;</span><br><span>         }</span><br><span> </span><br><span>        msg = sap_create_msg(SAP_TRANSFER_APDU_REQ, 1, params);</span><br><span>      if(!msg)</span><br><span style="color: hsl(0, 100%, 40%);">-                return;</span><br><span style="color: hsl(120, 100%, 40%);">+               return -ENOMEM;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-     osmosap_send(ms, msg);</span><br><span style="color: hsl(120, 100%, 40%);">+        rc = osmosap_send(ms, msg);</span><br><span style="color: hsl(120, 100%, 40%);">+   if (rc)</span><br><span style="color: hsl(120, 100%, 40%);">+               return rc;</span><br><span> </span><br><span>       ms->sap_entity.sap_state = SAP_PROCESSING_APDU_REQUEST;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+  return 0;</span><br><span> }</span><br><span> </span><br><span> int sap_open(struct osmocom_ms *ms, const char *socket_path)</span><br><span>@@ -538,9 +543,7 @@</span><br><span> {</span><br><span>        //LOGP(DSAP, LOGL_ERROR, "Received the following APDU from sim.c: %s\n" ,</span><br><span>  //     osmo_hexdump(data, length));</span><br><span style="color: hsl(0, 100%, 40%);">-     sap_apdu(ms, data, length);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-     return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+     return sap_apdu(ms, data, length);</span><br><span> }</span><br><span> </span><br><span> /* register message handler for messages that are sent from L2->L3 */</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/12431">change 12431</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/12431"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmocom-bb </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I3965843c4d49e31b1b5156d9ee8439eef6ecaab1 </div>
<div style="display:none"> Gerrit-Change-Number: 12431 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: Vadim Yanitskiy <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: Kévin Redon <kredon@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Vadim Yanitskiy <axilirator@gmail.com> </div>