<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/libosmo-netif/+/15782">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">stream: osmo_stream_srv_link: Support setting multiple addr<br><br>This API will be later used to set multiple addresses for SCTP sockets.<br><br>Depends: libosmocore.git Ic8681d9e093216c99c6bca4be81c31ef83688ed1<br>Related: OS#3608<br>Change-Id: I0fe62f518e195db4e34f3b0ad1762bb57ba9d92a<br>---<br>M include/osmocom/netif/stream.h<br>M src/stream.c<br>2 files changed, 38 insertions(+), 4 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/82/15782/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/netif/stream.h b/include/osmocom/netif/stream.h</span><br><span>index 3427df5..8fe2578 100644</span><br><span>--- a/include/osmocom/netif/stream.h</span><br><span>+++ b/include/osmocom/netif/stream.h</span><br><span>@@ -22,6 +22,7 @@</span><br><span> </span><br><span> void osmo_stream_srv_link_set_nodelay(struct osmo_stream_srv_link *link, bool nodelay);</span><br><span> void osmo_stream_srv_link_set_addr(struct osmo_stream_srv_link *link, const char *addr);</span><br><span style="color: hsl(120, 100%, 40%);">+int osmo_stream_srv_link_set_addrs(struct osmo_stream_srv_link *link, const char **addr, size_t addrcnt);</span><br><span> void osmo_stream_srv_link_set_port(struct osmo_stream_srv_link *link, uint16_t port);</span><br><span> void osmo_stream_srv_link_set_proto(struct osmo_stream_srv_link *link, uint16_t proto);</span><br><span> void osmo_stream_srv_link_set_accept_cb(struct osmo_stream_srv_link *link, int (*accept_cb)(struct osmo_stream_srv_link *link, int fd));</span><br><span>diff --git a/src/stream.c b/src/stream.c</span><br><span>index 9c4afec..0027537 100644</span><br><span>--- a/src/stream.c</span><br><span>+++ b/src/stream.c</span><br><span>@@ -647,7 +647,8 @@</span><br><span> </span><br><span> struct osmo_stream_srv_link {</span><br><span> struct osmo_fd ofd;</span><br><span style="color: hsl(0, 100%, 40%);">- char *addr;</span><br><span style="color: hsl(120, 100%, 40%);">+ char *addr[OSMO_SOCK_MAX_ADDRS];</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t addrcnt;</span><br><span> uint16_t port;</span><br><span> uint16_t proto;</span><br><span> int (*accept_cb)(struct osmo_stream_srv_link *srv, int fd);</span><br><span>@@ -745,8 +746,32 @@</span><br><span> void osmo_stream_srv_link_set_addr(struct osmo_stream_srv_link *link,</span><br><span> const char *addr)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_talloc_replace_string(link, &link->addr, addr);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_stream_srv_link_set_addrs(link, &addr, 1);</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%);">+/*! \brief Set the local address set to which we bind.</span><br><span style="color: hsl(120, 100%, 40%);">+ * Useful for protocols allowing bind on more than one address (such as SCTP)</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] link Stream Server Link to modify</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] addr Local IP address</span><br><span style="color: hsl(120, 100%, 40%);">+ * \return negative on error, 0 on success</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+int osmo_stream_srv_link_set_addrs(struct osmo_stream_srv_link *link, const char **addr, size_t addrcnt)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ int i = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (addrcnt > OSMO_SOCK_MAX_ADDRS)</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%);">+ for (; i < addrcnt; i++)</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_talloc_replace_string(link, &link->addr[i], addr[i]);</span><br><span style="color: hsl(120, 100%, 40%);">+ for (; i < link->addrcnt; i++) {</span><br><span style="color: hsl(120, 100%, 40%);">+ talloc_free(link->addr[i]);</span><br><span style="color: hsl(120, 100%, 40%);">+ link->addr[i] = NULL;</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%);">+ link->addrcnt = addrcnt;</span><br><span> link->flags |= OSMO_STREAM_SRV_F_RECONF;</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span> }</span><br><span> </span><br><span> /*! \brief Set the local port number to which we bind</span><br><span>@@ -853,8 +878,16 @@</span><br><span> </span><br><span> link->flags &= ~OSMO_STREAM_SRV_F_RECONF;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- ret = osmo_sock_init(AF_INET, SOCK_STREAM, link->proto,</span><br><span style="color: hsl(0, 100%, 40%);">- link->addr, link->port, OSMO_SOCK_F_BIND);</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (link->proto) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case IPPROTO_SCTP:</span><br><span style="color: hsl(120, 100%, 40%);">+ ret = osmo_sock_init2_multiaddr(AF_INET, SOCK_STREAM, link->proto,</span><br><span style="color: hsl(120, 100%, 40%);">+ (const char **)link->addr, link->addrcnt, link->port,</span><br><span style="color: hsl(120, 100%, 40%);">+ NULL, 0, 0, OSMO_SOCK_F_BIND);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ default:</span><br><span style="color: hsl(120, 100%, 40%);">+ ret = osmo_sock_init(AF_INET, SOCK_STREAM, link->proto,</span><br><span style="color: hsl(120, 100%, 40%);">+ link->addr[0], link->port, OSMO_SOCK_F_BIND);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> if (ret < 0)</span><br><span> return ret;</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmo-netif/+/15782">change 15782</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/libosmo-netif/+/15782"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: libosmo-netif </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I0fe62f518e195db4e34f3b0ad1762bb57ba9d92a </div>
<div style="display:none"> Gerrit-Change-Number: 15782 </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>