<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-hnodeb/+/26545">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">WIP: gtp<br><br>Change-Id: I019e57c693577a1836e1676146ac03bc3edd7e9c<br>---<br>M include/osmocom/hnodeb/hnodeb.h<br>M src/osmo-hnodeb/gtp.c<br>M src/osmo-hnodeb/hnb.c<br>3 files changed, 2 insertions(+), 29 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-hnodeb refs/changes/45/26545/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/hnodeb/hnodeb.h b/include/osmocom/hnodeb/hnodeb.h</span><br><span>index 37bf7d5..52d1bec 100644</span><br><span>--- a/include/osmocom/hnodeb/hnodeb.h</span><br><span>+++ b/include/osmocom/hnodeb/hnodeb.h</span><br><span>@@ -115,8 +115,6 @@</span><br><span>                 char *cfg_local_addr;</span><br><span>                struct osmo_sockaddr local_addr;</span><br><span>             struct gsn_t *gsn;</span><br><span style="color: hsl(0, 100%, 40%);">-              struct osmo_fd fd0;</span><br><span style="color: hsl(0, 100%, 40%);">-             struct osmo_fd fd1c;</span><br><span>                 struct osmo_fd fd1u;</span><br><span>         } gtp;</span><br><span> </span><br><span>diff --git a/src/osmo-hnodeb/gtp.c b/src/osmo-hnodeb/gtp.c</span><br><span>index 2368270..4695ea9 100644</span><br><span>--- a/src/osmo-hnodeb/gtp.c</span><br><span>+++ b/src/osmo-hnodeb/gtp.c</span><br><span>@@ -74,12 +74,6 @@</span><br><span> </span><br><span>         switch (fd->priv_nr) {</span><br><span>    case 0:</span><br><span style="color: hsl(0, 100%, 40%);">-         rc = gtp_decaps0(hnb->gtp.gsn);</span><br><span style="color: hsl(0, 100%, 40%);">-              break;</span><br><span style="color: hsl(0, 100%, 40%);">-  case 1:</span><br><span style="color: hsl(0, 100%, 40%);">-         rc = gtp_decaps1c(hnb->gtp.gsn);</span><br><span style="color: hsl(0, 100%, 40%);">-             break;</span><br><span style="color: hsl(0, 100%, 40%);">-  case 2:</span><br><span>              rc = gtp_decaps1u(hnb->gtp.gsn);</span><br><span>          break;</span><br><span>       default:</span><br><span>@@ -109,18 +103,10 @@</span><br><span>     rc = sk_get_bound_addr(gsn->fd1u, &hnb->gtp.local_addr);</span><br><span>   if (rc < 0) {</span><br><span>             LOGP(DGTP, LOGL_ERROR, "Failed to get GTP-U socket bound address: %s\n", strerror(-rc));</span><br><span style="color: hsl(0, 100%, 40%);">-              return rc;</span><br><span style="color: hsl(120, 100%, 40%);">+            goto free_ret;</span><br><span>       }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-   osmo_fd_setup(&hnb->gtp.fd0, gsn->fd0, OSMO_FD_READ, hnb_gtp_fd_cb, hnb, 0);</span><br><span style="color: hsl(0, 100%, 40%);">-  if ((rc = osmo_fd_register(&hnb->gtp.fd0)) < 0)</span><br><span style="color: hsl(0, 100%, 40%);">-               goto free_ret;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-  osmo_fd_setup(&hnb->gtp.fd1c, gsn->fd1c, OSMO_FD_READ, hnb_gtp_fd_cb, hnb, 1);</span><br><span style="color: hsl(0, 100%, 40%);">-        if ((rc = osmo_fd_register(&hnb->gtp.fd1c)) < 0)</span><br><span style="color: hsl(0, 100%, 40%);">-              goto free_ret;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-  osmo_fd_setup(&hnb->gtp.fd1u, gsn->fd1u, OSMO_FD_READ, hnb_gtp_fd_cb, hnb, 2);</span><br><span style="color: hsl(120, 100%, 40%);">+      osmo_fd_setup(&hnb->gtp.fd1u, gsn->fd1u, OSMO_FD_READ, hnb_gtp_fd_cb, hnb, 0);</span><br><span>     if ((rc = osmo_fd_register(&hnb->gtp.fd1u)) < 0)</span><br><span>           goto free_ret;</span><br><span> </span><br><span>@@ -130,12 +116,7 @@</span><br><span>    return 0;</span><br><span> </span><br><span> free_ret:</span><br><span style="color: hsl(0, 100%, 40%);">-      osmo_fd_unregister(&hnb->gtp.fd1u);</span><br><span style="color: hsl(0, 100%, 40%);">-      osmo_fd_unregister(&hnb->gtp.fd1c);</span><br><span style="color: hsl(0, 100%, 40%);">-      osmo_fd_unregister(&hnb->gtp.fd0);</span><br><span>    gtp_free(gsn);</span><br><span style="color: hsl(0, 100%, 40%);">-  hnb->gtp.fd0.fd = -1;</span><br><span style="color: hsl(0, 100%, 40%);">-        hnb->gtp.fd1c.fd = -1;</span><br><span>    hnb->gtp.fd1u.fd = -1;</span><br><span>    return rc;</span><br><span> }</span><br><span>@@ -143,12 +124,8 @@</span><br><span> void hnb_gtp_unbind(struct hnb *hnb)</span><br><span> {</span><br><span>  osmo_fd_unregister(&hnb->gtp.fd1u);</span><br><span style="color: hsl(0, 100%, 40%);">-      osmo_fd_unregister(&hnb->gtp.fd1c);</span><br><span style="color: hsl(0, 100%, 40%);">-      osmo_fd_unregister(&hnb->gtp.fd0);</span><br><span>    gtp_free(hnb->gtp.gsn);</span><br><span>   hnb->gtp.gsn = NULL;</span><br><span style="color: hsl(0, 100%, 40%);">- hnb->gtp.fd0.fd = -1;</span><br><span style="color: hsl(0, 100%, 40%);">-        hnb->gtp.fd1c.fd = -1;</span><br><span>    hnb->gtp.fd1u.fd = -1;</span><br><span> }</span><br><span> </span><br><span>diff --git a/src/osmo-hnodeb/hnb.c b/src/osmo-hnodeb/hnb.c</span><br><span>index 5710ab4..b733d15 100644</span><br><span>--- a/src/osmo-hnodeb/hnb.c</span><br><span>+++ b/src/osmo-hnodeb/hnb.c</span><br><span>@@ -61,8 +61,6 @@</span><br><span>      hnb->rtp.priority = -1;</span><br><span> </span><br><span>       hnb->gtp.cfg_local_addr = talloc_strdup(hnb, "0.0.0.0");</span><br><span style="color: hsl(0, 100%, 40%);">-   hnb->gtp.fd0.fd = -1;</span><br><span style="color: hsl(0, 100%, 40%);">-        hnb->gtp.fd1c.fd = -1;</span><br><span>    hnb->gtp.fd1u.fd = -1;</span><br><span> </span><br><span>        hnb->shutdown_fi = osmo_fsm_inst_alloc(&hnb_shutdown_fsm, hnb, hnb,</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-hnodeb/+/26545">change 26545</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-hnodeb/+/26545"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-hnodeb </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I019e57c693577a1836e1676146ac03bc3edd7e9c </div>
<div style="display:none"> Gerrit-Change-Number: 26545 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>