<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/24122">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  laforge: Looks good to me, approved
  pespin: Looks good to me, approved
  Jenkins Builder: Verified

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">gprs_ns2_sns: move selection of the next bind into own function<br><br>It will be also used by del_bind() when removing an active bind<br><br>Related: OS#5036<br>Change-Id: Ic39f0e5474ecc055d9a1b6a7b30777574d8b741d<br>---<br>M src/gb/gprs_ns2_sns.c<br>1 file changed, 10 insertions(+), 12 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 296a2e7..5d85ec0 100644</span><br><span>--- a/src/gb/gprs_ns2_sns.c</span><br><span>+++ b/src/gb/gprs_ns2_sns.c</span><br><span>@@ -883,6 +883,15 @@</span><br><span>       }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static void ns2_sns_choose_next_bind(struct ns2_sns_state *gss)</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 || gss->initial_bind->list.next == &gss->binds)</span><br><span style="color: hsl(120, 100%, 40%);">+                gss->initial_bind = llist_first_entry_or_null(&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%);">+          gss->initial_bind = llist_entry(gss->initial_bind->list.next, 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> /* setup all dynamic SNS settings, create a new nsvc and send the SIZE */</span><br><span> static void ns2_sns_st_bss_size_onenter(struct osmo_fsm_inst *fi, uint32_t old_state)</span><br><span> {</span><br><span>@@ -899,18 +908,7 @@</span><br><span>    gss->alive = false;</span><br><span> </span><br><span>   ns2_sns_compute_local_ep_from_binds(fi);</span><br><span style="color: hsl(0, 100%, 40%);">-</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(120, 100%, 40%);">+     ns2_sns_choose_next_bind(gss);</span><br><span> </span><br><span>   /* setup the NSVC */</span><br><span>         if (!gss->sns_nsvc) {</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/24122">change 24122</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/+/24122"/><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: Ic39f0e5474ecc055d9a1b6a7b30777574d8b741d </div>
<div style="display:none"> Gerrit-Change-Number: 24122 </div>
<div style="display:none"> Gerrit-PatchSet: 6 </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: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>