From b5472510fb182a5ea402630d00d50bc90765e9a5 Mon Sep 17 00:00:00 2001
From: VladLub <vladlubkovskiy1@gmail.com>
Date: Mon, 24 Mar 2025 14:29:11 +0100
Subject: [PATCH] finally
---
code/main.py | 6 ++++++
code/package_capture/src/database_connection.py | 5 ++++-
code/package_capture/src/packet_capturing.py | 3 ++-
3 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/code/main.py b/code/main.py
index 39fba55..3561478 100644
--- a/code/main.py
+++ b/code/main.py
@@ -5,6 +5,7 @@ import threading
import os
import sys
import duckdb
+import database_connection
sys.path.append(os.path.abspath(os.path.join(os.path.dirname(__file__), 'machine_learning_models')))
base_dir = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
@@ -323,7 +324,11 @@ class PacketCaptureGUI:
tree.heading("type_of_threat", text="Type of Threat")
# Connect to the DuckDB database and fetch data
+
conn = duckdb.connect('packets_data.duckdb')
+
+ database_connection.initiate_database(conn)
+ database_connection.commit(conn)
query = "SELECT * FROM packets"
result = conn.execute(query).fetchall()
@@ -331,6 +336,7 @@ class PacketCaptureGUI:
for row in result:
tree.insert("", tk.END, values=row)
+ database_connection.commit(conn)
conn.close()
data_window.protocol("WM_DELETE_WINDOW", lambda: self.on_close_window(data_window))
diff --git a/code/package_capture/src/database_connection.py b/code/package_capture/src/database_connection.py
index c233621..18af1bd 100644
--- a/code/package_capture/src/database_connection.py
+++ b/code/package_capture/src/database_connection.py
@@ -94,4 +94,7 @@ def extract_info(packet):
destination_mac = packet[Ether].dst if Ether in packet else UNDEFINED
source_port = packet[TCP].sport if TCP in packet else UNDEFINED
destination_port = packet[TCP].dport if TCP in packet else UNDEFINED
- return destination_ip, destination_mac, destination_port, source_ip, source_mac, source_port
\ No newline at end of file
+ return destination_ip, destination_mac, destination_port, source_ip, source_mac, source_port
+
+def commit(connection):
+ connection.commit()
\ No newline at end of file
diff --git a/code/package_capture/src/packet_capturing.py b/code/package_capture/src/packet_capturing.py
index 63b4762..c117dc3 100644
--- a/code/package_capture/src/packet_capturing.py
+++ b/code/package_capture/src/packet_capturing.py
@@ -5,6 +5,7 @@ from scapy.all import sniff
from scapy.packet import raw, Raw
from collections import defaultdict
import duckdb as duckdb
+
import database_connection as db_conn
import time
@@ -12,7 +13,7 @@ import sys
sys.stdout.reconfigure(line_buffering=True)
## Database ##
-connection = duckdb.connect('../../packets_data.duckdb')
+connection = duckdb.connect('packets_data.duckdb')
##############
## Reserved IPs ##
--
GitLab