<p>lynxis lazus <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/20558">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, but someone else must approve
daniel: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">gprs_ns2: rename gprs_ns2_ip_vc_sockaddr -> gprs_ns2_ip_vc_remote<br><br>It's more clear which part of the address is returned.<br>In preparation to add a gprs_ns2_ip_vc_local.<br><br>Change-Id: I6110ff573362961c713a990da7ef3f3dbedf6c57<br>---<br>M include/osmocom/gprs/gprs_ns2.h<br>M src/gb/gprs_ns2.c<br>M src/gb/gprs_ns2_sns.c<br>M src/gb/gprs_ns2_udp.c<br>M src/gb/gprs_ns2_vty.c<br>M src/gb/libosmogb.map<br>6 files changed, 10 insertions(+), 10 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/gprs/gprs_ns2.h b/include/osmocom/gprs/gprs_ns2.h</span><br><span>index a3edc63..5f341d9 100644</span><br><span>--- a/include/osmocom/gprs/gprs_ns2.h</span><br><span>+++ b/include/osmocom/gprs/gprs_ns2.h</span><br><span>@@ -139,7 +139,7 @@</span><br><span> const struct osmo_sockaddr *remote,</span><br><span> uint16_t nsei);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-const struct osmo_sockaddr *gprs_ns2_ip_vc_sockaddr(struct gprs_ns2_vc *nsvc);</span><br><span style="color: hsl(120, 100%, 40%);">+const struct osmo_sockaddr *gprs_ns2_ip_vc_remote(struct gprs_ns2_vc *nsvc);</span><br><span> const struct osmo_sockaddr *gprs_ns2_ip_bind_sockaddr(struct gprs_ns2_vc_bind *bind);</span><br><span> int gprs_ns2_is_ip_bind(struct gprs_ns2_vc_bind *bind);</span><br><span> int gprs_ns2_ip_bind_set_dscp(struct gprs_ns2_vc_bind *bind, int dscp);</span><br><span>diff --git a/src/gb/gprs_ns2.c b/src/gb/gprs_ns2.c</span><br><span>index 43a3d77..002ea1d 100644</span><br><span>--- a/src/gb/gprs_ns2.c</span><br><span>+++ b/src/gb/gprs_ns2.c</span><br><span>@@ -226,7 +226,7 @@</span><br><span> }</span><br><span> </span><br><span> local = gprs_ns2_ip_bind_sockaddr(nsvc->bind);</span><br><span style="color: hsl(0, 100%, 40%);">- remote = gprs_ns2_ip_vc_sockaddr(nsvc);</span><br><span style="color: hsl(120, 100%, 40%);">+ remote = gprs_ns2_ip_vc_remote(nsvc);</span><br><span> if (osmo_sockaddr_str_from_sockaddr(&local_str, &local->u.sas))</span><br><span> strcpy(local_str.ip, "invalid");</span><br><span> if (osmo_sockaddr_str_from_sockaddr(&remote_str, &remote->u.sas))</span><br><span>@@ -853,7 +853,7 @@</span><br><span> OSMO_ASSERT(sockaddr);</span><br><span> </span><br><span> llist_for_each_entry(nsvc, &nse->nsvc, list) {</span><br><span style="color: hsl(0, 100%, 40%);">- remote = gprs_ns2_ip_vc_sockaddr(nsvc);</span><br><span style="color: hsl(120, 100%, 40%);">+ remote = gprs_ns2_ip_vc_remote(nsvc);</span><br><span> if (!osmo_sockaddr_cmp(sockaddr, remote))</span><br><span> return nsvc;</span><br><span> }</span><br><span>diff --git a/src/gb/gprs_ns2_sns.c b/src/gb/gprs_ns2_sns.c</span><br><span>index 2756226..d4de8ae 100644</span><br><span>--- a/src/gb/gprs_ns2_sns.c</span><br><span>+++ b/src/gb/gprs_ns2_sns.c</span><br><span>@@ -305,7 +305,7 @@</span><br><span> if (nsvc->bind != bind)</span><br><span> continue;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (!osmo_sockaddr_cmp(&remote, gprs_ns2_ip_vc_sockaddr(nsvc))) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!osmo_sockaddr_cmp(&remote, gprs_ns2_ip_vc_remote(nsvc))) {</span><br><span> found = true;</span><br><span> break;</span><br><span> }</span><br><span>@@ -340,7 +340,7 @@</span><br><span> if (nsvc->bind != bind)</span><br><span> continue;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (!osmo_sockaddr_cmp(&remote, gprs_ns2_ip_vc_sockaddr(nsvc))) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!osmo_sockaddr_cmp(&remote, gprs_ns2_ip_vc_remote(nsvc))) {</span><br><span> found = true;</span><br><span> break;</span><br><span> }</span><br><span>@@ -508,7 +508,7 @@</span><br><span> }</span><br><span> </span><br><span> llist_for_each_entry(nsvc, &nse->nsvc, list) {</span><br><span style="color: hsl(0, 100%, 40%);">- remote = gprs_ns2_ip_vc_sockaddr(nsvc);</span><br><span style="color: hsl(120, 100%, 40%);">+ remote = gprs_ns2_ip_vc_remote(nsvc);</span><br><span> /* all nsvc in NSE should be IP/UDP nsvc */</span><br><span> OSMO_ASSERT(remote);</span><br><span> </span><br><span>@@ -556,7 +556,7 @@</span><br><span> }</span><br><span> </span><br><span> llist_for_each_entry_safe(nsvc, tmp, &nse->nsvc, list) {</span><br><span style="color: hsl(0, 100%, 40%);">- remote = gprs_ns2_ip_vc_sockaddr(nsvc);</span><br><span style="color: hsl(120, 100%, 40%);">+ remote = gprs_ns2_ip_vc_remote(nsvc);</span><br><span> /* all nsvc in NSE should be IP/UDP nsvc */</span><br><span> OSMO_ASSERT(remote);</span><br><span> if (osmo_sockaddr_cmp(&sa, remote))</span><br><span>diff --git a/src/gb/gprs_ns2_udp.c b/src/gb/gprs_ns2_udp.c</span><br><span>index 9aca80b..e689118 100644</span><br><span>--- a/src/gb/gprs_ns2_udp.c</span><br><span>+++ b/src/gb/gprs_ns2_udp.c</span><br><span>@@ -396,7 +396,7 @@</span><br><span> /*! Return the socket address of the remote peer of a NS-VC.</span><br><span> * \param[in] nsvc NS-VC whose remote peer we want to know</span><br><span> * \return address of the remote peer; NULL in case of error */</span><br><span style="color: hsl(0, 100%, 40%);">-const struct osmo_sockaddr *gprs_ns2_ip_vc_sockaddr(struct gprs_ns2_vc *nsvc)</span><br><span style="color: hsl(120, 100%, 40%);">+const struct osmo_sockaddr *gprs_ns2_ip_vc_remote(struct gprs_ns2_vc *nsvc)</span><br><span> {</span><br><span> struct priv_vc *priv;</span><br><span> </span><br><span>diff --git a/src/gb/gprs_ns2_vty.c b/src/gb/gprs_ns2_vty.c</span><br><span>index 92c0095..a457361 100644</span><br><span>--- a/src/gb/gprs_ns2_vty.c</span><br><span>+++ b/src/gb/gprs_ns2_vty.c</span><br><span>@@ -251,7 +251,7 @@</span><br><span> </span><br><span> switch (nsvc->ll) {</span><br><span> case GPRS_NS_LL_UDP: {</span><br><span style="color: hsl(0, 100%, 40%);">- sockaddr = gprs_ns2_ip_vc_sockaddr(nsvc);</span><br><span style="color: hsl(120, 100%, 40%);">+ sockaddr = gprs_ns2_ip_vc_remote(nsvc);</span><br><span> if (!sockaddr) {</span><br><span> vty_out(vty, "unknown");</span><br><span> break;</span><br><span>diff --git a/src/gb/libosmogb.map b/src/gb/libosmogb.map</span><br><span>index a185470..ee8651e 100644</span><br><span>--- a/src/gb/libosmogb.map</span><br><span>+++ b/src/gb/libosmogb.map</span><br><span>@@ -93,7 +93,7 @@</span><br><span> gprs_ns2_ip_connect2;</span><br><span> gprs_ns2_ip_connect_inactive;</span><br><span> gprs_ns2_ip_connect_sns;</span><br><span style="color: hsl(0, 100%, 40%);">-gprs_ns2_ip_vc_sockaddr;</span><br><span style="color: hsl(120, 100%, 40%);">+gprs_ns2_ip_vc_remote;</span><br><span> gprs_ns2_is_frgre_bind;</span><br><span> gprs_ns2_is_ip_bind;</span><br><span> gprs_ns2_ll_str;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/20558">change 20558</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/+/20558"/><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: I6110ff573362961c713a990da7ef3f3dbedf6c57 </div>
<div style="display:none"> Gerrit-Change-Number: 20558 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: lynxis lazus <lynxis@fe80.eu> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: daniel <dwillmann@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: lynxis lazus <lynxis@fe80.eu> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-CC: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>