<p>laforge has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/23468">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">gprs_ns2_vc_fsm: In IP-SNS/ALIVE mode, initial state is ALIVE/UNBLOCKED<br><br>Only when the ALIVE procedure fails, we mark a NS-VC as RECOVERING.<br><br>Change-Id: Ieb860827c2149306b135c0e6c8b3cd3bbb78851e<br>---<br>M src/gb/gprs_ns2_vc_fsm.c<br>1 file changed, 5 insertions(+), 8 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/68/23468/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 cca724f..48680a5 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>@@ -245,7 +245,9 @@</span><br><span>         case GPRS_NS2_EV_REQ_START:</span><br><span>          switch (priv->nsvc->mode) {</span><br><span>            case GPRS_NS2_VC_MODE_ALIVE:</span><br><span style="color: hsl(0, 100%, 40%);">-                    osmo_fsm_inst_state_chg(fi, GPRS_NS2_ST_RECOVERING, nsi->timeout[NS_TOUT_TNS_ALIVE], NS_TOUT_TNS_ALIVE);</span><br><span style="color: hsl(120, 100%, 40%);">+                   /* In IP-SNS, the NS-VC are assumed initially alive, until the alive</span><br><span style="color: hsl(120, 100%, 40%);">+                   * procedure should fail at some future point */</span><br><span style="color: hsl(120, 100%, 40%);">+                      osmo_fsm_inst_state_chg(fi, GPRS_NS2_ST_UNBLOCKED, 0, 0);</span><br><span>                    break;</span><br><span>               case GPRS_NS2_VC_MODE_BLOCKRESET:</span><br><span>                    osmo_fsm_inst_state_chg(fi, GPRS_NS2_ST_RESET, nsi->timeout[NS_TOUT_TNS_RESET], NS_TOUT_TNS_RESET);</span><br><span>@@ -428,17 +430,13 @@</span><br><span> </span><br><span>   ns2_tx_alive(priv->nsvc);</span><br><span>         ns2_nse_notify_unblocked(priv->nsvc, false);</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%);">-static void ns2_st_alive_onleave(struct osmo_fsm_inst *fi, uint32_t next_state)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">-        start_test_procedure(fi->priv);</span><br><span style="color: hsl(120, 100%, 40%);">+    start_test_procedure(priv);</span><br><span> }</span><br><span> </span><br><span> static const struct osmo_fsm_state ns2_vc_states[] = {</span><br><span>       [GPRS_NS2_ST_UNCONFIGURED] = {</span><br><span>               .in_event_mask = S(GPRS_NS2_EV_REQ_START),</span><br><span style="color: hsl(0, 100%, 40%);">-              .out_state_mask = S(GPRS_NS2_ST_RESET) | S(GPRS_NS2_ST_RECOVERING),</span><br><span style="color: hsl(120, 100%, 40%);">+           .out_state_mask = S(GPRS_NS2_ST_RESET) | S(GPRS_NS2_ST_UNBLOCKED),</span><br><span>           .name = "UNCONFIGURED",</span><br><span>            .action = ns2_st_unconfigured,</span><br><span>               .onenter = ns2_st_unconfigured_onenter,</span><br><span>@@ -483,7 +481,6 @@</span><br><span>                .name = "RECOVERING",</span><br><span>              .action = ns2_st_alive,</span><br><span>              .onenter = ns2_st_alive_onenter,</span><br><span style="color: hsl(0, 100%, 40%);">-                .onleave = ns2_st_alive_onleave,</span><br><span>     },</span><br><span> };</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/23468">change 23468</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/+/23468"/><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: Ieb860827c2149306b135c0e6c8b3cd3bbb78851e </div>
<div style="display:none"> Gerrit-Change-Number: 23468 </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>