Compare commits

..

No commits in common. "6e9d11dcde75cf2128066d54f55e55e135de7bca" and "93e785c2ae4b730810ce6e76bff3a863e8151678" have entirely different histories.

2 changed files with 79 additions and 261 deletions

96
test.py
View File

@ -1,96 +0,0 @@
import subprocess
import re
import json
import ipaddress
from datetime import datetime
from sys import hash_info
import pprint
def run_traceroute(host):
result = subprocess.run(['traceroute', host], stdout=subprocess.PIPE)
return result.stdout.decode()
def parse_traceroute_output(output):
lines = output.strip().split('\n')
hops = []
ip_regex = r"\((.*?)\)" # ipaddress are in ()
target = output.strip().split('\n')[0].split()[2]
for line in lines[1:]:
hop = []
hop_info = line.split()
hop_number = int(hop_info[0])
hop_name = None
hop_ip = None
hop_latency = None
latencies = []
#print("##### "+str(hop_info))
count = 0
for part in hop_info[1:]:
count += 1
# source node drops or blocks icmp packages
# We will give funny to name to hop for not answering and move on.
if part == '*':
hop_name = 'hop.'+str(count)+'.'+str(target)
break
# If first colum is either name or ip-address
if count == 1:
print(part)
match = re.search(ip_regex, part)
if match:
hop_ip = part.strip('()')
else:
print('do ever here?')
hop_name = part
# Second colum is ip-address first latency reading
if count == 2:
print(part)
if re.search(ip_regex, part):
try:
_ip = ipaddress.ip_address(part.strip('()'))
hop_ip = part.strip('()')
except ValueError:
pass # Ignore if it's not a valid IP address
# Rest of the input colums are either latency floats, 'ms' or
# reruns of the hop_name and hop_ip...
# We only need the latency floats anymore.
else:
print(part)
try:
latency = float(part)
latencies.append(latency)
except ValueError:
pass
hop_latency = sum(latencies) / len(latencies) if latencies else None
hop.append(hop_number)
if not hop_name == None:
hop.append(hop_name)
hop.append(hop_ip)
hop.append(hop_latency)
hops.append(hop)
return target, hops
if __name__ == '__main__':
target='8.8.8.8'
traceroute_output = run_traceroute(target)
target, hops = parse_traceroute_output(traceroute_output)
print('>> '+target)
pprint.pprint(hops)

View File

@ -4,184 +4,99 @@
import subprocess import subprocess
import sqlite3 import sqlite3
import re import re
import json
import ipaddress
from datetime import datetime from datetime import datetime
def run_traceroute(host): def run_traceroute(host):
timestamp = datetime.now().timestamp()
result = subprocess.run(['traceroute', host], stdout=subprocess.PIPE) result = subprocess.run(['traceroute', host], stdout=subprocess.PIPE)
return result.stdout.decode(), timestamp return result.stdout.decode()
def parse_traceroute_output(output, timestamp): def parse_traceroute_output(output):
lines = output.strip().split('\n')
hops = [] hops = []
lines = output.strip().split('\n')[1:] # Skip the first line (traceroute to ...)
ip_regex = r"\((.*?)\)" # ipaddress are in () previous_ip = None
for line in lines:
target = output.strip().split('\n')[0].split()[2] parts = line.split()
hop_number = int(parts[0])
for line in lines[1:]: ip_address = parts[1]
hop = {}
hop_info = line.split()
hop_number = int(hop_info[0])
hop_name = None
hop_ip = None
hop_latency = None
latencies = [] latencies = []
for part in parts[2:]:
#print("##### "+str(hop_info)) if re.match(r'^[0-9+\s+ms$]', part):
count = 0 latency_str = re.sub(r'[^0-9.]', '', part)
for part in hop_info[1:]: if latency_str and not latency_str == '':
count += 1
# source node drops or blocks icmp packages
# We will give funny to name to hop for not answering and move on.
if part == '*':
hop_name = 'hop.'+str(count)+'.'+str(target)
break
# If first colum is either name or ip-address
if count == 1:
match = re.search(ip_regex, part)
if match:
hop_ip = part.strip('()')
else:
hop_name = part
# Second colum is ip-address first latency reading
if count == 2:
if re.search(ip_regex, part):
try: try:
_ip = ipaddress.ip_address(part.strip('()')) print(part)
hop_ip = part.strip('()') print(latency_str)
latencies.append(float(latency_str))
except ValueError: except ValueError:
pass # Ignore if it's not a valid IP address print(f"Could not convert '{latency_str}' to float.")
# Rest of the input colums are either latency floats, 'ms' or
# reruns of the hop_name and hop_ip...
# We only need the latency floats anymore.
else:
try:
latency = float(part)
latencies.append(latency)
except ValueError:
pass
hop_latency = sum(latencies) / len(latencies) if latencies else None
hop['timestamp'] = timestamp
hop['hop_number'] = hop_number
if not hop_name == None:
hop['hop_name'] = hop_name
hop['hop_ip'] = hop_ip
hop['hop_latency'] = hop_latency
hops.append(target)
hops.append(hop)
avg_latency = sum(latencies) / len(latencies) if latencies else None
timestamp = datetime.now().isoformat()
if previous_ip:
hops.append({
'hop_number': hop_number,
'source_ip': previous_ip,
'destination_ip': ip_address,
'latency': avg_latency,
'timestamp': timestamp,
})
previous_ip = ip_address
return hops return hops
def create_tables():
def create_tables(databasefile): conn = sqlite3.connect('traceroute.db')
# Connect to the SQLite database
conn = sqlite3.connect(databasefile)
cursor = conn.cursor() cursor = conn.cursor()
# SQL statements to create the tables # Table to store unique links
create_links_table = """ cursor.execute('''
CREATE TABLE IF NOT EXISTS Links ( CREATE TABLE IF NOT EXISTS links (
id INTEGER PRIMARY KEY, id INTEGER PRIMARY KEY,
source_ip TEXT NOT NULL, source_ip TEXT,
destination_ip TEXT NOT NULL, destination_ip TEXT,
UNIQUE(source_ip, destination_ip) UNIQUE(source_ip, destination_ip)
); )
""" ''')
create_paths_table = """ # Table to store latency and timestamp for each link
CREATE TABLE IF NOT EXISTS Paths ( cursor.execute('''
CREATE TABLE IF NOT EXISTS link_latency (
id INTEGER PRIMARY KEY, id INTEGER PRIMARY KEY,
start_ip TEXT NOT NULL, link_id INTEGER,
end_ip TEXT NOT NULL, latency REAL,
hops_json TEXT NOT NULL, timestamp TEXT,
UNIQUE(start_ip, end_ip, hops_json) FOREIGN KEY (link_id) REFERENCES links (id)
); )
""" ''')
create_latency_table = """
CREATE TABLE IF NOT EXISTS Latency (
id INTEGER PRIMARY KEY,
link_id INTEGER NOT NULL,
timestamp DATETIME DEFAULT CURRENT_TIMESTAMP,
latency_ms REAL NOT NULL,
FOREIGN KEY (link_id) REFERENCES Links(id)
);
"""
create_hopdetails_table = """
CREATE TABLE IF NOT EXISTS HopDetails (
id INTEGER PRIMARY KEY,
link_id INTEGER NOT NULL,
ttl INTEGER,
icmp_type INTEGER,
icmp_code INTEGER,
packet_loss REAL,
FOREIGN KEY (link_id) REFERENCES Links(id)
);
"""
# Execute the SQL statements
cursor.execute(create_links_table)
cursor.execute(create_paths_table)
cursor.execute(create_latency_table)
cursor.execute(create_hopdetails_table)
# Commit changes and close the connection
conn.commit() conn.commit()
conn.close() conn.close()
def store_traceroute(db_file, start_ip, end_ip, hops): def store_traceroute(hops):
conn = sqlite3.connect(db_file) conn = sqlite3.connect('traceroute.db')
cursor = conn.cursor() cursor = conn.cursor()
# Insert links and get their IDs
link_ids = []
for hop in hops: for hop in hops:
print(hop) # Insert or ignore link into links table
source_ip = start_ip if not link_ids else hops[len(link_ids)-1][0] cursor.execute('''
destination_ip = hop[0] INSERT OR IGNORE INTO links (source_ip, destination_ip)
latency = hop[1] VALUES (?, ?)
''', (hop['source_ip'], hop['destination_ip']))
cursor.execute(""" # Retrieve the link_id
INSERT OR IGNORE INTO Links (source_ip, destination_ip) VALUES (?, ?) cursor.execute('''
""", (source_ip, destination_ip)) SELECT id FROM links WHERE source_ip = ? AND destination_ip = ?
cursor.execute(""" ''', (hop['source_ip'], hop['destination_ip']))
SELECT id FROM Links WHERE source_ip = ? AND destination_ip = ? link_id = cursor.fetchone()[0]
""", (source_ip, destination_ip))
result = cursor.fetchone()
if result is None:
print(hop)
raise ValueError(f"Failed to insert of find link between {source_ip} and {destination_ip}")
link_id = result[0]
link_ids.append(link_id)
cursor.execute(""" # Insert latency data into link_latency table
INSERT INTO Latency (link_id, latency_ms) VALUES (?, ?) cursor.execute('''
""", (link_id, latency)) INSERT INTO link_latency (link_id, latency, timestamp)
VALUES (?, ?, ?)
# Insert path ''', (link_id, hop['latency'], hop['timestamp']))
hops_json = json.dumps(link_ids)
cursor.execute("""
INSERT INTO Paths (start_ip, end_ip, hops_json) VALUES (?, ?, ?)
""", (start_ip, end_ip, hops_json))
conn.commit() conn.commit()
conn.close() conn.close()
def retrieve_traceroute(): def retrieve_traceroute():
conn = sqlite3.connect('traceroute.db') conn = sqlite3.connect('traceroute.db')
cursor = conn.cursor() cursor = conn.cursor()
@ -195,18 +110,17 @@ def retrieve_traceroute():
conn.close() conn.close()
return rows return rows
# Usage
if __name__ == '__main__': if __name__ == '__main__':
create_tables()
traceroute_output = run_traceroute('vi.fi')
hops = parse_traceroute_output(traceroute_output)
# for hop in hops:
# print(hop)
store_traceroute(hops)
stored_hops = retrieve_traceroute()
for hop in stored_hops:
print(f"Link: {hop[0]} -> {hop[1]}, Latency: {hop[2]} ms, Timestamp: {hop[3]}")
databasefile="./traceroute.db"
create_tables(databasefile)
target='vi.fi'
traceroute_output, timestamp = run_traceroute(target)
hops = parse_traceroute_output(traceroute_output, timestamp)
print("#####")
print(hops)
print("#####")
exit(0) exit(0)