diff options
| author | Pau Espin Pedrol <pespin@sysmocom.de> | 2018-06-27 15:56:24 +0200 |
|---|---|---|
| committer | Pau Espin Pedrol <pespin@sysmocom.de> | 2018-06-27 17:04:18 +0200 |
| commit | 360284d4d797519faed33559b0ae746b6c17e68a (patch) | |
| tree | a06163fe73d7be4692906ba1c1b140aef3628493 /openbsc | |
| parent | 57201c6c0a1f53390f3108a39e84744edf0c9bb1 (diff) | |
bsc-nat: Replace '.' in counter names with ':'
The '.' is illegal character in counter names, as they are exported
via CTRL interface, where '.' has a special meaning that cannot be
used by strings comprising the variable name.
Change-Id: I55470ae74d350e4020209921fd8a09b51b120a41
Diffstat (limited to 'openbsc')
| -rw-r--r-- | openbsc/src/libfilter/bsc_msg_acc.c | 6 | ||||
| -rw-r--r-- | openbsc/src/osmo-bsc_nat/bsc_nat_utils.c | 28 |
2 files changed, 17 insertions, 17 deletions
diff --git a/openbsc/src/libfilter/bsc_msg_acc.c b/openbsc/src/libfilter/bsc_msg_acc.c index bfc5bdd3f..7b658e440 100644 --- a/openbsc/src/libfilter/bsc_msg_acc.c +++ b/openbsc/src/libfilter/bsc_msg_acc.c @@ -27,12 +27,12 @@ #include <string.h> static const struct rate_ctr_desc acc_list_ctr_description[] = { - [ACC_LIST_LOCAL_FILTER] = { "access-list.local-filter", "Rejected by rule for local"}, - [ACC_LIST_GLOBAL_FILTER]= { "access-list.global-filter", "Rejected by rule for global"}, + [ACC_LIST_LOCAL_FILTER] = { "access-list:local-filter", "Rejected by rule for local"}, + [ACC_LIST_GLOBAL_FILTER]= { "access-list:global-filter", "Rejected by rule for global"}, }; static const struct rate_ctr_group_desc bsc_cfg_acc_list_desc = { - .group_name_prefix = "nat.filter", + .group_name_prefix = "nat:filter", .group_description = "NAT Access-List Statistics", .num_ctr = ARRAY_SIZE(acc_list_ctr_description), .ctr_desc = acc_list_ctr_description, diff --git a/openbsc/src/osmo-bsc_nat/bsc_nat_utils.c b/openbsc/src/osmo-bsc_nat/bsc_nat_utils.c index c12b29f1f..5a06d3fd3 100644 --- a/openbsc/src/osmo-bsc_nat/bsc_nat_utils.c +++ b/openbsc/src/osmo-bsc_nat/bsc_nat_utils.c @@ -46,23 +46,23 @@ #include <unistd.h> static const struct rate_ctr_desc bsc_cfg_ctr_description[] = { - [BCFG_CTR_SCCP_CONN] = { "sccp.conn", "SCCP Connections "}, - [BCFG_CTR_SCCP_CALLS] = { "sccp.calls", "SCCP Assignment Commands "}, - [BCFG_CTR_NET_RECONN] = { "net.reconnects", "Network reconnects "}, - [BCFG_CTR_DROPPED_SCCP] = { "dropped.sccp", "Dropped SCCP connections."}, - [BCFG_CTR_DROPPED_CALLS] = { "dropped.calls", "Dropped active calls. "}, - [BCFG_CTR_REJECTED_CR] = { "rejected.cr", "Rejected CR due filter "}, - [BCFG_CTR_REJECTED_MSG] = { "rejected.msg", "Rejected MSG due filter "}, - [BCFG_CTR_ILL_PACKET] = { "rejected.ill", "Rejected due parse error "}, - [BCFG_CTR_CON_TYPE_LU] = { "conn.lu", "Conn Location Update "}, - [BCFG_CTR_CON_CMSERV_RQ] = { "conn.rq", "Conn CM Service Req "}, - [BCFG_CTR_CON_PAG_RESP] = { "conn.pag", "Conn Paging Response "}, - [BCFG_CTR_CON_SSA] = { "conn.ssa", "Conn USSD "}, - [BCFG_CTR_CON_OTHER] = { "conn.other", "Conn Other "}, + [BCFG_CTR_SCCP_CONN] = { "sccp:conn", "SCCP Connections "}, + [BCFG_CTR_SCCP_CALLS] = { "sccp:calls", "SCCP Assignment Commands "}, + [BCFG_CTR_NET_RECONN] = { "net:reconnects", "Network reconnects "}, + [BCFG_CTR_DROPPED_SCCP] = { "dropped:sccp", "Dropped SCCP connections."}, + [BCFG_CTR_DROPPED_CALLS] = { "dropped:calls", "Dropped active calls. "}, + [BCFG_CTR_REJECTED_CR] = { "rejected:cr", "Rejected CR due filter "}, + [BCFG_CTR_REJECTED_MSG] = { "rejected:msg", "Rejected MSG due filter "}, + [BCFG_CTR_ILL_PACKET] = { "rejected:ill", "Rejected due parse error "}, + [BCFG_CTR_CON_TYPE_LU] = { "conn:lu", "Conn Location Update "}, + [BCFG_CTR_CON_CMSERV_RQ] = { "conn:rq", "Conn CM Service Req "}, + [BCFG_CTR_CON_PAG_RESP] = { "conn:pag", "Conn Paging Response "}, + [BCFG_CTR_CON_SSA] = { "conn:ssa", "Conn USSD "}, + [BCFG_CTR_CON_OTHER] = { "conn:other", "Conn Other "}, }; static const struct rate_ctr_group_desc bsc_cfg_ctrg_desc = { - .group_name_prefix = "nat.bsc", + .group_name_prefix = "nat:bsc", .group_description = "NAT BSC Statistics", .num_ctr = ARRAY_SIZE(bsc_cfg_ctr_description), .ctr_desc = bsc_cfg_ctr_description, |