bandwidth2: use injected properties

See: vivien#132

Author: kb100

bandwidth2/README.md

@@ -16,26 +16,32 @@ It comes with some other features though:
 make
 ```
 
-### Example Blocklet
+### Config
 ```ini
 [bandwidth]
 label=
-command=$SCRIPT_DIR/bandwidth2 -w 307200:30720 -c 512000:51200
+command=$SCRIPT_DIR/bandwidth2 
 interval=persist
 markup=pango
+#INTERFACE=(checks all interfaces)
+#USE_BITS=0
+#USE_BYES=1
+#WARN_RX=0
+#WARN_TX=0
+#CRIT_RX=0
+#CRIT_TX=0
 ```
 
-## Options
-
-```
-Usage: ./bandwidth2 [-b|B] [-t seconds] [-i interface] [-w Bytes:Bytes] [-c Bytes:Bytes] [-h]
-
--b              use bits/s
--B              use Bytes/s  (default)
--t seconds      refresh time (default is 1)
--i interface    network interface to monitor. If not specified, check all interfaces.
--w Bytes:Bytes  Set warning (color orange) for Rx:Tx bandwidth. (default: none)
--c Bytes:Bytes  Set critical (color red) for Rx:Tx bandwidth. (default: none)
--h              this help
+E.g.
 
+```ini
+[bandwidth]
+label=
+command=$SCRIPT_DIR/bandwidth2 
+interval=persist
+markup=pango
+WARN_RX=307200
+WARN_TX=30720
+CRIT_RX=512000
+CRIT_TX=51200
 ```

bandwidth2/bandwidth2.c

@@ -98,8 +98,35 @@ void display(int const unit, double b, int const warning, int const critical)
 int main(int argc, char *argv[])
 {
   int c, unit = 'B', t = 1;
-  char *iface = NULL;
+  char iface[BUFSIZ] = {0};
   int warningrx = 0, warningtx = 0, criticalrx = 0, criticaltx = 0;
+  char *envvar = NULL;
+
+  envvar = getenv("USE_BITS");
+  if (envvar && *envvar == '1')
+    unit = 'b';
+  envvar = getenv("USE_BYTES");
+  if (envvar && *envvar == '1')
+    unit = 'B';
+  envvar = getenv("REFRESH_TIME");
+  if (envvar)
+    t = atoi(envvar);
+  envvar = getenv("INTERFACE");
+  if (envvar)
+    snprintf(iface, BUFSIZ, "%s:", envvar);
+  envvar = getenv("WARN_RX");
+  if (envvar)
+      warningrx = atoi(envvar);
+  envvar = getenv("WARN_TX");
+  if (envvar)
+      warningtx = atoi(envvar);
+  envvar = getenv("CRIT_RX");
+  if (envvar)
+      criticalrx = atoi(envvar);
+  envvar = getenv("CRIT_TX");
+  if (envvar)
+      criticaltx = atoi(envvar);
+
   while (c = getopt(argc, argv, "bBht:i:w:c:"), c != -1) {
     switch (c) {
     case 'b':
@@ -110,7 +137,7 @@ int main(int argc, char *argv[])
       t = atoi(optarg);
       break;
     case 'i':
-      iface = strcat(optarg, ":");
+      snprintf(iface, BUFSIZ, "%s:", optarg);
       break;
     case 'w':
       sscanf(optarg, "%d:%d", &warningrx, &warningtx);
@@ -132,7 +159,7 @@ int main(int argc, char *argv[])
 
   while (1) {
     sleep(t);
-    get_values(iface, &s, &received, &sent);
+    get_values(iface[0] ? iface : NULL, &s, &received, &sent);
 
     rx = (received - received_old) / (float)(s - s_old);
     tx = (sent - sent_old) / (float)(s - s_old);