<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/9752">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;">bsc-nat: 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: I55470ae74d350e4020209921fd8a09b51b120a41<br>---<br>M openbsc/src/libfilter/bsc_msg_acc.c<br>M openbsc/src/osmo-bsc_nat/bsc_nat_utils.c<br>2 files changed, 17 insertions(+), 17 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/openbsc/src/libfilter/bsc_msg_acc.c b/openbsc/src/libfilter/bsc_msg_acc.c</span><br><span>index bfc5bdd..7b658e4 100644</span><br><span>--- a/openbsc/src/libfilter/bsc_msg_acc.c</span><br><span>+++ b/openbsc/src/libfilter/bsc_msg_acc.c</span><br><span>@@ -27,12 +27,12 @@</span><br><span> #include <string.h></span><br><span> </span><br><span> static const struct rate_ctr_desc acc_list_ctr_description[] = {</span><br><span style="color: hsl(0, 100%, 40%);">-       [ACC_LIST_LOCAL_FILTER] = { "access-list.local-filter", "Rejected by rule for local"},</span><br><span style="color: hsl(0, 100%, 40%);">-      [ACC_LIST_GLOBAL_FILTER]= { "access-list.global-filter", "Rejected by rule for global"},</span><br><span style="color: hsl(120, 100%, 40%);">+  [ACC_LIST_LOCAL_FILTER] = { "access-list:local-filter", "Rejected by rule for local"},</span><br><span style="color: hsl(120, 100%, 40%);">+    [ACC_LIST_GLOBAL_FILTER]= { "access-list:global-filter", "Rejected by rule for global"},</span><br><span> };</span><br><span> </span><br><span> static const struct rate_ctr_group_desc bsc_cfg_acc_list_desc = {</span><br><span style="color: hsl(0, 100%, 40%);">-     .group_name_prefix = "nat.filter",</span><br><span style="color: hsl(120, 100%, 40%);">+  .group_name_prefix = "nat:filter",</span><br><span>         .group_description = "NAT Access-List Statistics",</span><br><span>         .num_ctr = ARRAY_SIZE(acc_list_ctr_description),</span><br><span>     .ctr_desc = acc_list_ctr_description,</span><br><span>diff --git a/openbsc/src/osmo-bsc_nat/bsc_nat_utils.c b/openbsc/src/osmo-bsc_nat/bsc_nat_utils.c</span><br><span>index c12b29f..5a06d3f 100644</span><br><span>--- a/openbsc/src/osmo-bsc_nat/bsc_nat_utils.c</span><br><span>+++ b/openbsc/src/osmo-bsc_nat/bsc_nat_utils.c</span><br><span>@@ -46,23 +46,23 @@</span><br><span> #include <unistd.h></span><br><span> </span><br><span> static const struct rate_ctr_desc bsc_cfg_ctr_description[] = {</span><br><span style="color: hsl(0, 100%, 40%);">-    [BCFG_CTR_SCCP_CONN]     = { "sccp.conn",      "SCCP Connections         "},</span><br><span style="color: hsl(0, 100%, 40%);">-        [BCFG_CTR_SCCP_CALLS]    = { "sccp.calls",     "SCCP Assignment Commands "},</span><br><span style="color: hsl(0, 100%, 40%);">-        [BCFG_CTR_NET_RECONN]    = { "net.reconnects", "Network reconnects       "},</span><br><span style="color: hsl(0, 100%, 40%);">-        [BCFG_CTR_DROPPED_SCCP]  = { "dropped.sccp",   "Dropped SCCP connections."},</span><br><span style="color: hsl(0, 100%, 40%);">-        [BCFG_CTR_DROPPED_CALLS] = { "dropped.calls",  "Dropped active calls.    "},</span><br><span style="color: hsl(0, 100%, 40%);">-        [BCFG_CTR_REJECTED_CR]   = { "rejected.cr",    "Rejected CR due filter   "},</span><br><span style="color: hsl(0, 100%, 40%);">-        [BCFG_CTR_REJECTED_MSG]  = { "rejected.msg",   "Rejected MSG due filter  "},</span><br><span style="color: hsl(0, 100%, 40%);">-        [BCFG_CTR_ILL_PACKET]    = { "rejected.ill",   "Rejected due parse error "},</span><br><span style="color: hsl(0, 100%, 40%);">-        [BCFG_CTR_CON_TYPE_LU]   = { "conn.lu",        "Conn Location Update     "},</span><br><span style="color: hsl(0, 100%, 40%);">-        [BCFG_CTR_CON_CMSERV_RQ] = { "conn.rq",        "Conn CM Service Req      "},</span><br><span style="color: hsl(0, 100%, 40%);">-        [BCFG_CTR_CON_PAG_RESP]  = { "conn.pag",       "Conn Paging Response     "},</span><br><span style="color: hsl(0, 100%, 40%);">-        [BCFG_CTR_CON_SSA]       = { "conn.ssa",       "Conn USSD                "},</span><br><span style="color: hsl(0, 100%, 40%);">-        [BCFG_CTR_CON_OTHER]     = { "conn.other",     "Conn Other               "},</span><br><span style="color: hsl(120, 100%, 40%);">+      [BCFG_CTR_SCCP_CONN]     = { "sccp:conn",      "SCCP Connections         "},</span><br><span style="color: hsl(120, 100%, 40%);">+      [BCFG_CTR_SCCP_CALLS]    = { "sccp:calls",     "SCCP Assignment Commands "},</span><br><span style="color: hsl(120, 100%, 40%);">+      [BCFG_CTR_NET_RECONN]    = { "net:reconnects", "Network reconnects       "},</span><br><span style="color: hsl(120, 100%, 40%);">+      [BCFG_CTR_DROPPED_SCCP]  = { "dropped:sccp",   "Dropped SCCP connections."},</span><br><span style="color: hsl(120, 100%, 40%);">+      [BCFG_CTR_DROPPED_CALLS] = { "dropped:calls",  "Dropped active calls.    "},</span><br><span style="color: hsl(120, 100%, 40%);">+      [BCFG_CTR_REJECTED_CR]   = { "rejected:cr",    "Rejected CR due filter   "},</span><br><span style="color: hsl(120, 100%, 40%);">+      [BCFG_CTR_REJECTED_MSG]  = { "rejected:msg",   "Rejected MSG due filter  "},</span><br><span style="color: hsl(120, 100%, 40%);">+      [BCFG_CTR_ILL_PACKET]    = { "rejected:ill",   "Rejected due parse error "},</span><br><span style="color: hsl(120, 100%, 40%);">+      [BCFG_CTR_CON_TYPE_LU]   = { "conn:lu",        "Conn Location Update     "},</span><br><span style="color: hsl(120, 100%, 40%);">+      [BCFG_CTR_CON_CMSERV_RQ] = { "conn:rq",        "Conn CM Service Req      "},</span><br><span style="color: hsl(120, 100%, 40%);">+      [BCFG_CTR_CON_PAG_RESP]  = { "conn:pag",       "Conn Paging Response     "},</span><br><span style="color: hsl(120, 100%, 40%);">+      [BCFG_CTR_CON_SSA]       = { "conn:ssa",       "Conn USSD                "},</span><br><span style="color: hsl(120, 100%, 40%);">+      [BCFG_CTR_CON_OTHER]     = { "conn:other",     "Conn Other               "},</span><br><span> };</span><br><span> </span><br><span> static const struct rate_ctr_group_desc bsc_cfg_ctrg_desc = {</span><br><span style="color: hsl(0, 100%, 40%);">-     .group_name_prefix = "nat.bsc",</span><br><span style="color: hsl(120, 100%, 40%);">+     .group_name_prefix = "nat:bsc",</span><br><span>    .group_description = "NAT BSC Statistics",</span><br><span>         .num_ctr = ARRAY_SIZE(bsc_cfg_ctr_description),</span><br><span>      .ctr_desc = bsc_cfg_ctr_description,</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/9752">change 9752</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/9752"/><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: I55470ae74d350e4020209921fd8a09b51b120a41 </div>
<div style="display:none"> Gerrit-Change-Number: 9752 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </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 </div>