<p>lynxis lazus has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/25558">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">ns2: correct parse a BLOCK PDU which was received over a different NSVC<br><br>BLOCK PDU can be send over a different NSVC than the NSVC.<br>E.g. informing a NSVC got blocked in case of a lower-layer failure.<br><br>Change-Id: I483e3a1d3b8c43bbb0cc6185b7f7f772bcb264bf<br>---<br>M src/gb/gprs_ns2_vc_fsm.c<br>1 file changed, 33 insertions(+), 7 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/58/25558/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 3395254..b528a06 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>@@ -118,6 +118,7 @@</span><br><span>       GPRS_NS2_EV_REQ_OM_RESET,               /* vty cmd: reset */</span><br><span>         GPRS_NS2_EV_REQ_OM_BLOCK,               /* vty cmd: block */</span><br><span>         GPRS_NS2_EV_REQ_OM_UNBLOCK,             /* vty cmd: unblock*/</span><br><span style="color: hsl(120, 100%, 40%);">+ GPRS_NS2_EV_RX_BLOCK_FOREIGN,           /* received a BLOCK over another NSVC */</span><br><span> };</span><br><span> </span><br><span> static const struct value_string ns2_vc_event_names[] = {</span><br><span>@@ -127,6 +128,7 @@</span><br><span>        { GPRS_NS2_EV_RX_UNBLOCK,               "RX-UNBLOCK" },</span><br><span>    { GPRS_NS2_EV_RX_UNBLOCK_ACK,           "RX-UNBLOCK_ACK" },</span><br><span>        { GPRS_NS2_EV_RX_BLOCK,                 "RX-BLOCK" },</span><br><span style="color: hsl(120, 100%, 40%);">+       { GPRS_NS2_EV_RX_BLOCK_FOREIGN,         "RX-BLOCK_FOREIGN" },</span><br><span>      { GPRS_NS2_EV_RX_BLOCK_ACK,             "RX-BLOCK_ACK" },</span><br><span>  { GPRS_NS2_EV_RX_ALIVE,                 "RX-ALIVE" },</span><br><span>      { GPRS_NS2_EV_RX_ALIVE_ACK,             "RX-ALIVE_ACK" },</span><br><span>@@ -368,8 +370,12 @@</span><br><span>                   osmo_timer_del(&fi->timer);</span><br><span>                   break;</span><br><span>               case GPRS_NS2_EV_RX_BLOCK:</span><br><span style="color: hsl(120, 100%, 40%);">+            case GPRS_NS2_EV_RX_BLOCK_FOREIGN:</span><br><span>                   priv->accept_unitdata = false;</span><br><span style="color: hsl(0, 100%, 40%);">-                       ns2_tx_block_ack(priv->nsvc, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+                        /* the BLOCK ACK for foreign BLOCK PDUs (rx over another nsvc) will be send</span><br><span style="color: hsl(120, 100%, 40%);">+                    * from the receiving nsvc */</span><br><span style="color: hsl(120, 100%, 40%);">+                 if (event == GPRS_NS2_EV_RX_BLOCK)</span><br><span style="color: hsl(120, 100%, 40%);">+                            ns2_tx_block_ack(priv->nsvc, NULL);</span><br><span>                       osmo_timer_del(&fi->timer);</span><br><span>                   break;</span><br><span>               case GPRS_NS2_EV_RX_UNBLOCK:</span><br><span>@@ -380,6 +386,9 @@</span><br><span>           }</span><br><span>    } else if (priv->initiate_block) {</span><br><span>                switch (event) {</span><br><span style="color: hsl(120, 100%, 40%);">+              case GPRS_NS2_EV_RX_BLOCK_FOREIGN:</span><br><span style="color: hsl(120, 100%, 40%);">+                    /* the block ack will be send by the rx NSVC */</span><br><span style="color: hsl(120, 100%, 40%);">+                       break;</span><br><span>               case GPRS_NS2_EV_RX_BLOCK:</span><br><span>                   /* TODO: BLOCK is a UNBLOCK_NACK */</span><br><span>                  ns2_tx_block_ack(priv->nsvc, NULL);</span><br><span>@@ -396,6 +405,9 @@</span><br><span>         } else {</span><br><span>             /* we are on the receiving end. The initiator who sent RESET is responsible to UNBLOCK! */</span><br><span>           switch (event) {</span><br><span style="color: hsl(120, 100%, 40%);">+              case GPRS_NS2_EV_RX_BLOCK_FOREIGN:</span><br><span style="color: hsl(120, 100%, 40%);">+                    /* the block ack will be send by the rx NSVC */</span><br><span style="color: hsl(120, 100%, 40%);">+                       break;</span><br><span>               case GPRS_NS2_EV_RX_BLOCK:</span><br><span>                   ns2_tx_block_ack(priv->nsvc, NULL);</span><br><span>                       break;</span><br><span>@@ -438,10 +450,14 @@</span><br><span>       case GPRS_NS2_EV_RX_UNBLOCK:</span><br><span>                 ns2_tx_unblock_ack(priv->nsvc);</span><br><span>           break;</span><br><span style="color: hsl(120, 100%, 40%);">+        case GPRS_NS2_EV_RX_BLOCK_FOREIGN:</span><br><span>   case GPRS_NS2_EV_RX_BLOCK:</span><br><span>           priv->initiate_block = false;</span><br><span>             priv->accept_unitdata = false;</span><br><span style="color: hsl(0, 100%, 40%);">-               ns2_tx_block_ack(priv->nsvc, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+                /* the BLOCK ACK for foreign BLOCK PDUs (rx over another nsvc) will be send</span><br><span style="color: hsl(120, 100%, 40%);">+            * from the receiving nsvc */</span><br><span style="color: hsl(120, 100%, 40%);">+         if (event == GPRS_NS2_EV_RX_BLOCK)</span><br><span style="color: hsl(120, 100%, 40%);">+                    ns2_tx_block_ack(priv->nsvc, NULL);</span><br><span>               osmo_fsm_inst_state_chg(fi, GPRS_NS2_ST_BLOCKED,</span><br><span>                                     0, 2);</span><br><span>               break;</span><br><span>@@ -887,21 +903,26 @@</span><br><span>                       /* 48.016 ยง 7.3.1 send RESET_ACK to wrong NSVCI + ignore */</span><br><span>                         if (nsh->pdu_type == NS_PDUT_RESET) {</span><br><span>                             ns2_tx_reset_ack(nsvc);</span><br><span style="color: hsl(0, 100%, 40%);">-                 } else if (nsh->pdu_type == NS_PDUT_STATUS) {</span><br><span style="color: hsl(0, 100%, 40%);">-                                /* this is a PDU received over a NSVC and reports a status for another NSVC */</span><br><span style="color: hsl(120, 100%, 40%);">+                        } else if (nsh->pdu_type == NS_PDUT_BLOCK || nsh->pdu_type == NS_PDUT_STATUS) {</span><br><span style="color: hsl(120, 100%, 40%);">+                         /* this is a PDU received over a NSVC and reports a status/block for another NSVC */</span><br><span>                                 target_nsvc = gprs_ns2_nsvc_by_nsvci(nsvc->nse->nsi,  nsvci);</span><br><span>                          if (!target_nsvc) {</span><br><span>                                  LOGPFSML(fi, LOGL_ERROR, "Received a STATUS PDU for unknown NSVC (NSVCI %d)\n", nsvci);</span><br><span style="color: hsl(120, 100%, 40%);">+                                     if (nsh->pdu_type == NS_PDUT_BLOCK) {</span><br><span style="color: hsl(120, 100%, 40%);">+                                              /* send out status */</span><br><span style="color: hsl(120, 100%, 40%);">+                                 }</span><br><span>                                    goto out;</span><br><span>                            }</span><br><span> </span><br><span>                                if (target_nsvc->nse != nsvc->nse) {</span><br><span>                                   LOGPFSML(fi, LOGL_ERROR, "Received a STATUS PDU for a NSVC (NSVCI %d) but it belongs to a different NSE!\n", nsvci);</span><br><span style="color: hsl(0, 100%, 40%);">-                                  /* send out status */</span><br><span style="color: hsl(120, 100%, 40%);">+                                 if (nsh->pdu_type == NS_PDUT_BLOCK) {</span><br><span style="color: hsl(120, 100%, 40%);">+                                              /* send out status */</span><br><span style="color: hsl(120, 100%, 40%);">+                                 }</span><br><span>                                    goto out;</span><br><span>                            }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-                           /* the status will be passed to the nsvc/target nsvc in the switch */</span><br><span style="color: hsl(120, 100%, 40%);">+                         /* the status/block will be passed to the nsvc/target nsvc in the switch */</span><br><span>                  } else {</span><br><span>                             LOG_NS_SIGNAL(nsvc, "Rx", nsh->pdu_type, LOGL_ERROR, " with wrong NSVCI=%05u. Ignoring PDU.\n", nsvci);</span><br><span>                               goto out;</span><br><span>@@ -917,7 +938,12 @@</span><br><span>             osmo_fsm_inst_dispatch(fi, GPRS_NS2_EV_RX_RESET_ACK, tp);</span><br><span>            break;</span><br><span>       case NS_PDUT_BLOCK:</span><br><span style="color: hsl(0, 100%, 40%);">-             osmo_fsm_inst_dispatch(fi, GPRS_NS2_EV_RX_BLOCK, tp);</span><br><span style="color: hsl(120, 100%, 40%);">+         if (target_nsvc) {</span><br><span style="color: hsl(120, 100%, 40%);">+                    osmo_fsm_inst_dispatch(target_nsvc->fi, GPRS_NS2_EV_RX_BLOCK_FOREIGN, tp);</span><br><span style="color: hsl(120, 100%, 40%);">+                 ns2_tx_block_ack(nsvc, &nsvci);</span><br><span style="color: hsl(120, 100%, 40%);">+           } else {</span><br><span style="color: hsl(120, 100%, 40%);">+                      osmo_fsm_inst_dispatch(fi, GPRS_NS2_EV_RX_BLOCK, tp);</span><br><span style="color: hsl(120, 100%, 40%);">+         }</span><br><span>            break;</span><br><span>       case NS_PDUT_BLOCK_ACK:</span><br><span>              osmo_fsm_inst_dispatch(fi, GPRS_NS2_EV_RX_BLOCK_ACK, tp);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/25558">change 25558</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/+/25558"/><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: I483e3a1d3b8c43bbb0cc6185b7f7f772bcb264bf </div>
<div style="display:none"> Gerrit-Change-Number: 25558 </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>