<p>lynxis lazus has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/25554">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">ns2: message: BLOCK/BLOCK ACK allow to use a given NSVCI instead of using the nsvc nsvci<br><br>The BLOCK and BLOCK ACK PDUs can be send over a working NSVC to inform<br>the NSE that a NSVC is blocked.<br><br>Change-Id: I6189229fdc1f054e86811bc60cb7646e1f758a78<br>---<br>M src/gb/gprs_ns2_internal.h<br>M src/gb/gprs_ns2_message.c<br>M src/gb/gprs_ns2_vc_fsm.c<br>M tests/gb/gprs_ns2_test.c<br>4 files changed, 25 insertions(+), 15 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/54/25554/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/gb/gprs_ns2_internal.h b/src/gb/gprs_ns2_internal.h</span><br><span>index bfb12d9..a5d78d4 100644</span><br><span>--- a/src/gb/gprs_ns2_internal.h</span><br><span>+++ b/src/gb/gprs_ns2_internal.h</span><br><span>@@ -422,8 +422,8 @@</span><br><span> unsigned int num_ip6_elems);</span><br><span> </span><br><span> /* transmit message over a VC */</span><br><span style="color: hsl(0, 100%, 40%);">-int ns2_tx_block(struct gprs_ns2_vc *nsvc, uint8_t cause);</span><br><span style="color: hsl(0, 100%, 40%);">-int ns2_tx_block_ack(struct gprs_ns2_vc *nsvc);</span><br><span style="color: hsl(120, 100%, 40%);">+int ns2_tx_block(struct gprs_ns2_vc *nsvc, uint8_t cause, uint16_t *nsvci);</span><br><span style="color: hsl(120, 100%, 40%);">+int ns2_tx_block_ack(struct gprs_ns2_vc *nsvc, uint16_t *nsvci);</span><br><span> </span><br><span> int ns2_tx_reset(struct gprs_ns2_vc *nsvc, uint8_t cause);</span><br><span> int ns2_tx_reset_ack(struct gprs_ns2_vc *nsvc);</span><br><span>diff --git a/src/gb/gprs_ns2_message.c b/src/gb/gprs_ns2_message.c</span><br><span>index 5e3e025..2dbbf5e 100644</span><br><span>--- a/src/gb/gprs_ns2_message.c</span><br><span>+++ b/src/gb/gprs_ns2_message.c</span><br><span>@@ -207,11 +207,16 @@</span><br><span> * \param[in] vc NS-VC on which the NS-BLOCK is to be transmitted</span><br><span> * \param[in] cause Numeric NS Cause value</span><br><span> * \returns 0 in case of success */</span><br><span style="color: hsl(0, 100%, 40%);">-int ns2_tx_block(struct gprs_ns2_vc *nsvc, uint8_t cause)</span><br><span style="color: hsl(120, 100%, 40%);">+int ns2_tx_block(struct gprs_ns2_vc *nsvc, uint8_t cause, uint16_t *nsvci)</span><br><span> {</span><br><span> struct msgb *msg;</span><br><span> struct gprs_ns_hdr *nsh;</span><br><span style="color: hsl(0, 100%, 40%);">- uint16_t nsvci = osmo_htons(nsvc->nsvci);</span><br><span style="color: hsl(120, 100%, 40%);">+ uint16_t encoded_nsvci;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (nsvci)</span><br><span style="color: hsl(120, 100%, 40%);">+ encoded_nsvci = osmo_htons(*nsvci);</span><br><span style="color: hsl(120, 100%, 40%);">+ else</span><br><span style="color: hsl(120, 100%, 40%);">+ encoded_nsvci = osmo_htons(nsvc->nsvci);</span><br><span> </span><br><span> log_set_context(LOG_CTX_GB_NSE, nsvc->nse);</span><br><span> log_set_context(LOG_CTX_GB_NSVC, nsvc);</span><br><span>@@ -229,7 +234,7 @@</span><br><span> nsh->pdu_type = NS_PDUT_BLOCK;</span><br><span> </span><br><span> msgb_tvlv_put(msg, NS_IE_CAUSE, 1, &cause);</span><br><span style="color: hsl(0, 100%, 40%);">- msgb_tvlv_put(msg, NS_IE_VCI, 2, (uint8_t *) &nsvci);</span><br><span style="color: hsl(120, 100%, 40%);">+ msgb_tvlv_put(msg, NS_IE_VCI, 2, (uint8_t *) &encoded_nsvci);</span><br><span> </span><br><span> LOG_NS_SIGNAL(nsvc, "Tx", nsh->pdu_type, LOGL_INFO, " cause=%s\n", gprs_ns2_cause_str(cause));</span><br><span> return ns_vc_tx(nsvc, msg);</span><br><span>@@ -238,11 +243,16 @@</span><br><span> /*! Transmit a NS-BLOCK-ACK on a given NS-VC.</span><br><span> * \param[in] nsvc NS-VC on which the NS-BLOCK is to be transmitted</span><br><span> * \returns 0 in case of success */</span><br><span style="color: hsl(0, 100%, 40%);">-int ns2_tx_block_ack(struct gprs_ns2_vc *nsvc)</span><br><span style="color: hsl(120, 100%, 40%);">+int ns2_tx_block_ack(struct gprs_ns2_vc *nsvc, uint16_t *nsvci)</span><br><span> {</span><br><span> struct msgb *msg;</span><br><span> struct gprs_ns_hdr *nsh;</span><br><span style="color: hsl(0, 100%, 40%);">- uint16_t nsvci = osmo_htons(nsvc->nsvci);</span><br><span style="color: hsl(120, 100%, 40%);">+ uint16_t encoded_nsvci;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (nsvci)</span><br><span style="color: hsl(120, 100%, 40%);">+ encoded_nsvci = osmo_htons(*nsvci);</span><br><span style="color: hsl(120, 100%, 40%);">+ else</span><br><span style="color: hsl(120, 100%, 40%);">+ encoded_nsvci = osmo_htons(nsvc->nsvci);</span><br><span> </span><br><span> log_set_context(LOG_CTX_GB_NSE, nsvc->nse);</span><br><span> log_set_context(LOG_CTX_GB_NSVC, nsvc);</span><br><span>@@ -257,7 +267,7 @@</span><br><span> nsh = (struct gprs_ns_hdr *) msg->l2h;</span><br><span> nsh->pdu_type = NS_PDUT_BLOCK_ACK;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- msgb_tvlv_put(msg, NS_IE_VCI, 2, (uint8_t *) &nsvci);</span><br><span style="color: hsl(120, 100%, 40%);">+ msgb_tvlv_put(msg, NS_IE_VCI, 2, (uint8_t *) &encoded_nsvci);</span><br><span> </span><br><span> LOG_NS_TX_SIGNAL(nsvc, nsh->pdu_type);</span><br><span> return ns_vc_tx(nsvc, msg);</span><br><span>diff --git a/src/gb/gprs_ns2_vc_fsm.c b/src/gb/gprs_ns2_vc_fsm.c</span><br><span>index fa8cec2..a366c93 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>@@ -348,7 +348,7 @@</span><br><span> if (old_state == GPRS_NS2_ST_RESET) {</span><br><span> osmo_timer_del(&fi->timer);</span><br><span> } else {</span><br><span style="color: hsl(0, 100%, 40%);">- ns2_tx_block(priv->nsvc, NS_CAUSE_OM_INTERVENTION);</span><br><span style="color: hsl(120, 100%, 40%);">+ ns2_tx_block(priv->nsvc, NS_CAUSE_OM_INTERVENTION, NULL);</span><br><span> }</span><br><span> } else if (priv->initiate_block) {</span><br><span> ns2_tx_unblock(priv->nsvc);</span><br><span>@@ -369,12 +369,12 @@</span><br><span> break;</span><br><span> case GPRS_NS2_EV_RX_BLOCK:</span><br><span> priv->accept_unitdata = false;</span><br><span style="color: hsl(0, 100%, 40%);">- ns2_tx_block_ack(priv->nsvc);</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> priv->accept_unitdata = false;</span><br><span style="color: hsl(0, 100%, 40%);">- ns2_tx_block(priv->nsvc, NS_CAUSE_OM_INTERVENTION);</span><br><span style="color: hsl(120, 100%, 40%);">+ ns2_tx_block(priv->nsvc, NS_CAUSE_OM_INTERVENTION, NULL);</span><br><span> osmo_timer_add(&fi->timer);</span><br><span> break;</span><br><span> }</span><br><span>@@ -382,7 +382,7 @@</span><br><span> switch (event) {</span><br><span> case GPRS_NS2_EV_RX_BLOCK:</span><br><span> /* TODO: BLOCK is a UNBLOCK_NACK */</span><br><span style="color: hsl(0, 100%, 40%);">- ns2_tx_block_ack(priv->nsvc);</span><br><span style="color: hsl(120, 100%, 40%);">+ ns2_tx_block_ack(priv->nsvc, NULL);</span><br><span> break;</span><br><span> case GPRS_NS2_EV_RX_UNBLOCK:</span><br><span> ns2_tx_unblock_ack(priv->nsvc);</span><br><span>@@ -397,7 +397,7 @@</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> case GPRS_NS2_EV_RX_BLOCK:</span><br><span style="color: hsl(0, 100%, 40%);">- ns2_tx_block_ack(priv->nsvc);</span><br><span style="color: hsl(120, 100%, 40%);">+ ns2_tx_block_ack(priv->nsvc, NULL);</span><br><span> break;</span><br><span> case GPRS_NS2_EV_RX_UNBLOCK:</span><br><span> ns2_tx_unblock_ack(priv->nsvc);</span><br><span>@@ -441,7 +441,7 @@</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);</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>diff --git a/tests/gb/gprs_ns2_test.c b/tests/gb/gprs_ns2_test.c</span><br><span>index ad78a62..0221a8d 100644</span><br><span>--- a/tests/gb/gprs_ns2_test.c</span><br><span>+++ b/tests/gb/gprs_ns2_test.c</span><br><span>@@ -439,7 +439,7 @@</span><br><span> </span><br><span> printf("---- Send Block NSVC[0]\n");</span><br><span> ns2_vc_block(nsvc[0]);</span><br><span style="color: hsl(0, 100%, 40%);">- ns2_tx_block_ack(loop[0]);</span><br><span style="color: hsl(120, 100%, 40%);">+ ns2_tx_block_ack(loop[0], NULL);</span><br><span> </span><br><span> /* try to receive a unitdata - this should be dropped & freed by NS */</span><br><span> printf("---- Try to receive over blocked NSVC[0]\n");</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/25554">change 25554</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/+/25554"/><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: I6189229fdc1f054e86811bc60cb7646e1f758a78 </div>
<div style="display:none"> Gerrit-Change-Number: 25554 </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>