<p>lynxis lazus has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/22293">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">gprs_ns2_vc_fsm: ensure all state is resetted via force_unconf<br><br>Change-Id: I240225ce82fa27dfcb5b4b8e2981bb4d8cc4cd70<br>---<br>M src/gb/gprs_ns2_vc_fsm.c<br>1 file changed, 8 insertions(+), 2 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/93/22293/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 e0ff05d..79a0d4a 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>@@ -57,6 +57,7 @@</span><br><span>      int N;</span><br><span>       /* The initiator is responsible to UNBLOCK the VC. The BSS is usually the initiator.</span><br><span>          * It can change during runtime. The side which blocks an unblocked side.*/</span><br><span style="color: hsl(120, 100%, 40%);">+   bool initiator;</span><br><span>      bool initiate_block;</span><br><span>         bool initiate_reset;</span><br><span>         /* if blocked by O&M/vty */</span><br><span>@@ -228,6 +229,9 @@</span><br><span>        struct gprs_ns2_vc_priv *priv = fi->priv;</span><br><span>         struct gprs_ns2_inst *nsi = priv->nsvc->nse->nsi;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+        priv->initiate_reset = priv->initiate_block = priv->initiator;</span><br><span style="color: hsl(120, 100%, 40%);">+       priv->om_blocked = false;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>       switch (event) {</span><br><span>     case GPRS_NS2_EV_REQ_START:</span><br><span>          switch (priv->nsvc->mode) {</span><br><span>@@ -268,6 +272,9 @@</span><br><span> </span><br><span>  if (priv->initiate_reset) {</span><br><span>               switch (event) {</span><br><span style="color: hsl(120, 100%, 40%);">+              case GPRS_NS2_EV_RX_RESET:</span><br><span style="color: hsl(120, 100%, 40%);">+                    ns2_tx_reset_ack(priv->nsvc);</span><br><span style="color: hsl(120, 100%, 40%);">+                      /* fall-through */</span><br><span>           case GPRS_NS2_EV_RX_RESET_ACK:</span><br><span>                       osmo_fsm_inst_state_chg(fi, GPRS_NS2_ST_BLOCKED,</span><br><span>                                             nsi->timeout[NS_TOUT_TNS_BLOCK], NS_TOUT_TNS_BLOCK);</span><br><span>@@ -683,8 +690,7 @@</span><br><span>        nsvc->fi = fi;</span><br><span>    priv = fi->priv = talloc_zero(fi, struct gprs_ns2_vc_priv);</span><br><span>       priv->nsvc = nsvc;</span><br><span style="color: hsl(0, 100%, 40%);">-   priv->initiate_reset = initiator;</span><br><span style="color: hsl(0, 100%, 40%);">-    priv->initiate_block = initiator;</span><br><span style="color: hsl(120, 100%, 40%);">+  priv->initiator = initiator;</span><br><span> </span><br><span>  osmo_timer_setup(&priv->alive.timer, alive_timeout_handler, fi);</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/22293">change 22293</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/+/22293"/><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: I240225ce82fa27dfcb5b4b8e2981bb4d8cc4cd70 </div>
<div style="display:none"> Gerrit-Change-Number: 22293 </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>