ua1zbe
/
aprsc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dupecheck/acconting/web: Count duplicate packets per client and listener

This commit is contained in:
Heikki Hannikainen 2012-10-29 20:34:25 +02:00
parent 77506fdfb3
commit 2e6fe52daf
7 changed files with 32 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/accept.c
View File

@ -1340,6 +1340,7 @@ int accept_listener_status(cJSON *listeners, cJSON *totals)
cJSON_AddNumberToObject(jl, "pkts_rx", l->portaccount->rxpackets);
cJSON_AddNumberToObject(jl, "pkts_tx", l->portaccount->txpackets);
cJSON_AddNumberToObject(jl, "pkts_ign", l->portaccount->rxdrops);
cJSON_AddNumberToObject(jl, "pkts_dup", l->portaccount->rxdupes);
json_add_rxerrs(jl, "rx_errs", l->portaccount->rxerrs);
cJSON_AddItemToArray(listeners, jl);

2
src/incoming.c
View File

@ -968,7 +968,7 @@ in_drop:
/* Account the one incoming packet.
* Incoming bytes were already accounted earlier.
*/
clientaccount_add(c, l4proto, 0, 1, 0, 0, (e < 0) ? e : 0);
clientaccount_add(c, l4proto, 0, 1, 0, 0, (e < 0) ? e : 0, 0);
return 0;
}

15
src/outgoing.c
View File

@ -27,9 +27,9 @@
static inline void send_single(struct worker_t *self, struct client_t *c, struct pbuf_t *pb)
{
if (c->udp_port && c->udpclient)
clientaccount_add( c, IPPROTO_UDP, 0, 0, 0, 1, 0);
clientaccount_add( c, IPPROTO_UDP, 0, 0, 0, 1, 0, 0);
else
clientaccount_add( c, IPPROTO_TCP, 0, 0, 0, 1, 0);
clientaccount_add( c, IPPROTO_TCP, 0, 0, 0, 1, 0, 0);
client_write(self, c, pb->data, pb->packet_len);
}
@ -59,6 +59,17 @@ static void process_outgoing_single(struct worker_t *self, struct pbuf_t *pb)
send_single(self, c, pb);
}
/* Check if I have the client which sent this dupe, and
* increment it's dupe counter
*/
/* OPTIMIZE: we walk through all clients for each dupe - how to find it quickly? */
for (c = self->clients; (c); c = c->next) {
if (c == pb->origin) {
clientaccount_add(c, -1, 0, 0, 0, 0, 0, 1);
break;
}
}
return;
}

2
src/web/aprsc.css
View File

@ -68,7 +68,7 @@ div.msg_e, div.msg_i, div.msg_s {
padding: 5px;
margin: 5px 25px 5px 0px;
border-radius: 5px;
width: 450px;
width: 480px;
}
/* tooltip */

10
src/web/aprsc.js
View File

@ -98,12 +98,12 @@ function client_bytes_rates(c, k)
function client_pkts_rx(c, k)
{
if (isUndefined(c['pkts_ign']))
return c['pkts_rx'];
//if (isUndefined(c['pkts_ign']))
// return c['pkts_rx'];
var s = c['pkts_rx'] + '/' + c['pkts_ign'];
var s = c['pkts_rx'] + '/' + c['pkts_dup'] + '/' + c['pkts_ign'];
if (c['pkts_ign'] > 0)
if (c['pkts_ign'] > 0 || c['pkts_dup'] > 0)
return '<span class="'
+ ((c['pkts_ign'] / c['pkts_rx'] > 0.1) ? 'rxerr_red' : 'rxerr')
+ '" onclick="return rx_err_popup(event, ' + c['fd'] + ');">' + s + '</span>';
@ -386,7 +386,7 @@ function rx_err_contents(fd)
if (isUndefined(er))
return 'No rx errors for client on fd ' + fd;
var s = '<b>Received packets dropped: ' + fd_clients[fd]['pkts_ign'] + ' out of ' + fd_clients[fd]['pkts_rx'] + '</b><br />';
var s = '<b>Receive drops: ' + fd_clients[fd]['pkts_dup'] + ' dupes, ' + fd_clients[fd]['pkts_ign'] + ' errors in ' + fd_clients[fd]['pkts_rx'] + '</b><br />';
for (var i = 0; i < rx_err_codes.length; i++) {
if (er[i] < 1)

14
src/worker.c
View File

@ -587,7 +587,7 @@ char *hexsockaddr(const struct sockaddr *sa, const int addr_len)
return hstrdup(eb);
}
void clientaccount_add(struct client_t *c, int l4proto, int rxbytes, int rxpackets, int txbytes, int txpackets, int rxerr)
void clientaccount_add(struct client_t *c, int l4proto, int rxbytes, int rxpackets, int txbytes, int txpackets, int rxerr, int rxdupes)
{
struct portaccount_t *pa = NULL;
int rxdrops = 0;
@ -604,6 +604,7 @@ void clientaccount_add(struct client_t *c, int l4proto, int rxbytes, int rxpacke
c->localaccount.txbytes += txbytes;
c->localaccount.rxpackets += rxpackets;
c->localaccount.txpackets += txpackets;
c->localaccount.rxdupes += rxdupes;
if (rxdrops) {
c->localaccount.rxdrops += 1;
c->localaccount.rxerrs[rxerr] += 1;
@ -621,6 +622,7 @@ void clientaccount_add(struct client_t *c, int l4proto, int rxbytes, int rxpacke
__sync_fetch_and_add(&pa->txbytes, txbytes);
__sync_fetch_and_add(&pa->rxpackets, rxpackets);
__sync_fetch_and_add(&pa->txpackets, txpackets);
__sync_fetch_and_add(&pa->rxdupes, rxdupes);
if (rxdrops) {
__sync_fetch_and_add(&pa->rxdrops, 1);
__sync_fetch_and_add(&pa->rxerrs[rxerr], 1);
@ -631,6 +633,7 @@ void clientaccount_add(struct client_t *c, int l4proto, int rxbytes, int rxpacke
pa->txbytes += txbytes;
pa->rxpackets += rxpackets;
pa->txpackets += txpackets;
pa->rxdupes += rxdupes;
if (rxdrops) {
pa->rxdrops += 1;
pa->rxerrs[rxerr] += 1;
@ -848,7 +851,7 @@ int client_write(struct worker_t *self, struct client_t *c, char *p, int len)
// hlog( LOG_DEBUG, "UDP from %d to client port %d, sendto rc=%d", c->udpclient->portnum, c->udp_port, i );
if (i > 0)
clientaccount_add( c, IPPROTO_UDP, 0, 0, i, 0, 0);
clientaccount_add( c, IPPROTO_UDP, 0, 0, i, 0, 0, 0);
return i;
}
@ -863,7 +866,7 @@ int client_write(struct worker_t *self, struct client_t *c, char *p, int len)
* will be incremented only when we actually transmit a packet
* instead of a keepalive.
*/
clientaccount_add( c, IPPROTO_TCP, 0, 0, len, 0, 0);
clientaccount_add( c, IPPROTO_TCP, 0, 0, len, 0, 0, 0);
}
if (c->obuf_end + len > c->obuf_size) {
@ -1088,7 +1091,7 @@ static int handle_corepeer_readable(struct worker_t *self, struct client_t *c)
hlog(LOG_DEBUG, "worker thread passing UDP packet from %s to handler: %*s", addrs, r, c->ibuf);
hfree(addrs);
*/
clientaccount_add( rc, IPPROTO_UDP, r, 0, 0, 0, 0); /* Account byte count. incoming_handler() will account packets. */
clientaccount_add( rc, IPPROTO_UDP, r, 0, 0, 0, 0, 0); /* Account byte count. incoming_handler() will account packets. */
rc->last_read = tick;
/* Ignore CRs and LFs in UDP input packet - the current core peer system puts 1 APRS packet in each
@ -1150,7 +1153,7 @@ static int handle_client_readable(struct worker_t *self, struct client_t *c)
return -1;
}
clientaccount_add(c, IPPROTO_TCP, r, 0, 0, 0, 0); /* Number of packets is now unknown,
clientaccount_add(c, IPPROTO_TCP, r, 0, 0, 0, 0, 0); /* Number of packets is now unknown,
byte count is collected.
The incoming_handler() will account
packets. */
@ -1931,6 +1934,7 @@ static struct cJSON *worker_client_json(struct client_t *c, int liveup_info)
cJSON_AddNumberToObject(jc, "pkts_rx", c->localaccount.rxpackets);
cJSON_AddNumberToObject(jc, "pkts_tx", c->localaccount.txpackets);
cJSON_AddNumberToObject(jc, "pkts_ign", c->localaccount.rxdrops);
cJSON_AddNumberToObject(jc, "pkts_dup", c->localaccount.rxdupes);
cJSON_AddNumberToObject(jc, "heard_count", c->client_heard_count);
cJSON_AddNumberToObject(jc, "courtesy_count", c->client_courtesy_count);

4
src/worker.h
View File

@ -210,7 +210,7 @@ struct portaccount_t { /* Port accounter tracks port usage, and traffic
long long rxbytes, txbytes;
long long rxpackets, txpackets;
long long rxdrops;
long long rxdrops, rxdupes;
long long rxerrs[INERR_BUCKETS];
/* record usage references */
@ -469,7 +469,7 @@ extern void port_accounter_drop(struct portaccount_t *p);
extern char *strsockaddr(const struct sockaddr *sa, const int addr_len);
extern char *hexsockaddr(const struct sockaddr *sa, const int addr_len);
extern void clientaccount_add(struct client_t *c, int l4proto, int rxbytes, int rxpackets, int txbytes, int txpackets, int rxerr);
extern void clientaccount_add(struct client_t *c, int l4proto, int rxbytes, int rxpackets, int txbytes, int txpackets, int rxerr, int rxdupes);
extern void json_add_rxerrs(cJSON *root, const char *key, long long vals[]);
extern int worker_client_list(cJSON *workers, cJSON *clients, cJSON *uplinks, cJSON *peers, cJSON *totals, cJSON *memory);