<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/11575">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Harald Welte: Looks good to me, approved
Pau Espin Pedrol: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Add counters for BSSMAP cipher mode messages<br><br>Count COMPLETE and REJECT messages. Besides general troubleshooting<br>that's also useful for TTCN-3 tests to check that OsmoMSC processed<br>those messages as expected.<br><br>Change-Id: I5822b2b38b64f1a691b26c926a8e2bece21dc624<br>Related: OS#3187<br>---<br>M include/osmocom/msc/gsm_data.h<br>M src/libmsc/a_iface_bssap.c<br>2 files changed, 10 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/msc/gsm_data.h b/include/osmocom/msc/gsm_data.h</span><br><span>index 579697e..085248c 100644</span><br><span>--- a/include/osmocom/msc/gsm_data.h</span><br><span>+++ b/include/osmocom/msc/gsm_data.h</span><br><span>@@ -216,6 +216,8 @@</span><br><span> MSC_CTR_NC_SS_MO_ESTABLISHED,</span><br><span> MSC_CTR_NC_SS_MT_REQUESTS,</span><br><span> MSC_CTR_NC_SS_MT_ESTABLISHED,</span><br><span style="color: hsl(120, 100%, 40%);">+ MSC_CTR_BSSMAP_CIPHER_MODE_REJECT,</span><br><span style="color: hsl(120, 100%, 40%);">+ MSC_CTR_BSSMAP_CIPHER_MODE_COMPLETE,</span><br><span> };</span><br><span> </span><br><span> static const struct rate_ctr_desc msc_ctr_description[] = {</span><br><span>@@ -247,6 +249,8 @@</span><br><span> [MSC_CTR_NC_SS_MO_ESTABLISHED] = {"nc_ss:mo_established", "Established MS-initiated call independent SS/USSD sessions."},</span><br><span> [MSC_CTR_NC_SS_MT_REQUESTS] = {"nc_ss:mt_requests", "Received network-initiated call independent SS/USSD requests."},</span><br><span> [MSC_CTR_NC_SS_MT_ESTABLISHED] = {"nc_ss:mt_established", "Established network-initiated call independent SS/USSD sessions."},</span><br><span style="color: hsl(120, 100%, 40%);">+ [MSC_CTR_BSSMAP_CIPHER_MODE_REJECT] = {"bssmap:cipher_mode_reject", "Number of CIPHER MODE REJECT messages processed by BSSMAP layer"},</span><br><span style="color: hsl(120, 100%, 40%);">+ [MSC_CTR_BSSMAP_CIPHER_MODE_COMPLETE] = {"bssmap:cipher_mode_complete", "Number of CIPHER MODE COMPLETE messages processed by BSSMAP layer"},</span><br><span> };</span><br><span> </span><br><span> static const struct rate_ctr_group_desc msc_ctrg_desc = {</span><br><span>diff --git a/src/libmsc/a_iface_bssap.c b/src/libmsc/a_iface_bssap.c</span><br><span>index 4666ae3..282fd73 100644</span><br><span>--- a/src/libmsc/a_iface_bssap.c</span><br><span>+++ b/src/libmsc/a_iface_bssap.c</span><br><span>@@ -400,6 +400,7 @@</span><br><span> * This needs to be discussed further! */</span><br><span> </span><br><span> uint8_t alg_id = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct rate_ctr_group *msc = conn->network->msc_ctrs;</span><br><span> </span><br><span> LOGPCONN(conn, LOGL_DEBUG, "Rx BSSMAP CIPHER MODE COMPLETE\n");</span><br><span> </span><br><span>@@ -414,6 +415,8 @@</span><br><span> msg = NULL;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_inc(&msc->ctr[MSC_CTR_BSSMAP_CIPHER_MODE_COMPLETE]);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* Hand over cipher mode complete message to the MSC */</span><br><span> msc_cipher_mode_compl(conn, msg, alg_id);</span><br><span> </span><br><span>@@ -425,6 +428,7 @@</span><br><span> struct msgb *msg, struct tlv_parsed *tp)</span><br><span> {</span><br><span> enum gsm0808_cause cause;</span><br><span style="color: hsl(120, 100%, 40%);">+ 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>@@ -433,6 +437,8 @@</span><br><span> return -EINVAL;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_inc(&msc->ctr[MSC_CTR_BSSMAP_CIPHER_MODE_REJECT]);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* FIXME: add support for 2-byte Cause values using libosmocore functions */</span><br><span> cause = *TLVP_VAL(tp, GSM0808_IE_CAUSE);</span><br><span> LOGPCONN(conn, LOGL_NOTICE, "Cipher mode rejection cause: %s\n", gsm0808_cause_name(cause));</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11575">change 11575</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/11575"/><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: I5822b2b38b64f1a691b26c926a8e2bece21dc624 </div>
<div style="display:none"> Gerrit-Change-Number: 11575 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </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: Pau Espin Pedrol <pespin@sysmocom.de> </div>