<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/21483">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: use switch() case instead of multiple if in ns2_create_vc()<br><br>Improve readibilty and allows it to extend for future ns2 vty changes<br><br>Change-Id: I8bd9c75fb04169a166b7a3f5e13a5902250cfd0e<br>---<br>M src/gb/gprs_ns2.c<br>1 file changed, 14 insertions(+), 19 deletions(-)<br><br></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 15364fc..69c1174 100644</span><br><span>--- a/src/gb/gprs_ns2.c</span><br><span>+++ b/src/gb/gprs_ns2.c</span><br><span>@@ -772,42 +772,37 @@</span><br><span> if (msg->len < sizeof(struct gprs_ns_hdr))</span><br><span> return GPRS_NS2_CS_ERROR;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (nsh->pdu_type == NS_PDUT_STATUS) {</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (nsh->pdu_type) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case NS_PDUT_STATUS:</span><br><span> /* Do not respond, see 3GPP TS 08.16, 7.5.1 */</span><br><span> LOGP(DLNS, LOGL_INFO, "Ignoring NS STATUS from %s "</span><br><span> "for non-existing NS-VC\n",</span><br><span> logname);</span><br><span> return GPRS_NS2_CS_SKIPPED;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (nsh->pdu_type == NS_PDUT_ALIVE_ACK) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case NS_PDUT_ALIVE_ACK:</span><br><span> /* Ignore this, see 3GPP TS 08.16, 7.4.1 */</span><br><span> LOGP(DLNS, LOGL_INFO, "Ignoring NS ALIVE ACK from %s "</span><br><span> "for non-existing NS-VC\n",</span><br><span> logname);</span><br><span> return GPRS_NS2_CS_SKIPPED;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (nsh->pdu_type == NS_PDUT_RESET_ACK) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case NS_PDUT_RESET_ACK:</span><br><span> /* Ignore this, see 3GPP TS 08.16, 7.3.1 */</span><br><span> LOGP(DLNS, LOGL_INFO, "Ignoring NS RESET ACK from %s "</span><br><span> "for non-existing NS-VC\n",</span><br><span> logname);</span><br><span> return GPRS_NS2_CS_SKIPPED;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ case NS_PDUT_RESET:</span><br><span style="color: hsl(120, 100%, 40%);">+ /* accept PDU RESET when vc_mode matches */</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%);">+ break;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (bind->vc_mode == NS2_VC_MODE_BLOCKRESET) {</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(0, 100%, 40%);">-</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(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- return GPRS_NS2_CS_REJECTED;</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%);">+ 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> }</span><br><span style="color: hsl(0, 100%, 40%);">- } else { /* NS2_VC_MODE_ALIVE */</span><br><span style="color: hsl(120, 100%, 40%);">+ return GPRS_NS2_CS_REJECTED;</span><br><span style="color: hsl(120, 100%, 40%);">+ default:</span><br><span> rc = reject_status_msg(msg, &tp, reject, NS_CAUSE_PDU_INCOMP_PSTATE);</span><br><span> </span><br><span> if (rc < 0) {</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/21483">change 21483</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/+/21483"/><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: I8bd9c75fb04169a166b7a3f5e13a5902250cfd0e </div>
<div style="display:none"> Gerrit-Change-Number: 21483 </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: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>