<p>lynxis lazus <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/21575">View Change</a></p><div style="white-space:pre-wrap">Approvals:
laforge: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">gprs_ns2_sns: introduce SNS Size/Config retries<br><br>According to 3GPP Size and Config procedure can<br>have retries in case the timeout of the procedure runs out.<br><br>Change-Id: I00e9023a6e7adc6ad48f4016fcaef189ac8b353e<br>---<br>M src/gb/gprs_ns2.c<br>M src/gb/gprs_ns2_internal.h<br>M src/gb/gprs_ns2_sns.c<br>3 files changed, 19 insertions(+), 5 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/gb/gprs_ns2.c b/src/gb/gprs_ns2.c</span><br><span>index 5e5dd83..fd016e6 100644</span><br><span>--- a/src/gb/gprs_ns2.c</span><br><span>+++ b/src/gb/gprs_ns2.c</span><br><span>@@ -1153,6 +1153,8 @@</span><br><span> nsi->timeout[NS_TOUT_TNS_ALIVE] = 3;</span><br><span> nsi->timeout[NS_TOUT_TNS_ALIVE_RETRIES] = 10;</span><br><span> nsi->timeout[NS_TOUT_TSNS_PROV] = 3; /* 1..10 */</span><br><span style="color: hsl(120, 100%, 40%);">+ nsi->timeout[NS_TOUT_TSNS_SIZE_RETRIES] = 3;</span><br><span style="color: hsl(120, 100%, 40%);">+ nsi->timeout[NS_TOUT_TSNS_CONFIG_RETRIES] = 3;</span><br><span> </span><br><span> return nsi;</span><br><span> }</span><br><span>diff --git a/src/gb/gprs_ns2_internal.h b/src/gb/gprs_ns2_internal.h</span><br><span>index d12c663..9e63c70 100644</span><br><span>--- a/src/gb/gprs_ns2_internal.h</span><br><span>+++ b/src/gb/gprs_ns2_internal.h</span><br><span>@@ -15,10 +15,8 @@</span><br><span> struct gprs_ns2_vc_driver;</span><br><span> struct gprs_ns2_vc_bind;</span><br><span> </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%);">-#define NS_TIMERS_COUNT 8</span><br><span style="color: hsl(0, 100%, 40%);">-#define NS_TIMERS "(tns-block|tns-block-retries|tns-reset|tns-reset-retries|tns-test|tns-alive|tns-alive-retries|tsns-prov)"</span><br><span style="color: hsl(120, 100%, 40%);">+#define NS_TIMERS_COUNT 10</span><br><span style="color: hsl(120, 100%, 40%);">+#define NS_TIMERS "(tns-block|tns-block-retries|tns-reset|tns-reset-retries|tns-test|tns-alive|tns-alive-retries|tsns-prov|tsns-prov-retries)"</span><br><span> #define NS_TIMERS_HELP \</span><br><span> "(un)blocking Timer (Tns-block) timeout\n" \</span><br><span> "(un)blocking Timer (Tns-block) number of retries\n" \</span><br><span>@@ -27,7 +25,9 @@</span><br><span> "Test Timer (Tns-test) timeout\n" \</span><br><span> "Alive Timer (Tns-alive) timeout\n" \</span><br><span> "Alive Timer (Tns-alive) number of retries\n" \</span><br><span style="color: hsl(0, 100%, 40%);">- "SNS Provision Timer (Tsns-prov) timeout\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "SNS Provision Timer (Tsns-prov) timeout\n" \</span><br><span style="color: hsl(120, 100%, 40%);">+ "SNS Size number of retries\n" \</span><br><span style="color: hsl(120, 100%, 40%);">+ "SNS Config number of retries\n" \</span><br><span> </span><br><span> /* Educated guess - LLC user payload is 1500 bytes plus possible headers */</span><br><span> #define NS_ALLOC_SIZE 3072</span><br><span>@@ -42,6 +42,8 @@</span><br><span> NS_TOUT_TNS_ALIVE,</span><br><span> NS_TOUT_TNS_ALIVE_RETRIES,</span><br><span> NS_TOUT_TSNS_PROV,</span><br><span style="color: hsl(120, 100%, 40%);">+ NS_TOUT_TSNS_SIZE_RETRIES,</span><br><span style="color: hsl(120, 100%, 40%);">+ NS_TOUT_TSNS_CONFIG_RETRIES,</span><br><span> };</span><br><span> </span><br><span> enum nsvc_timer_mode {</span><br><span>diff --git a/src/gb/gprs_ns2_sns.c b/src/gb/gprs_ns2_sns.c</span><br><span>index 0676b61..f25d93a 100644</span><br><span>--- a/src/gb/gprs_ns2_sns.c</span><br><span>+++ b/src/gb/gprs_ns2_sns.c</span><br><span>@@ -119,6 +119,8 @@</span><br><span> struct gprs_ns2_vc *sns_nsvc;</span><br><span> /* iterate over the binds after all remote has been tested */</span><br><span> int bind_offset;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* timer N */</span><br><span style="color: hsl(120, 100%, 40%);">+ int N;</span><br><span> </span><br><span> /* local configuration to send to the remote end */</span><br><span> struct gprs_ns_ie_ip4_elem *ip4_local;</span><br><span>@@ -1304,14 +1306,22 @@</span><br><span> </span><br><span> static int ns2_sns_fsm_bss_timer_cb(struct osmo_fsm_inst *fi)</span><br><span> {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct ns2_sns_state *gss = (struct ns2_sns_state *) fi->priv;</span><br><span> struct gprs_ns2_nse *nse = nse_inst_from_fi(fi);</span><br><span> struct gprs_ns2_inst *nsi = nse->nsi;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ gss->N++;</span><br><span> switch (fi->T) {</span><br><span> case 1:</span><br><span style="color: hsl(120, 100%, 40%);">+ if (gss->N >= nsi->timeout[NS_TOUT_TSNS_SIZE_RETRIES])</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fsm_inst_dispatch(fi, GPRS_SNS_EV_SELECT_ENDPOINT, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> osmo_fsm_inst_state_chg(fi, GPRS_SNS_ST_SIZE, nsi->timeout[NS_TOUT_TSNS_PROV], 1);</span><br><span> break;</span><br><span> case 2:</span><br><span style="color: hsl(120, 100%, 40%);">+ if (gss->N >= nsi->timeout[NS_TOUT_TSNS_CONFIG_RETRIES])</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fsm_inst_dispatch(fi, GPRS_SNS_EV_SELECT_ENDPOINT, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> osmo_fsm_inst_state_chg(fi, GPRS_SNS_ST_CONFIG_BSS, nsi->timeout[NS_TOUT_TSNS_PROV], 2);</span><br><span> break;</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/21575">change 21575</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/+/21575"/><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: I00e9023a6e7adc6ad48f4016fcaef189ac8b353e </div>
<div style="display:none"> Gerrit-Change-Number: 21575 </div>
<div style="display:none"> Gerrit-PatchSet: 12 </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: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: lynxis lazus <lynxis@fe80.eu> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>