<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/19723">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">sock: osmo_sock_init2_multiaddr: decouple addr resolution from socket creation<br><br>Address resolution is done first and once we have the information, it<br>proceeds to create the socket. This separation in steps will help when<br>adding support for IPv6+IPv4 sets, where AF_UNSEPC is passed and created<br>socket needs to be AF_INET6 in order to handle addr of both versions.<br><br>Change-Id: I03147e3033a0c1fd04c9ac61d2ffbd78a1bb784a<br>---<br>M src/socket.c<br>1 file changed, 42 insertions(+), 45 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/23/19723/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/socket.c b/src/socket.c</span><br><span>index 9c60821..d92c670 100644</span><br><span>--- a/src/socket.c</span><br><span>+++ b/src/socket.c</span><br><span>@@ -483,7 +483,7 @@</span><br><span> unsigned int flags)</span><br><span> </span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- struct addrinfo *result[OSMO_SOCK_MAX_ADDRS];</span><br><span style="color: hsl(120, 100%, 40%);">+ struct addrinfo *res_loc[OSMO_SOCK_MAX_ADDRS], *res_rem[OSMO_SOCK_MAX_ADDRS];</span><br><span> int sfd = -1, rc, on = 1;</span><br><span> int i;</span><br><span> struct sockaddr_in addrs4[OSMO_SOCK_MAX_ADDRS];</span><br><span>@@ -519,21 +519,31 @@</span><br><span> </span><br><span> /* figure out local side of socket */</span><br><span> if (flags & OSMO_SOCK_F_BIND) {</span><br><span style="color: hsl(0, 100%, 40%);">- rc = addrinfo_helper_multi(result, family, type, proto, local_hosts,</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = addrinfo_helper_multi(res_loc, family, type, proto, local_hosts,</span><br><span> local_hosts_cnt, local_port, true);</span><br><span> if (rc < 0)</span><br><span> return -EINVAL;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ /* figure out remote side of socket */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (flags & OSMO_SOCK_F_CONNECT) {</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = addrinfo_helper_multi(res_rem, family, type, proto, remote_hosts,</span><br><span style="color: hsl(120, 100%, 40%);">+ remote_hosts_cnt, remote_port, false);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rc < 0)</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%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* figure out local side of socket */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (flags & OSMO_SOCK_F_BIND) {</span><br><span> </span><br><span> /* Since addrinfo_helper sets ai_family, socktype and</span><br><span> ai_protocol in hints, we know all results will use same</span><br><span> values, so simply pick the first one and pass it to create</span><br><span> the socket:</span><br><span> */</span><br><span style="color: hsl(0, 100%, 40%);">- sfd = socket_helper(result[0], flags);</span><br><span style="color: hsl(120, 100%, 40%);">+ sfd = socket_helper(res_loc[0], flags);</span><br><span> if (sfd < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- for (i = 0; i < local_hosts_cnt; i++)</span><br><span style="color: hsl(0, 100%, 40%);">- freeaddrinfo(result[i]);</span><br><span style="color: hsl(0, 100%, 40%);">- return sfd;</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = sfd;</span><br><span style="color: hsl(120, 100%, 40%);">+ goto ret_freeaddrinfo;</span><br><span> }</span><br><span> </span><br><span> /* Since so far we only allow IPPROTO_SCTP in this function,</span><br><span>@@ -547,22 +557,17 @@</span><br><span> " %s:%u: %s\n",</span><br><span> strbuf, local_port,</span><br><span> strerror(errno));</span><br><span style="color: hsl(0, 100%, 40%);">- for (i = 0; i < local_hosts_cnt; i++)</span><br><span style="color: hsl(0, 100%, 40%);">- freeaddrinfo(result[i]);</span><br><span style="color: hsl(0, 100%, 40%);">- close(sfd);</span><br><span style="color: hsl(0, 100%, 40%);">- return rc;</span><br><span style="color: hsl(120, 100%, 40%);">+ goto ret_close;</span><br><span> }</span><br><span> </span><br><span> /* Build array of addresses taking first of same family for each host.</span><br><span> TODO: Ideally we should use backtracking storing last used</span><br><span> indexes and trying next combination if connect() fails .*/</span><br><span style="color: hsl(0, 100%, 40%);">- rc = addrinfo_to_sockaddr(family, (const struct addrinfo **)result,</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = addrinfo_to_sockaddr(family, (const struct addrinfo **)res_loc,</span><br><span> local_hosts, local_hosts_cnt, addrs4, addrs6);</span><br><span> if (rc < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- for (i = 0; i < local_hosts_cnt; i++)</span><br><span style="color: hsl(0, 100%, 40%);">- freeaddrinfo(result[i]);</span><br><span style="color: hsl(0, 100%, 40%);">- close(sfd);</span><br><span style="color: hsl(0, 100%, 40%);">- return -ENODEV;</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = -ENODEV;</span><br><span style="color: hsl(120, 100%, 40%);">+ goto ret_close;</span><br><span> }</span><br><span> </span><br><span> if (family == AF_INET)</span><br><span>@@ -573,13 +578,9 @@</span><br><span> multiaddr_snprintf(strbuf, sizeof(strbuf), local_hosts, local_hosts_cnt);</span><br><span> LOGP(DLGLOBAL, LOGL_NOTICE, "unable to bind socket: %s:%u: %s\n",</span><br><span> strbuf, local_port, strerror(errno));</span><br><span style="color: hsl(0, 100%, 40%);">- for (i = 0; i < local_hosts_cnt; i++)</span><br><span style="color: hsl(0, 100%, 40%);">- freeaddrinfo(result[i]);</span><br><span style="color: hsl(0, 100%, 40%);">- close(sfd);</span><br><span style="color: hsl(0, 100%, 40%);">- return -ENODEV;</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = -ENODEV;</span><br><span style="color: hsl(120, 100%, 40%);">+ goto ret_close;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- for (i = 0; i < local_hosts_cnt; i++)</span><br><span style="color: hsl(0, 100%, 40%);">- freeaddrinfo(result[i]);</span><br><span> }</span><br><span> </span><br><span> /* Reached this point, if OSMO_SOCK_F_BIND then sfd is valid (>=0) or it</span><br><span>@@ -588,38 +589,27 @@</span><br><span> </span><br><span> /* figure out remote side of socket */</span><br><span> if (flags & OSMO_SOCK_F_CONNECT) {</span><br><span style="color: hsl(0, 100%, 40%);">- rc = addrinfo_helper_multi(result, family, type, proto, remote_hosts,</span><br><span style="color: hsl(0, 100%, 40%);">- remote_hosts_cnt, remote_port, false);</span><br><span style="color: hsl(0, 100%, 40%);">- if (rc < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (sfd >= 0)</span><br><span style="color: hsl(0, 100%, 40%);">- close(sfd);</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(0, 100%, 40%);">-</span><br><span> if (sfd < 0) {</span><br><span> /* Since addrinfo_helper sets ai_family, socktype and</span><br><span> ai_protocol in hints, we know all results will use same</span><br><span> values, so simply pick the first one and pass it to create</span><br><span> the socket:</span><br><span> */</span><br><span style="color: hsl(0, 100%, 40%);">- sfd = socket_helper(result[0], flags);</span><br><span style="color: hsl(120, 100%, 40%);">+ sfd = socket_helper(res_rem[0], flags);</span><br><span> if (sfd < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- for (i = 0; i < remote_hosts_cnt; i++)</span><br><span style="color: hsl(0, 100%, 40%);">- freeaddrinfo(result[i]);</span><br><span style="color: hsl(0, 100%, 40%);">- return sfd;</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = sfd;</span><br><span style="color: hsl(120, 100%, 40%);">+ goto ret_freeaddrinfo;</span><br><span> }</span><br><span> }</span><br><span> </span><br><span> /* Build array of addresses taking first of same family for each host.</span><br><span> TODO: Ideally we should use backtracking storing last used</span><br><span> indexes and trying next combination if connect() fails .*/</span><br><span style="color: hsl(0, 100%, 40%);">- rc = addrinfo_to_sockaddr(family, (const struct addrinfo **)result,</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = addrinfo_to_sockaddr(family, (const struct addrinfo **)res_rem,</span><br><span> remote_hosts, remote_hosts_cnt, addrs4, addrs6);</span><br><span> if (rc < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- for (i = 0; i < remote_hosts_cnt; i++)</span><br><span style="color: hsl(0, 100%, 40%);">- freeaddrinfo(result[i]);</span><br><span style="color: hsl(0, 100%, 40%);">- close(sfd);</span><br><span style="color: hsl(0, 100%, 40%);">- return -ENODEV;</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = -ENODEV;</span><br><span style="color: hsl(120, 100%, 40%);">+ goto ret_close;</span><br><span> }</span><br><span> </span><br><span> if (family == AF_INET)</span><br><span>@@ -631,13 +621,9 @@</span><br><span> multiaddr_snprintf(strbuf, sizeof(strbuf), remote_hosts, remote_hosts_cnt);</span><br><span> LOGP(DLGLOBAL, LOGL_ERROR, "unable to connect socket: %s:%u: %s\n",</span><br><span> strbuf, remote_port, strerror(errno));</span><br><span style="color: hsl(0, 100%, 40%);">- for (i = 0; i < remote_hosts_cnt; i++)</span><br><span style="color: hsl(0, 100%, 40%);">- freeaddrinfo(result[i]);</span><br><span style="color: hsl(0, 100%, 40%);">- close(sfd);</span><br><span style="color: hsl(0, 100%, 40%);">- return -ENODEV;</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = -ENODEV;</span><br><span style="color: hsl(120, 100%, 40%);">+ goto ret_close;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- for (i = 0; i < remote_hosts_cnt; i++)</span><br><span style="color: hsl(0, 100%, 40%);">- freeaddrinfo(result[i]);</span><br><span> }</span><br><span> </span><br><span> rc = osmo_sock_init_tail(sfd, type, flags);</span><br><span>@@ -646,7 +632,18 @@</span><br><span> sfd = -1;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- return sfd;</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = sfd;</span><br><span style="color: hsl(120, 100%, 40%);">+ goto ret_freeaddrinfo;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ret_close:</span><br><span style="color: hsl(120, 100%, 40%);">+ if (sfd >= 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ close(sfd);</span><br><span style="color: hsl(120, 100%, 40%);">+ret_freeaddrinfo:</span><br><span style="color: hsl(120, 100%, 40%);">+ for (i = 0; i < local_hosts_cnt; i++)</span><br><span style="color: hsl(120, 100%, 40%);">+ freeaddrinfo(res_loc[i]);</span><br><span style="color: hsl(120, 100%, 40%);">+ for (i = 0; i < remote_hosts_cnt; i++)</span><br><span style="color: hsl(120, 100%, 40%);">+ freeaddrinfo(res_rem[i]);</span><br><span style="color: hsl(120, 100%, 40%);">+ return rc;</span><br><span> }</span><br><span> #endif /* HAVE_LIBSCTP */</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/19723">change 19723</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/+/19723"/><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: I03147e3033a0c1fd04c9ac61d2ffbd78a1bb784a </div>
<div style="display:none"> Gerrit-Change-Number: 19723 </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>