<p>lynxis lazus has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/22744">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">gprs_ns2_sns: reset the N of timeout when entering a new state<br><br>Otherwise retries are splitted between the states.<br><br>Change-Id: Iefde0c89965f0be899d6d1f096480f6fc79a92be<br>---<br>M src/gb/gprs_ns2_sns.c<br>1 file changed, 17 insertions(+), 1 deletion(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/44/22744/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 3230b6e..88b7c74 100644</span><br><span>--- a/src/gb/gprs_ns2_sns.c</span><br><span>+++ b/src/gb/gprs_ns2_sns.c</span><br><span>@@ -726,8 +726,10 @@</span><br><span>    int count;</span><br><span> </span><br><span>       /* 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(120, 100%, 40%);">+    if (old_state != GPRS_SNS_ST_UNCONFIGURED) {</span><br><span style="color: hsl(120, 100%, 40%);">+          gss->N = 0;</span><br><span>               ns2_prim_status_ind(gss->nse, NULL, 0, GPRS_NS2_AFF_CAUSE_SNS_FAILURE);</span><br><span style="color: hsl(120, 100%, 40%);">+    }</span><br><span> </span><br><span>        gss->alive = false;</span><br><span>       ns2_clear_ipv46_entries(gss);</span><br><span>@@ -874,6 +876,10 @@</span><br><span> static void ns2_sns_st_config_bss_onenter(struct osmo_fsm_inst *fi, uint32_t old_state)</span><br><span> {</span><br><span>         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%);">+   if (old_state != GPRS_SNS_ST_CONFIG_BSS)</span><br><span style="color: hsl(120, 100%, 40%);">+              gss->N = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>     /* Transmit SNS-CONFIG */</span><br><span>    switch (gss->ip) {</span><br><span>        case IPv4:</span><br><span>@@ -1000,9 +1006,18 @@</span><br><span>  } else {</span><br><span>             /* just send CONFIG-ACK */</span><br><span>           ns2_tx_sns_config_ack(gss->sns_nsvc, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+                osmo_timer_schedule(&fi->timer, nse->nsi->timeout[NS_TOUT_TSNS_PROV], 0);</span><br><span>       }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static void ns2_sns_st_config_sgsn_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%);">+   if (old_state != GPRS_SNS_ST_CONFIG_SGSN)</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%);">+</span><br><span> static void ns2_sns_st_config_sgsn(struct osmo_fsm_inst *fi, uint32_t event, void *data)</span><br><span> {</span><br><span>         struct ns2_sns_state *gss = (struct ns2_sns_state *) fi->priv;</span><br><span>@@ -1335,6 +1350,7 @@</span><br><span>                              S(GPRS_SNS_ST_SIZE),</span><br><span>               .name = "CONFIG_SGSN",</span><br><span>             .action = ns2_sns_st_config_sgsn,</span><br><span style="color: hsl(120, 100%, 40%);">+             .onenter = ns2_sns_st_config_sgsn_onenter,</span><br><span>   },</span><br><span>   [GPRS_SNS_ST_CONFIGURED] = {</span><br><span>                 .in_event_mask = S(GPRS_SNS_EV_ADD) |</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/22744">change 22744</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/+/22744"/><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: Iefde0c89965f0be899d6d1f096480f6fc79a92be </div>
<div style="display:none"> Gerrit-Change-Number: 22744 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: lynxis lazus <lynxis@fe80.eu> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>