From cc355f8959b51847ef22ca62810eb6c11da454a2 Mon Sep 17 00:00:00 2001
From: Christian Giese <christian@rtbrick.com>
Date: Wed, 26 Jan 2022 13:38:14 +0100
Subject: [PATCH] extend interfaces cmd with traffic stats

---
 src/bbl_ctrl.c | 31 +++++++++++++++++++------------
 1 file changed, 19 insertions(+), 12 deletions(-)

diff --git a/src/bbl_ctrl.c b/src/bbl_ctrl.c
index fad414db..209a787f 100644
--- a/src/bbl_ctrl.c
+++ b/src/bbl_ctrl.c
@@ -397,6 +397,22 @@ bbl_ctrl_session_info(int fd, bbl_ctx_s *ctx, uint32_t session_id, json_t* argum
     }
 }
 
+static json_t *
+bbl_ctrl_interfaces_json(bbl_interface_s *interace, const char *type) {
+    return json_pack("{ss si ss si si si si si si si si}",
+                     "name", interace->name,
+                     "ifindex", interace->ifindex,
+                     "type", type,
+                     "tx-packets", interace->stats.packets_tx,
+                     "tx-bytes", interace->stats.bytes_tx, 
+                     "tx-pps", interace->stats.rate_packets_tx.avg,
+                     "tx-kbps", interace->stats.rate_bytes_tx.avg * 8 / 1000,
+                     "rx-packets", interace->stats.packets_rx, 
+                     "rx-bytes", interace->stats.bytes_rx,
+                     "rx-pps", interace->stats.rate_packets_rx.avg,
+                     "rx-kbps", interace->stats.rate_bytes_rx.avg * 8 / 1000);
+}
+
 ssize_t
 bbl_ctrl_interfaces(int fd, bbl_ctx_s *ctx, uint32_t session_id __attribute__((unused)), json_t* arguments __attribute__((unused))) {
     ssize_t result = 0;
@@ -405,24 +421,15 @@ bbl_ctrl_interfaces(int fd, bbl_ctx_s *ctx, uint32_t session_id __attribute__((u
 
     interfaces = json_array();
     for(i=0; i < ctx->interfaces.network_if_count; i++) {
-        interface = json_pack("{ss si ss}",
-                            "name", ctx->interfaces.network_if[i]->name,
-                            "ifindex", ctx->interfaces.network_if[i]->ifindex,
-                            "type", "network");
+        interface = bbl_ctrl_interfaces_json(ctx->interfaces.access_if[i], "access");
         json_array_append(interfaces, interface);
     }
     for(i=0; i < ctx->interfaces.access_if_count; i++) {
-        interface = json_pack("{ss si ss}",
-                            "name", ctx->interfaces.access_if[i]->name,
-                            "ifindex", ctx->interfaces.access_if[i]->ifindex,
-                            "type", "access");
+        interface = bbl_ctrl_interfaces_json(ctx->interfaces.network_if[i], "network");
         json_array_append(interfaces, interface);
     }
     for(i=0; i < ctx->interfaces.a10nsp_if_count; i++) {
-        interface = json_pack("{ss si ss}",
-                            "name", ctx->interfaces.a10nsp_if[i]->name,
-                            "ifindex", ctx->interfaces.a10nsp_if[i]->ifindex,
-                            "type", "a10nsp");
+        interface = bbl_ctrl_interfaces_json(ctx->interfaces.a10nsp_if[i], "a10nsp");
         json_array_append(interfaces, interface);
     }
     root = json_pack("{ss si so}",