<p>lynxis lazus has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/23185">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">gprs_ns2: sns: move alive timeout into own variable<br><br>It allows to span the timeout across fsm states.<br>In prepration to add a new state for local procedures.<br><br>Change-Id: I4b223118c7f250dbc8161cbf29cbd994c26c362f<br>---<br>M src/gb/gprs_ns2_sns.c<br>1 file changed, 17 insertions(+), 6 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/85/23185/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 a82da95..86b4fdf 100644</span><br><span>--- a/src/gb/gprs_ns2_sns.c</span><br><span>+++ b/src/gb/gprs_ns2_sns.c</span><br><span>@@ -137,6 +137,8 @@</span><br><span> int N;</span><br><span> /* true if at least one nsvc is alive */</span><br><span> bool alive;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* alive timeout, to ensure at least one NSVC comes after X online */</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_timer_list alive_timeout;</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>@@ -959,7 +961,8 @@</span><br><span> ns2_tx_sns_config_ack(gss->sns_nsvc, NULL);</span><br><span> /* start the test procedure on ALL NSVCs! */</span><br><span> gprs_ns2_start_alive_all_nsvcs(nse);</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_fsm_inst_state_chg(fi, GPRS_SNS_ST_CONFIGURED, ns_sns_configured_timeout(fi), 4);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_timer_schedule(&gss->alive_timeout, ns_sns_configured_timeout(fi), 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fsm_inst_state_chg(fi, GPRS_SNS_ST_CONFIGURED, 0, 4);</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>@@ -1312,7 +1315,7 @@</span><br><span> ns2_sns_st_configured_change(fi, gss, tp);</span><br><span> break;</span><br><span> case GPRS_SNS_EV_REQ_NSVC_ALIVE:</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_timer_del(&fi->timer);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_timer_del(&gss->alive_timeout);</span><br><span> break;</span><br><span> }</span><br><span> }</span><br><span>@@ -1373,6 +1376,17 @@</span><br><span> },</span><br><span> };</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* timer to ensure the SNS doesn't configure NSVC, but then no NSVC come alive afterwards */</span><br><span style="color: hsl(120, 100%, 40%);">+static void ns2_sns_timeout_alive_cb(void *data)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_fsm_inst *fi = data;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gprs_ns2_nse *nse = nse_inst_from_fi(fi);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPFSML(fi, LOGL_ERROR, "NSE %d: Config succeeded but no NS-VC came online. Selecting next IP-SNS endpoint.\n", nse->nsei);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fsm_inst_dispatch(fi, GPRS_SNS_EV_REQ_SELECT_ENDPOINT, NULL);</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> static int ns2_sns_fsm_bss_timer_cb(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>@@ -1405,10 +1419,6 @@</span><br><span> osmo_fsm_inst_state_chg(fi, GPRS_SNS_ST_CONFIG_SGSN, nsi->timeout[NS_TOUT_TSNS_PROV], 3);</span><br><span> }</span><br><span> break;</span><br><span style="color: hsl(0, 100%, 40%);">- case 4:</span><br><span style="color: hsl(0, 100%, 40%);">- LOGPFSML(fi, LOGL_ERROR, "NSE %d: Config succeeded but no NS-VC came online. Selecting next IP-SNS endpoint.\n", nse->nsei);</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_fsm_inst_dispatch(fi, GPRS_SNS_EV_REQ_SELECT_ENDPOINT, NULL);</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span> }</span><br><span> return 0;</span><br><span> }</span><br><span>@@ -1542,6 +1552,7 @@</span><br><span> gss->nse = nse;</span><br><span> INIT_LLIST_HEAD(&gss->sns_endpoints);</span><br><span> INIT_LLIST_HEAD(&gss->binds);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_timer_setup(&gss->alive_timeout, ns2_sns_timeout_alive_cb, fi);</span><br><span> </span><br><span> return fi;</span><br><span> err:</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/23185">change 23185</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/+/23185"/><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: I4b223118c7f250dbc8161cbf29cbd994c26c362f </div>
<div style="display:none"> Gerrit-Change-Number: 23185 </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>