<p>laforge has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/23477">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">WIP: Actually start Tns-test after SNS-CONFIG creates NS-VC<br><br>the previous commit fixed the state transition, but also caused<br>neither Tns-alive nor Tns-test to run<br><br>Change-Id: I07ea3fd5cec3d4acf4051930a1a3c746d6fd597c<br>---<br>M src/gb/gprs_ns2_vc_fsm.c<br>1 file changed, 36 insertions(+), 10 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/77/23477/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/gb/gprs_ns2_vc_fsm.c b/src/gb/gprs_ns2_vc_fsm.c</span><br><span>index b7adaf9..83e7590 100644</span><br><span>--- a/src/gb/gprs_ns2_vc_fsm.c</span><br><span>+++ b/src/gb/gprs_ns2_vc_fsm.c</span><br><span>@@ -143,19 +143,38 @@</span><br><span> return priv->nsvc->nse->nsi;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void start_test_procedure(struct gprs_ns2_vc_priv *priv)</span><br><span style="color: hsl(120, 100%, 40%);">+/* Start the NS-TEST procedure, either with transmitting a tx_alive,</span><br><span style="color: hsl(120, 100%, 40%);">+ * (start_tx_alive==true) or with starting tns-test */</span><br><span style="color: hsl(120, 100%, 40%);">+static void start_test_procedure(struct osmo_fsm_inst *fi, bool start_tx_alive)</span><br><span> {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gprs_ns2_vc_priv *priv = fi->priv;</span><br><span> struct gprs_ns2_inst *nsi = priv->nsvc->nse->nsi;</span><br><span style="color: hsl(120, 100%, 40%);">+ unsigned int tout_idx;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (osmo_timer_pending(&priv->alive.timer))</span><br><span style="color: hsl(0, 100%, 40%);">- return;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (osmo_timer_pending(&priv->alive.timer)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (start_tx_alive) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (priv->alive.mode == NS_TOUT_TNS_ALIVE)</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (priv->alive.mode == NS_TOUT_TNS_TEST)</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- priv->alive.mode = NS_TOUT_TNS_ALIVE;</span><br><span> priv->alive.N = 0;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- osmo_clock_gettime(CLOCK_MONOTONIC, &priv->alive.timer_started);</span><br><span style="color: hsl(0, 100%, 40%);">- ns2_tx_alive(priv->nsvc);</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_timer_schedule(&priv->alive.timer, nsi->timeout[NS_TOUT_TNS_ALIVE], 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (start_tx_alive) {</span><br><span style="color: hsl(120, 100%, 40%);">+ priv->alive.mode = NS_TOUT_TNS_ALIVE;</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_clock_gettime(CLOCK_MONOTONIC, &priv->alive.timer_started);</span><br><span style="color: hsl(120, 100%, 40%);">+ ns2_tx_alive(priv->nsvc);</span><br><span style="color: hsl(120, 100%, 40%);">+ tout_idx = NS_TOUT_TNS_ALIVE;</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ priv->alive.mode = NS_TOUT_TNS_TEST;</span><br><span style="color: hsl(120, 100%, 40%);">+ tout_idx = NS_TOUT_TNS_TEST;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPFSML(fi, LOGL_DEBUG, "Starting Tns-%s of %u seconds\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ tout_idx == NS_TOUT_TNS_ALIVE ? "alive" : "test", nsi->timeout[tout_idx]);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_timer_schedule(&priv->alive.timer, nsi->timeout[tout_idx], 0);</span><br><span> }</span><br><span> </span><br><span> static void stop_test_procedure(struct gprs_ns2_vc_priv *priv)</span><br><span>@@ -163,6 +182,7 @@</span><br><span> osmo_timer_del(&priv->alive.timer);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* how many milliseconds have expired since the last alive timer start? */</span><br><span> static int alive_timer_elapsed_ms(struct gprs_ns2_vc_priv *priv)</span><br><span> {</span><br><span> struct timespec now, elapsed;</span><br><span>@@ -174,6 +194,7 @@</span><br><span> return elapsed.tv_sec * 1000 + (elapsed.tv_nsec / 1000000);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* we just received a NS-ALIVE-ACK; re-schedule after Tns-test */</span><br><span> static void recv_test_procedure(struct osmo_fsm_inst *fi)</span><br><span> {</span><br><span> struct gprs_ns2_vc_priv *priv = fi->priv;</span><br><span>@@ -326,7 +347,7 @@</span><br><span> ns2_tx_unblock(priv->nsvc);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- start_test_procedure(priv);</span><br><span style="color: hsl(120, 100%, 40%);">+ start_test_procedure(fi, true);</span><br><span> }</span><br><span> </span><br><span> static void ns2_st_blocked(struct osmo_fsm_inst *fi, uint32_t event, void *data)</span><br><span>@@ -392,6 +413,12 @@</span><br><span> priv->accept_unitdata = true;</span><br><span> ns2_nse_notify_unblocked(nsvc, true);</span><br><span> ns2_prim_status_ind(nse, nsvc, 0, GPRS_NS2_AFF_CAUSE_VC_RECOVERY);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* the closest interpretation of the spec would start Tns-test here first,</span><br><span style="color: hsl(120, 100%, 40%);">+ * and only send a NS-ALIVE after Tns-test has expired (i.e. setting the</span><br><span style="color: hsl(120, 100%, 40%);">+ * second argument to 'false'. However, being quick in detecting unavailability</span><br><span style="color: hsl(120, 100%, 40%);">+ * of a NS-VC seems like a good idea */</span><br><span style="color: hsl(120, 100%, 40%);">+ start_test_procedure(fi, true);</span><br><span> }</span><br><span> </span><br><span> static void ns2_st_unblocked(struct osmo_fsm_inst *fi, uint32_t event, void *data)</span><br><span>@@ -431,9 +458,8 @@</span><br><span> if (old_state != GPRS_NS2_ST_RECOVERING)</span><br><span> priv->N = 0;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- ns2_tx_alive(priv->nsvc);</span><br><span> ns2_nse_notify_unblocked(priv->nsvc, false);</span><br><span style="color: hsl(0, 100%, 40%);">- start_test_procedure(priv);</span><br><span style="color: hsl(120, 100%, 40%);">+ start_test_procedure(fi, true);</span><br><span> }</span><br><span> </span><br><span> static const struct osmo_fsm_state ns2_vc_states[] = {</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/23477">change 23477</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/+/23477"/><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: I07ea3fd5cec3d4acf4051930a1a3c746d6fd597c </div>
<div style="display:none"> Gerrit-Change-Number: 23477 </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>