This is merely a historical archive of years 2008-2021, before the migration to mailman3.
A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.
Pau Espin Pedrol gerrit-no-reply at lists.osmocom.orgPau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11276
Change subject: Replace '.' in counter names with ':'
......................................................................
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
---
M src/osmo_client_main.c
M src/osmo_server_main.c
M src/osmo_server_network.c
3 files changed, 23 insertions(+), 23 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-pcap refs/changes/76/11276/1
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 @@
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 @@
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 @@
};
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 @@
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);
--
To view, visit https://gerrit.osmocom.org/11276
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-pcap
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: Icec5338d3242137980fa05d2c7ae2db940afb542
Gerrit-Change-Number: 11276
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol <pespin at sysmocom.de>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20181008/af32a082/attachment.htm>