<p>daniel <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/22235">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
daniel: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Refactor ns2_nsvc_create_ip*<br><br>Move code common in ipv4/6 into a separate function and call that<br>function.<br><br>Change-Id: I076d53bee2e67e1cb3ad6ee5cd05c63ebe3359fb<br>Related: OS#4948<br>---<br>M src/gb/gprs_ns2_sns.c<br>1 file changed, 27 insertions(+), 38 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/gb/gprs_ns2_sns.c b/src/gb/gprs_ns2_sns.c</span><br><span>index 1958477..ceff115 100644</span><br><span>--- a/src/gb/gprs_ns2_sns.c</span><br><span>+++ b/src/gb/gprs_ns2_sns.c</span><br><span>@@ -255,66 +255,55 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void ns2_nsvc_create_ip4(struct osmo_fsm_inst *fi,</span><br><span style="color: hsl(0, 100%, 40%);">- struct gprs_ns2_nse *nse,</span><br><span style="color: hsl(0, 100%, 40%);">- const struct gprs_ns_ie_ip4_elem *ip4)</span><br><span style="color: hsl(120, 100%, 40%);">+static void ns2_vc_create_ip(struct osmo_fsm_inst *fi, struct gprs_ns2_nse *nse, const struct osmo_sockaddr *remote,</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t sig_weight, uint8_t data_weight)</span><br><span> {</span><br><span> struct gprs_ns2_inst *nsi = nse->nsi;</span><br><span> struct gprs_ns2_vc *nsvc;</span><br><span> struct gprs_ns2_vc_bind *bind;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* for every bind, create a connection if bind type == IP */</span><br><span style="color: hsl(120, 100%, 40%);">+ llist_for_each_entry(bind, &nsi->binding, list) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (bind->ll != GPRS_NS2_LL_UDP)</span><br><span style="color: hsl(120, 100%, 40%);">+ continue;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* ignore failed connection */</span><br><span style="color: hsl(120, 100%, 40%);">+ nsvc = gprs_ns2_ip_connect_inactive(bind,</span><br><span style="color: hsl(120, 100%, 40%);">+ remote,</span><br><span style="color: hsl(120, 100%, 40%);">+ nse, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!nsvc) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPFSML(fi, LOGL_ERROR, "SNS-CONFIG: Failed to create NSVC\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ continue;</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%);">+ nsvc->sig_weight = sig_weight;</span><br><span style="color: hsl(120, 100%, 40%);">+ nsvc->data_weight = data_weight;</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%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+static void ns2_nsvc_create_ip4(struct osmo_fsm_inst *fi,</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gprs_ns2_nse *nse,</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct gprs_ns_ie_ip4_elem *ip4)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span> struct osmo_sockaddr remote = { };</span><br><span> /* copy over. Both data structures use network byte order */</span><br><span> remote.u.sin.sin_family = AF_INET;</span><br><span> remote.u.sin.sin_addr.s_addr = ip4->ip_addr;</span><br><span> remote.u.sin.sin_port = ip4->udp_port;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* for every bind, create a connection if bind type == IP */</span><br><span style="color: hsl(0, 100%, 40%);">- llist_for_each_entry(bind, &nsi->binding, list) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (bind->ll != GPRS_NS2_LL_UDP)</span><br><span style="color: hsl(0, 100%, 40%);">- continue;</span><br><span style="color: hsl(0, 100%, 40%);">- /* ignore failed connection */</span><br><span style="color: hsl(0, 100%, 40%);">- nsvc = gprs_ns2_ip_connect_inactive(bind,</span><br><span style="color: hsl(0, 100%, 40%);">- &remote,</span><br><span style="color: hsl(0, 100%, 40%);">- nse, 0);</span><br><span style="color: hsl(0, 100%, 40%);">- if (!nsvc) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGPFSML(fi, LOGL_ERROR, "SNS-CONFIG: Failed to create NSVC\n");</span><br><span style="color: hsl(0, 100%, 40%);">- continue;</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%);">- nsvc->sig_weight = ip4->sig_weight;</span><br><span style="color: hsl(0, 100%, 40%);">- nsvc->data_weight = ip4->data_weight;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ ns2_vc_create_ip(fi, nse, &remote, ip4->sig_weight, ip4->data_weight);</span><br><span> }</span><br><span> </span><br><span> static void ns2_nsvc_create_ip6(struct osmo_fsm_inst *fi,</span><br><span> struct gprs_ns2_nse *nse,</span><br><span> const struct gprs_ns_ie_ip6_elem *ip6)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- struct gprs_ns2_inst *nsi = nse->nsi;</span><br><span style="color: hsl(0, 100%, 40%);">- struct gprs_ns2_vc *nsvc;</span><br><span style="color: hsl(0, 100%, 40%);">- struct gprs_ns2_vc_bind *bind;</span><br><span> struct osmo_sockaddr remote = {};</span><br><span> /* copy over. Both data structures use network byte order */</span><br><span> remote.u.sin6.sin6_family = AF_INET6;</span><br><span> remote.u.sin6.sin6_addr = ip6->ip_addr;</span><br><span> remote.u.sin6.sin6_port = ip6->udp_port;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* for every bind, create a connection if bind type == IP */</span><br><span style="color: hsl(0, 100%, 40%);">- llist_for_each_entry(bind, &nsi->binding, list) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (bind->ll != GPRS_NS2_LL_UDP)</span><br><span style="color: hsl(0, 100%, 40%);">- continue;</span><br><span style="color: hsl(0, 100%, 40%);">- /* ignore failed connection */</span><br><span style="color: hsl(0, 100%, 40%);">- nsvc = gprs_ns2_ip_connect_inactive(bind,</span><br><span style="color: hsl(0, 100%, 40%);">- &remote,</span><br><span style="color: hsl(0, 100%, 40%);">- nse, 0);</span><br><span style="color: hsl(0, 100%, 40%);">- if (!nsvc) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGPFSML(fi, LOGL_ERROR, "SNS-CONFIG: Failed to create NSVC\n");</span><br><span style="color: hsl(0, 100%, 40%);">- continue;</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%);">- nsvc->sig_weight = ip6->sig_weight;</span><br><span style="color: hsl(0, 100%, 40%);">- nsvc->data_weight = ip6->data_weight;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ ns2_vc_create_ip(fi, nse, &remote, ip6->sig_weight, ip6->data_weight);</span><br><span> }</span><br><span> </span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/22235">change 22235</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/+/22235"/><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: I076d53bee2e67e1cb3ad6ee5cd05c63ebe3359fb </div>
<div style="display:none"> Gerrit-Change-Number: 22235 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: daniel <dwillmann@sysmocom.de> </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: laforge <laforge@osmocom.org> </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-MessageType: merged </div>