<p>laforge has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/23244">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">gprs_ns2_sns: refactor ns2_sns_st_size_onenter()<br><br>Let's move computing of the local IP endpoints to a separate function,<br>so it can not only be used when entering the SNS_SIZE state. Preparation<br>for SGSN-side IP-SNS.<br><br>Change-Id: I5d7ce419135a8ef538cf9abcb76a49049ed7d5f9<br>Related: OS#3373<br>---<br>M src/gb/gprs_ns2_sns.c<br>1 file changed, 40 insertions(+), 31 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/44/23244/1</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 04cebf4..1d4d069 100644</span><br><span>--- a/src/gb/gprs_ns2_sns.c</span><br><span>+++ b/src/gb/gprs_ns2_sns.c</span><br><span>@@ -723,8 +723,7 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/* setup all dynamic SNS settings, create a new nsvc and send the SIZE */</span><br><span style="color: hsl(0, 100%, 40%);">-static void ns2_sns_st_size_onenter(struct osmo_fsm_inst *fi, uint32_t old_state)</span><br><span style="color: hsl(120, 100%, 40%);">+static void ns2_sns_compute_local_ep_from_binds(struct osmo_fsm_inst *fi)</span><br><span> {</span><br><span> struct ns2_sns_state *gss = (struct ns2_sns_state *) fi->priv;</span><br><span> struct gprs_ns_ie_ip4_elem *ip4_elems;</span><br><span>@@ -736,14 +735,6 @@</span><br><span> struct osmo_sockaddr local;</span><br><span> int count;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* on a generic failure, the timer callback will recover */</span><br><span style="color: hsl(0, 100%, 40%);">- if (old_state != GPRS_SNS_ST_UNCONFIGURED)</span><br><span style="color: hsl(0, 100%, 40%);">- ns2_prim_status_ind(gss->nse, NULL, 0, GPRS_NS2_AFF_CAUSE_SNS_FAILURE);</span><br><span style="color: hsl(0, 100%, 40%);">- if (old_state != GPRS_SNS_ST_SIZE)</span><br><span style="color: hsl(0, 100%, 40%);">- gss->N = 0;</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%);">- gss->alive = false;</span><br><span> ns2_clear_ipv46_entries(gss);</span><br><span> </span><br><span> /* no initial available */</span><br><span>@@ -759,27 +750,6 @@</span><br><span> return;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* take the first bind or take the next bind */</span><br><span style="color: hsl(0, 100%, 40%);">- if (!gss->initial_bind) {</span><br><span style="color: hsl(0, 100%, 40%);">- gss->initial_bind = llist_first_entry(&gss->binds, struct ns2_sns_bind, list);</span><br><span style="color: hsl(0, 100%, 40%);">- } else {</span><br><span style="color: hsl(0, 100%, 40%);">- if (gss->initial_bind->list.next != &gss->binds) {</span><br><span style="color: hsl(0, 100%, 40%);">- gss->initial_bind = llist_entry(gss->initial_bind->list.next, struct ns2_sns_bind, list);</span><br><span style="color: hsl(0, 100%, 40%);">- } else {</span><br><span style="color: hsl(0, 100%, 40%);">- gss->initial_bind = llist_first_entry(&gss->binds, struct ns2_sns_bind, list);</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%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- bind = gss->initial_bind->bind;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* setup the NSVC */</span><br><span style="color: hsl(0, 100%, 40%);">- if (!gss->sns_nsvc) {</span><br><span style="color: hsl(0, 100%, 40%);">- gss->sns_nsvc = ns2_ip_bind_connect(bind, gss->nse, remote);</span><br><span style="color: hsl(0, 100%, 40%);">- if (!gss->sns_nsvc)</span><br><span style="color: hsl(0, 100%, 40%);">- return;</span><br><span style="color: hsl(0, 100%, 40%);">- gss->sns_nsvc->sns_only = true;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> switch (gss->ip) {</span><br><span> case IPv4:</span><br><span> ip4_elems = talloc_zero_size(fi, sizeof(struct gprs_ns_ie_ip4_elem) * count);</span><br><span>@@ -854,6 +824,45 @@</span><br><span> gss->num_max_nsvcs = OSMO_MAX(gss->num_max_ip6_remote * gss->num_ip6_local, 8);</span><br><span> break;</span><br><span> }</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%);">+/* setup all dynamic SNS settings, create a new nsvc and send the SIZE */</span><br><span style="color: hsl(120, 100%, 40%);">+static void ns2_sns_st_size_onenter(struct osmo_fsm_inst *fi, uint32_t old_state)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct ns2_sns_state *gss = (struct ns2_sns_state *) fi->priv;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* on a generic failure, the timer callback will recover */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (old_state != GPRS_SNS_ST_UNCONFIGURED)</span><br><span style="color: hsl(120, 100%, 40%);">+ ns2_prim_status_ind(gss->nse, NULL, 0, GPRS_NS2_AFF_CAUSE_SNS_FAILURE);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (old_state != GPRS_SNS_ST_SIZE)</span><br><span style="color: hsl(120, 100%, 40%);">+ gss->N = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ gss->alive = false;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ ns2_sns_compute_local_ep_from_binds(fi);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* take the first bind or take the next bind */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!gss->initial_bind) {</span><br><span style="color: hsl(120, 100%, 40%);">+ gss->initial_bind = llist_first_entry(&gss->binds, struct ns2_sns_bind, list);</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (gss->initial_bind->list.next != &gss->binds) {</span><br><span style="color: hsl(120, 100%, 40%);">+ gss->initial_bind = llist_entry(gss->initial_bind->list.next, struct ns2_sns_bind, list);</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ gss->initial_bind = llist_first_entry(&gss->binds, struct ns2_sns_bind, list);</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%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* setup the NSVC */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!gss->sns_nsvc) {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gprs_ns2_vc_bind *bind = gss->initial_bind->bind;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_sockaddr *remote = &gss->initial->saddr;</span><br><span style="color: hsl(120, 100%, 40%);">+ gss->sns_nsvc = ns2_ip_bind_connect(bind, gss->nse, remote);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!gss->sns_nsvc)</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span style="color: hsl(120, 100%, 40%);">+ gss->sns_nsvc->sns_only = true;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> </span><br><span> if (gss->num_max_ip4_remote > 0)</span><br><span> ns2_tx_sns_size(gss->sns_nsvc, true, gss->num_max_nsvcs, gss->num_max_ip4_remote, -1);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/23244">change 23244</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/+/23244"/><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: I5d7ce419135a8ef538cf9abcb76a49049ed7d5f9 </div>
<div style="display:none"> Gerrit-Change-Number: 23244 </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>