Grab addresses and rates from single source: ip

[khatus.git] / bin / khatus_show

diff --git a/bin/khatus_show b/bin/khatus_show
index 935a1da..523f22a 100755 (executable)
--- a/bin/khatus_show
+++ b/bin/khatus_show
@@ -93,44 +93,69 @@ disk=$(
         }')
 
 network=$(
-    awk -v wifi_conn=$(cat $STATUS_FILE__WIFI) '
+    ip -s addr \
+    | awk -v wifi_conn=$(cat $STATUS_FILE__WIFI) '
         BEGIN {
             bytes_per_unit = 1024 * 1024
         }
 
-        NR > 2 {
-            device     = $1; sub(":$", "", device);
-            curr_read  = $2;
-            curr_write = $10;
-
-            prev_file_prefix  = "/home/siraaj/var/run/status/io_net_" device;
-            prev_read_file  = prev_file_prefix "_read";
-            prev_write_file = prev_file_prefix "_write";
-
-            getline prev_read < prev_read_file;
-            getline prev_write < prev_write_file;
+        /^[0-9]/ {
+            sub(":$", "", $1)
+            sub(":$", "", $2)
+            sequence = $1
+            interface = $2
+            interfaces[sequence] = interface
+        }
 
-            diff_read  = (curr_read  - prev_read ) / bytes_per_unit;
-            diff_write = (curr_write - prev_write) / bytes_per_unit;
+        /^ +inet [0-9]/ {
+            sub("/[0-9]+", "", $2)
+            addr = $2
+            addrs[interface] = addr
+        }
 
-            print curr_read  > prev_read_file;
-            print curr_write > prev_write_file;
+        /^ +RX: / {transfer_direction = "r"}
+        /^ +TX: / {transfer_direction = "w"}
 
-            devices[device] = sprintf("%0.3f▲ %0.3f▼", diff_write, diff_read);
+        /^ +[0-9]+ +[0-9]+ +[0-9]+ +[0-9]+ +[0-9]+ +[0-9]+ *$/ {
+            io[interface, transfer_direction] = $1;
         }
 
         END {
-            lo      = devices["lo"]
-            #eth    = devices["enp0s25"]
-            wifi_io = devices["wlp3s0"]
-            if (wifi_conn == "--") {
-                wifi = wifi_conn
-            } else {
-                wifi = wifi_conn " " wifi_io
+            for (i=1; i<=sequence; i++) {
+                interface = interfaces[i]
+                if (addrs[interface]) {
+                    curr_read  = io[interface, "r"]
+                    curr_write = io[interface, "w"]
+
+                    prefix = "/home/siraaj/var/run/status/io_net_" interface
+                    prev_read_file  = prefix "_read"
+                    prev_write_file = prefix "_write"
+
+                    getline prev_read < prev_read_file
+                    getline prev_write < prev_write_file
+
+                    diff_r = (curr_read  - prev_read ) / bytes_per_unit
+                    diff_w = (curr_write - prev_write) / bytes_per_unit
+
+                    print curr_read  > prev_read_file
+                    print curr_write > prev_write_file
+
+                    if (interface == "wlp3s0") {
+                        label = wifi_conn
+                    } else {
+                        label = interface
+                    }
+
+                    if (i == sequence) {
+                        sep = ""
+                    } else {
+                        sep = " | "
+                    }
+
+                    printf("%s %0.3f▲ %0.3f▼%s", label, diff_w, diff_r, sep)
+                }
             }
-            printf("[%s | %s]", lo, wifi)
-        }
-    ' /proc/net/dev
+        }'
 )
 
 energy=$(
@@ -311,7 +336,7 @@ signal_last_msg_age=$(
         months  = days / 30;
         #fmt = "%.1f";
         fmt = "%d";
-        #printf(fmt " s\n", seconds);
+        printf(fmt " s\n", seconds);
         printf(fmt " m\n", minutes);
         printf(fmt " h\n", hours);
         printf(fmt " d\n", days);
@@ -410,7 +435,7 @@ echo \
  D$disk\
  \
  \
- N:$network\
+ N:[$network]\
  \
  \
  B:$bluetooth_power\