<p>Pau Espin Pedrol has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/11276">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">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: Icec5338d3242137980fa05d2c7ae2db940afb542<br>---<br>M src/osmo_client_main.c<br>M src/osmo_server_main.c<br>M src/osmo_server_network.c<br>3 files changed, 23 insertions(+), 23 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-pcap refs/changes/76/11276/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo_client_main.c b/src/osmo_client_main.c</span><br><span>index b491a25..f571b96 100644</span><br><span>--- a/src/osmo_client_main.c</span><br><span>+++ b/src/osmo_client_main.c</span><br><span>@@ -55,21 +55,21 @@</span><br><span> </span><br><span> </span><br><span> static const struct rate_ctr_desc pcap_client_ctr_desc[] = {</span><br><span style="color: hsl(0, 100%, 40%);">- [CLIENT_CTR_CONNECT] = { "server.connect", "Connects to the server" },</span><br><span style="color: hsl(0, 100%, 40%);">- [CLIENT_CTR_BYTES] = { "captured.bytes", "Captured bytes " },</span><br><span style="color: hsl(0, 100%, 40%);">- [CLIENT_CTR_PKTS] = { "captured.pkts", "Captured packets " },</span><br><span style="color: hsl(0, 100%, 40%);">- [CLIENT_CTR_2BIG] = { "bpf.too_big", "Captured data too big " },</span><br><span style="color: hsl(0, 100%, 40%);">- [CLIENT_CTR_NOMEM] = { "client.no_mem", "No memory available " },</span><br><span style="color: hsl(0, 100%, 40%);">- [CLIENT_CTR_QERR] = { "client.queue_err", "Can not queue data " },</span><br><span style="color: hsl(0, 100%, 40%);">- [CLIENT_CTR_PERR] = { "client.pcap_err", "libpcap error " },</span><br><span style="color: hsl(0, 100%, 40%);">- [CLIENT_CTR_WERR] = { "client.write_err", "Write error " },</span><br><span style="color: hsl(0, 100%, 40%);">- [CLIENT_CTR_P_RECV] = { "pcap.recv", "PCAP received packets " },</span><br><span style="color: hsl(0, 100%, 40%);">- [CLIENT_CTR_P_DROP] = { "pcap.drop", "PCAP dropped packets " },</span><br><span style="color: hsl(0, 100%, 40%);">- [CLIENT_CTR_P_IFDROP] = { "pcap.ifdrop", "iface dropped packets " },</span><br><span style="color: hsl(120, 100%, 40%);">+ [CLIENT_CTR_CONNECT] = { "server:connect", "Connects to the server" },</span><br><span style="color: hsl(120, 100%, 40%);">+ [CLIENT_CTR_BYTES] = { "captured:bytes", "Captured bytes " },</span><br><span style="color: hsl(120, 100%, 40%);">+ [CLIENT_CTR_PKTS] = { "captured:pkts", "Captured packets " },</span><br><span style="color: hsl(120, 100%, 40%);">+ [CLIENT_CTR_2BIG] = { "bpf:too_big", "Captured data too big " },</span><br><span style="color: hsl(120, 100%, 40%);">+ [CLIENT_CTR_NOMEM] = { "client:no_mem", "No memory available " },</span><br><span style="color: hsl(120, 100%, 40%);">+ [CLIENT_CTR_QERR] = { "client:queue_err", "Can not queue data " },</span><br><span style="color: hsl(120, 100%, 40%);">+ [CLIENT_CTR_PERR] = { "client:pcap_err", "libpcap error " },</span><br><span style="color: hsl(120, 100%, 40%);">+ [CLIENT_CTR_WERR] = { "client:write_err", "Write error " },</span><br><span style="color: hsl(120, 100%, 40%);">+ [CLIENT_CTR_P_RECV] = { "pcap:recv", "PCAP received packets " },</span><br><span style="color: hsl(120, 100%, 40%);">+ [CLIENT_CTR_P_DROP] = { "pcap:drop", "PCAP dropped packets " },</span><br><span style="color: hsl(120, 100%, 40%);">+ [CLIENT_CTR_P_IFDROP] = { "pcap:ifdrop", "iface dropped packets " },</span><br><span> };</span><br><span> </span><br><span> static const struct rate_ctr_group_desc pcap_client_ctr_group_desc = {</span><br><span style="color: hsl(0, 100%, 40%);">- .group_name_prefix = "pcap.client",</span><br><span style="color: hsl(120, 100%, 40%);">+ .group_name_prefix = "pcap:client",</span><br><span> .group_description = "PCAP Client statistics",</span><br><span> .num_ctr = ARRAY_SIZE(pcap_client_ctr_desc),</span><br><span> .ctr_desc = pcap_client_ctr_desc,</span><br><span>diff --git a/src/osmo_server_main.c b/src/osmo_server_main.c</span><br><span>index 5c4f1cb..d95c994 100644</span><br><span>--- a/src/osmo_server_main.c</span><br><span>+++ b/src/osmo_server_main.c</span><br><span>@@ -56,18 +56,18 @@</span><br><span> </span><br><span> </span><br><span> static const struct rate_ctr_desc pcap_peer_ctr_desc[] = {</span><br><span style="color: hsl(0, 100%, 40%);">- [PEER_CTR_CONNECT] = { "peer.connect", "Connect of a peer " },</span><br><span style="color: hsl(0, 100%, 40%);">- [PEER_CTR_BYTES] = { "peer.bytes", "Received bytes " },</span><br><span style="color: hsl(0, 100%, 40%);">- [PEER_CTR_PKTS] = { "peer.pkts", "Received packets " },</span><br><span style="color: hsl(0, 100%, 40%);">- [PEER_CTR_PROTATE] = { "peer.file_rotated","Capture file rotated" },</span><br><span style="color: hsl(120, 100%, 40%);">+ [PEER_CTR_CONNECT] = { "peer:connect", "Connect of a peer " },</span><br><span style="color: hsl(120, 100%, 40%);">+ [PEER_CTR_BYTES] = { "peer:bytes", "Received bytes " },</span><br><span style="color: hsl(120, 100%, 40%);">+ [PEER_CTR_PKTS] = { "peer:pkts", "Received packets " },</span><br><span style="color: hsl(120, 100%, 40%);">+ [PEER_CTR_PROTATE] = { "peer:file_rotated","Capture file rotated" },</span><br><span> };</span><br><span> </span><br><span> static const struct rate_ctr_desc pcap_server_ctr_desc[] = {</span><br><span style="color: hsl(0, 100%, 40%);">- [SERVER_CTR_CONNECT] = { "server.connect", "Connect of a peer " },</span><br><span style="color: hsl(0, 100%, 40%);">- [SERVER_CTR_BYTES] = { "server.bytes", "Received bytes " },</span><br><span style="color: hsl(0, 100%, 40%);">- [SERVER_CTR_PKTS] = { "server.pkts", "Received packets " },</span><br><span style="color: hsl(0, 100%, 40%);">- [SERVER_CTR_PROTATE] = { "server.file_rotated", "Capture file rotated" },</span><br><span style="color: hsl(0, 100%, 40%);">- [SERVER_CTR_NOCLIENT] = { "server.no_client", "Unknown connected " },</span><br><span style="color: hsl(120, 100%, 40%);">+ [SERVER_CTR_CONNECT] = { "server:connect", "Connect of a peer " },</span><br><span style="color: hsl(120, 100%, 40%);">+ [SERVER_CTR_BYTES] = { "server:bytes", "Received bytes " },</span><br><span style="color: hsl(120, 100%, 40%);">+ [SERVER_CTR_PKTS] = { "server:pkts", "Received packets " },</span><br><span style="color: hsl(120, 100%, 40%);">+ [SERVER_CTR_PROTATE] = { "server:file_rotated", "Capture file rotated" },</span><br><span style="color: hsl(120, 100%, 40%);">+ [SERVER_CTR_NOCLIENT] = { "server:no_client", "Unknown connected " },</span><br><span> };</span><br><span> </span><br><span> const struct rate_ctr_group_desc pcap_peer_group_desc = {</span><br><span>@@ -79,7 +79,7 @@</span><br><span> };</span><br><span> </span><br><span> static const struct rate_ctr_group_desc pcap_server_group_desc = {</span><br><span style="color: hsl(0, 100%, 40%);">- .group_name_prefix = "pcap.server",</span><br><span style="color: hsl(120, 100%, 40%);">+ .group_name_prefix = "pcap:server",</span><br><span> .group_description = "PCAP Server global statistics",</span><br><span> .num_ctr = ARRAY_SIZE(pcap_server_ctr_desc),</span><br><span> .ctr_desc = pcap_server_ctr_desc,</span><br><span>diff --git a/src/osmo_server_network.c b/src/osmo_server_network.c</span><br><span>index a854223..695090d 100644</span><br><span>--- a/src/osmo_server_network.c</span><br><span>+++ b/src/osmo_server_network.c</span><br><span>@@ -285,7 +285,7 @@</span><br><span> return NULL;</span><br><span> }</span><br><span> memcpy(desc, &pcap_peer_group_desc, sizeof(pcap_peer_group_desc));</span><br><span style="color: hsl(0, 100%, 40%);">- desc->group_name_prefix = talloc_asprintf(desc, "pcap.peer.%s", name);</span><br><span style="color: hsl(120, 100%, 40%);">+ desc->group_name_prefix = talloc_asprintf(desc, "pcap:peer:%s", name);</span><br><span> if (!desc->group_name_prefix) {</span><br><span> LOGP(DSERVER, LOGL_ERROR,</span><br><span> "Failed to allocate group name prefix peer=%s\n", name);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11276">change 11276</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/11276"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-pcap </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: Icec5338d3242137980fa05d2c7ae2db940afb542 </div>
<div style="display:none"> Gerrit-Change-Number: 11276 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Pau Espin Pedrol <pespin@sysmocom.de> </div>