<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/25557">View Change</a></p><div style="white-space:pre-wrap">Approvals:
laforge: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">ns2: correct parse a STATUS PDU which was received over a different NSVC<br><br>STATUS PDU can be send over a different NSVC than the NSVC which<br>generated the STATUS PDU. E.g. informing a NSVC got blocked in case of a lower-layer failure.<br><br>Change-Id: I5c9e9de10c669c1226da67bb9e2663c5cfe828a8<br>---<br>M src/gb/gprs_ns2_vc_fsm.c<br>1 file changed, 20 insertions(+), 4 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 1a632b1..aa6613b 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>@@ -851,6 +851,7 @@</span><br><span> int ns2_vc_rx(struct gprs_ns2_vc *nsvc, struct msgb *msg, struct tlv_parsed *tp)</span><br><span> {</span><br><span> struct gprs_ns_hdr *nsh = (struct gprs_ns_hdr *) msg->l2h;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gprs_ns2_vc *target_nsvc = nsvc;</span><br><span> struct osmo_fsm_inst *fi = nsvc->fi;</span><br><span> int rc = 0;</span><br><span> uint8_t cause;</span><br><span>@@ -884,11 +885,26 @@</span><br><span> nsvci = tlvp_val16be(tp, NS_IE_VCI);</span><br><span> if (nsvci != nsvc->nsvci) {</span><br><span> /* 48.016 ยง 7.3.1 send RESET_ACK to wrong NSVCI + ignore */</span><br><span style="color: hsl(0, 100%, 40%);">- if (nsh->pdu_type == NS_PDUT_RESET)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (nsh->pdu_type == NS_PDUT_RESET) {</span><br><span> ns2_tx_reset_ack(nsvc);</span><br><span style="color: hsl(120, 100%, 40%);">+ } else if (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 for another NSVC */</span><br><span style="color: hsl(120, 100%, 40%);">+ target_nsvc = gprs_ns2_nsvc_by_nsvci(nsvc->nse->nsi, nsvci);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!target_nsvc) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPFSML(fi, LOGL_ERROR, "Received a STATUS PDU for unknown NSVC (NSVCI %d)\n", nsvci);</span><br><span style="color: hsl(120, 100%, 40%);">+ goto out;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- LOG_NS_SIGNAL(nsvc, "Rx", nsh->pdu_type, LOGL_ERROR, " with wrong NSVCI=%05u. Ignoring PDU.\n", nsvci);</span><br><span style="color: hsl(0, 100%, 40%);">- goto out;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (target_nsvc->nse != nsvc->nse) {</span><br><span style="color: hsl(120, 100%, 40%);">+ 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(120, 100%, 40%);">+ goto out;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* the status will be passed to the nsvc/target nsvc in the switch */</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOG_NS_SIGNAL(nsvc, "Rx", nsh->pdu_type, LOGL_ERROR, " with wrong NSVCI=%05u. Ignoring PDU.\n", nsvci);</span><br><span style="color: hsl(120, 100%, 40%);">+ goto out;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> }</span><br><span> }</span><br><span> </span><br><span>@@ -922,7 +938,7 @@</span><br><span> osmo_fsm_inst_dispatch(fi, GPRS_NS2_EV_RX_UNITDATA, msg);</span><br><span> return 0;</span><br><span> case NS_PDUT_STATUS:</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_fsm_inst_dispatch(fi, GPRS_NS2_EV_RX_STATUS, tp);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fsm_inst_dispatch(target_nsvc->fi, GPRS_NS2_EV_RX_STATUS, tp);</span><br><span> break;</span><br><span> default:</span><br><span> LOGPFSML(fi, LOGL_ERROR, "NSEI=%u Rx unknown NS PDU type %s\n", nsvc->nse->nsei,</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/25557">change 25557</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/+/25557"/><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: I5c9e9de10c669c1226da67bb9e2663c5cfe828a8 </div>
<div style="display:none"> Gerrit-Change-Number: 25557 </div>
<div style="display:none"> Gerrit-PatchSet: 4 </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>