<p>lynxis lazus has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/20097">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">libgb/ns: allow to create NS_ALIVE NSVC<br><br>Change-Id: I562c3ac4a8baaa2c97852bbd6a5a10ba1f144004<br>---<br>M src/gb/gprs_ns2.c<br>1 file changed, 27 insertions(+), 12 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/97/20097/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/gb/gprs_ns2.c b/src/gb/gprs_ns2.c</span><br><span>index bae9438..0fa7197 100644</span><br><span>--- a/src/gb/gprs_ns2.c</span><br><span>+++ b/src/gb/gprs_ns2.c</span><br><span>@@ -625,15 +625,28 @@</span><br><span> return GPRS_NS2_CS_SKIPPED;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* Only the RESET procedure creates a new NSVC */</span><br><span style="color: hsl(0, 100%, 40%);">- if (nsh->pdu_type != NS_PDUT_RESET) {</span><br><span style="color: hsl(0, 100%, 40%);">- rc = reject_status_msg(msg, &tp, reject, NS_CAUSE_PDU_INCOMP_PSTATE);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (bind->vc_mode == NS2_VC_MODE_BLOCKRESET) {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Only the RESET procedure creates a new NSVC */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (nsh->pdu_type != NS_PDUT_RESET) {</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = reject_status_msg(msg, &tp, reject, NS_CAUSE_PDU_INCOMP_PSTATE);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (rc < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DLNS, LOGL_ERROR, "Failed to generate reject message (%d)\n", rc);</span><br><span style="color: hsl(0, 100%, 40%);">- return rc;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rc < 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLNS, LOGL_ERROR, "Failed to generate reject message (%d)\n", rc);</span><br><span style="color: hsl(120, 100%, 40%);">+ return rc;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ return GPRS_NS2_CS_REJECTED;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- return GPRS_NS2_CS_REJECTED;</span><br><span style="color: hsl(120, 100%, 40%);">+ } else { /* NS2_VC_MODE_ALIVE */</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Only the ALIVE procedure creates a new NSVC */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (nsh->pdu_type != NS_PDUT_ALIVE) {</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = reject_status_msg(msg, &tp, reject, NS_CAUSE_PDU_INCOMP_PSTATE);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rc < 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLNS, LOGL_ERROR, "Failed to generate reject message (%d)\n", rc);</span><br><span style="color: hsl(120, 100%, 40%);">+ return rc;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ return GPRS_NS2_CS_REJECTED;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> }</span><br><span> </span><br><span> rc = ns2_tlv_parse(&tp, nsh->data,</span><br><span>@@ -645,11 +658,13 @@</span><br><span> return GPRS_NS2_CS_REJECTED;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (!TLVP_PRESENT(&tp, NS_IE_CAUSE) ||</span><br><span style="color: hsl(0, 100%, 40%);">- !TLVP_PRESENT(&tp, NS_IE_VCI) || !TLVP_PRESENT(&tp, NS_IE_NSEI)) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DLNS, LOGL_ERROR, "NS RESET Missing mandatory IE\n");</span><br><span style="color: hsl(0, 100%, 40%);">- rc = reject_status_msg(msg, &tp, reject, NS_CAUSE_MISSING_ESSENT_IE);</span><br><span style="color: hsl(0, 100%, 40%);">- return GPRS_NS2_CS_REJECTED;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (bind->vc_mode == NS2_VC_MODE_BLOCKRESET) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!TLVP_PRESENT(&tp, NS_IE_CAUSE) ||</span><br><span style="color: hsl(120, 100%, 40%);">+ !TLVP_PRESENT(&tp, NS_IE_VCI) || !TLVP_PRESENT(&tp, NS_IE_NSEI)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLNS, LOGL_ERROR, "NS RESET Missing mandatory IE\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = reject_status_msg(msg, &tp, reject, NS_CAUSE_MISSING_ESSENT_IE);</span><br><span style="color: hsl(120, 100%, 40%);">+ return GPRS_NS2_CS_REJECTED;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> }</span><br><span> </span><br><span> /* find or create NSE */</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/20097">change 20097</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/+/20097"/><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: I562c3ac4a8baaa2c97852bbd6a5a10ba1f144004 </div>
<div style="display:none"> Gerrit-Change-Number: 20097 </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>