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

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Use libosmocore to function to parse cipher mode reject cause<br><br>This allow us to handle both regular and extended cause transparently.<br><br>Change-Id: I7742ac41dd0642a5a40ce79d23250f8d9e6ae556<br>Related: OS#3187<br>---<br>M src/libmsc/a_iface_bssap.c<br>1 file changed, 7 insertions(+), 6 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/libmsc/a_iface_bssap.c b/src/libmsc/a_iface_bssap.c</span><br><span>index f24fb05..c11347e 100644</span><br><span>--- a/src/libmsc/a_iface_bssap.c</span><br><span>+++ b/src/libmsc/a_iface_bssap.c</span><br><span>@@ -427,20 +427,21 @@</span><br><span> static int bssmap_rx_ciph_rej(struct gsm_subscriber_connection *conn,</span><br><span>                               struct msgb *msg, struct tlv_parsed *tp)</span><br><span> {</span><br><span style="color: hsl(120, 100%, 40%);">+   int rc;</span><br><span>      enum gsm0808_cause cause;</span><br><span>    struct rate_ctr_group *msc = conn->network->msc_ctrs;</span><br><span> </span><br><span>      LOGPCONN(conn, LOGL_NOTICE, "RX BSSMAP CIPHER MODE REJECT\n");</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-    if (!TLVP_PRES_LEN(tp, GSM0808_IE_CAUSE, 1)) {</span><br><span style="color: hsl(0, 100%, 40%);">-          LOGPCONN(conn, LOGL_ERROR, "Cause code is missing -- discarding message!\n");</span><br><span style="color: hsl(0, 100%, 40%);">-         return -EINVAL;</span><br><span style="color: hsl(120, 100%, 40%);">+       rc = gsm0808_get_cipher_reject_cause(tp);</span><br><span style="color: hsl(120, 100%, 40%);">+     if (rc < 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+              LOGPCONN(conn, LOGL_ERROR, "failed (%s) to extract Cause from Cipher mode reject: %s\n",</span><br><span style="color: hsl(120, 100%, 40%);">+                     strerror(-rc), msgb_hexdump(msg));</span><br><span style="color: hsl(120, 100%, 40%);">+           return rc;</span><br><span>   }</span><br><span> </span><br><span>        rate_ctr_inc(&msc->ctr[MSC_CTR_BSSMAP_CIPHER_MODE_REJECT]);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-      /* FIXME: add support for 2-byte Cause values using libosmocore functions */</span><br><span style="color: hsl(0, 100%, 40%);">-    cause = *TLVP_VAL(tp, GSM0808_IE_CAUSE);</span><br><span style="color: hsl(120, 100%, 40%);">+      cause = (enum gsm0808_cause)rc;</span><br><span>      LOGPCONN(conn, LOGL_NOTICE, "Cipher mode rejection cause: %s\n", gsm0808_cause_name(cause));</span><br><span> </span><br><span>   /* FIXME: Can we do something meaningful here? e.g. report to the</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11832">change 11832</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/11832"/><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: I7742ac41dd0642a5a40ce79d23250f8d9e6ae556 </div>
<div style="display:none"> Gerrit-Change-Number: 11832 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: Max <msuraev@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: Max <msuraev@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Pau Espin Pedrol <pespin@sysmocom.de> </div>