<p>laforge has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/22566">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">ns2: Move to one common/shared ns2_bind_alloc()<br><br>Avoid code duplication between three different drivers by sharing<br>the "core" of the bind initialization in a new, shared ns2_bind_alloc().<br><br>Change-Id: I535fc68e94fcd695de827dd922706adc1c5a2cb7<br>---<br>M src/gb/gprs_ns2.c<br>M src/gb/gprs_ns2_fr.c<br>M src/gb/gprs_ns2_frgre.c<br>M src/gb/gprs_ns2_internal.h<br>M src/gb/gprs_ns2_udp.c<br>5 files changed, 63 insertions(+), 74 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/66/22566/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/gb/gprs_ns2.c b/src/gb/gprs_ns2.c</span><br><span>index eccbe13..7308e75 100644</span><br><span>--- a/src/gb/gprs_ns2.c</span><br><span>+++ b/src/gb/gprs_ns2.c</span><br><span>@@ -1351,4 +1351,36 @@</span><br><span> return transfer_cap;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/*! common allocation + low-level initialization of a bind. Called by vc-drivers */</span><br><span style="color: hsl(120, 100%, 40%);">+int ns2_bind_alloc(struct gprs_ns2_inst *nsi, const char *name,</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gprs_ns2_vc_bind **result)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gprs_ns2_vc_bind *bind;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!name)</span><br><span style="color: hsl(120, 100%, 40%);">+ return -EINVAL;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (gprs_ns2_bind_by_name(nsi, name))</span><br><span style="color: hsl(120, 100%, 40%);">+ return -EALREADY;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ bind = talloc_zero(nsi, struct gprs_ns2_vc_bind);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!bind)</span><br><span style="color: hsl(120, 100%, 40%);">+ return -ENOSPC;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ bind->name = talloc_strdup(bind, name);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!bind->name) {</span><br><span style="color: hsl(120, 100%, 40%);">+ talloc_free(bind);</span><br><span style="color: hsl(120, 100%, 40%);">+ return -ENOSPC;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ bind->nsi = nsi;</span><br><span style="color: hsl(120, 100%, 40%);">+ INIT_LLIST_HEAD(&bind->nsvc);</span><br><span style="color: hsl(120, 100%, 40%);">+ llist_add(&bind->list, &nsi->binding);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (result)</span><br><span style="color: hsl(120, 100%, 40%);">+ *result = bind;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /*! @} */</span><br><span>diff --git a/src/gb/gprs_ns2_fr.c b/src/gb/gprs_ns2_fr.c</span><br><span>index 9de2b06..953f4ca 100644</span><br><span>--- a/src/gb/gprs_ns2_fr.c</span><br><span>+++ b/src/gb/gprs_ns2_fr.c</span><br><span>@@ -719,21 +719,15 @@</span><br><span> struct osmo_fr_link *fr_link;</span><br><span> int rc = 0;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (!name)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (strlen(netif) > IFNAMSIZ)</span><br><span> return -EINVAL;</span><br><span> </span><br><span> if (gprs_ns2_bind_by_name(nsi, name))</span><br><span> return -EALREADY;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- bind = talloc_zero(nsi, struct gprs_ns2_vc_bind);</span><br><span style="color: hsl(0, 100%, 40%);">- if (!bind)</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%);">- bind->name = talloc_strdup(bind, name);</span><br><span style="color: hsl(0, 100%, 40%);">- if (!bind->name) {</span><br><span style="color: hsl(0, 100%, 40%);">- rc = -ENOSPC;</span><br><span style="color: hsl(0, 100%, 40%);">- goto err_bind;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = ns2_bind_alloc(nsi, name, &bind);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rc < 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ return rc;</span><br><span> </span><br><span> bind->driver = &vc_driver_fr;</span><br><span> bind->ll = GPRS_NS2_LL_FR;</span><br><span>@@ -742,27 +736,19 @@</span><br><span> bind->send_vc = fr_vc_sendmsg;</span><br><span> bind->free_vc = free_vc;</span><br><span> bind->dump_vty = dump_vty;</span><br><span style="color: hsl(0, 100%, 40%);">- bind->nsi = nsi;</span><br><span> priv = bind->priv = talloc_zero(bind, struct priv_bind);</span><br><span> if (!priv) {</span><br><span> rc = -ENOSPC;</span><br><span style="color: hsl(0, 100%, 40%);">- goto err_name;</span><br><span style="color: hsl(120, 100%, 40%);">+ goto err_bind;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (strlen(netif) > IFNAMSIZ) {</span><br><span style="color: hsl(0, 100%, 40%);">- rc = -EINVAL;</span><br><span style="color: hsl(0, 100%, 40%);">- goto err_priv;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span> OSMO_STRLCPY_ARRAY(priv->netif, netif);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (result)</span><br><span style="color: hsl(0, 100%, 40%);">- *result = bind;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> /* FIXME: move fd handling into socket.c */</span><br><span> fr_link = osmo_fr_link_alloc(fr_network, fr_role, netif);</span><br><span> if (!fr_link) {</span><br><span> rc = -EINVAL;</span><br><span style="color: hsl(0, 100%, 40%);">- goto err_priv;</span><br><span style="color: hsl(120, 100%, 40%);">+ goto err_bind;</span><br><span> }</span><br><span> </span><br><span> fr_link->tx_cb = fr_tx_cb;</span><br><span>@@ -793,9 +779,6 @@</span><br><span> if (rc < 0)</span><br><span> goto err_fd;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- INIT_LLIST_HEAD(&bind->nsvc);</span><br><span style="color: hsl(0, 100%, 40%);">- llist_add(&bind->list, &nsi->binding);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> #ifdef ENABLE_LIBMNL</span><br><span> if (!nsi->linkmon_mnl)</span><br><span> nsi->linkmon_mnl = osmo_mnl_init(nsi, NETLINK_ROUTE, RTMGRP_LINK, linkmon_mnl_cb, nsi);</span><br><span>@@ -806,18 +789,17 @@</span><br><span> linkmon_initial_dump(nsi->linkmon_mnl);</span><br><span> #endif</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ if (result)</span><br><span style="color: hsl(120, 100%, 40%);">+ *result = bind;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> return rc;</span><br><span> </span><br><span> err_fd:</span><br><span> close(priv->backlog.ofd.fd);</span><br><span> err_fr:</span><br><span> osmo_fr_link_free(fr_link);</span><br><span style="color: hsl(0, 100%, 40%);">-err_priv:</span><br><span style="color: hsl(0, 100%, 40%);">- talloc_free(priv);</span><br><span style="color: hsl(0, 100%, 40%);">-err_name:</span><br><span style="color: hsl(0, 100%, 40%);">- talloc_free((char *)bind->name);</span><br><span> err_bind:</span><br><span style="color: hsl(0, 100%, 40%);">- talloc_free(bind);</span><br><span style="color: hsl(120, 100%, 40%);">+ gprs_ns2_free_bind(bind);</span><br><span> </span><br><span> return rc;</span><br><span> }</span><br><span>diff --git a/src/gb/gprs_ns2_frgre.c b/src/gb/gprs_ns2_frgre.c</span><br><span>index 5047af0..863f8f2 100644</span><br><span>--- a/src/gb/gprs_ns2_frgre.c</span><br><span>+++ b/src/gb/gprs_ns2_frgre.c</span><br><span>@@ -537,29 +537,22 @@</span><br><span> int dscp,</span><br><span> struct gprs_ns2_vc_bind **result)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- struct gprs_ns2_vc_bind *bind = talloc_zero(nsi, struct gprs_ns2_vc_bind);</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gprs_ns2_vc_bind *bind;</span><br><span> struct priv_bind *priv;</span><br><span> int rc;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (!name)</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%);">- if (gprs_ns2_bind_by_name(nsi, name))</span><br><span style="color: hsl(0, 100%, 40%);">- return -EALREADY;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (!bind)</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%);">- if (local->u.sa.sa_family != AF_INET && local->u.sa.sa_family != AF_INET6) {</span><br><span style="color: hsl(0, 100%, 40%);">- talloc_free(bind);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (local->u.sa.sa_family != AF_INET && local->u.sa.sa_family != AF_INET6)</span><br><span> return -EINVAL;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ bind = gprs_ns2_bind_by_name(nsi, name);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (bind) {</span><br><span style="color: hsl(120, 100%, 40%);">+ *result = bind;</span><br><span style="color: hsl(120, 100%, 40%);">+ return -EALREADY;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- bind->name = talloc_strdup(bind, name);</span><br><span style="color: hsl(0, 100%, 40%);">- if (!bind->name) {</span><br><span style="color: hsl(0, 100%, 40%);">- talloc_free(bind);</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(120, 100%, 40%);">+ rc = ns2_bind_alloc(nsi, name, &bind);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rc < 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ return rc;</span><br><span> </span><br><span> bind->driver = &vc_driver_frgre;</span><br><span> bind->ll = GPRS_NS2_LL_FR_GRE;</span><br><span>@@ -571,7 +564,7 @@</span><br><span> </span><br><span> priv = bind->priv = talloc_zero(bind, struct priv_bind);</span><br><span> if (!priv) {</span><br><span style="color: hsl(0, 100%, 40%);">- talloc_free(bind);</span><br><span style="color: hsl(120, 100%, 40%);">+ gprs_ns2_free_bind(bind);</span><br><span> return -ENOSPC;</span><br><span> }</span><br><span> priv->fd.cb = frgre_fd_cb;</span><br><span>@@ -579,14 +572,11 @@</span><br><span> priv->addr = *local;</span><br><span> INIT_LLIST_HEAD(&bind->nsvc);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- llist_add(&bind->list, &nsi->binding);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> rc = osmo_sock_init_osa_ofd(&priv->fd, SOCK_RAW, IPPROTO_GRE,</span><br><span> local, NULL,</span><br><span> OSMO_SOCK_F_BIND);</span><br><span> if (rc < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- talloc_free(priv);</span><br><span style="color: hsl(0, 100%, 40%);">- talloc_free(bind);</span><br><span style="color: hsl(120, 100%, 40%);">+ gprs_ns2_free_bind(bind);</span><br><span> return rc;</span><br><span> }</span><br><span> </span><br><span>diff --git a/src/gb/gprs_ns2_internal.h b/src/gb/gprs_ns2_internal.h</span><br><span>index 0b264b6..1ab2770 100644</span><br><span>--- a/src/gb/gprs_ns2_internal.h</span><br><span>+++ b/src/gb/gprs_ns2_internal.h</span><br><span>@@ -272,6 +272,9 @@</span><br><span> enum gprs_ns2_vc_mode vc_mode,</span><br><span> const char *id);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+int ns2_bind_alloc(struct gprs_ns2_inst *nsi, const char *name,</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gprs_ns2_vc_bind **result);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> struct msgb *ns2_msgb_alloc(void);</span><br><span> </span><br><span> void ns2_sns_write_vty(struct vty *vty, const struct gprs_ns2_nse *nse);</span><br><span>diff --git a/src/gb/gprs_ns2_udp.c b/src/gb/gprs_ns2_udp.c</span><br><span>index 43ece13..b4bcd01 100644</span><br><span>--- a/src/gb/gprs_ns2_udp.c</span><br><span>+++ b/src/gb/gprs_ns2_udp.c</span><br><span>@@ -315,32 +315,18 @@</span><br><span> struct priv_bind *priv;</span><br><span> int rc;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (!name)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (local->u.sa.sa_family != AF_INET && local->u.sa.sa_family != AF_INET6)</span><br><span> return -EINVAL;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (gprs_ns2_bind_by_name(nsi, name))</span><br><span style="color: hsl(0, 100%, 40%);">- return -EALREADY;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> bind = gprs_ns2_ip_bind_by_sockaddr(nsi, local);</span><br><span> if (bind) {</span><br><span> *result = bind;</span><br><span> return -EBUSY;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- bind = talloc_zero(nsi, struct gprs_ns2_vc_bind);</span><br><span style="color: hsl(0, 100%, 40%);">- if (!bind)</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%);">- bind->name = talloc_strdup(bind, name);</span><br><span style="color: hsl(0, 100%, 40%);">- if (!bind->name) {</span><br><span style="color: hsl(0, 100%, 40%);">- talloc_free(bind);</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%);">- if (local->u.sa.sa_family != AF_INET && local->u.sa.sa_family != AF_INET6) {</span><br><span style="color: hsl(0, 100%, 40%);">- talloc_free(bind);</span><br><span style="color: hsl(0, 100%, 40%);">- return -EINVAL;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = ns2_bind_alloc(nsi, name, &bind);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rc < 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ return rc;</span><br><span> </span><br><span> bind->driver = &vc_driver_ip;</span><br><span> bind->ll = GPRS_NS2_LL_UDP;</span><br><span>@@ -351,24 +337,21 @@</span><br><span> bind->send_vc = nsip_vc_sendmsg;</span><br><span> bind->free_vc = free_vc;</span><br><span> bind->dump_vty = dump_vty;</span><br><span style="color: hsl(0, 100%, 40%);">- bind->nsi = nsi;</span><br><span> </span><br><span> priv = bind->priv = talloc_zero(bind, struct priv_bind);</span><br><span> if (!priv) {</span><br><span style="color: hsl(0, 100%, 40%);">- talloc_free(bind);</span><br><span style="color: hsl(120, 100%, 40%);">+ gprs_ns2_free_bind(bind);</span><br><span> return -ENOSPC;</span><br><span> }</span><br><span> priv->fd.cb = nsip_fd_cb;</span><br><span> priv->fd.data = bind;</span><br><span> priv->addr = *local;</span><br><span style="color: hsl(0, 100%, 40%);">- INIT_LLIST_HEAD(&bind->nsvc);</span><br><span> </span><br><span> rc = osmo_sock_init_osa_ofd(&priv->fd, SOCK_DGRAM, IPPROTO_UDP,</span><br><span> local, NULL,</span><br><span> OSMO_SOCK_F_BIND);</span><br><span> if (rc < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- talloc_free(priv);</span><br><span style="color: hsl(0, 100%, 40%);">- talloc_free(bind);</span><br><span style="color: hsl(120, 100%, 40%);">+ gprs_ns2_free_bind(bind);</span><br><span> return rc;</span><br><span> }</span><br><span> </span><br><span>@@ -382,7 +365,6 @@</span><br><span> dscp, rc, errno);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- llist_add(&bind->list, &nsi->binding);</span><br><span> if (result)</span><br><span> *result = bind;</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/22566">change 22566</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/libosmocore/+/22566"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: libosmocore </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I535fc68e94fcd695de827dd922706adc1c5a2cb7 </div>
<div style="display:none"> Gerrit-Change-Number: 22566 </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>