New way to filter devices

Author: solsticedhiver

README.md

@@ -5,33 +5,35 @@ This python script uses *matplotlib* to draw a chart with the activity of each d
 
 It opens an interactive *matplotlib* window if no output image is specified.
 
-    usage: kismet_timeplot.py [-h] [-b DB] [-i [IMAGE]] [-l] [--label]
-                              [-k KNOWNMAC] [-M MIN] [-m MAC] [-p] [-r RSSI]
-                              [-s START] [--time-span TIME_SPAN] [-t [TITLE]] [-v]
-    
-    Plot a timeline of devices' activity as captured by kismet
-    
-    optional arguments:
-      -h, --help            show this help message and exit
-      -b DB, --db DB        file name of the kismet db
-      -i [IMAGE], --image [IMAGE]
-                            output an image
-      -l, --legend          add a legend
-      --label               add a mac label for each plot
-      -k KNOWNMAC, --knownmac KNOWNMAC
-                            known mac to highlight in red
-      -M MIN, --min MIN     minimum number of packets for device to be plotted
-      -m MAC, --mac MAC     only display that mac
-      -p, --privacy         merge LAA MAC address
-      -r RSSI, --rssi RSSI  minimal value for RSSI
-      -s START, --start START
-                            start timestamp
-      --time-span TIME_SPAN
-                            time span (coud be #d or ##h or ###m)
-      -t [TITLE], --title [TITLE]
-                            add a title to the top of image (if none specified,
-                            use a timestamp)
-      -v, --verbose         be verbose
+```
+usage: kismet_timeplot.py [-h] [-b DB] [-i [IMAGE]] [-l] [--label]
+                          [-k KNOWNMAC] [-M MIN] [-m MAC] [-p] [-r RSSI]
+                          [-s START] [--time-span TIME_SPAN] [-t [TITLE]] [-v]
+
+Plot a timeline of devices' activity as captured by kismet
+
+options:
+  -h, --help            show this help message and exit
+  -b DB, --db DB        file name of the kismet db
+  -i [IMAGE], --image [IMAGE]
+                        output an image
+  -l, --legend          add a legend
+  --label               add a mac label for each plot
+  -k KNOWNMAC, --knownmac KNOWNMAC
+                        known mac to highlight in red
+  -M MIN, --min MIN     minimum number of packets for device to be plotted
+  -m MAC, --mac MAC     only display that mac
+  -p, --privacy         merge LAA MAC address
+  -r RSSI, --rssi RSSI  minimal value for RSSI
+  -s START, --start START
+                        start timestamp
+  --time-span TIME_SPAN
+                        time span (coud be #d or ##h or ###m)
+  -t [TITLE], --title [TITLE]
+                        add a title to the top of image (if none specified,
+                        use a timestamp)
+  -v, --verbose         be verbose
+```
 
 ![Image of chart plotted with kismet_timeplot.py](plot.png)
 

kismet_timeplot.py

@@ -61,27 +61,24 @@ def get_data(args):
             ts[row[2]].append(row[0])
         else:
             ts[row[2]] = [row[0]]
-        # filter out multicast mac addresses. TODO: use the exact range 00:00:00-7f:ff:ff
-        if row[3] in ts and not row[3].startswith('01:00:5e'):
+        if row[3] in ts:
             ts[row[3]].append(row[0])
         else:
             ts[row[3]] = [row[0]]
-    try:
-        del ts['ff:ff:ff:ff:ff:ff']
-        del ts['00:00:00:00:00:00']
-    except KeyError as k:
-        pass
+
     # filter to keep only wifi client and device
     sql = 'select lower(devmac),type from devices'
     c.execute(sql)
+    dev_type = {}
     for row in c.fetchall():
-        if row[1] not in ['Wi-Fi Device','Wi-Fi Client']:
-            try:
-                del ts[row[0]]
-            except KeyError as k:
-                pass
+        dev_type[row[0]] = row[1]
     conn.close()
 
+    for k in list(ts.keys()):
+        # remove Wi-Fi AP and Wi-Fi-Bridged
+        if k not in dev_type or dev_type[k] not in ('Wi-Fi Device','Wi-Fi Client', 'Wi-Fi Ad-Hoc'):
+            del ts[k]
+
     def match(m, s):
         # match on start of mac address and use % as wild-card like in SQL syntax
         if '%' in m:
@@ -91,8 +88,6 @@ def match(m, s):
         m = '^'+m
         return re.search(m, s) is not None
 
-    if None in ts.keys():
-        del ts[None]
     macs = list(ts.keys())
     if args.mac :
         # keep mac with args.mac as substring