<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/13981">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">libmsc/ran_msg_a.c: refactor ran_a_decode_lcls_notification()<br><br>We basically need to make sure that one of two possible IEs<br>is not NULL, while another is NULL (eXclusive OR). This can<br>be done using at least two conditional branches.<br><br>Change-Id: Ie0f9b5c1bbbfb744e0615da07d76037d91b0abc8<br>Fixes: CID#198444 Logically dead code<br>---<br>M src/libmsc/ran_msg_a.c<br>1 file changed, 3 insertions(+), 10 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/libmsc/ran_msg_a.c b/src/libmsc/ran_msg_a.c</span><br><span>index da32a84..21be896 100644</span><br><span>--- a/src/libmsc/ran_msg_a.c</span><br><span>+++ b/src/libmsc/ran_msg_a.c</span><br><span>@@ -375,13 +375,7 @@</span><br><span>     struct ran_msg ran_dec_msg;</span><br><span> </span><br><span>      /* Either §3.2.2.119 LCLS-BSS-Status or §3.2.2.120 LCLS-Break-Request shall be present */</span><br><span style="color: hsl(0, 100%, 40%);">-     if ((!ie_lcls_bss_status && !ie_lcls_break_req)</span><br><span style="color: hsl(0, 100%, 40%);">-     || (ie_lcls_bss_status && ie_lcls_break_req)) {</span><br><span style="color: hsl(0, 100%, 40%);">-             LOG_RAN_A_DEC(ran_dec, LOGL_ERROR, "Ignoring broken LCLS Notification message\n");</span><br><span style="color: hsl(0, 100%, 40%);">-            return -EINVAL;</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 (ie_lcls_bss_status) {</span><br><span style="color: hsl(120, 100%, 40%);">+     if (ie_lcls_bss_status && !ie_lcls_break_req) {</span><br><span>              ran_dec_msg = (struct ran_msg){</span><br><span>                      .msg_type = RAN_MSG_LCLS_STATUS,</span><br><span>                     .msg_name = "BSSMAP LCLS Notification (LCLS Status)",</span><br><span>@@ -391,9 +385,7 @@</span><br><span>                        },</span><br><span>           };</span><br><span>           return ran_decoded(ran_dec, &ran_dec_msg);</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 (ie_lcls_break_req) {</span><br><span style="color: hsl(120, 100%, 40%);">+      } else if (ie_lcls_break_req && !ie_lcls_bss_status) {</span><br><span>               ran_dec_msg = (struct ran_msg){</span><br><span>                      .msg_type = RAN_MSG_LCLS_BREAK_REQ,</span><br><span>                  .msg_name = "BSSMAP LCLS Notification (LCLS Break Req)",</span><br><span>@@ -404,6 +396,7 @@</span><br><span>             return ran_decoded(ran_dec, &ran_dec_msg);</span><br><span>       }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ LOG_RAN_A_DEC(ran_dec, LOGL_ERROR, "Ignoring broken LCLS Notification message\n");</span><br><span>         return -EINVAL;</span><br><span> }</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/13981">change 13981</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/13981"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-msc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: Ie0f9b5c1bbbfb744e0615da07d76037d91b0abc8 </div>
<div style="display:none"> Gerrit-Change-Number: 13981 </div>
<div style="display:none"> Gerrit-PatchSet: 4 </div>
<div style="display:none"> Gerrit-Owner: Vadim Yanitskiy <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>