<p>fixeria has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-pcu/+/15278">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">osmobts_sock.cpp: pcu_sock_cb(): use libosmocore's socket API<br><br>Change-Id: I7f5c7f5744ab14f36f46cf7941e91352eca8d2b9<br>---<br>M src/osmobts_sock.cpp<br>1 file changed, 9 insertions(+), 51 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/78/15278/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmobts_sock.cpp b/src/osmobts_sock.cpp</span><br><span>index 6b49347..1072229 100644</span><br><span>--- a/src/osmobts_sock.cpp</span><br><span>+++ b/src/osmobts_sock.cpp</span><br><span>@@ -239,9 +239,6 @@</span><br><span> int pcu_l1if_open(void)</span><br><span> {</span><br><span>       struct pcu_sock_state *state;</span><br><span style="color: hsl(0, 100%, 40%);">-   struct osmo_fd *bfd;</span><br><span style="color: hsl(0, 100%, 40%);">-    struct sockaddr_un local;</span><br><span style="color: hsl(0, 100%, 40%);">-       unsigned int namelen;</span><br><span>        int rc;</span><br><span>      struct gprs_rlcmac_bts *bts = bts_main_data();</span><br><span> </span><br><span>@@ -255,60 +252,21 @@</span><br><span>           INIT_LLIST_HEAD(&state->upqueue);</span><br><span>     }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-   bfd = &state->conn_bfd;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-  bfd->fd = socket(AF_UNIX, SOCK_SEQPACKET, 0);</span><br><span style="color: hsl(0, 100%, 40%);">-        if (bfd->fd < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">-                LOGP(DL1IF, LOGL_ERROR, "Failed to create PCU socket.\n");</span><br><span style="color: hsl(0, 100%, 40%);">-            talloc_free(state);</span><br><span style="color: hsl(0, 100%, 40%);">-             return -1;</span><br><span style="color: hsl(0, 100%, 40%);">-      }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-       local.sun_family = AF_UNIX;</span><br><span style="color: hsl(0, 100%, 40%);">-     if (osmo_strlcpy(local.sun_path, bts->pcu_sock_path, sizeof(local.sun_path)) >= sizeof(local.sun_path)) {</span><br><span style="color: hsl(0, 100%, 40%);">-         LOGP(DLGLOBAL, LOGL_ERROR, "Socket path exceeds maximum length of %zd bytes: %s\n",</span><br><span style="color: hsl(0, 100%, 40%);">-                sizeof(local.sun_path), bts->pcu_sock_path);</span><br><span style="color: hsl(0, 100%, 40%);">-            return -ENOSPC;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-       /* we use the same magic that X11 uses in Xtranssock.c for</span><br><span style="color: hsl(0, 100%, 40%);">-       * calculating the proper length of the sockaddr */</span><br><span style="color: hsl(0, 100%, 40%);">-#if defined(BSD44SOCKETS) || defined(__UNIXWARE__)</span><br><span style="color: hsl(0, 100%, 40%);">-   local.sun_len = strlen(local.sun_path);</span><br><span style="color: hsl(0, 100%, 40%);">-#endif</span><br><span style="color: hsl(0, 100%, 40%);">-#if defined(BSD44SOCKETS) || defined(SUN_LEN)</span><br><span style="color: hsl(0, 100%, 40%);">-      namelen = SUN_LEN(&local);</span><br><span style="color: hsl(0, 100%, 40%);">-#else</span><br><span style="color: hsl(0, 100%, 40%);">-     namelen = strlen(local.sun_path) +</span><br><span style="color: hsl(0, 100%, 40%);">-                offsetof(struct sockaddr_un, sun_path);</span><br><span style="color: hsl(0, 100%, 40%);">-#endif</span><br><span style="color: hsl(0, 100%, 40%);">- rc = connect(bfd->fd, (struct sockaddr *) &local, namelen);</span><br><span style="color: hsl(0, 100%, 40%);">-      if (rc != 0) {</span><br><span style="color: hsl(0, 100%, 40%);">-          LOGP(DL1IF, LOGL_ERROR, "Failed to connect to the osmo-bts"</span><br><span style="color: hsl(0, 100%, 40%);">-                   " PCU socket (%s), delaying... '%s'\n",</span><br><span style="color: hsl(0, 100%, 40%);">-                       strerror(errno), local.sun_path);</span><br><span style="color: hsl(0, 100%, 40%);">-               pcu_sock_state = state;</span><br><span style="color: hsl(0, 100%, 40%);">-         close(bfd->fd);</span><br><span style="color: hsl(0, 100%, 40%);">-              bfd->fd = -1;</span><br><span style="color: hsl(120, 100%, 40%);">+      rc = osmo_sock_unix_init_ofd(&state->conn_bfd, SOCK_SEQPACKET, 0,</span><br><span style="color: hsl(120, 100%, 40%);">+                                   bts->pcu_sock_path, OSMO_SOCK_F_CONNECT);</span><br><span style="color: hsl(120, 100%, 40%);">+     if (rc < 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+              LOGP(DL1IF, LOGL_ERROR, "Failed to connect to the BTS (%s). "</span><br><span style="color: hsl(120, 100%, 40%);">+                                       "Retrying...\n", bts->pcu_sock_path);</span><br><span>           osmo_timer_setup(&state->timer, pcu_sock_timeout, NULL);</span><br><span>              osmo_timer_schedule(&state->timer, 5, 0);</span><br><span style="color: hsl(0, 100%, 40%);">-                return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+             return -EAGAIN;</span><br><span>      }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-   bfd->when = BSC_FD_READ;</span><br><span style="color: hsl(0, 100%, 40%);">-     bfd->cb = pcu_sock_cb;</span><br><span style="color: hsl(0, 100%, 40%);">-       bfd->data = state;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-   rc = osmo_fd_register(bfd);</span><br><span style="color: hsl(0, 100%, 40%);">-     if (rc < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">-                LOGP(DL1IF, LOGL_ERROR, "Could not register PCU fd: %d\n", rc);</span><br><span style="color: hsl(0, 100%, 40%);">-               close(bfd->fd);</span><br><span style="color: hsl(0, 100%, 40%);">-              talloc_free(state);</span><br><span style="color: hsl(0, 100%, 40%);">-             return rc;</span><br><span style="color: hsl(0, 100%, 40%);">-      }</span><br><span style="color: hsl(120, 100%, 40%);">+     state->conn_bfd.cb = pcu_sock_cb;</span><br><span style="color: hsl(120, 100%, 40%);">+  state->conn_bfd.data = state;</span><br><span> </span><br><span>         LOGP(DL1IF, LOGL_NOTICE, "osmo-bts PCU socket %s has been connected\n",</span><br><span style="color: hsl(0, 100%, 40%);">-            local.sun_path);</span><br><span style="color: hsl(120, 100%, 40%);">+      bts->pcu_sock_path);</span><br><span> </span><br><span>     pcu_sock_state = state;</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-pcu/+/15278">change 15278</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/osmo-pcu/+/15278"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-pcu </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I7f5c7f5744ab14f36f46cf7941e91352eca8d2b9 </div>
<div style="display:none"> Gerrit-Change-Number: 15278 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: fixeria <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>