Add IPv6 support for network table

networktable.c

@@ -44,8 +44,8 @@ bool create_network_addresses_table(void)
 	// Create network_addresses table in the database
 	ret = dbquery("CREATE TABLE network_addresses ( network_id INTEGER NOT NULL, "\
 	                                               "ip TEXT NOT NULL, "\
-	                                               "lastQuery INTEGER NOT NULL, "\
-	                                               "UNIQUE(network_id,ip), "\
+	                                               "lastSeen INTEGER NOT NULL, "\
+	                                               "PRIMARY KEY(network_id,ip), "\
 	                                               "FOREIGN KEY(network_id) REFERENCES network(id));");
 	if(!ret){ dbclose(); return false; }
 
@@ -82,7 +82,7 @@ void parse_neighbor_cache(void)
 	// Prepare buffers
 	char * linebuffer = NULL;
 	size_t linebuffersize = 0;
-	char ip[100], status[100], hwaddr[100], iface[100];
+	char ip[100], status1[100], status2[100], hwaddr[100], iface[100];
 	unsigned int entries = 0;
 	time_t now = time(NULL);
 
@@ -93,17 +93,35 @@ void parse_neighbor_cache(void)
 	// Read ARP cache line by line
 	while(getline(&linebuffer, &linebuffersize, arpfp) != -1)
 	{
-		int num = sscanf(linebuffer, "%99s dev %99s lladdr %99s %99s",
-		                 ip, iface, hwaddr, status);
+		int num = sscanf(linebuffer, "%99s dev %99s lladdr %99s %99s %99s",
+		                 ip, iface, hwaddr, status1, status2);
 
-		// Skip addresses without hardware address information
-		if (num != 4)
-			continue;
-
-		// Only process active entries
-		if(strcasecmp(status, "reachable") != 0 &&
-		   strcasecmp(status, "stale")     != 0)
-			continue;
+		// Check if we want to process the line we just read
+		switch(num)
+		{
+			// Example: 2003:17:7:dc:e1b1:1e01:1a5a:ff dev eth0 lladdr a0:20:29:24:98:99 REACHABLE
+			case 4:
+				if(strcasecmp(status1, "reachable") != 0 &&
+				   strcasecmp(status1, "stale")     != 0)
+				{
+					continue;
+				}
+				break;
+
+			// Example: dead:beef:dead:beef:dead:beef dev wlp3s0 lladdr de:ad:be:ef:de:ad router REACHABLE
+			case 5:
+				if(strcasecmp(status1, "router")     != 0 &&
+				   (strcasecmp(status2, "reachable") != 0 &&
+				    strcasecmp(status2, "stale")     != 0 ))
+				{
+					continue;
+				}
+				break;
+
+			// Skip lines without hardware information
+			default:
+				continue;
+		}
 
 		// Get ID of this device in our network database. If it cannot be
 		// found, then this is a new device. We only use the hardware address
@@ -194,15 +212,6 @@ void parse_neighbor_cache(void)
 			        "WHERE id = %i;",\
 			        ip, dbID);
 
-			// Add unique pair of ID (corresponds to one particular hardware
-			// address) and IP address if it does not exist (INSERT). In case
-			// this pair already exists, the UNIQUE(network_id,ip) trigger
-			// becomes active and the line is instead REPLACEd, causing the
-			// lastQuery timestamp to be updated
-			dbquery("INSERT OR REPLACE INTO network_addresses "\
-			        "(network_id,ip,lastQuery) VALUES(%i,\'%s\',%i);",\
-			        dbID, ip, client->lastQuery);
-
 			// Store hostname if available
 			if(strlen(hostname) > 0)
 			{
@@ -216,6 +225,15 @@ void parse_neighbor_cache(void)
 		// else:
 		// Device in database but not known to Pi-hole: No action required
 
+		// Add unique pair of ID (corresponds to one particular hardware
+		// address) and IP address if it does not exist (INSERT). In case
+		// this pair already exists, the UNIQUE(network_id,ip) trigger
+		// becomes active and the line is instead REPLACEd, causing the
+		// lastQuery timestamp to be updated
+		dbquery("INSERT OR REPLACE INTO network_addresses "\
+		        "(network_id,ip,lastSeen) VALUES(%i,\'%s\',%d);",\
+		        dbID, ip, time(NULL));
+
 		// Count number of processed ARP cache entries
 		entries++;
 	}

test/test_suite.bats

@@ -244,6 +244,7 @@
   [[ "${lines[@]}" == *"CREATE TABLE ftl ( id INTEGER PRIMARY KEY NOT NULL, value BLOB NOT NULL );"* ]]
   [[ "${lines[@]}" == *"CREATE TABLE counters ( id INTEGER PRIMARY KEY NOT NULL, value INTEGER NOT NULL );"* ]]
   [[ "${lines[@]}" == *"CREATE TABLE network ( id INTEGER PRIMARY KEY NOT NULL, ip TEXT NOT NULL, hwaddr TEXT NOT NULL, interface TEXT NOT NULL, name TEXT, firstSeen INTEGER NOT NULL, lastQuery INTEGER NOT NULL, numQueries INTEGER NOT NULL,macVendor TEXT);"* ]]
+  [[ "${lines[@]}" == *"CREATE TABLE network_addresses ( network_id INTEGER NOT NULL, ip TEXT NOT NULL, lastSeen INTEGER NOT NULL, PRIMARY KEY(network_id,ip), FOREIGN KEY(network_id) REFERENCES network(id));"* ]]
   [[ "${lines[@]}" == *"CREATE INDEX idx_queries_timestamps ON queries (timestamp);"* ]]
   [[ "${lines[@]}" == *"CREATE UNIQUE INDEX network_hwaddr_idx ON network(hwaddr);"* ]]
 }