<p>Vadim Yanitskiy <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/12433">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: remove redundant socket_path argument<br><br>Change-Id: I408b3e1fa40e9b5daf88fa6ed5f3930b83dffe6f<br>---<br>M src/host/layer23/include/osmocom/bb/common/sap_interface.h<br>M src/host/layer23/src/common/sap_interface.c<br>M src/host/layer23/src/mobile/subscriber.c<br>3 files changed, 6 insertions(+), 5 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/host/layer23/include/osmocom/bb/common/sap_interface.h b/src/host/layer23/include/osmocom/bb/common/sap_interface.h</span><br><span>index e2aad3f..e78320e 100644</span><br><span>--- a/src/host/layer23/include/osmocom/bb/common/sap_interface.h</span><br><span>+++ b/src/host/layer23/include/osmocom/bb/common/sap_interface.h</span><br><span>@@ -2,7 +2,7 @@</span><br><span> </span><br><span> typedef int (*osmosap_cb_t)(struct msgb *msg, struct osmocom_ms *ms);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-int sap_open(struct osmocom_ms *ms, const char *socket_path);</span><br><span style="color: hsl(120, 100%, 40%);">+int sap_open(struct osmocom_ms *ms);</span><br><span> int sap_close(struct osmocom_ms *ms);</span><br><span> int osmosap_send_apdu(struct osmocom_ms *ms, uint8_t *data, uint16_t length);</span><br><span> int osmosap_register_handler(struct osmocom_ms *ms, osmosap_cb_t cb);</span><br><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 b436c75..7a42233 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>@@ -502,14 +502,15 @@</span><br><span>       return 0;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-int sap_open(struct osmocom_ms *ms, const char *socket_path)</span><br><span style="color: hsl(120, 100%, 40%);">+int sap_open(struct osmocom_ms *ms)</span><br><span> {</span><br><span>     ssize_t rc;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- rc = osmo_sock_unix_init_ofd(&ms->sap_wq.bfd, SOCK_STREAM, 0, socket_path, OSMO_SOCK_F_CONNECT);</span><br><span style="color: hsl(120, 100%, 40%);">+       rc = osmo_sock_unix_init_ofd(&ms->sap_wq.bfd, SOCK_STREAM, 0,</span><br><span style="color: hsl(120, 100%, 40%);">+          ms->settings.sap_socket_path, OSMO_SOCK_F_CONNECT);</span><br><span>       if (rc < 0) {</span><br><span>             LOGP(DSAP, LOGL_ERROR, "Failed to create unix domain socket %s: %s\n",</span><br><span style="color: hsl(0, 100%, 40%);">-                     socket_path, strerror(-rc));</span><br><span style="color: hsl(120, 100%, 40%);">+                  ms->settings.sap_socket_path, strerror(-rc));</span><br><span>                ms->sap_entity.sap_state = SAP_SOCKET_ERROR;</span><br><span>              return rc;</span><br><span>   }</span><br><span>diff --git a/src/host/layer23/src/mobile/subscriber.c b/src/host/layer23/src/mobile/subscriber.c</span><br><span>index 7f24d56..b2be554 100644</span><br><span>--- a/src/host/layer23/src/mobile/subscriber.c</span><br><span>+++ b/src/host/layer23/src/mobile/subscriber.c</span><br><span>@@ -1282,7 +1282,7 @@</span><br><span>       /* Try to connect to the SAP interface */</span><br><span>    vty_notify(ms, NULL);</span><br><span>        vty_notify(ms, "Connecting to the SAP interface...\n");</span><br><span style="color: hsl(0, 100%, 40%);">-       rc = sap_open(ms, ms->settings.sap_socket_path);</span><br><span style="color: hsl(120, 100%, 40%);">+   rc = sap_open(ms);</span><br><span>   if (rc < 0) {</span><br><span>             LOGP(DSAP, LOGL_ERROR, "Failed during sap_open(), no SAP based SIM reader\n");</span><br><span>             vty_notify(ms, "SAP connection error!\n");</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/12433">change 12433</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/12433"/><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: I408b3e1fa40e9b5daf88fa6ed5f3930b83dffe6f </div>
<div style="display:none"> Gerrit-Change-Number: 12433 </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>