Add unique packets counter, differential loss and diversity calculation #419

Author: svpcom

src/rx.cpp

@@ -265,7 +265,7 @@ void Receiver::loop_iter(void)
 
 
 Aggregator::Aggregator(const string &client_addr, int client_port, const string &keypair, uint64_t epoch, uint32_t channel_id) : \
-    count_p_all(0), count_b_all(0), count_p_dec_err(0), count_p_dec_ok(0), count_p_fec_recovered(0),
+    count_p_all(0), count_b_all(0), count_p_dec_err(0), count_p_session(0), count_p_data(0), count_p_fec_recovered(0),
     count_p_lost(0), count_p_bad(0), count_p_override(0), count_p_outgoing(0), count_b_outgoing(0),
     fec_p(NULL), fec_k(-1), fec_n(-1), seq(0), rx_ring{}, rx_ring_front(0), rx_ring_alloc(0),
     last_known_block((uint64_t)-1), epoch(epoch), channel_id(channel_id)
@@ -490,8 +490,14 @@ void Aggregator::dump_stats(void)
                 it->second.snr_min, it->second.snr_sum / it->second.count_all, it->second.snr_max);
     }
 
-    IPC_MSG("%" PRIu64 "\tPKT\t%u:%u:%u:%u:%u:%u:%u:%u:%u\n", ts, count_p_all, count_b_all, count_p_dec_err,
-            count_p_dec_ok, count_p_fec_recovered, count_p_lost, count_p_bad, count_p_outgoing, count_b_outgoing);
+    IPC_MSG("%" PRIu64 "\tPKT\t%u:%u:%u:%u:%u:%u:%u:%u:%u:%u:%u\n", ts,
+            count_p_all, count_b_all,                    // incoming
+            count_p_dec_err,                             // decryption
+            count_p_session, count_p_data,               // classification
+            (uint32_t)count_p_uniq.size(),               // unique check
+            count_p_fec_recovered, count_p_lost,         // fec recovering
+            count_p_bad,                                 // internal errors
+            count_p_outgoing, count_b_outgoing);         // outgoing
     IPC_MSG_SEND();
 
     if(count_p_override)
@@ -643,8 +649,11 @@ void Aggregator::process_packet(const uint8_t *buf, size_t size, uint8_t wlan_id
             return;
         }
 
-        count_p_dec_ok += 1;
-        log_rssi(sockaddr, wlan_idx, antenna, rssi, noise, freq, mcs_index, bandwidth);
+        count_p_session += 1;
+
+        // Ignore RSSI (and per-card rx counters) for session packets to simplify calculation
+        // of lost packets because session packets doesn't have any serial number and it is
+        // too hard to calculate number of unique session packets
 
         if (memcmp(session_key, new_session_data->session_key, sizeof(session_key)) != 0)
         {
@@ -686,7 +695,7 @@ void Aggregator::process_packet(const uint8_t *buf, size_t size, uint8_t wlan_id
         return;
     }
 
-    count_p_dec_ok += 1;
+    count_p_data += 1;
     log_rssi(sockaddr, wlan_idx, antenna, rssi, noise, freq, mcs_index, bandwidth);
 
     assert(decrypted_len >= sizeof(wpacket_hdr_t));
@@ -695,6 +704,8 @@ void Aggregator::process_packet(const uint8_t *buf, size_t size, uint8_t wlan_id
     uint64_t block_idx = be64toh(block_hdr->data_nonce) >> 8;
     uint8_t fragment_idx = (uint8_t)(be64toh(block_hdr->data_nonce) & 0xff);
 
+    count_p_uniq.insert(be64toh(block_hdr->data_nonce));
+
     // Should never happend due to generating new session key on tx side
     if (block_idx > MAX_BLOCK_IDX)
     {

src/rx.hpp

@@ -25,6 +25,7 @@
 #include <stdio.h>
 #include <errno.h>
 #include <string>
+#include <set>
 #include <string.h>
 #include <stdexcept>
 
@@ -172,7 +173,9 @@ class Aggregator : public BaseAggregator
         count_p_all = 0;
         count_b_all = 0;
         count_p_dec_err = 0;
-        count_p_dec_ok = 0;
+        count_p_session = 0;
+        count_p_data = 0;
+        count_p_uniq.clear();
         count_p_fec_recovered = 0;
         count_p_lost = 0;
         count_p_bad = 0;
@@ -185,7 +188,9 @@ class Aggregator : public BaseAggregator
     uint32_t count_p_all;
     uint32_t count_b_all;
     uint32_t count_p_dec_err;
-    uint32_t count_p_dec_ok;
+    uint32_t count_p_session;
+    uint32_t count_p_data;
+    std::set<uint32_t> count_p_uniq;
     uint32_t count_p_fec_recovered;
     uint32_t count_p_lost;
     uint32_t count_p_bad;

wfb_ng/cli.py

@@ -175,8 +175,11 @@ def draw_rx(self, attrs):
         def _norm(l):
             return (1000 * l[0] // self.log_interval, l[1])
 
+        diversity = p['data'][0] / p['uniq'][0] if p['uniq'][0] > 0 else 0
+
         msg_l = (('{recv}  %4d$ (%d)' % _norm(p['all']),     0),
                  ('{udp}   %4d$ (%d)' % _norm(p['out']),     0),
+                 ('sess  %4d$ (%d)' % _norm(p['session']),  0),
                  ('fec_r %4d$ (%d)' % _norm(p['fec_rec']), curses.A_REVERSE if p['fec_rec'][0] else 0),
                  ('lost  %4d$ (%d)' % _norm(p['lost']),    curses.A_REVERSE if p['lost'][0] else 0),
                  ('d_err %4d$ (%d)' % _norm(p['dec_err']), curses.A_REVERSE if p['dec_err'][0] else 0),
@@ -193,7 +196,9 @@ def _norm(l):
               human_rate(1000 * p['out_bytes'][0] / self.log_interval))
 
         if session_d:
-            flow_str += '{FEC:} %(fec_k)d/%(fec_n)d' % (session_d)
+            flow_str += '{FEC:} %(fec_k)d/%(fec_n)d  ' % (session_d)
+
+        flow_str += '{Diversity:} %.2f' % (diversity,)
 
         addstr_markup(window, 0, 20, flow_str)
 
@@ -205,15 +210,17 @@ def _norm(l):
                 lpad = ''
                 rpad = ''
 
-            addstr_markup(window, 2, 20, '{Freq MCS BW %s[ANT]%s pkt/s}     {RSSI} [dBm]        {SNR} [dB]' % (lpad, rpad))
+            addstr_markup(window, 2, 20, '{Freq MCS BW %s[ANT]%s pkt/s dloss}     {RSSI} [dBm]        {SNR} [dB]' % (lpad, rpad))
             for y, (((freq, mcs_index, bandwith), ant_id), v) in enumerate(sorted(stats_d.items()), 3):
                 pkt_s, rssi_min, rssi_avg, rssi_max, snr_min, snr_avg, snr_max = v
                 if y < ymax:
                     active_tx = ((ant_id >> 8) == tx_wlan)
-                    addstr_markup(window, y, 20, '%04d %3d %2d %s%s%s  %4d  %3d < {%3d} < %3d  %3d < {%3d} < %3d' % \
+                    diff_loss = max(p['uniq'][0] - pkt_s, 0)
+                    addstr_markup(window, y, 20, '%04d %3d %2d %s%s%s  %4d  %s%4d%s  %3d < {%3d} < %3d  %3d < {%3d} < %3d' % \
                            (freq, mcs_index, bandwith,
                             '{' if active_tx else '', format_ant(ant_id), '}' if active_tx else '',
                             1000 * pkt_s // self.log_interval,
+                            '{' if diff_loss else '', 1000 * diff_loss // self.log_interval, '}' if diff_loss else '',
                             rssi_min, rssi_avg, rssi_max,
                             snr_min, snr_avg, snr_max), 0 if active_tx else curses.A_DIM)
         else:

wfb_ng/protocols.py

@@ -409,7 +409,7 @@ def lineReceived(self, line):
                 if len(cols) != 3:
                     raise BadTelemetry()
 
-                k_tuple = ('all', 'all_bytes', 'dec_err', 'dec_ok', 'fec_rec', 'lost', 'bad', 'out', 'out_bytes')
+                k_tuple = ('all', 'all_bytes', 'dec_err', 'session', 'data', 'uniq', 'fec_rec', 'lost', 'bad', 'out', 'out_bytes')
                 counters = tuple(int(i) for i in cols[2].split(':'))
                 assert len(counters) == len(k_tuple)