From f10c57801adc3f92831e48ed8a9286c26a9ede4a Mon Sep 17 00:00:00 2001 From: Pau Espin Pedrol Date: Mon, 8 Oct 2018 20:20:10 +0200 Subject: [PATCH] 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: Icec5338d3242137980fa05d2c7ae2db940afb542 --- src/osmo_client_main.c | 24 ++++++++++++------------ src/osmo_server_main.c | 20 ++++++++++---------- src/osmo_server_network.c | 2 +- 3 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/osmo_client_main.c b/src/osmo_client_main.c index b491a25..f571b96 100644 --- a/src/osmo_client_main.c +++ b/src/osmo_client_main.c @@ -55,21 +55,21 @@ extern void *tall_ctr_ctx; static const struct rate_ctr_desc pcap_client_ctr_desc[] = { - [CLIENT_CTR_CONNECT] = { "server.connect", "Connects to the server" }, - [CLIENT_CTR_BYTES] = { "captured.bytes", "Captured bytes " }, - [CLIENT_CTR_PKTS] = { "captured.pkts", "Captured packets " }, - [CLIENT_CTR_2BIG] = { "bpf.too_big", "Captured data too big " }, - [CLIENT_CTR_NOMEM] = { "client.no_mem", "No memory available " }, - [CLIENT_CTR_QERR] = { "client.queue_err", "Can not queue data " }, - [CLIENT_CTR_PERR] = { "client.pcap_err", "libpcap error " }, - [CLIENT_CTR_WERR] = { "client.write_err", "Write error " }, - [CLIENT_CTR_P_RECV] = { "pcap.recv", "PCAP received packets " }, - [CLIENT_CTR_P_DROP] = { "pcap.drop", "PCAP dropped packets " }, - [CLIENT_CTR_P_IFDROP] = { "pcap.ifdrop", "iface dropped packets " }, + [CLIENT_CTR_CONNECT] = { "server:connect", "Connects to the server" }, + [CLIENT_CTR_BYTES] = { "captured:bytes", "Captured bytes " }, + [CLIENT_CTR_PKTS] = { "captured:pkts", "Captured packets " }, + [CLIENT_CTR_2BIG] = { "bpf:too_big", "Captured data too big " }, + [CLIENT_CTR_NOMEM] = { "client:no_mem", "No memory available " }, + [CLIENT_CTR_QERR] = { "client:queue_err", "Can not queue data " }, + [CLIENT_CTR_PERR] = { "client:pcap_err", "libpcap error " }, + [CLIENT_CTR_WERR] = { "client:write_err", "Write error " }, + [CLIENT_CTR_P_RECV] = { "pcap:recv", "PCAP received packets " }, + [CLIENT_CTR_P_DROP] = { "pcap:drop", "PCAP dropped packets " }, + [CLIENT_CTR_P_IFDROP] = { "pcap:ifdrop", "iface dropped packets " }, }; static const struct rate_ctr_group_desc pcap_client_ctr_group_desc = { - .group_name_prefix = "pcap.client", + .group_name_prefix = "pcap:client", .group_description = "PCAP Client statistics", .num_ctr = ARRAY_SIZE(pcap_client_ctr_desc), .ctr_desc = pcap_client_ctr_desc, diff --git a/src/osmo_server_main.c b/src/osmo_server_main.c index 5c4f1cb..d95c994 100644 --- a/src/osmo_server_main.c +++ b/src/osmo_server_main.c @@ -56,18 +56,18 @@ extern void *tall_ctr_ctx; static const struct rate_ctr_desc pcap_peer_ctr_desc[] = { - [PEER_CTR_CONNECT] = { "peer.connect", "Connect of a peer " }, - [PEER_CTR_BYTES] = { "peer.bytes", "Received bytes " }, - [PEER_CTR_PKTS] = { "peer.pkts", "Received packets " }, - [PEER_CTR_PROTATE] = { "peer.file_rotated","Capture file rotated" }, + [PEER_CTR_CONNECT] = { "peer:connect", "Connect of a peer " }, + [PEER_CTR_BYTES] = { "peer:bytes", "Received bytes " }, + [PEER_CTR_PKTS] = { "peer:pkts", "Received packets " }, + [PEER_CTR_PROTATE] = { "peer:file_rotated","Capture file rotated" }, }; static const struct rate_ctr_desc pcap_server_ctr_desc[] = { - [SERVER_CTR_CONNECT] = { "server.connect", "Connect of a peer " }, - [SERVER_CTR_BYTES] = { "server.bytes", "Received bytes " }, - [SERVER_CTR_PKTS] = { "server.pkts", "Received packets " }, - [SERVER_CTR_PROTATE] = { "server.file_rotated", "Capture file rotated" }, - [SERVER_CTR_NOCLIENT] = { "server.no_client", "Unknown connected " }, + [SERVER_CTR_CONNECT] = { "server:connect", "Connect of a peer " }, + [SERVER_CTR_BYTES] = { "server:bytes", "Received bytes " }, + [SERVER_CTR_PKTS] = { "server:pkts", "Received packets " }, + [SERVER_CTR_PROTATE] = { "server:file_rotated", "Capture file rotated" }, + [SERVER_CTR_NOCLIENT] = { "server:no_client", "Unknown connected " }, }; const struct rate_ctr_group_desc pcap_peer_group_desc = { @@ -79,7 +79,7 @@ const struct rate_ctr_group_desc pcap_peer_group_desc = { }; static const struct rate_ctr_group_desc pcap_server_group_desc = { - .group_name_prefix = "pcap.server", + .group_name_prefix = "pcap:server", .group_description = "PCAP Server global statistics", .num_ctr = ARRAY_SIZE(pcap_server_ctr_desc), .ctr_desc = pcap_server_ctr_desc, diff --git a/src/osmo_server_network.c b/src/osmo_server_network.c index a854223..695090d 100644 --- a/src/osmo_server_network.c +++ b/src/osmo_server_network.c @@ -285,7 +285,7 @@ struct osmo_pcap_conn *osmo_pcap_server_find(struct osmo_pcap_server *server, return NULL; } memcpy(desc, &pcap_peer_group_desc, sizeof(pcap_peer_group_desc)); - desc->group_name_prefix = talloc_asprintf(desc, "pcap.peer.%s", name); + desc->group_name_prefix = talloc_asprintf(desc, "pcap:peer:%s", name); if (!desc->group_name_prefix) { LOGP(DSERVER, LOGL_ERROR, "Failed to allocate group name prefix peer=%s\n", name);