<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/23738">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Jenkins Builder: Verified
  laforge: Looks good to me, approved

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">gprs_ns2: fix nsvc block and unblock vty command<br><br>e7dfeac8dcb3 introduced a regression in the block/unblock check<br>as it was using the priv->initiate_block instead of priv->om_blocked.<br>The initiate_block tracks who is responsible to unblock the NSVC.<br><br>Fixes: e7dfeac8dcb3 ("gprs_ns2_vty: print a response to vty `nsvc <nsvci> (block|unblock|reset)")<br>Change-Id: I516faea223e30b120a297faed10636daa554be8a<br>---<br>M src/gb/gprs_ns2_vc_fsm.c<br>1 file changed, 2 insertions(+), 2 deletions(-)<br><br></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 9a6bfc2..7ed8299 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>@@ -785,7 +785,7 @@</span><br><span> int ns2_vc_block(struct gprs_ns2_vc *nsvc)</span><br><span> {</span><br><span>      struct gprs_ns2_vc_priv *priv = nsvc->fi->priv;</span><br><span style="color: hsl(0, 100%, 40%);">-   if (priv->initiate_block)</span><br><span style="color: hsl(120, 100%, 40%);">+  if (priv->om_blocked)</span><br><span>             return -EALREADY;</span><br><span> </span><br><span>        return osmo_fsm_inst_dispatch(nsvc->fi, GPRS_NS2_EV_REQ_OM_BLOCK, NULL);</span><br><span>@@ -797,7 +797,7 @@</span><br><span> int ns2_vc_unblock(struct gprs_ns2_vc *nsvc)</span><br><span> {</span><br><span>       struct gprs_ns2_vc_priv *priv = nsvc->fi->priv;</span><br><span style="color: hsl(0, 100%, 40%);">-   if (!priv->initiate_block)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!priv->om_blocked)</span><br><span>            return -EALREADY;</span><br><span> </span><br><span>        return osmo_fsm_inst_dispatch(nsvc->fi, GPRS_NS2_EV_REQ_OM_UNBLOCK, NULL);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/23738">change 23738</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/+/23738"/><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: I516faea223e30b120a297faed10636daa554be8a </div>
<div style="display:none"> Gerrit-Change-Number: 23738 </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-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: daniel <dwillmann@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>