Merge b4c851b39e into 985c9bb97c

fix up bpftrace-based operation
improve output somewhat (add tracker name when reporting a match), clean up code a bit
2024-05-02 01:27:17 +02:00 · 2024-04-26 00:21:49 +02:00 · 2024-04-25 23:20:14 +02:00 · 2024-04-25 22:33:32 +02:00 · 2024-04-25 21:18:43 +02:00 · 2024-04-25 21:06:51 +02:00
10 changed files with 872 additions and 224 deletions
--- a/README.md
+++ b/README.md
@ -72,13 +72,17 @@ addresses, so you must check both sets before determining something is in
 fact a Google service and not a Google customer.

 # To run on a single process on Linux
-
 Or, to track a single process, fe `firefox`, start it and run:

 ```shell
 sudo bpftrace netsendmsg.bt |
-    grep --line-buffered ^$(pgrep firefox) |
-    stdbuf -oL cut -f2 | ./cidr.py | ./teller
+    grep --line-buffered ^$(pgrep firefox) | ./teller
+```
+
+Or try:
+
+```shell
+sudo bpftrace netsendmsg.bt | grep --line-buffered -i chrome | ./teller
 ```

 And cry.
--- a/cidr.py
+++ b/cidr.py
@ -1,18 +0,0 @@
-#!/usr/bin/env -S python3 -u
-import sys
-from ipaddress import ip_network, ip_address
-
-nets = []
-with open("goog-prefixes.txt") as f:
-    nets = [line.strip() for line in f.readlines()]
-
-for line in iter(sys.stdin.readline, ''):
-    line = line.strip()
-    for net in nets:
-        try:
-            if ip_address(line) in ip_network(net):
-                print(line)
-
-                continue
-        except:
-            continue
--- a/cloud.json
+++ b/cloud.json
@ -1,7 +1,23 @@
 {
-  "syncToken": "1661187707374",
-  "creationTime": "2022-08-22T10:01:47.374464",
+  "syncToken": "1714053903689",
+  "creationTime": "2024-04-25T07:05:03.68994",
  "prefixes": [{
+    "ipv4Prefix": "34.35.0.0/16",
+    "service": "Google Cloud",
+    "scope": "africa-south1"
+  }, {
+    "ipv4Prefix": "34.152.86.0/23",
+    "service": "Google Cloud",
+    "scope": "africa-south1"
+  }, {
+    "ipv4Prefix": "34.177.50.0/23",
+    "service": "Google Cloud",
+    "scope": "africa-south1"
+  }, {
+    "ipv6Prefix": "2600:1900:8000::/44",
+    "service": "Google Cloud",
+    "scope": "africa-south1"
+  }, {
    "ipv4Prefix": "34.80.0.0/15",
    "service": "Google Cloud",
    "scope": "asia-east1"
@ -281,6 +297,26 @@
    "ipv6Prefix": "2600:1900:41d0::/44",
    "service": "Google Cloud",
    "scope": "asia-northeast2"
+  }, {
+    "ipv4Prefix": "34.0.96.0/19",
+    "service": "Google Cloud",
+    "scope": "asia-northeast3"
+  }, {
+    "ipv4Prefix": "34.22.64.0/19",
+    "service": "Google Cloud",
+    "scope": "asia-northeast3"
+  }, {
+    "ipv4Prefix": "34.22.96.0/20",
+    "service": "Google Cloud",
+    "scope": "asia-northeast3"
+  }, {
+    "ipv4Prefix": "34.47.64.0/18",
+    "service": "Google Cloud",
+    "scope": "asia-northeast3"
+  }, {
+    "ipv4Prefix": "34.50.0.0/18",
+    "service": "Google Cloud",
+    "scope": "asia-northeast3"
  }, {
    "ipv4Prefix": "34.64.32.0/19",
    "service": "Google Cloud",
@ -337,6 +373,14 @@
    "ipv6Prefix": "2600:1901:8180::/44",
    "service": "Google Cloud",
    "scope": "asia-northeast3"
+  }, {
+    "ipv4Prefix": "34.0.227.0/24",
+    "service": "Google Cloud",
+    "scope": "asia-south1"
+  }, {
+    "ipv4Prefix": "34.47.128.0/17",
+    "service": "Google Cloud",
+    "scope": "asia-south1"
  }, {
    "ipv4Prefix": "34.93.0.0/16",
    "service": "Google Cloud",
@ -353,6 +397,10 @@
    "ipv4Prefix": "34.124.44.0/23",
    "service": "Google Cloud",
    "scope": "asia-south1"
+  }, {
+    "ipv4Prefix": "34.152.64.0/22",
+    "service": "Google Cloud",
+    "scope": "asia-south1"
  }, {
    "ipv4Prefix": "34.157.87.0/24",
    "service": "Google Cloud",
@ -361,6 +409,10 @@
    "ipv4Prefix": "34.157.215.0/24",
    "service": "Google Cloud",
    "scope": "asia-south1"
+  }, {
+    "ipv4Prefix": "34.177.32.0/22",
+    "service": "Google Cloud",
+    "scope": "asia-south1"
  }, {
    "ipv4Prefix": "35.200.128.0/17",
    "service": "Google Cloud",
@ -393,6 +445,10 @@
    "ipv6Prefix": "2600:1900:40a0::/44",
    "service": "Google Cloud",
    "scope": "asia-south1"
+  }, {
+    "ipv4Prefix": "34.0.0.0/20",
+    "service": "Google Cloud",
+    "scope": "asia-south2"
  }, {
    "ipv4Prefix": "34.104.120.0/23",
    "service": "Google Cloud",
@ -409,10 +465,26 @@
    "ipv4Prefix": "34.131.0.0/16",
    "service": "Google Cloud",
    "scope": "asia-south2"
+  }, {
+    "ipv4Prefix": "34.153.32.0/24",
+    "service": "Google Cloud",
+    "scope": "asia-south2"
+  }, {
+    "ipv4Prefix": "34.153.224.0/24",
+    "service": "Google Cloud",
+    "scope": "asia-south2"
  }, {
    "ipv6Prefix": "2600:1900:41b0::/44",
    "service": "Google Cloud",
    "scope": "asia-south2"
+  }, {
+    "ipv4Prefix": "34.1.128.0/20",
+    "service": "Google Cloud",
+    "scope": "asia-southeast1"
+  }, {
+    "ipv4Prefix": "34.21.128.0/17",
+    "service": "Google Cloud",
+    "scope": "asia-southeast1"
  }, {
    "ipv4Prefix": "34.87.0.0/17",
    "service": "Google Cloud",
@ -445,6 +517,14 @@
    "ipv4Prefix": "34.126.128.0/18",
    "service": "Google Cloud",
    "scope": "asia-southeast1"
+  }, {
+    "ipv4Prefix": "34.128.44.0/23",
+    "service": "Google Cloud",
+    "scope": "asia-southeast1"
+  }, {
+    "ipv4Prefix": "34.128.60.0/23",
+    "service": "Google Cloud",
+    "scope": "asia-southeast1"
  }, {
    "ipv4Prefix": "34.142.128.0/17",
    "service": "Google Cloud",
@ -513,6 +593,14 @@
    "ipv6Prefix": "2600:1900:4080::/44",
    "service": "Google Cloud",
    "scope": "asia-southeast1"
+  }, {
+    "ipv4Prefix": "34.34.216.0/21",
+    "service": "Google Cloud",
+    "scope": "asia-southeast2"
+  }, {
+    "ipv4Prefix": "34.50.64.0/18",
+    "service": "Google Cloud",
+    "scope": "asia-southeast2"
  }, {
    "ipv4Prefix": "34.101.18.0/24",
    "service": "Google Cloud",
@ -541,6 +629,14 @@
    "ipv4Prefix": "34.128.64.0/18",
    "service": "Google Cloud",
    "scope": "asia-southeast2"
+  }, {
+    "ipv4Prefix": "34.152.68.0/24",
+    "service": "Google Cloud",
+    "scope": "asia-southeast2"
+  }, {
+    "ipv4Prefix": "34.157.254.0/24",
+    "service": "Google Cloud",
+    "scope": "asia-southeast2"
  }, {
    "ipv4Prefix": "35.219.0.0/17",
    "service": "Google Cloud",
@ -549,6 +645,10 @@
    "ipv6Prefix": "2600:1901:8170::/44",
    "service": "Google Cloud",
    "scope": "asia-southeast2"
+  }, {
+    "ipv4Prefix": "34.40.128.0/17",
+    "service": "Google Cloud",
+    "scope": "australia-southeast1"
  }, {
    "ipv4Prefix": "34.87.192.0/18",
    "service": "Google Cloud",
@ -565,6 +665,14 @@
    "ipv4Prefix": "34.124.40.0/23",
    "service": "Google Cloud",
    "scope": "australia-southeast1"
+  }, {
+    "ipv4Prefix": "34.128.36.0/24",
+    "service": "Google Cloud",
+    "scope": "australia-southeast1"
+  }, {
+    "ipv4Prefix": "34.128.48.0/24",
+    "service": "Google Cloud",
+    "scope": "australia-southeast1"
  }, {
    "ipv4Prefix": "34.151.64.0/18",
    "service": "Google Cloud",
@ -609,6 +717,10 @@
    "ipv6Prefix": "2600:1900:40b0::/44",
    "service": "Google Cloud",
    "scope": "australia-southeast1"
+  }, {
+    "ipv4Prefix": "34.0.16.0/20",
+    "service": "Google Cloud",
+    "scope": "australia-southeast2"
  }, {
    "ipv4Prefix": "34.104.122.0/23",
    "service": "Google Cloud",
@ -629,6 +741,10 @@
    "ipv6Prefix": "2600:1900:41c0::/44",
    "service": "Google Cloud",
    "scope": "australia-southeast2"
+  }, {
+    "ipv4Prefix": "34.0.240.0/20",
+    "service": "Google Cloud",
+    "scope": "europe-central2"
  }, {
    "ipv4Prefix": "34.104.116.0/22",
    "service": "Google Cloud",
@ -685,6 +801,10 @@
    "ipv6Prefix": "2600:1900:4150::/44",
    "service": "Google Cloud",
    "scope": "europe-north1"
+  }, {
+    "ipv4Prefix": "34.0.192.0/19",
+    "service": "Google Cloud",
+    "scope": "europe-southwest1"
  }, {
    "ipv4Prefix": "34.157.44.0/23",
    "service": "Google Cloud",
@ -721,6 +841,22 @@
    "ipv4Prefix": "23.251.128.0/20",
    "service": "Google Cloud",
    "scope": "europe-west1"
+  }, {
+    "ipv4Prefix": "34.22.112.0/20",
+    "service": "Google Cloud",
+    "scope": "europe-west1"
+  }, {
+    "ipv4Prefix": "34.22.128.0/17",
+    "service": "Google Cloud",
+    "scope": "europe-west1"
+  }, {
+    "ipv4Prefix": "34.34.128.0/18",
+    "service": "Google Cloud",
+    "scope": "europe-west1"
+  }, {
+    "ipv4Prefix": "34.38.0.0/16",
+    "service": "Google Cloud",
+    "scope": "europe-west1"
  }, {
    "ipv4Prefix": "34.76.0.0/14",
    "service": "Google Cloud",
@ -853,6 +989,42 @@
    "ipv6Prefix": "2600:1900:4010::/44",
    "service": "Google Cloud",
    "scope": "europe-west1"
+  }, {
+    "ipv4Prefix": "34.32.0.0/17",
+    "service": "Google Cloud",
+    "scope": "europe-west10"
+  }, {
+    "ipv4Prefix": "34.152.80.0/23",
+    "service": "Google Cloud",
+    "scope": "europe-west10"
+  }, {
+    "ipv4Prefix": "34.177.36.0/23",
+    "service": "Google Cloud",
+    "scope": "europe-west10"
+  }, {
+    "ipv6Prefix": "2600:1901:81f0::/44",
+    "service": "Google Cloud",
+    "scope": "europe-west10"
+  }, {
+    "ipv4Prefix": "34.17.0.0/16",
+    "service": "Google Cloud",
+    "scope": "europe-west12"
+  }, {
+    "ipv4Prefix": "34.157.124.0/23",
+    "service": "Google Cloud",
+    "scope": "europe-west12"
+  }, {
+    "ipv4Prefix": "34.157.250.0/23",
+    "service": "Google Cloud",
+    "scope": "europe-west12"
+  }, {
+    "ipv6Prefix": "2600:1901:81b0::/44",
+    "service": "Google Cloud",
+    "scope": "europe-west12"
+  }, {
+    "ipv4Prefix": "34.39.0.0/17",
+    "service": "Google Cloud",
+    "scope": "europe-west2"
  }, {
    "ipv4Prefix": "34.89.0.0/17",
    "service": "Google Cloud",
@ -865,6 +1037,10 @@
    "ipv4Prefix": "34.127.186.0/23",
    "service": "Google Cloud",
    "scope": "europe-west2"
+  }, {
+    "ipv4Prefix": "34.128.52.0/22",
+    "service": "Google Cloud",
+    "scope": "europe-west2"
  }, {
    "ipv4Prefix": "34.142.0.0/17",
    "service": "Google Cloud",
@ -941,6 +1117,18 @@
    "ipv6Prefix": "2600:1900:40c0::/44",
    "service": "Google Cloud",
    "scope": "europe-west2"
+  }, {
+    "ipv4Prefix": "34.0.224.0/24",
+    "service": "Google Cloud",
+    "scope": "europe-west3"
+  }, {
+    "ipv4Prefix": "34.0.226.0/24",
+    "service": "Google Cloud",
+    "scope": "europe-west3"
+  }, {
+    "ipv4Prefix": "34.40.0.0/17",
+    "service": "Google Cloud",
+    "scope": "europe-west3"
  }, {
    "ipv4Prefix": "34.89.128.0/17",
    "service": "Google Cloud",
@ -1021,6 +1209,14 @@
    "ipv6Prefix": "2600:1900:40d0::/44",
    "service": "Google Cloud",
    "scope": "europe-west3"
+  }, {
+    "ipv4Prefix": "34.32.128.0/17",
+    "service": "Google Cloud",
+    "scope": "europe-west4"
+  }, {
+    "ipv4Prefix": "34.34.0.0/17",
+    "service": "Google Cloud",
+    "scope": "europe-west4"
  }, {
    "ipv4Prefix": "34.90.0.0/15",
    "service": "Google Cloud",
@ -1113,6 +1309,18 @@
    "ipv6Prefix": "2600:1900:4160::/44",
    "service": "Google Cloud",
    "scope": "europe-west6"
+  }, {
+    "ipv4Prefix": "34.0.160.0/19",
+    "service": "Google Cloud",
+    "scope": "europe-west8"
+  }, {
+    "ipv4Prefix": "34.153.38.0/24",
+    "service": "Google Cloud",
+    "scope": "europe-west8"
+  }, {
+    "ipv4Prefix": "34.153.230.0/24",
+    "service": "Google Cloud",
+    "scope": "europe-west8"
  }, {
    "ipv4Prefix": "34.154.0.0/16",
    "service": "Google Cloud",
@ -1121,10 +1329,18 @@
    "ipv4Prefix": "34.157.8.0/23",
    "service": "Google Cloud",
    "scope": "europe-west8"
+  }, {
+    "ipv4Prefix": "34.157.121.0/24",
+    "service": "Google Cloud",
+    "scope": "europe-west8"
  }, {
    "ipv4Prefix": "34.157.136.0/23",
    "service": "Google Cloud",
    "scope": "europe-west8"
+  }, {
+    "ipv4Prefix": "34.157.249.0/24",
+    "service": "Google Cloud",
+    "scope": "europe-west8"
  }, {
    "ipv4Prefix": "35.219.224.0/19",
    "service": "Google Cloud",
@ -1133,6 +1349,10 @@
    "ipv6Prefix": "2600:1901:8110::/44",
    "service": "Google Cloud",
    "scope": "europe-west8"
+  }, {
+    "ipv4Prefix": "34.1.0.0/20",
+    "service": "Google Cloud",
+    "scope": "europe-west9"
  }, {
    "ipv4Prefix": "34.155.0.0/16",
    "service": "Google Cloud",
@ -1153,6 +1373,14 @@
    "ipv6Prefix": "2600:1901:8120::/44",
    "service": "Google Cloud",
    "scope": "europe-west9"
+  }, {
+    "ipv4Prefix": "34.36.0.0/16",
+    "service": "Google Cloud",
+    "scope": "global"
+  }, {
+    "ipv4Prefix": "34.49.0.0/16",
+    "service": "Google Cloud",
+    "scope": "global"
  }, {
    "ipv4Prefix": "34.95.64.0/18",
    "service": "Google Cloud",
@ -1270,21 +1498,77 @@
    "service": "Google Cloud",
    "scope": "global"
  }, {
-    "ipv6Prefix": "2600:1901:1:1000::/52",
+    "ipv4Prefix": "34.1.32.0/20",
    "service": "Google Cloud",
-    "scope": "global"
+    "scope": "me-central1"
  }, {
-    "ipv6Prefix": "2600:1901:1:2000::/51",
+    "ipv4Prefix": "34.18.0.0/16",
    "service": "Google Cloud",
-    "scope": "global"
+    "scope": "me-central1"
  }, {
-    "ipv6Prefix": "2600:1901:1:4000::/50",
+    "ipv4Prefix": "34.157.126.0/23",
    "service": "Google Cloud",
-    "scope": "global"
+    "scope": "me-central1"
  }, {
-    "ipv6Prefix": "2600:1901:1:8000::/49",
+    "ipv4Prefix": "34.157.252.0/23",
    "service": "Google Cloud",
-    "scope": "global"
+    "scope": "me-central1"
+  }, {
+    "ipv6Prefix": "2600:1901:81c0::/44",
+    "service": "Google Cloud",
+    "scope": "me-central1"
+  }, {
+    "ipv4Prefix": "34.1.48.0/20",
+    "service": "Google Cloud",
+    "scope": "me-central2"
+  }, {
+    "ipv4Prefix": "34.152.84.0/23",
+    "service": "Google Cloud",
+    "scope": "me-central2"
+  }, {
+    "ipv4Prefix": "34.166.0.0/16",
+    "service": "Google Cloud",
+    "scope": "me-central2"
+  }, {
+    "ipv4Prefix": "34.177.48.0/23",
+    "service": "Google Cloud",
+    "scope": "me-central2"
+  }, {
+    "ipv6Prefix": "2600:1900:5400::/44",
+    "service": "Google Cloud",
+    "scope": "me-central2"
+  }, {
+    "ipv4Prefix": "34.0.64.0/19",
+    "service": "Google Cloud",
+    "scope": "me-west1"
+  }, {
+    "ipv4Prefix": "34.157.90.0/23",
+    "service": "Google Cloud",
+    "scope": "me-west1"
+  }, {
+    "ipv4Prefix": "34.157.216.0/23",
+    "service": "Google Cloud",
+    "scope": "me-west1"
+  }, {
+    "ipv4Prefix": "34.165.0.0/16",
+    "service": "Google Cloud",
+    "scope": "me-west1"
+  }, {
+    "ipv6Prefix": "2600:1901:8160::/44",
+    "service": "Google Cloud",
+    "scope": "me-west1"
+  }, {
+    "ipv4Prefix": "34.19.128.0/17",
+    "service": "Google Cloud",
+    "scope": "northamerica-northeast1"
+  }, {
+    "ipv4Prefix": "34.20.0.0/17",
+    "service": "Google Cloud",
+    "scope": "northamerica-northeast1"
+  }, {
+    "ipv4Prefix": "34.47.0.0/18",
+    "service": "Google Cloud",
+    "scope": "northamerica-northeast1"
  }, {
    "ipv4Prefix": "34.95.0.0/18",
    "service": "Google Cloud",
@ -1301,6 +1585,22 @@
    "ipv4Prefix": "34.124.12.0/22",
    "service": "Google Cloud",
    "scope": "northamerica-northeast1"
+  }, {
+    "ipv4Prefix": "34.128.37.0/24",
+    "service": "Google Cloud",
+    "scope": "northamerica-northeast1"
+  }, {
+    "ipv4Prefix": "34.128.42.0/23",
+    "service": "Google Cloud",
+    "scope": "northamerica-northeast1"
+  }, {
+    "ipv4Prefix": "34.128.49.0/24",
+    "service": "Google Cloud",
+    "scope": "northamerica-northeast1"
+  }, {
+    "ipv4Prefix": "34.128.58.0/23",
+    "service": "Google Cloud",
+    "scope": "northamerica-northeast1"
  }, {
    "ipv4Prefix": "34.152.0.0/18",
    "service": "Google Cloud",
@ -1329,6 +1629,10 @@
    "ipv6Prefix": "2600:1900:40e0::/44",
    "service": "Google Cloud",
    "scope": "northamerica-northeast1"
+  }, {
+    "ipv4Prefix": "34.0.32.0/20",
+    "service": "Google Cloud",
+    "scope": "northamerica-northeast2"
  }, {
    "ipv4Prefix": "34.104.114.0/23",
    "service": "Google Cloud",
@ -1345,10 +1649,22 @@
    "ipv4Prefix": "34.130.0.0/16",
    "service": "Google Cloud",
    "scope": "northamerica-northeast2"
+  }, {
+    "ipv4Prefix": "34.152.69.0/24",
+    "service": "Google Cloud",
+    "scope": "northamerica-northeast2"
+  }, {
+    "ipv4Prefix": "34.157.255.0/24",
+    "service": "Google Cloud",
+    "scope": "northamerica-northeast2"
  }, {
    "ipv6Prefix": "2600:1900:41e0::/44",
    "service": "Google Cloud",
    "scope": "northamerica-northeast2"
+  }, {
+    "ipv4Prefix": "34.39.128.0/17",
+    "service": "Google Cloud",
+    "scope": "southamerica-east1"
  }, {
    "ipv4Prefix": "34.95.128.0/17",
    "service": "Google Cloud",
@ -1401,6 +1717,10 @@
    "ipv6Prefix": "2600:1900:40f0::/44",
    "service": "Google Cloud",
    "scope": "southamerica-east1"
+  }, {
+    "ipv4Prefix": "34.0.48.0/20",
+    "service": "Google Cloud",
+    "scope": "southamerica-west1"
  }, {
    "ipv4Prefix": "34.104.50.0/23",
    "service": "Google Cloud",
@ -1409,6 +1729,14 @@
    "ipv4Prefix": "34.127.178.0/23",
    "service": "Google Cloud",
    "scope": "southamerica-west1"
+  }, {
+    "ipv4Prefix": "34.153.33.0/24",
+    "service": "Google Cloud",
+    "scope": "southamerica-west1"
+  }, {
+    "ipv4Prefix": "34.153.225.0/24",
+    "service": "Google Cloud",
+    "scope": "southamerica-west1"
  }, {
    "ipv4Prefix": "34.176.0.0/16",
    "service": "Google Cloud",
@ -1441,10 +1769,42 @@
    "ipv4Prefix": "23.251.144.0/20",
    "service": "Google Cloud",
    "scope": "us-central1"
+  }, {
+    "ipv4Prefix": "34.0.225.0/24",
+    "service": "Google Cloud",
+    "scope": "us-central1"
  }, {
    "ipv4Prefix": "34.16.0.0/17",
    "service": "Google Cloud",
    "scope": "us-central1"
+  }, {
+    "ipv4Prefix": "34.27.0.0/16",
+    "service": "Google Cloud",
+    "scope": "us-central1"
+  }, {
+    "ipv4Prefix": "34.28.0.0/14",
+    "service": "Google Cloud",
+    "scope": "us-central1"
+  }, {
+    "ipv4Prefix": "34.33.0.0/16",
+    "service": "Google Cloud",
+    "scope": "us-central1"
+  }, {
+    "ipv4Prefix": "34.41.0.0/16",
+    "service": "Google Cloud",
+    "scope": "us-central1"
+  }, {
+    "ipv4Prefix": "34.42.0.0/16",
+    "service": "Google Cloud",
+    "scope": "us-central1"
+  }, {
+    "ipv4Prefix": "34.44.0.0/15",
+    "service": "Google Cloud",
+    "scope": "us-central1"
+  }, {
+    "ipv4Prefix": "34.46.0.0/16",
+    "service": "Google Cloud",
+    "scope": "us-central1"
  }, {
    "ipv4Prefix": "34.66.0.0/15",
    "service": "Google Cloud",
@ -1469,6 +1829,10 @@
    "ipv4Prefix": "34.122.0.0/15",
    "service": "Google Cloud",
    "scope": "us-central1"
+  }, {
+    "ipv4Prefix": "34.128.32.0/22",
+    "service": "Google Cloud",
+    "scope": "us-central1"
  }, {
    "ipv4Prefix": "34.132.0.0/14",
    "service": "Google Cloud",
@ -1501,6 +1865,10 @@
    "ipv4Prefix": "34.172.0.0/15",
    "service": "Google Cloud",
    "scope": "us-central1"
+  }, {
+    "ipv4Prefix": "34.177.52.0/22",
+    "service": "Google Cloud",
+    "scope": "us-central1"
  }, {
    "ipv4Prefix": "35.184.0.0/16",
    "service": "Google Cloud",
@ -1685,6 +2053,10 @@
    "ipv6Prefix": "2600:1900:4000::/44",
    "service": "Google Cloud",
    "scope": "us-central1"
+  }, {
+    "ipv4Prefix": "34.22.0.0/19",
+    "service": "Google Cloud",
+    "scope": "us-central2"
  }, {
    "ipv4Prefix": "35.186.0.0/17",
    "service": "Google Cloud",
@ -1721,6 +2093,18 @@
    "ipv6Prefix": "2600:1900:4070::/44",
    "service": "Google Cloud",
    "scope": "us-central2"
+  }, {
+    "ipv4Prefix": "34.23.0.0/16",
+    "service": "Google Cloud",
+    "scope": "us-east1"
+  }, {
+    "ipv4Prefix": "34.24.0.0/15",
+    "service": "Google Cloud",
+    "scope": "us-east1"
+  }, {
+    "ipv4Prefix": "34.26.0.0/16",
+    "service": "Google Cloud",
+    "scope": "us-east1"
  }, {
    "ipv4Prefix": "34.73.0.0/16",
    "service": "Google Cloud",
@ -1745,6 +2129,14 @@
    "ipv4Prefix": "34.148.0.0/16",
    "service": "Google Cloud",
    "scope": "us-east1"
+  }, {
+    "ipv4Prefix": "34.152.72.0/21",
+    "service": "Google Cloud",
+    "scope": "us-east1"
+  }, {
+    "ipv4Prefix": "34.177.40.0/21",
+    "service": "Google Cloud",
+    "scope": "us-east1"
  }, {
    "ipv4Prefix": "35.185.0.0/17",
    "service": "Google Cloud",
@ -1837,6 +2229,14 @@
    "ipv6Prefix": "2600:1900:4020::/44",
    "service": "Google Cloud",
    "scope": "us-east1"
+  }, {
+    "ipv4Prefix": "34.21.0.0/17",
+    "service": "Google Cloud",
+    "scope": "us-east4"
+  }, {
+    "ipv4Prefix": "34.48.0.0/16",
+    "service": "Google Cloud",
+    "scope": "us-east4"
  }, {
    "ipv4Prefix": "34.85.128.0/17",
    "service": "Google Cloud",
@ -1945,6 +2345,10 @@
    "ipv6Prefix": "2600:1900:4090::/44",
    "service": "Google Cloud",
    "scope": "us-east4"
+  }, {
+    "ipv4Prefix": "34.1.16.0/20",
+    "service": "Google Cloud",
+    "scope": "us-east5"
  }, {
    "ipv4Prefix": "34.157.32.0/22",
    "service": "Google Cloud",
@ -1981,6 +2385,10 @@
    "ipv6Prefix": "2600:1901:8150::/44",
    "service": "Google Cloud",
    "scope": "us-east7"
+  }, {
+    "ipv4Prefix": "34.0.128.0/19",
+    "service": "Google Cloud",
+    "scope": "us-south1"
  }, {
    "ipv4Prefix": "34.157.46.0/23",
    "service": "Google Cloud",
@ -1997,6 +2405,10 @@
    "ipv6Prefix": "2600:1901:8140::/44",
    "service": "Google Cloud",
    "scope": "us-south1"
+  }, {
+    "ipv4Prefix": "34.19.0.0/17",
+    "service": "Google Cloud",
+    "scope": "us-west1"
  }, {
    "ipv4Prefix": "34.82.0.0/15",
    "service": "Google Cloud",
@ -2101,6 +2513,10 @@
    "ipv6Prefix": "2600:1900:4040::/44",
    "service": "Google Cloud",
    "scope": "us-west1"
+  }, {
+    "ipv4Prefix": "34.20.128.0/17",
+    "service": "Google Cloud",
+    "scope": "us-west2"
  }, {
    "ipv4Prefix": "34.94.0.0/16",
    "service": "Google Cloud",
@ -2153,6 +2569,10 @@
    "ipv6Prefix": "2600:1900:4120::/44",
    "service": "Google Cloud",
    "scope": "us-west2"
+  }, {
+    "ipv4Prefix": "34.22.32.0/19",
+    "service": "Google Cloud",
+    "scope": "us-west3"
  }, {
    "ipv4Prefix": "34.104.52.0/24",
    "service": "Google Cloud",
@ -2181,6 +2601,10 @@
    "ipv6Prefix": "2600:1900:4170::/44",
    "service": "Google Cloud",
    "scope": "us-west3"
+  }, {
+    "ipv4Prefix": "34.16.128.0/17",
+    "service": "Google Cloud",
+    "scope": "us-west4"
  }, {
    "ipv4Prefix": "34.104.72.0/22",
    "service": "Google Cloud",
@ -2205,5 +2629,21 @@
    "ipv6Prefix": "2600:1900:4180::/44",
    "service": "Google Cloud",
    "scope": "us-west4"
+  }, {
+    "ipv4Prefix": "34.37.0.0/16",
+    "service": "Google Cloud",
+    "scope": "us-west8"
+  }, {
+    "ipv4Prefix": "34.128.46.0/23",
+    "service": "Google Cloud",
+    "scope": "us-west8"
+  }, {
+    "ipv4Prefix": "34.128.62.0/23",
+    "service": "Google Cloud",
+    "scope": "us-west8"
+  }, {
+    "ipv6Prefix": "2600:1900:4280::/44",
+    "service": "Google Cloud",
+    "scope": "us-west8"
  }]
 }
--- a/goog-cloud-prefixes.txt
+++ b/goog-cloud-prefixes.txt
@ -1,3 +1,6 @@
+34.35.0.0/16
+34.152.86.0/23
+34.177.50.0/23
 34.80.0.0/15
 34.137.0.0/16
 35.185.128.0/19
@ -64,6 +67,11 @@
 35.220.45.0/24
 35.242.45.0/24
 35.243.56.0/21
+34.0.96.0/19
+34.22.64.0/19
+34.22.96.0/20
+34.47.64.0/18
+34.50.0.0/18
 34.64.32.0/19
 34.64.64.0/22
 34.64.68.0/22
@ -77,12 +85,16 @@
 34.64.160.0/19
 34.64.192.0/18
 35.216.0.0/17
+34.0.227.0/24
+34.47.128.0/17
 34.93.0.0/16
 34.100.128.0/17
 34.104.108.0/23
 34.124.44.0/23
+34.152.64.0/22
 34.157.87.0/24
 34.157.215.0/24
+34.177.32.0/22
 35.200.128.0/17
 35.201.41.0/24
 35.207.192.0/18
@ -90,10 +102,15 @@
 35.234.208.0/20
 35.242.42.0/24
 35.244.0.0/18
+34.0.0.0/20
 34.104.120.0/23
 34.124.56.0/23
 34.126.208.0/20
 34.131.0.0/16
+34.153.32.0/24
+34.153.224.0/24
+34.1.128.0/20
+34.21.128.0/17
 34.87.0.0/17
 34.87.128.0/18
 34.104.58.0/23
@ -102,6 +119,8 @@
 34.124.128.0/17
 34.126.64.0/18
 34.126.128.0/18
+34.128.44.0/23
+34.128.60.0/23
 34.142.128.0/17
 34.143.128.0/17
 34.157.82.0/23
@ -118,6 +137,8 @@
 35.240.128.0/17
 35.242.24.0/23
 35.247.128.0/18
+34.34.216.0/21
+34.50.64.0/18
 34.101.18.0/24
 34.101.20.0/22
 34.101.24.0/22
@ -125,11 +146,16 @@
 34.101.64.0/18
 34.101.128.0/17
 34.128.64.0/18
+34.152.68.0/24
+34.157.254.0/24
 35.219.0.0/17
+34.40.128.0/17
 34.87.192.0/18
 34.104.104.0/23
 34.116.64.0/18
 34.124.40.0/23
+34.128.36.0/24
+34.128.48.0/24
 34.151.64.0/18
 34.151.128.0/18
 35.189.0.0/18
@ -140,10 +166,12 @@
 35.234.224.0/20
 35.242.41.0/24
 35.244.64.0/18
+34.0.16.0/20
 34.104.122.0/23
 34.124.58.0/23
 34.126.192.0/20
 34.129.0.0/16
+34.0.240.0/20
 34.104.116.0/22
 34.116.128.0/17
 34.118.0.0/17
@ -156,6 +184,7 @@
 35.220.26.0/24
 35.228.0.0/16
 35.242.26.0/24
+34.0.192.0/19
 34.157.44.0/23
 34.157.172.0/23
 34.164.0.0/16
@ -164,6 +193,10 @@
 8.34.211.0/24
 8.34.220.0/22
 23.251.128.0/20
+34.22.112.0/20
+34.22.128.0/17
+34.34.128.0/18
+34.38.0.0/16
 34.76.0.0/14
 34.118.254.0/23
 34.140.0.0/16
@ -196,9 +229,17 @@
 146.148.16.0/20
 146.148.112.0/20
 192.158.28.0/22
+34.32.0.0/17
+34.152.80.0/23
+34.177.36.0/23
+34.17.0.0/16
+34.157.124.0/23
+34.157.250.0/23
+34.39.0.0/17
 34.89.0.0/17
 34.105.128.0/17
 34.127.186.0/23
+34.128.52.0/22
 34.142.0.0/17
 34.147.128.0/17
 34.157.36.0/22
@ -217,6 +258,9 @@
 35.242.20.0/22
 35.242.128.0/18
 35.246.0.0/17
+34.0.224.0/24
+34.0.226.0/24
+34.40.0.0/17
 34.89.128.0/17
 34.104.112.0/23
 34.107.0.0/17
@ -236,6 +280,8 @@
 35.242.18.0/23
 35.242.192.0/18
 35.246.128.0/17
+34.32.128.0/17
+34.34.0.0/17
 34.90.0.0/15
 34.104.126.0/23
 34.124.62.0/23
@ -257,14 +303,22 @@
 35.220.44.0/24
 35.235.216.0/21
 35.242.44.0/24
+34.0.160.0/19
+34.153.38.0/24
+34.153.230.0/24
 34.154.0.0/16
 34.157.8.0/23
+34.157.121.0/24
 34.157.136.0/23
+34.157.249.0/24
 35.219.224.0/19
+34.1.0.0/20
 34.155.0.0/16
 34.157.12.0/22
 34.157.140.0/22
 34.163.0.0/16
+34.36.0.0/16
+34.49.0.0/16
 34.95.64.0/18
 34.96.64.0/18
 34.98.64.0/18
@ -293,20 +347,43 @@
 130.211.8.0/21
 130.211.16.0/20
 130.211.32.0/20
+34.1.32.0/20
+34.18.0.0/16
+34.157.126.0/23
+34.157.252.0/23
+34.1.48.0/20
+34.152.84.0/23
+34.166.0.0/16
+34.177.48.0/23
+34.0.64.0/19
+34.157.90.0/23
+34.157.216.0/23
+34.165.0.0/16
+34.19.128.0/17
+34.20.0.0/17
+34.47.0.0/18
 34.95.0.0/18
 34.104.76.0/22
 34.118.128.0/18
 34.124.12.0/22
+34.128.37.0/24
+34.128.42.0/23
+34.128.49.0/24
+34.128.58.0/23
 34.152.0.0/18
 35.203.0.0/17
 35.215.0.0/18
 35.220.43.0/24
 35.234.240.0/20
 35.242.43.0/24
+34.0.32.0/20
 34.104.114.0/23
 34.124.50.0/23
 34.124.112.0/20
 34.130.0.0/16
+34.152.69.0/24
+34.157.255.0/24
+34.39.128.0/17
 34.95.128.0/17
 34.104.80.0/21
 34.124.16.0/21
@ -319,8 +396,11 @@
 35.235.0.0/20
 35.242.40.0/24
 35.247.192.0/18
+34.0.48.0/20
 34.104.50.0/23
 34.127.178.0/23
+34.153.33.0/24
+34.153.225.0/24
 34.176.0.0/16
 8.34.210.0/24
 8.34.212.0/22
@ -328,13 +408,22 @@
 8.35.192.0/21
 23.236.48.0/20
 23.251.144.0/20
+34.0.225.0/24
 34.16.0.0/17
+34.27.0.0/16
+34.28.0.0/14
+34.33.0.0/16
+34.41.0.0/16
+34.42.0.0/16
+34.44.0.0/15
+34.46.0.0/16
 34.66.0.0/15
 34.68.0.0/14
 34.72.0.0/16
 34.118.200.0/21
 34.121.0.0/16
 34.122.0.0/15
+34.128.32.0/22
 34.132.0.0/14
 34.136.0.0/16
 34.157.84.0/23
@ -343,6 +432,7 @@
 34.157.224.0/20
 34.170.0.0/15
 34.172.0.0/15
+34.177.52.0/22
 35.184.0.0/16
 35.188.0.0/17
 35.188.128.0/18
@ -388,6 +478,7 @@
 199.192.115.0/24
 199.223.232.0/22
 199.223.236.0/24
+34.22.0.0/19
 35.186.0.0/17
 35.186.128.0/20
 35.206.32.0/19
@ -396,12 +487,17 @@
 107.167.160.0/20
 108.59.88.0/21
 173.255.120.0/21
+34.23.0.0/16
+34.24.0.0/15
+34.26.0.0/16
 34.73.0.0/16
 34.74.0.0/15
 34.98.128.0/21
 34.118.250.0/23
 34.138.0.0/15
 34.148.0.0/16
+34.152.72.0/21
+34.177.40.0/21
 35.185.0.0/17
 35.190.128.0/18
 35.196.0.0/16
@ -424,6 +520,8 @@
 104.196.128.0/18
 104.196.192.0/19
 162.216.148.0/22
+34.21.0.0/17
+34.48.0.0/16
 34.85.128.0/17
 34.86.0.0/16
 34.104.60.0/23
@ -450,6 +548,7 @@
 35.242.60.0/22
 35.243.40.0/21
 35.245.0.0/16
+34.1.16.0/20
 34.157.32.0/22
 34.157.160.0/22
 34.162.0.0/16
@ -457,9 +556,11 @@
 34.127.184.0/23
 34.161.0.0/16
 35.206.10.0/23
+34.0.128.0/19
 34.157.46.0/23
 34.157.174.0/23
 34.174.0.0/16
+34.19.0.0/17
 34.82.0.0/15
 34.105.0.0/17
 34.118.192.0/21
@ -485,6 +586,7 @@
 104.198.0.0/20
 104.198.96.0/20
 104.199.112.0/20
+34.20.128.0/17
 34.94.0.0/16
 34.102.0.0/17
 34.104.64.0/21
@ -497,14 +599,19 @@
 35.236.0.0/17
 35.242.47.0/24
 35.243.0.0/21
+34.22.32.0/19
 34.104.52.0/24
 34.106.0.0/16
 34.127.180.0/24
 35.217.64.0/18
 35.220.31.0/24
 35.242.31.0/24
+34.16.128.0/17
 34.104.72.0/22
 34.118.240.0/22
 34.124.8.0/22
 34.125.0.0/16
 35.219.128.0/18
+34.37.0.0/16
+34.128.46.0/23
+34.128.62.0/23
--- a/goog-cloud-prefixes6.txt
+++ b/goog-cloud-prefixes6.txt
@ -1,3 +1,4 @@
+2600:1900:8000::/44
 2600:1900:4030::/44
 2600:1900:41a0::/44
 2600:1900:4050::/44
@ -13,6 +14,8 @@
 2600:1900:4150::/44
 2600:1901:8100::/44
 2600:1900:4010::/44
+2600:1901:81f0::/44
+2600:1901:81b0::/44
 2600:1900:40c0::/44
 2600:1900:40d0::/44
 2600:1900:4060::/44
@ -20,10 +23,9 @@
 2600:1901:8110::/44
 2600:1901:8120::/44
 2600:1901::/48
-2600:1901:1:1000::/52
-2600:1901:1:2000::/51
-2600:1901:1:4000::/50
-2600:1901:1:8000::/49
+2600:1901:81c0::/44
+2600:1900:5400::/44
+2600:1901:8160::/44
 2600:1900:40e0::/44
 2600:1900:41e0::/44
 2600:1900:40f0::/44
@ -39,3 +41,4 @@
 2600:1900:4120::/44
 2600:1900:4170::/44
 2600:1900:4180::/44
+2600:1900:4280::/44
--- a/goog-prefixes.txt
+++ b/goog-prefixes.txt
@ -1,76 +1,73 @@
- 8.8.4.0/24
- 8.8.8.0/24
- 8.34.208.0/20
- 8.35.192.0/20
- 23.236.48.0/20
- 23.251.128.0/19
- 34.0.0.0/15
- 34.2.0.0/16
- 34.3.0.0/23
- 34.3.3.0/24
- 34.3.4.0/24
- 34.3.8.0/21
- 34.3.16.0/20
- 34.3.32.0/19
- 34.3.64.0/18
- 34.3.128.0/17
- 34.4.0.0/14
- 34.8.0.0/13
- 34.16.0.0/12
- 34.32.0.0/11
- 34.64.0.0/10
- 34.128.0.0/10
- 35.184.0.0/13
- 35.192.0.0/14
- 35.196.0.0/15
- 35.198.0.0/16
- 35.199.0.0/17
- 35.199.128.0/18
- 35.200.0.0/13
- 35.208.0.0/12
- 35.224.0.0/12
- 35.240.0.0/13
- 64.15.112.0/20
- 64.233.160.0/19
- 66.22.228.0/23
- 66.102.0.0/20
- 66.249.64.0/19
- 70.32.128.0/19
- 72.14.192.0/18
- 74.114.24.0/21
- 74.125.0.0/16
- 104.154.0.0/15
- 104.196.0.0/14
- 104.237.160.0/19
- 107.167.160.0/19
- 107.178.192.0/18
- 108.59.80.0/20
- 108.170.192.0/18
- 108.177.0.0/17
- 130.211.0.0/16
- 136.112.0.0/12
- 142.250.0.0/15
- 146.148.0.0/17
- 162.216.148.0/22
- 162.222.176.0/21
- 172.110.32.0/21
- 172.217.0.0/16
- 172.253.0.0/16
- 173.194.0.0/16
- 173.255.112.0/20
- 192.158.28.0/22
- 192.178.0.0/15
- 193.186.4.0/24
- 199.36.154.0/23
- 199.36.156.0/24
- 199.192.112.0/22
- 199.223.232.0/21
- 207.223.160.0/20
- 208.65.152.0/22
- 208.68.108.0/22
- 208.81.188.0/22
- 208.117.224.0/19
- 209.85.128.0/17
- 216.58.192.0/19
- 216.73.80.0/20
- 216.239.32.0/19
+8.8.4.0/24
+8.8.8.0/24
+8.34.208.0/20
+8.35.192.0/20
+23.236.48.0/20
+23.251.128.0/19
+34.0.0.0/15
+34.2.0.0/16
+34.3.0.0/23
+34.3.3.0/24
+34.3.4.0/24
+34.3.8.0/21
+34.3.16.0/20
+34.3.32.0/19
+34.3.64.0/18
+34.4.0.0/14
+34.8.0.0/13
+34.16.0.0/12
+34.32.0.0/11
+34.64.0.0/10
+34.128.0.0/10
+35.184.0.0/13
+35.192.0.0/14
+35.196.0.0/15
+35.198.0.0/16
+35.199.0.0/17
+35.199.128.0/18
+35.200.0.0/13
+35.208.0.0/12
+35.224.0.0/12
+35.240.0.0/13
+64.15.112.0/20
+64.233.160.0/19
+66.22.228.0/23
+66.102.0.0/20
+66.249.64.0/19
+70.32.128.0/19
+72.14.192.0/18
+74.125.0.0/16
+104.154.0.0/15
+104.196.0.0/14
+104.237.160.0/19
+107.167.160.0/19
+107.178.192.0/18
+108.59.80.0/20
+108.170.192.0/18
+108.177.0.0/17
+130.211.0.0/16
+142.250.0.0/15
+146.148.0.0/17
+162.216.148.0/22
+162.222.176.0/21
+172.110.32.0/21
+172.217.0.0/16
+172.253.0.0/16
+173.194.0.0/16
+173.255.112.0/20
+192.158.28.0/22
+192.178.0.0/15
+193.186.4.0/24
+199.36.154.0/23
+199.36.156.0/24
+199.192.112.0/22
+199.223.232.0/21
+207.223.160.0/20
+208.65.152.0/22
+208.68.108.0/22
+208.81.188.0/22
+208.117.224.0/19
+209.85.128.0/17
+216.58.192.0/19
+216.73.80.0/20
+216.239.32.0/19
--- a/goog.json
+++ b/goog.json
@ -1,6 +1,6 @@
 {
-  "syncToken": "1661015026669",
-  "creationTime": "2022-08-20T10:03:46.669184",
+  "syncToken": "1714053903689",
+  "creationTime": "2024-04-25T07:05:03.68994",
  "prefixes": [{
    "ipv4Prefix": "8.8.4.0/24"
  }, {
@ -31,8 +31,6 @@
    "ipv4Prefix": "34.3.32.0/19"
  }, {
    "ipv4Prefix": "34.3.64.0/18"
-  }, {
-    "ipv4Prefix": "34.3.128.0/17"
  }, {
    "ipv4Prefix": "34.4.0.0/14"
  }, {
@ -79,8 +77,6 @@
    "ipv4Prefix": "70.32.128.0/19"
  }, {
    "ipv4Prefix": "72.14.192.0/18"
-  }, {
-    "ipv4Prefix": "74.114.24.0/21"
  }, {
    "ipv4Prefix": "74.125.0.0/16"
  }, {
@ -101,8 +97,6 @@
    "ipv4Prefix": "108.177.0.0/17"
  }, {
    "ipv4Prefix": "130.211.0.0/16"
-  }, {
-    "ipv4Prefix": "136.112.0.0/12"
  }, {
    "ipv4Prefix": "142.250.0.0/15"
  }, {
--- a/netsendmsg.bt
+++ b/netsendmsg.bt
@ -6,7 +6,15 @@ kprobe:tcp_sendmsg
 {
  $sk = (struct sock *)arg0;

-  $daddr = ntop($sk->__sk_common.skc_daddr);
+  if($sk->__sk_common.skc_family==2) {
+    $daddr = ntop($sk->__sk_common.skc_daddr);
+  }
+  else if($sk->__sk_common.skc_family==10) {
+    $daddr = ntop($sk->__sk_common.skc_v6_daddr.in6_u.u6_addr8);
+  }

-  printf("%-8d\t%s\t(%s)\n", pid, $daddr, comm);
+  /* skc_v6_daddr, skc_family */
+
+  printf("direct\t%s\tpid%d\t%d\t%s\n", $daddr , pid, $sk->__sk_common.skc_family, comm);
 }
+
--- a/teller.cc
+++ b/teller.cc
@ -14,6 +14,7 @@ using namespace std;

 struct TrackerConf
 {
+  string name; // superfluous but makes life easier
  double freq{400};
  double balance{0.5}; // 0 is left, 1 is right
  std::atomic<int64_t> counter{0};
@ -86,6 +87,7 @@ int main(int argc, char** argv)
  auto tellerarr = conftbl.as_table();
  for(const auto& t : *tellerarr) {
    auto& entry = trackerdb[(string)t.first];
+    entry.name = t.first;
    entry.balance =     conftbl[t.first]["balance"].value_or(0.5);
    entry.freq =     conftbl[t.first]["freq"].value_or(500);
    cout <<"Want to play sound for tracker "<<t.first<<", balance= "<<entry.balance<<" frequency = "<<entry.freq<<endl;
@ -113,7 +115,7 @@ int main(int argc, char** argv)
      });
    }
    else {
-      cout<<"Not array?"<<endl;
+      cout<<"Not array, or empty"<<endl;
    }
    
    track = trackertbl[t.first]["negative"].as_array();
@ -126,7 +128,7 @@ int main(int argc, char** argv)
      });
    }
    else {
-      cout<<"Negative "<<t.first<<" not array?"<<endl;
+      cout<<"Negative "<<t.first<<" not array, or empty"<<endl;
    }
  }
  
@ -137,7 +139,7 @@ int main(int argc, char** argv)
  }
  string line;
  while(getline(cin, line)) {
-
+    string ip;
    /*
      22:42:25.323984 IP 13.81.0.219.29601 > 10.0.0.3.32902: tcp 1186
      22:42:25.323997 IP 10.0.0.3.32902 > 13.81.0.219.29601: tcp 0
@ -150,18 +152,20 @@ int main(int argc, char** argv)
      auto pos = line.find('>');
      if(pos == string::npos)
        continue;
-      auto pos2 = line.find('.', pos);
+      auto pos2 = line.find('.', pos); // this misses out on IPv6 ICMP
      if(pos2 == string::npos) continue;
      line.resize(pos2);
-      string ip = line.substr(pos+2, pos2 - pos - 2);
-
-      if(tracksneg.lookup(&line.at(pos+2))) {
-        cout<<ip<<" negative match"<<endl;
-      }
-      else if(auto fptr = trackspos.lookup(&line.at(pos+2))) {
-        cout<<ip<<" match!"<<endl;
-        ((TrackerConf*)fptr)->counter++;
-      }
+      ip = line.substr(pos+2, pos2 - pos - 2);
+    }
+    else if(line.find("direct") ==0 ) { // ebpfscript output
+      auto pos = line.find('\t');
+      if(pos == string::npos)
+        continue;
+      auto pos2 = line.find('\t', pos+1);
+      if(pos2 == string::npos)
+        continue;
+      line.resize(pos2);
+      ip = line.substr(pos+1);
    }
    else { 
      auto pos = line.find('>');
@ -178,17 +182,19 @@ int main(int argc, char** argv)
      if(pos2 == string::npos) continue;
      
      line.resize(pos2);
-      string ip=line.substr(pos+2, pos2 - pos - 2);
-      //    cout<<&line.at(pos+2)<<endl;
-      if(tracksneg.lookup(&line.at(pos+2))) {
-        cout<<ip<<" negative match"<<endl;
+      ip=line.substr(pos+2, pos2 - pos - 2);
+    }
+    if(!ip.empty()) {
+      if(auto fptr = tracksneg.lookup(ip.c_str())) {
+	auto ptr = (TrackerConf*)fptr;
+        cout<<ip<<" negative match ("<<ptr->name<<")"<<endl;
      }
-      else if(auto fptr = trackspos.lookup(&line.at(pos+2))) {
-        cout<<ip<<" match!"<<endl;
-        ((TrackerConf*)fptr)->counter++;
+      else if(auto fptr = trackspos.lookup(ip.c_str())) {
+	auto ptr = (TrackerConf*)fptr;
+        cout<<ip<<" match ("<<ptr->name<<")"<<endl;
+        ptr->counter++;
      }
    }
-
  }
  sleep(1);
 }
--- a/trackers.conf
+++ b/trackers.conf
@ -1,79 +1,76 @@
 [google]
 	positive= ["8.8.4.0/24",
-"8.8.8.0/24", 
-"8.34.208.0/20", 
-"8.35.192.0/20", 
-"23.236.48.0/20", 
-"23.251.128.0/19", 
-"34.0.0.0/15", 
-"34.2.0.0/16", 
-"34.3.0.0/23", 
-"34.3.3.0/24", 
-"34.3.4.0/24", 
-"34.3.8.0/21", 
-"34.3.16.0/20", 
-"34.3.32.0/19", 
-"34.3.64.0/18", 
-"34.3.128.0/17", 
-"34.4.0.0/14", 
-"34.8.0.0/13", 
-"34.16.0.0/12", 
-"34.32.0.0/11", 
-"34.64.0.0/10", 
-"34.128.0.0/10", 
-"35.184.0.0/13", 
-"35.192.0.0/14", 
-"35.196.0.0/15", 
-"35.198.0.0/16", 
-"35.199.0.0/17", 
-"35.199.128.0/18", 
-"35.200.0.0/13", 
-"35.208.0.0/12", 
-"35.224.0.0/12", 
-"35.240.0.0/13", 
-"64.15.112.0/20", 
-"64.233.160.0/19", 
-"66.22.228.0/23", 
-"66.102.0.0/20", 
-"66.249.64.0/19", 
-"70.32.128.0/19", 
-"72.14.192.0/18", 
-"74.114.24.0/21", 
-"74.125.0.0/16", 
-"104.154.0.0/15", 
-"104.196.0.0/14", 
-"104.237.160.0/19", 
-"107.167.160.0/19", 
-"107.178.192.0/18", 
-"108.59.80.0/20", 
-"108.170.192.0/18", 
-"108.177.0.0/17", 
-"130.211.0.0/16", 
-"136.112.0.0/12", 
-"142.250.0.0/15", 
-"146.148.0.0/17", 
-"162.216.148.0/22", 
-"162.222.176.0/21", 
-"172.110.32.0/21", 
-"172.217.0.0/16", 
-"172.253.0.0/16", 
-"173.194.0.0/16", 
-"173.255.112.0/20", 
-"192.158.28.0/22", 
-"192.178.0.0/15", 
-"193.186.4.0/24", 
-"199.36.154.0/23", 
-"199.36.156.0/24", 
-"199.192.112.0/22", 
-"199.223.232.0/21", 
-"207.223.160.0/20", 
-"208.65.152.0/22", 
-"208.68.108.0/22", 
-"208.81.188.0/22", 
-"208.117.224.0/19", 
-"209.85.128.0/17", 
-"216.58.192.0/19", 
-"216.73.80.0/20", 
+"8.8.8.0/24",
+"8.34.208.0/20",
+"8.35.192.0/20",
+"23.236.48.0/20",
+"23.251.128.0/19",
+"34.0.0.0/15",
+"34.2.0.0/16",
+"34.3.0.0/23",
+"34.3.3.0/24",
+"34.3.4.0/24",
+"34.3.8.0/21",
+"34.3.16.0/20",
+"34.3.32.0/19",
+"34.3.64.0/18",
+"34.4.0.0/14",
+"34.8.0.0/13",
+"34.16.0.0/12",
+"34.32.0.0/11",
+"34.64.0.0/10",
+"34.128.0.0/10",
+"35.184.0.0/13",
+"35.192.0.0/14",
+"35.196.0.0/15",
+"35.198.0.0/16",
+"35.199.0.0/17",
+"35.199.128.0/18",
+"35.200.0.0/13",
+"35.208.0.0/12",
+"35.224.0.0/12",
+"35.240.0.0/13",
+"64.15.112.0/20",
+"64.233.160.0/19",
+"66.22.228.0/23",
+"66.102.0.0/20",
+"66.249.64.0/19",
+"70.32.128.0/19",
+"72.14.192.0/18",
+"74.125.0.0/16",
+"104.154.0.0/15",
+"104.196.0.0/14",
+"104.237.160.0/19",
+"107.167.160.0/19",
+"107.178.192.0/18",
+"108.59.80.0/20",
+"108.170.192.0/18",
+"108.177.0.0/17",
+"130.211.0.0/16",
+"142.250.0.0/15",
+"146.148.0.0/17",
+"162.216.148.0/22",
+"162.222.176.0/21",
+"172.110.32.0/21",
+"172.217.0.0/16",
+"172.253.0.0/16",
+"173.194.0.0/16",
+"173.255.112.0/20",
+"192.158.28.0/22",
+"192.178.0.0/15",
+"193.186.4.0/24",
+"199.36.154.0/23",
+"199.36.156.0/24",
+"199.192.112.0/22",
+"199.223.232.0/21",
+"207.223.160.0/20",
+"208.65.152.0/22",
+"208.68.108.0/22",
+"208.81.188.0/22",
+"208.117.224.0/19",
+"209.85.128.0/17",
+"216.58.192.0/19",
+"216.73.80.0/20",
 "216.239.32.0/19",
 "2001:4860::/32",
 "2404:6800::/32",
@ -85,10 +82,13 @@
 "2620:120:e000::/40",
 "2800:3f0::/32",
 "2a00:1450::/32",
-"2c0f:fb50::/32"
-]
+"2c0f:fb50::/32"]
 
- negative=["34.80.0.0/15",
+ negative=[
+"34.35.0.0/16",
+"34.152.86.0/23",
+"34.177.50.0/23",
+"34.80.0.0/15",
 "34.137.0.0/16",
 "35.185.128.0/19",
 "35.185.160.0/20",
@ -154,6 +154,11 @@
 "35.220.45.0/24",
 "35.242.45.0/24",
 "35.243.56.0/21",
+"34.0.96.0/19",
+"34.22.64.0/19",
+"34.22.96.0/20",
+"34.47.64.0/18",
+"34.50.0.0/18",
 "34.64.32.0/19",
 "34.64.64.0/22",
 "34.64.68.0/22",
@ -167,12 +172,16 @@
 "34.64.160.0/19",
 "34.64.192.0/18",
 "35.216.0.0/17",
+"34.0.227.0/24",
+"34.47.128.0/17",
 "34.93.0.0/16",
 "34.100.128.0/17",
 "34.104.108.0/23",
 "34.124.44.0/23",
+"34.152.64.0/22",
 "34.157.87.0/24",
 "34.157.215.0/24",
+"34.177.32.0/22",
 "35.200.128.0/17",
 "35.201.41.0/24",
 "35.207.192.0/18",
@ -180,10 +189,15 @@
 "35.234.208.0/20",
 "35.242.42.0/24",
 "35.244.0.0/18",
+"34.0.0.0/20",
 "34.104.120.0/23",
 "34.124.56.0/23",
 "34.126.208.0/20",
 "34.131.0.0/16",
+"34.153.32.0/24",
+"34.153.224.0/24",
+"34.1.128.0/20",
+"34.21.128.0/17",
 "34.87.0.0/17",
 "34.87.128.0/18",
 "34.104.58.0/23",
@ -192,6 +206,8 @@
 "34.124.128.0/17",
 "34.126.64.0/18",
 "34.126.128.0/18",
+"34.128.44.0/23",
+"34.128.60.0/23",
 "34.142.128.0/17",
 "34.143.128.0/17",
 "34.157.82.0/23",
@ -208,6 +224,8 @@
 "35.240.128.0/17",
 "35.242.24.0/23",
 "35.247.128.0/18",
+"34.34.216.0/21",
+"34.50.64.0/18",
 "34.101.18.0/24",
 "34.101.20.0/22",
 "34.101.24.0/22",
@ -215,11 +233,16 @@
 "34.101.64.0/18",
 "34.101.128.0/17",
 "34.128.64.0/18",
+"34.152.68.0/24",
+"34.157.254.0/24",
 "35.219.0.0/17",
+"34.40.128.0/17",
 "34.87.192.0/18",
 "34.104.104.0/23",
 "34.116.64.0/18",
 "34.124.40.0/23",
+"34.128.36.0/24",
+"34.128.48.0/24",
 "34.151.64.0/18",
 "34.151.128.0/18",
 "35.189.0.0/18",
@ -230,10 +253,12 @@
 "35.234.224.0/20",
 "35.242.41.0/24",
 "35.244.64.0/18",
+"34.0.16.0/20",
 "34.104.122.0/23",
 "34.124.58.0/23",
 "34.126.192.0/20",
 "34.129.0.0/16",
+"34.0.240.0/20",
 "34.104.116.0/22",
 "34.116.128.0/17",
 "34.118.0.0/17",
@ -246,6 +271,7 @@
 "35.220.26.0/24",
 "35.228.0.0/16",
 "35.242.26.0/24",
+"34.0.192.0/19",
 "34.157.44.0/23",
 "34.157.172.0/23",
 "34.164.0.0/16",
@ -254,6 +280,10 @@
 "8.34.211.0/24",
 "8.34.220.0/22",
 "23.251.128.0/20",
+"34.22.112.0/20",
+"34.22.128.0/17",
+"34.34.128.0/18",
+"34.38.0.0/16",
 "34.76.0.0/14",
 "34.118.254.0/23",
 "34.140.0.0/16",
@ -286,9 +316,17 @@
 "146.148.16.0/20",
 "146.148.112.0/20",
 "192.158.28.0/22",
+"34.32.0.0/17",
+"34.152.80.0/23",
+"34.177.36.0/23",
+"34.17.0.0/16",
+"34.157.124.0/23",
+"34.157.250.0/23",
+"34.39.0.0/17",
 "34.89.0.0/17",
 "34.105.128.0/17",
 "34.127.186.0/23",
+"34.128.52.0/22",
 "34.142.0.0/17",
 "34.147.128.0/17",
 "34.157.36.0/22",
@ -307,6 +345,9 @@
 "35.242.20.0/22",
 "35.242.128.0/18",
 "35.246.0.0/17",
+"34.0.224.0/24",
+"34.0.226.0/24",
+"34.40.0.0/17",
 "34.89.128.0/17",
 "34.104.112.0/23",
 "34.107.0.0/17",
@ -326,6 +367,8 @@
 "35.242.18.0/23",
 "35.242.192.0/18",
 "35.246.128.0/17",
+"34.32.128.0/17",
+"34.34.0.0/17",
 "34.90.0.0/15",
 "34.104.126.0/23",
 "34.124.62.0/23",
@ -347,14 +390,22 @@
 "35.220.44.0/24",
 "35.235.216.0/21",
 "35.242.44.0/24",
+"34.0.160.0/19",
+"34.153.38.0/24",
+"34.153.230.0/24",
 "34.154.0.0/16",
 "34.157.8.0/23",
+"34.157.121.0/24",
 "34.157.136.0/23",
+"34.157.249.0/24",
 "35.219.224.0/19",
+"34.1.0.0/20",
 "34.155.0.0/16",
 "34.157.12.0/22",
 "34.157.140.0/22",
 "34.163.0.0/16",
+"34.36.0.0/16",
+"34.49.0.0/16",
 "34.95.64.0/18",
 "34.96.64.0/18",
 "34.98.64.0/18",
@ -383,20 +434,43 @@
 "130.211.8.0/21",
 "130.211.16.0/20",
 "130.211.32.0/20",
+"34.1.32.0/20",
+"34.18.0.0/16",
+"34.157.126.0/23",
+"34.157.252.0/23",
+"34.1.48.0/20",
+"34.152.84.0/23",
+"34.166.0.0/16",
+"34.177.48.0/23",
+"34.0.64.0/19",
+"34.157.90.0/23",
+"34.157.216.0/23",
+"34.165.0.0/16",
+"34.19.128.0/17",
+"34.20.0.0/17",
+"34.47.0.0/18",
 "34.95.0.0/18",
 "34.104.76.0/22",
 "34.118.128.0/18",
 "34.124.12.0/22",
+"34.128.37.0/24",
+"34.128.42.0/23",
+"34.128.49.0/24",
+"34.128.58.0/23",
 "34.152.0.0/18",
 "35.203.0.0/17",
 "35.215.0.0/18",
 "35.220.43.0/24",
 "35.234.240.0/20",
 "35.242.43.0/24",
+"34.0.32.0/20",
 "34.104.114.0/23",
 "34.124.50.0/23",
 "34.124.112.0/20",
 "34.130.0.0/16",
+"34.152.69.0/24",
+"34.157.255.0/24",
+"34.39.128.0/17",
 "34.95.128.0/17",
 "34.104.80.0/21",
 "34.124.16.0/21",
@ -409,8 +483,11 @@
 "35.235.0.0/20",
 "35.242.40.0/24",
 "35.247.192.0/18",
+"34.0.48.0/20",
 "34.104.50.0/23",
 "34.127.178.0/23",
+"34.153.33.0/24",
+"34.153.225.0/24",
 "34.176.0.0/16",
 "8.34.210.0/24",
 "8.34.212.0/22",
@ -418,13 +495,22 @@
 "8.35.192.0/21",
 "23.236.48.0/20",
 "23.251.144.0/20",
+"34.0.225.0/24",
 "34.16.0.0/17",
+"34.27.0.0/16",
+"34.28.0.0/14",
+"34.33.0.0/16",
+"34.41.0.0/16",
+"34.42.0.0/16",
+"34.44.0.0/15",
+"34.46.0.0/16",
 "34.66.0.0/15",
 "34.68.0.0/14",
 "34.72.0.0/16",
 "34.118.200.0/21",
 "34.121.0.0/16",
 "34.122.0.0/15",
+"34.128.32.0/22",
 "34.132.0.0/14",
 "34.136.0.0/16",
 "34.157.84.0/23",
@ -433,6 +519,7 @@
 "34.157.224.0/20",
 "34.170.0.0/15",
 "34.172.0.0/15",
+"34.177.52.0/22",
 "35.184.0.0/16",
 "35.188.0.0/17",
 "35.188.128.0/18",
@ -478,6 +565,7 @@
 "199.192.115.0/24",
 "199.223.232.0/22",
 "199.223.236.0/24",
+"34.22.0.0/19",
 "35.186.0.0/17",
 "35.186.128.0/20",
 "35.206.32.0/19",
@ -486,12 +574,17 @@
 "107.167.160.0/20",
 "108.59.88.0/21",
 "173.255.120.0/21",
+"34.23.0.0/16",
+"34.24.0.0/15",
+"34.26.0.0/16",
 "34.73.0.0/16",
 "34.74.0.0/15",
 "34.98.128.0/21",
 "34.118.250.0/23",
 "34.138.0.0/15",
 "34.148.0.0/16",
+"34.152.72.0/21",
+"34.177.40.0/21",
 "35.185.0.0/17",
 "35.190.128.0/18",
 "35.196.0.0/16",
@ -514,6 +607,8 @@
 "104.196.128.0/18",
 "104.196.192.0/19",
 "162.216.148.0/22",
+"34.21.0.0/17",
+"34.48.0.0/16",
 "34.85.128.0/17",
 "34.86.0.0/16",
 "34.104.60.0/23",
@ -540,6 +635,7 @@
 "35.242.60.0/22",
 "35.243.40.0/21",
 "35.245.0.0/16",
+"34.1.16.0/20",
 "34.157.32.0/22",
 "34.157.160.0/22",
 "34.162.0.0/16",
@ -547,9 +643,11 @@
 "34.127.184.0/23",
 "34.161.0.0/16",
 "35.206.10.0/23",
+"34.0.128.0/19",
 "34.157.46.0/23",
 "34.157.174.0/23",
 "34.174.0.0/16",
+"34.19.0.0/17",
 "34.82.0.0/15",
 "34.105.0.0/17",
 "34.118.192.0/21",
@ -575,6 +673,7 @@
 "104.198.0.0/20",
 "104.198.96.0/20",
 "104.199.112.0/20",
+"34.20.128.0/17",
 "34.94.0.0/16",
 "34.102.0.0/17",
 "34.104.64.0/21",
@ -587,17 +686,23 @@
 "35.236.0.0/17",
 "35.242.47.0/24",
 "35.243.0.0/21",
+"34.22.32.0/19",
 "34.104.52.0/24",
 "34.106.0.0/16",
 "34.127.180.0/24",
 "35.217.64.0/18",
 "35.220.31.0/24",
 "35.242.31.0/24",
+"34.16.128.0/17",
 "34.104.72.0/22",
 "34.118.240.0/22",
 "34.124.8.0/22",
 "34.125.0.0/16",
 "35.219.128.0/18",
+"34.37.0.0/16",
+"34.128.46.0/23",
+"34.128.62.0/23",
+"2600:1900:8000::/44",
 "2600:1900:4030::/44",
 "2600:1900:41a0::/44",
 "2600:1900:4050::/44",
@ -613,6 +718,8 @@
 "2600:1900:4150::/44",
 "2600:1901:8100::/44",
 "2600:1900:4010::/44",
+"2600:1901:81f0::/44",
+"2600:1901:81b0::/44",
 "2600:1900:40c0::/44",
 "2600:1900:40d0::/44",
 "2600:1900:4060::/44",
@ -620,10 +727,9 @@
 "2600:1901:8110::/44",
 "2600:1901:8120::/44",
 "2600:1901::/48",
-"2600:1901:1:1000::/52",
-"2600:1901:1:2000::/51",
-"2600:1901:1:4000::/50",
-"2600:1901:1:8000::/49",
+"2600:1901:81c0::/44",
+"2600:1900:5400::/44",
+"2600:1901:8160::/44",
 "2600:1900:40e0::/44",
 "2600:1900:41e0::/44",
 "2600:1900:40f0::/44",
@ -638,7 +744,8 @@
 "2600:1900:4040::/44",
 "2600:1900:4120::/44",
 "2600:1900:4170::/44",
-"2600:1900:4180::/44"
+"2600:1900:4180::/44",
+"2600:1900:4280::/44"
 ]

 [facebook]
Author	SHA1	Message	Date
Chris Blom	aad2d92ec6	Merge `b4c851b39e` into `985c9bb97c`	2024-05-02 01:27:17 +02:00
bert hubert	985c9bb97c	fix up bpftrace-based operation	2024-04-26 00:21:49 +02:00
bert hubert	ef47d7cfae	improve output somewhat (add tracker name when reporting a match), clean up code a bit	2024-04-25 23:20:14 +02:00
bert hubert	9fb88577a3	update google ip addresses in the main config	2024-04-25 22:33:32 +02:00
bert hubert	f906610bc4	update json of google cloud addresses	2024-04-25 21:18:43 +02:00
bert hubert	24ec2e56dd	update google IP addresses	2024-04-25 21:06:51 +02:00