include traceroute messages

Author: filipsPL

mesh-collectd.py

@@ -61,6 +61,15 @@ def init_db(db_path="mqtt_messages.db"):
            )"""
     )
 
+    cursor.execute(
+        """CREATE TABLE IF NOT EXISTS traceroutes (
+               id INTEGER PRIMARY KEY AUTOINCREMENT,
+               from_node TEXT,
+               to_node TEXT,
+               timestamp INTEGER
+           )"""
+    )
+
     conn.commit()
     return conn
 
@@ -86,6 +95,24 @@ def save_nodeinfo_to_db(conn, node_id, longname=None, shortname=None, hardware=N
     except Exception as e:
         print(f"Error saving node info: {e}")
 
+def save_traceroute_to_db(conn, route, timestamp):
+    cursor = conn.cursor()
+    try:
+        # Process each consecutive pair in the route
+        for i in range(len(route) - 1):
+            from_node = sanitize_string(route[i])
+            to_node = sanitize_string(route[i + 1])
+
+            if 'Unknown' not in [from_node, to_node]:
+                cursor.execute(
+                    """INSERT INTO traceroutes (from_node, to_node, timestamp)
+                    VALUES (?, ?, ?)""",
+                    (from_node, to_node, timestamp)
+                )
+            conn.commit()
+    except Exception as e:
+        print(f"Error saving traceroute info: {e}")
+
 
 def save_message_to_db(conn, topic, sender, receiver, physical_sender, timestamp, rssi, snr, type):
     cursor = conn.cursor()
@@ -129,6 +156,8 @@ def db_worker(queue, db_path):
                 save_neighbors_to_db(conn, *item[1:])
             elif item[0] == "position":
                 save_nodeinfo_to_db(conn, *item[1:])
+            elif item[0] == "traceroute":
+                save_traceroute_to_db(conn, *item[1:])
         except Exception as e:
             print(f"Database error: {e}")
     conn.close()
@@ -241,6 +270,21 @@ def on_message(client, userdata, msg):
                     f"Node {node_id}: {timestamp} {node_id} Neighbors: {len(neighbors)}"
                 )
 
+
+        elif msg_type == "traceroute" and "payload" in payload:
+            route_payload = payload["payload"]
+            if "route" in route_payload:
+                route = route_payload["route"]
+                current_time = int(time.time())  # Get current Unix timestamp
+                userdata.put(("traceroute", route, current_time))
+                
+                # Print the route pairs
+                route_pairs = [f"{route[i]} -> {route[i+1]}" 
+                             for i in range(len(route)-1)]
+                print(f"Traceroute at {timestamp} with pairs:")
+                for pair in route_pairs:
+                    print(f"  {pair}")
+
         elif msg_type == "position" and "payload" in payload:
             pos_payload = payload["payload"]
             if all(k in pos_payload for k in ["latitude_i", "longitude_i"]):

sqlite2json.py

@@ -160,7 +160,89 @@ def export_to_json(db_path, json_output_path, time_limit_minutes, use_physical_s
             conn.close()
 
 
-# Example usage
+def get_node_shortname_and_role(cursor, longname):
+    """Get shortname and role for a node by its longname from the nodes table"""
+    cursor.execute("SELECT shortname, role FROM nodes WHERE longname = ?", (longname,))
+    result = cursor.fetchone()
+    if result:
+        return result[0], result[1]  # shortname, role
+    return longname, None  # Return original longname if no match found
+
+def export_traceroutes_to_json(db_path, json_output_path, time_limit_minutes):
+    try:
+        conn = sqlite3.connect(db_path)
+        cursor = conn.cursor()
+
+        cutoff_time = int((datetime.now() - timedelta(minutes=time_limit_minutes)).timestamp())
+
+        cursor.execute(
+            """SELECT from_node, to_node, COUNT(*) as count
+               FROM traceroutes
+               WHERE timestamp >= ?
+               GROUP BY from_node, to_node""",
+            (cutoff_time,),
+        )
+        rows = cursor.fetchall()
+
+        connection_counts = defaultdict(int)
+        valid_connections = []
+
+        for row in rows:
+            from_node, to_node, count = row
+            valid_connections.append((from_node, to_node, count))
+            connection_counts[from_node] += 1
+            connection_counts[to_node] += 1
+
+        cytoscape_data = []
+        processed_nodes = set()
+
+        # Add nodes
+        for node_name in connection_counts.keys():
+            if node_name not in processed_nodes:
+                shortname, role = get_node_shortname_and_role(cursor, node_name)
+                node_id = shortname  # Use shortname as node ID
+                
+                cytoscape_data.append({
+                    "data": {
+                        "id": node_id,
+                        "label": shortname,
+                        "role": role,
+                        "connections": connection_counts[node_name],
+                        "original_name": node_name
+                    }
+                })
+                processed_nodes.add(node_name)
+
+        # Add edges
+        for from_node, to_node, count in valid_connections:
+            from_shortname, _ = get_node_shortname_and_role(cursor, from_node)
+            to_shortname, _ = get_node_shortname_and_role(cursor, to_node)
+
+            cytoscape_data.append({
+                "data": {
+                    "id": f"{from_shortname}_{to_shortname}",
+                    "source": from_shortname,
+                    "target": to_shortname,
+                    "count": count,
+                    "original_source": from_node,
+                    "original_target": to_node
+                }
+            })
+
+        with open(json_output_path, "w") as json_file:
+            json.dump(cytoscape_data, json_file, indent=2)
+
+        print(f"Traceroute data successfully exported to {json_output_path}")
+
+    except sqlite3.Error as e:
+        print(f"Database error: {e}")
+    except Exception as e:
+        print(f"Error: {e}")
+    finally:
+        if conn:
+            conn.close()
+
+
 if __name__ == "__main__":
     db_path = "mqtt_messages.db"
     time_windows = [15, 30, 60, 3 * 60, 24 * 60]
@@ -181,10 +263,12 @@ def export_to_json(db_path, json_output_path, time_limit_minutes, use_physical_s
         messages_json = f"{data}/cytoscape_messages_{time_str}.json"
         messages_physical_json = f"{data}/cytoscape_messages_physical_{time_str}.json"
         neighbors_json = f"{data}/cytoscape_neighbors_{time_str}.json"
+        traceroutes_json = f"{data}/cytoscape_traceroutes_{time_str}.json"  # New file for traceroutes
 
         print(f"\nExporting data for {time_str} time window...")
 
-        # Export both variants of message data and neighbor data
+        # Export all data types
         export_to_json(db_path, messages_json, minutes, use_physical_sender=False)
         export_to_json(db_path, messages_physical_json, minutes, use_physical_sender=True)
         export_neighbors_to_json(db_path, neighbors_json, minutes)
+        export_traceroutes_to_json(db_path, traceroutes_json, minutes) 

webpage/index.html

@@ -34,6 +34,9 @@
     <strong>Map of mesh node connections.</strong> Updated: <span id="whenupdated"></span>
     <div class="controls">
         <select id="fileSelect">
+            <option value="data/cytoscape_traceroutes_1h.json">🚇  Traceroutes :: 1 hour</option>
+            <option value="data/cytoscape_traceroutes_3h.json">🚇  Traceroutes :: 3 hours</option>
+            <option value="data/cytoscape_traceroutes_24h.json">🚇 Traceroutes :: 24 hours</option>
             <option value="data/cytoscape_messages_physical_15min.json">➽ sender ⤑ to :: 15 minutes</option>
             <option value="data/cytoscape_messages_physical_30min.json">➽ sender ⤑ to :: 30 minutes</option>
             <option value="data/cytoscape_messages_physical_1h.json">➽ sender ⤑ to :: 1 hour</option>