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

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">gsm_data.h: Replace '.' in counter names with ':'<br><br>The '.' is illegal character in counter names, as they are exported<br>via CTRL interface, where '.' has a special meaning that cannot be<br>used by strings comprising the variable name.<br><br>Change-Id: I075c0f992e2e31226bd04b9c036ca125467f840e<br>---<br>M openbsc/include/openbsc/gsm_data.h<br>1 file changed, 39 insertions(+), 39 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/openbsc/include/openbsc/gsm_data.h b/openbsc/include/openbsc/gsm_data.h</span><br><span>index 2e1e64f..f3d85ac 100644</span><br><span>--- a/openbsc/include/openbsc/gsm_data.h</span><br><span>+++ b/openbsc/include/openbsc/gsm_data.h</span><br><span>@@ -206,26 +206,26 @@</span><br><span> };</span><br><span> </span><br><span> static const struct rate_ctr_desc bsc_ctr_description[] = {</span><br><span style="color: hsl(0, 100%, 40%);">-        [BSC_CTR_CHREQ_TOTAL] =                 {"chreq.total", "Received channel requests."},</span><br><span style="color: hsl(0, 100%, 40%);">-      [BSC_CTR_CHREQ_NO_CHANNEL] =            {"chreq.no_channel", "Sent to MS no channel available."},</span><br><span style="color: hsl(0, 100%, 40%);">-   [BSC_CTR_HANDOVER_ATTEMPTED] =          {"handover.attempted", "Received handover attempts."},</span><br><span style="color: hsl(0, 100%, 40%);">-      [BSC_CTR_HANDOVER_NO_CHANNEL] =                 {"handover.no_channel", "Sent no channel available responses."},</span><br><span style="color: hsl(0, 100%, 40%);">-    [BSC_CTR_HANDOVER_TIMEOUT] =            {"handover.timeout", "Count the amount of timeouts of timer T3103."},</span><br><span style="color: hsl(0, 100%, 40%);">-       [BSC_CTR_HANDOVER_COMPLETED] =          {"handover.completed", "Received handover completed."},</span><br><span style="color: hsl(0, 100%, 40%);">-     [BSC_CTR_HANDOVER_FAILED] =             {"handover.failed", "Receive HO FAIL messages."},</span><br><span style="color: hsl(0, 100%, 40%);">-   [BSC_CTR_PAGING_ATTEMPTED] =            {"paging.attempted", "Paging attempts for a MS."},</span><br><span style="color: hsl(0, 100%, 40%);">-  [BSC_CTR_PAGING_DETACHED] =             {"paging.detached", "Counts the amount of paging attempts which couldn't sent out any paging request because no responsible bts found."},</span><br><span style="color: hsl(0, 100%, 40%);">-       [BSC_CTR_PAGING_COMPLETED] =            {"paging.completed", "Paging successful completed."},</span><br><span style="color: hsl(0, 100%, 40%);">-       [BSC_CTR_PAGING_EXPIRED] =              {"paging.expired", "Paging Request expired because of timeout T3113."},</span><br><span style="color: hsl(0, 100%, 40%);">-     [BSC_CTR_CHAN_RF_FAIL] =                {"chan.rf_fail", "Received a RF failure indication from BTS."},</span><br><span style="color: hsl(0, 100%, 40%);">-     [BSC_CTR_CHAN_RLL_ERR] =                {"chan.rll_err", "Received a RLL failure with T200 cause from BTS."},</span><br><span style="color: hsl(0, 100%, 40%);">-       [BSC_CTR_BTS_OML_FAIL] =                {"bts.oml_fail", "Received a TEI down on a OML link."},</span><br><span style="color: hsl(0, 100%, 40%);">-     [BSC_CTR_BTS_RSL_FAIL] =                {"bts.rsl_fail", "Received a TEI down on a OML link."},</span><br><span style="color: hsl(0, 100%, 40%);">-     [BSC_CTR_CODEC_AMR_F] =                 {"bts.codec_amr_f", "Count the usage of AMR/F codec by channel mode requested."},</span><br><span style="color: hsl(0, 100%, 40%);">-   [BSC_CTR_CODEC_AMR_H] =                 {"bts.codec_amr_h", "Count the usage of AMR/H codec by channel mode requested."},</span><br><span style="color: hsl(0, 100%, 40%);">-   [BSC_CTR_CODEC_EFR] =                   {"bts.codec_efr", "Count the usage of EFR codec by channel mode requested."},</span><br><span style="color: hsl(0, 100%, 40%);">-       [BSC_CTR_CODEC_V1_FR] =                 {"bts.codec_fr", "Count the usage of FR codec by channel mode requested."},</span><br><span style="color: hsl(0, 100%, 40%);">- [BSC_CTR_CODEC_V1_HR] =                 {"bts.codec_hr", "Count the usage of HR codec by channel mode requested."},</span><br><span style="color: hsl(120, 100%, 40%);">+       [BSC_CTR_CHREQ_TOTAL] =                 {"chreq:total", "Received channel requests."},</span><br><span style="color: hsl(120, 100%, 40%);">+    [BSC_CTR_CHREQ_NO_CHANNEL] =            {"chreq:no_channel", "Sent to MS no channel available."},</span><br><span style="color: hsl(120, 100%, 40%);">+ [BSC_CTR_HANDOVER_ATTEMPTED] =          {"handover:attempted", "Received handover attempts."},</span><br><span style="color: hsl(120, 100%, 40%);">+    [BSC_CTR_HANDOVER_NO_CHANNEL] =         {"handover:no_channel", "Sent no channel available responses."},</span><br><span style="color: hsl(120, 100%, 40%);">+  [BSC_CTR_HANDOVER_TIMEOUT] =            {"handover:timeout", "Count the amount of timeouts of timer T3103."},</span><br><span style="color: hsl(120, 100%, 40%);">+     [BSC_CTR_HANDOVER_COMPLETED] =          {"handover:completed", "Received handover completed."},</span><br><span style="color: hsl(120, 100%, 40%);">+   [BSC_CTR_HANDOVER_FAILED] =             {"handover:failed", "Receive HO FAIL messages."},</span><br><span style="color: hsl(120, 100%, 40%);">+ [BSC_CTR_PAGING_ATTEMPTED] =            {"paging:attempted", "Paging attempts for a MS."},</span><br><span style="color: hsl(120, 100%, 40%);">+        [BSC_CTR_PAGING_DETACHED] =             {"paging:detached", "Counts the amount of paging attempts which couldn't sent out any paging request because no responsible bts found."},</span><br><span style="color: hsl(120, 100%, 40%);">+     [BSC_CTR_PAGING_COMPLETED] =            {"paging:completed", "Paging successful completed."},</span><br><span style="color: hsl(120, 100%, 40%);">+     [BSC_CTR_PAGING_EXPIRED] =              {"paging:expired", "Paging Request expired because of timeout T3113."},</span><br><span style="color: hsl(120, 100%, 40%);">+   [BSC_CTR_CHAN_RF_FAIL] =                {"chan:rf_fail", "Received a RF failure indication from BTS."},</span><br><span style="color: hsl(120, 100%, 40%);">+   [BSC_CTR_CHAN_RLL_ERR] =                {"chan:rll_err", "Received a RLL failure with T200 cause from BTS."},</span><br><span style="color: hsl(120, 100%, 40%);">+     [BSC_CTR_BTS_OML_FAIL] =                {"bts:oml_fail", "Received a TEI down on a OML link."},</span><br><span style="color: hsl(120, 100%, 40%);">+   [BSC_CTR_BTS_RSL_FAIL] =                {"bts:rsl_fail", "Received a TEI down on a OML link."},</span><br><span style="color: hsl(120, 100%, 40%);">+   [BSC_CTR_CODEC_AMR_F] =                 {"bts:codec_amr_f", "Count the usage of AMR/F codec by channel mode requested."},</span><br><span style="color: hsl(120, 100%, 40%);">+ [BSC_CTR_CODEC_AMR_H] =                 {"bts:codec_amr_h", "Count the usage of AMR/H codec by channel mode requested."},</span><br><span style="color: hsl(120, 100%, 40%);">+ [BSC_CTR_CODEC_EFR] =                   {"bts:codec_efr", "Count the usage of EFR codec by channel mode requested."},</span><br><span style="color: hsl(120, 100%, 40%);">+     [BSC_CTR_CODEC_V1_FR] =                 {"bts:codec_fr", "Count the usage of FR codec by channel mode requested."},</span><br><span style="color: hsl(120, 100%, 40%);">+       [BSC_CTR_CODEC_V1_HR] =                 {"bts:codec_hr", "Count the usage of HR codec by channel mode requested."},</span><br><span> };</span><br><span> </span><br><span> enum {</span><br><span>@@ -251,26 +251,26 @@</span><br><span> };</span><br><span> </span><br><span> static const struct rate_ctr_desc msc_ctr_description[] = {</span><br><span style="color: hsl(0, 100%, 40%);">-    [MSC_CTR_LOC_UPDATE_TYPE_ATTACH] =              {"loc_update_type.attach", "Received location update imsi attach requests."},</span><br><span style="color: hsl(0, 100%, 40%);">-       [MSC_CTR_LOC_UPDATE_TYPE_NORMAL] =              {"loc_update_type.normal", "Received location update normal requests."},</span><br><span style="color: hsl(0, 100%, 40%);">-    [MSC_CTR_LOC_UPDATE_TYPE_PERIODIC] =            {"loc_update_type.periodic", "Received location update periodic requests."},</span><br><span style="color: hsl(0, 100%, 40%);">-        [MSC_CTR_LOC_UPDATE_TYPE_DETACH] =              {"loc_update_type.detach", "Received location update detach indication."},</span><br><span style="color: hsl(0, 100%, 40%);">-  [MSC_CTR_LOC_UPDATE_FAILED] =           {"loc_update_resp.failed", "Rejected location updates."},</span><br><span style="color: hsl(0, 100%, 40%);">-   [MSC_CTR_LOC_UPDATE_COMPLETED] =        {"loc_update_resp.completed", "Successful location updates."},</span><br><span style="color: hsl(0, 100%, 40%);">-      [MSC_CTR_SMS_SUBMITTED] =               {"sms.submitted", "Received a RPDU from a MS (MO)."},</span><br><span style="color: hsl(0, 100%, 40%);">-       [MSC_CTR_SMS_NO_RECEIVER] =             {"sms.no_receiver", "Counts SMS which couldn't routed because no receiver found."},</span><br><span style="color: hsl(0, 100%, 40%);">-     [MSC_CTR_SMS_DELIVERED] =               {"sms.delivered", "Global SMS Deliver attempts."},</span><br><span style="color: hsl(0, 100%, 40%);">-  [MSC_CTR_SMS_RP_ERR_MEM] =              {"sms.rp_err_mem", "CAUSE_MT_MEM_EXCEEDED errors of MS responses on a sms deliver attempt."},</span><br><span style="color: hsl(0, 100%, 40%);">-       [MSC_CTR_SMS_RP_ERR_OTHER] =            {"sms.rp_err_other", "Other error of MS responses on a sms delive attempt."},</span><br><span style="color: hsl(0, 100%, 40%);">-       [MSC_CTR_SMS_DELIVER_UNKNOWN_ERROR] =   {"sms.deliver_unknown_error", "Unknown error occured during sms delivery."},</span><br><span style="color: hsl(120, 100%, 40%);">+      [MSC_CTR_LOC_UPDATE_TYPE_ATTACH] =              {"loc_update_type:attach", "Received location update imsi attach requests."},</span><br><span style="color: hsl(120, 100%, 40%);">+     [MSC_CTR_LOC_UPDATE_TYPE_NORMAL] =              {"loc_update_type:normal", "Received location update normal requests."},</span><br><span style="color: hsl(120, 100%, 40%);">+  [MSC_CTR_LOC_UPDATE_TYPE_PERIODIC] =            {"loc_update_type:periodic", "Received location update periodic requests."},</span><br><span style="color: hsl(120, 100%, 40%);">+      [MSC_CTR_LOC_UPDATE_TYPE_DETACH] =              {"loc_update_type:detach", "Received location update detach indication."},</span><br><span style="color: hsl(120, 100%, 40%);">+        [MSC_CTR_LOC_UPDATE_FAILED] =           {"loc_update_resp:failed", "Rejected location updates."},</span><br><span style="color: hsl(120, 100%, 40%);">+ [MSC_CTR_LOC_UPDATE_COMPLETED] =        {"loc_update_resp:completed", "Successful location updates."},</span><br><span style="color: hsl(120, 100%, 40%);">+    [MSC_CTR_SMS_SUBMITTED] =               {"sms:submitted", "Received a RPDU from a MS (MO)."},</span><br><span style="color: hsl(120, 100%, 40%);">+     [MSC_CTR_SMS_NO_RECEIVER] =             {"sms:no_receiver", "Counts SMS which couldn't routed because no receiver found."},</span><br><span style="color: hsl(120, 100%, 40%);">+   [MSC_CTR_SMS_DELIVERED] =               {"sms:delivered", "Global SMS Deliver attempts."},</span><br><span style="color: hsl(120, 100%, 40%);">+        [MSC_CTR_SMS_RP_ERR_MEM] =              {"sms:rp_err_mem", "CAUSE_MT_MEM_EXCEEDED errors of MS responses on a sms deliver attempt."},</span><br><span style="color: hsl(120, 100%, 40%);">+     [MSC_CTR_SMS_RP_ERR_OTHER] =            {"sms:rp_err_other", "Other error of MS responses on a sms delive attempt."},</span><br><span style="color: hsl(120, 100%, 40%);">+     [MSC_CTR_SMS_DELIVER_UNKNOWN_ERROR] =   {"sms:deliver_unknown_error", "Unknown error occured during sms delivery."},</span><br><span>     /* FIXME: count also sms delivered */</span><br><span style="color: hsl(0, 100%, 40%);">-   [MSC_CTR_CALL_MO_SETUP] =               {"call.mo_setup", "Received setup requests from a MS to init a MO call."},</span><br><span style="color: hsl(0, 100%, 40%);">-  [MSC_CTR_CALL_MO_CONNECT_ACK] =                 {"call.mo_connect_ack", "Received a connect ack from MS of a MO call. Call is now succesful connected up."},</span><br><span style="color: hsl(0, 100%, 40%);">-        [MSC_CTR_CALL_MT_SETUP] =               {"call.mt_setup", "Sent setup requests to the MS (MT)."},</span><br><span style="color: hsl(0, 100%, 40%);">-   [MSC_CTR_CALL_MT_CONNECT] =             {"call.mt_connect", "Sent a connect to the MS (MT)."},</span><br><span style="color: hsl(0, 100%, 40%);">-      [MSC_CTR_CALL_ACTIVE] =                 {"call.active", "Count total amount of calls that ever reached active state."},</span><br><span style="color: hsl(0, 100%, 40%);">-     [MSC_CTR_CALL_COMPLETE] =               {"call.complete", "Count total amount of calls which got terminated by disconnect req or ind after reaching active state."},</span><br><span style="color: hsl(0, 100%, 40%);">-        [MSC_CTR_CALL_INCOMPLETE] =             {"call.incomplete", "Count total amount of call which got terminated by any other reason after reaching active state."},</span><br><span style="color: hsl(120, 100%, 40%);">+  [MSC_CTR_CALL_MO_SETUP] =               {"call:mo_setup", "Received setup requests from a MS to init a MO call."},</span><br><span style="color: hsl(120, 100%, 40%);">+        [MSC_CTR_CALL_MO_CONNECT_ACK] =         {"call:mo_connect_ack", "Received a connect ack from MS of a MO call. Call is now succesful connected up."},</span><br><span style="color: hsl(120, 100%, 40%);">+      [MSC_CTR_CALL_MT_SETUP] =               {"call:mt_setup", "Sent setup requests to the MS (MT)."},</span><br><span style="color: hsl(120, 100%, 40%);">+ [MSC_CTR_CALL_MT_CONNECT] =             {"call:mt_connect", "Sent a connect to the MS (MT)."},</span><br><span style="color: hsl(120, 100%, 40%);">+    [MSC_CTR_CALL_ACTIVE] =                 {"call:active", "Count total amount of calls that ever reached active state."},</span><br><span style="color: hsl(120, 100%, 40%);">+   [MSC_CTR_CALL_COMPLETE] =               {"call:complete", "Count total amount of calls which got terminated by disconnect req or ind after reaching active state."},</span><br><span style="color: hsl(120, 100%, 40%);">+      [MSC_CTR_CALL_INCOMPLETE] =             {"call:incomplete", "Count total amount of call which got terminated by any other reason after reaching active state."},</span><br><span> };</span><br><span> </span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/10662">change 10662</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/10662"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: openbsc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I075c0f992e2e31226bd04b9c036ca125467f840e </div>
<div style="display:none"> Gerrit-Change-Number: 10662 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Pau Espin Pedrol <pespin@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>