From b0a3fd951dc391dc0a38adf261e3a723351398d4 Mon Sep 17 00:00:00 2001
From: Sebastian Lenzlinger <sebastian.lenzlinger@unibas.ch>
Date: Thu, 2 May 2024 17:15:51 +0000
Subject: [PATCH 1/2] Add bash file with functions to enable and disable
 monitor mode using either...

---
 .idea/2024-bsc-sebastian-lenzlinger.iml       |  3 +
 .idea/workspace.xml                           | 81 +++++++++----------
 code/kydcap/scripts/wifi_ctl.sh               | 55 +++++++++++++
 code/kydcap/subcommands/sniff.py              |  6 +-
 .../utils/{tcpdump_utils.py => utils.py}      |  9 ++-
 code/kydcap/utils/wifi_ctrl_utils.py          | 10 +++
 6 files changed, 115 insertions(+), 49 deletions(-)
 create mode 100644 code/kydcap/scripts/wifi_ctl.sh
 rename code/kydcap/utils/{tcpdump_utils.py => utils.py} (81%)
 create mode 100644 code/kydcap/utils/wifi_ctrl_utils.py

diff --git a/.idea/2024-bsc-sebastian-lenzlinger.iml b/.idea/2024-bsc-sebastian-lenzlinger.iml
index ec63674..aad402c 100644
--- a/.idea/2024-bsc-sebastian-lenzlinger.iml
+++ b/.idea/2024-bsc-sebastian-lenzlinger.iml
@@ -4,4 +4,7 @@
     <option name="format" value="PLAIN" />
     <option name="myDocStringFormat" value="Plain" />
   </component>
+  <component name="TestRunnerService">
+    <option name="PROJECT_TEST_RUNNER" value="py.test" />
+  </component>
 </module>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 1b59c65..4e4bd90 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,28 +4,13 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="7a3ac8e1-7fbf-4aa7-9cf9-a51d7ade8503" name="Changes" comment="Start tracking development config files.">
-      <change afterPath="$PROJECT_DIR$/.idea/webResources.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/code/kydcap/subcommands/__init__.py" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/code/tests/fixtures/__init__.py" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/code/tests/fixtures/shared_fixtures.py" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/code/tests/models/test_capture_metadata_model.py" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/code/tests/models/test_device_metadata_model.py" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/code/tests/subcommands/test_initialize_device_root_dir.py" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/code/tests/subcommands/test_sniff.py" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/code/tests/test_main.py" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/code/tests/utils/test_capture_metadata_utils.py" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/code/tests/utils/test_device_metadata_utils.py" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/code/tests/utils/test_tcpdump_utils.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
+    <list default="true" id="7a3ac8e1-7fbf-4aa7-9cf9-a51d7ade8503" name="Changes" comment="Setup testing structure">
+      <change afterPath="$PROJECT_DIR$/code/kydcap/scripts/wifi_ctl.sh" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/code/kydcap/utils/wifi_ctrl_utils.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/2024-bsc-sebastian-lenzlinger.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/2024-bsc-sebastian-lenzlinger.iml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/archive/metadata_utils.py" beforeDir="false" afterPath="$PROJECT_DIR$/archive/metadata_utils.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/code/kydcap/config.py" beforeDir="false" afterPath="$PROJECT_DIR$/code/kydcap/config.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/code/kydcap/main.py" beforeDir="false" afterPath="$PROJECT_DIR$/code/kydcap/__main__.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/code/kydcap/models/capture_metadata.py" beforeDir="false" afterPath="$PROJECT_DIR$/code/kydcap/models/capture_metadata_model.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/code/kydcap/models/device_metadata.py" beforeDir="false" afterPath="$PROJECT_DIR$/code/kydcap/models/device_metadata_model.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/code/kydcap/subcommands/initialize_device_root_dir.py" beforeDir="false" afterPath="$PROJECT_DIR$/code/kydcap/subcommands/initialize_device_root_dir.py" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/code/kydcap/subcommands/sniff.py" beforeDir="false" afterPath="$PROJECT_DIR$/code/kydcap/subcommands/sniff.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/code/kydcap/utils/tcpdump_utils.py" beforeDir="false" afterPath="$PROJECT_DIR$/code/kydcap/utils/utils.py" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -59,27 +44,27 @@
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent"><![CDATA[{
-  "keyToString": {
-    "ASKED_ADD_EXTERNAL_FILES": "true",
-    "ASKED_MARK_IGNORED_FILES_AS_EXCLUDED": "true",
-    "ASKED_SHARE_PROJECT_CONFIGURATION_FILES": "true",
-    "Python.__init__.executor": "Run",
-    "Python.__main__.executor": "Run",
-    "Python.main.executor": "Run",
-    "RunOnceActivity.ShowReadmeOnStart": "true",
-    "SHARE_PROJECT_CONFIGURATION_FILES": "true",
-    "git-widget-placeholder": "main",
-    "last_opened_file_path": "/home/slnopriv/projects/2024-bsc-sebastian-lenzlinger/code/kydcap/utils/device_metadata_utils.py",
-    "node.js.detected.package.eslint": "true",
-    "node.js.detected.package.tslint": "true",
-    "node.js.selected.package.eslint": "(autodetect)",
-    "node.js.selected.package.tslint": "(autodetect)",
-    "nodejs_package_manager_path": "npm",
-    "settings.editor.selected.configurable": "com.jetbrains.python.configuration.PyActiveSdkModuleConfigurable",
-    "vue.rearranger.settings.migration": "true"
+  <component name="PropertiesComponent">{
+  &quot;keyToString&quot;: {
+    &quot;ASKED_ADD_EXTERNAL_FILES&quot;: &quot;true&quot;,
+    &quot;ASKED_MARK_IGNORED_FILES_AS_EXCLUDED&quot;: &quot;true&quot;,
+    &quot;ASKED_SHARE_PROJECT_CONFIGURATION_FILES&quot;: &quot;true&quot;,
+    &quot;Python.__init__.executor&quot;: &quot;Run&quot;,
+    &quot;Python.__main__.executor&quot;: &quot;Run&quot;,
+    &quot;Python.main.executor&quot;: &quot;Run&quot;,
+    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
+    &quot;SHARE_PROJECT_CONFIGURATION_FILES&quot;: &quot;true&quot;,
+    &quot;git-widget-placeholder&quot;: &quot;main&quot;,
+    &quot;last_opened_file_path&quot;: &quot;/home/slnopriv/projects/2024-bsc-sebastian-lenzlinger/code/kydcap/utils/device_metadata_utils.py&quot;,
+    &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
+    &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
+    &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
+    &quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
+    &quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
+    &quot;settings.editor.selected.configurable&quot;: &quot;com.jetbrains.python.configuration.PyActiveSdkModuleConfigurable&quot;,
+    &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
   }
-}]]></component>
+}</component>
   <component name="RecentsManager">
     <key name="MoveFile.RECENT_KEYS">
       <recent name="$PROJECT_DIR$/archive" />
@@ -165,7 +150,8 @@
       <workItem from="1713967495566" duration="6927000" />
       <workItem from="1714554228183" duration="34000" />
       <workItem from="1714554269789" duration="56478000" />
-      <workItem from="1714616237168" duration="6135000" />
+      <workItem from="1714616237168" duration="9071000" />
+      <workItem from="1714631778143" duration="1000000" />
     </task>
     <task id="LOCAL-00001" summary="Add code for capture testbed. This is a huge commit. End of day sync...">
       <option name="closed" value="true" />
@@ -215,7 +201,15 @@
       <option name="project" value="LOCAL" />
       <updated>1714617266799</updated>
     </task>
-    <option name="localTasksCounter" value="7" />
+    <task id="LOCAL-00007" summary="Setup testing structure">
+      <option name="closed" value="true" />
+      <created>1714622469786</created>
+      <option name="number" value="00007" />
+      <option name="presentableId" value="LOCAL-00007" />
+      <option name="project" value="LOCAL" />
+      <updated>1714622469786</updated>
+    </task>
+    <option name="localTasksCounter" value="8" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -271,7 +265,8 @@
     <MESSAGE value="Add test module." />
     <MESSAGE value="Update gitignore again." />
     <MESSAGE value="Start tracking development config files." />
-    <option name="LAST_COMMIT_MESSAGE" value="Start tracking development config files." />
+    <MESSAGE value="Setup testing structure" />
+    <option name="LAST_COMMIT_MESSAGE" value="Setup testing structure" />
   </component>
   <component name="com.intellij.coverage.CoverageDataManagerImpl">
     <SUITE FILE_PATH="coverage/2024_bsc_sebastian_lenzlinger$__init__.coverage" NAME="__init__ Coverage Results" MODIFIED="1714619300966" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/code/kydcap" />
diff --git a/code/kydcap/scripts/wifi_ctl.sh b/code/kydcap/scripts/wifi_ctl.sh
new file mode 100644
index 0000000..076d2fd
--- /dev/null
+++ b/code/kydcap/scripts/wifi_ctl.sh
@@ -0,0 +1,55 @@
+#!/usr/bin/env bash
+# Note, this is not my original work. Source: https://linuxtldr.com/changing-interface-mode/
+
+function list_nic_info () {
+  ip addr show
+}
+
+function enable_monm_iw () {
+  interface=$1
+  sudo ip link set "$interface" down
+  sudo iw "$interface" set monitor control
+  sudo ip link set "$interface" up
+}
+
+function disable_monm_iw () {
+  interface=$1
+  sudo ip link set "$interface" down
+  sudo iw "$interface" set type managed
+  sudo ip link set "$interface" up
+}
+
+function enable_monm_iwconfig () {
+  interface=$1
+  sudo ifconfig "$interface" down
+  sudo iwconfig "$interface" mode monitor
+  sudo ifconfig "$interface" up
+}
+
+function disable_monm_iwconfig () {
+  interface=$1
+  sudo ifconfig "$interface" down
+  sudo iwconfig "$interface" mode managed
+  sudo ifconfig "$interface" up
+}
+
+function enable_monm_acng () {
+  interface=$1
+  sudo airmon-ng check
+  sudo airmon-ng check kill
+  sudo airmon-ng start "$interface"
+}
+
+function disable_monm_acng () {
+  interface="${1}mon"
+  sudo airmon-ng stop "$interface"
+  sudo systemctl restart NetworkManager
+}
+
+if declare -f "$1" > /dev/null
+then
+  "$@"
+else
+  echo "Unknown function '$1'" >&2
+  exit 1
+fi
\ No newline at end of file
diff --git a/code/kydcap/subcommands/sniff.py b/code/kydcap/subcommands/sniff.py
index a84600e..87df0a5 100644
--- a/code/kydcap/subcommands/sniff.py
+++ b/code/kydcap/subcommands/sniff.py
@@ -69,7 +69,7 @@ def handle_sniff(args):
     if not cwd_is_device_root_dir():
         handle_metadata()
     else:
-        cmd = ['sudo tcpdump', '-i', args.capture_interface]
+        cmd = ['sudo', 'tcpdump', '-i', args.capture_interface]
         if args.monitor_mode:
             cmd.append('-I')
         if args.no_name_resolution:
@@ -83,8 +83,10 @@ def handle_sniff(args):
             cmd.append(str(args.count))
         elif args.mins:
             pass
-        print('Executing: ' + ' '.join(cmd))
+        print('Complete command:' + ' '.join(cmd))
         # TODO maybe dump this into file -> put into device metadata
+        # TODO generate pcap filename
+        # TODO construct capture metadata file
         try:
             start_time = datetime.now().strftime('%H:%M:%S')
             subprocess.run(cmd)
diff --git a/code/kydcap/utils/tcpdump_utils.py b/code/kydcap/utils/utils.py
similarity index 81%
rename from code/kydcap/utils/tcpdump_utils.py
rename to code/kydcap/utils/utils.py
index 08bfb7e..a6d0ff2 100644
--- a/code/kydcap/utils/tcpdump_utils.py
+++ b/code/kydcap/utils/utils.py
@@ -1,15 +1,16 @@
 import shutil
 import subprocess
 
+DEPENDENCIES =
 
-def check_installed() -> bool:
+def check_installed(tool) -> bool:
     """Check if tcpdump is installed and available on the system path."""
-    return shutil.which('tcpdump') is not None
+    return shutil.which(f'{tool}') is not None
 
 
-def ensure_installed():
+def ensure_installed(tool):
     """Ensure that tcpdump is installed, raise an error if not."""
-    if not check_installed():
+    if not check_installed(tool):
         raise RuntimeError("tcpdump is not installed. Please install it to continue.")
 
 
diff --git a/code/kydcap/utils/wifi_ctrl_utils.py b/code/kydcap/utils/wifi_ctrl_utils.py
new file mode 100644
index 0000000..671d038
--- /dev/null
+++ b/code/kydcap/utils/wifi_ctrl_utils.py
@@ -0,0 +1,10 @@
+import subprocess
+
+def enable_monitor_mode(interface):
+    pass
+
+def disable_monitor_mode(interface):
+    pass
+
+def get_ap_channel(interface):
+    pass
\ No newline at end of file

From de88c05349f8dc1e1d4f3f64acb0a53ab2dda9fc Mon Sep 17 00:00:00 2001
From: Sebastian Lenzlinger <sebastian.lenzlinger@unibas.ch>
Date: Tue, 7 May 2024 21:19:04 +0200
Subject: [PATCH 2/2] Prepare main branch for rebase

---
 code/kydcap/__init__.py                       |   0
 code/kydcap/__main__.py                       |  40 -------
 code/kydcap/config.py                         |  20 ----
 code/kydcap/models/__init__.py                |   0
 code/kydcap/models/capture_metadata_model.py  |  47 --------
 code/kydcap/models/device_metadata_model.py   |  66 -----------
 code/kydcap/scripts/wifi_ctl.sh               |  55 ---------
 code/kydcap/subcommands/__init__.py           |   0
 .../subcommands/initialize_device_root_dir.py |  40 -------
 code/kydcap/subcommands/sniff.py              | 104 ------------------
 code/kydcap/utils/__init__.py                 |   0
 code/kydcap/utils/capture_metadata_utils.py   |  40 -------
 code/kydcap/utils/device_metadata_utils.py    |  49 ---------
 code/kydcap/utils/utils.py                    |  29 -----
 code/kydcap/utils/wifi_ctrl_utils.py          |  10 --
 code/tests/test_capture_metadata_model.py     |   2 +
 16 files changed, 2 insertions(+), 500 deletions(-)
 delete mode 100644 code/kydcap/__init__.py
 delete mode 100644 code/kydcap/__main__.py
 delete mode 100644 code/kydcap/config.py
 delete mode 100644 code/kydcap/models/__init__.py
 delete mode 100644 code/kydcap/models/capture_metadata_model.py
 delete mode 100644 code/kydcap/models/device_metadata_model.py
 delete mode 100644 code/kydcap/scripts/wifi_ctl.sh
 delete mode 100644 code/kydcap/subcommands/__init__.py
 delete mode 100644 code/kydcap/subcommands/initialize_device_root_dir.py
 delete mode 100644 code/kydcap/subcommands/sniff.py
 delete mode 100644 code/kydcap/utils/__init__.py
 delete mode 100644 code/kydcap/utils/capture_metadata_utils.py
 delete mode 100644 code/kydcap/utils/device_metadata_utils.py
 delete mode 100644 code/kydcap/utils/utils.py
 delete mode 100644 code/kydcap/utils/wifi_ctrl_utils.py
 create mode 100644 code/tests/test_capture_metadata_model.py

diff --git a/code/kydcap/__init__.py b/code/kydcap/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/code/kydcap/__main__.py b/code/kydcap/__main__.py
deleted file mode 100644
index 773ed35..0000000
--- a/code/kydcap/__main__.py
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/usr/bin/env python3
-import argparse
-
-from kydcap.subcommands.sniff import setup_sniff_parser
-from kydcap.subcommands.initialize_device_root_dir import setup_init_root_dir_parser
-
-CAP_DIR_PREFIX = ...
-
-
-######################
-# Argparse setup
-######################
-def setup_argparse():
-    # create top level parser
-    root_parser = argparse.ArgumentParser(prog="kydcap")
-    subparsers = root_parser.add_subparsers(title="subcommands", required=True, dest="command")
-
-    setup_sniff_parser(subparsers)
-    setup_init_root_dir_parser(subparsers)
-
-    return root_parser
-
-
-def main():
-    parser = setup_argparse()
-    args = parser.parse_args()
-    print(args)
-    if args.command:
-        try:
-            args.func(args)
-        except KeyboardInterrupt:
-            print("Received keyboard interrupt. Exiting...")
-            exit(1)
-        except Exception as e:
-            print(f"Error: {e}")
-    # create_capture_directory(args.device_name)
-
-
-if __name__ == "__main__":
-    main()
diff --git a/code/kydcap/config.py b/code/kydcap/config.py
deleted file mode 100644
index e39c53c..0000000
--- a/code/kydcap/config.py
+++ /dev/null
@@ -1,20 +0,0 @@
-from datetime import datetime
-from enum import Flag, unique, global_enum
-
-
-DEVICE_METADATA_FILE = "device-metadata.json"
-CAPTURE_METADATA_FILE = "capture-metadata.json"
-TODAY_DATE_STRING = datetime.now().strftime("%d%b%Y").lower()
-
-
-@unique
-@global_enum
-class ReturnCodes(Flag):
-    SUCCESS = 0
-    ABORTED = 1
-    FAILURE = 2
-    UNKNOWN = 3
-    FILE_NOT_FOUND = 4
-    FILE_ALREADY_EXISTS = 5
-    INVALID_ARGUMENT = 6
-    INVALID_ARGUMENT_VALUE = 7
diff --git a/code/kydcap/models/__init__.py b/code/kydcap/models/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/code/kydcap/models/capture_metadata_model.py b/code/kydcap/models/capture_metadata_model.py
deleted file mode 100644
index 6e26975..0000000
--- a/code/kydcap/models/capture_metadata_model.py
+++ /dev/null
@@ -1,47 +0,0 @@
-import json
-import uuid
-from datetime import datetime
-from pathlib import Path
-from typing import Optional, Any
-
-from pydantic import BaseModel, Field
-
-from kydcap.config import ReturnCodes
-
-
-class KydcapCaptureMetadata(BaseModel):
-    # Required Fields
-    device_id: str
-    capture_id: uuid.UUID = Field(default_factory=lambda: str(uuid.uuid4()))
-    capture_date: str = Field(default_factory=lambda: datetime.now().strftime('%d-%m-%YT%H:%M:%S').lower())
-
-    # Statistics
-    start_time: str
-    stop_time: str
-    packet_count: Optional[int]
-
-    # Optional Fields
-    device_ip_address: Optional[str] = None
-    device_mac_address: Optional[str] = None
-
-    app: Optional[str] = None
-    app_version: Optional[str] = None
-    firmware_version: Optional[str] = None
-
-    def __init__(self, device_id: str, start_time: str, stop_time: str, /, **data: Any):
-        super().__init__(**data)  # Pycharms orders
-        assert isinstance(device_id, str)
-        assert isinstance(start_time, str)
-        assert isinstance(stop_time, str)
-        self.device_id = device_id
-        self.start_time = start_time
-        self.stop_time = stop_time
-
-    def save_to_json(self, file_path: Path):
-        if file_path.is_file():
-            print(f"File {file_path} already exists, update instead.")
-            return ReturnCodes.FILE_ALREADY_EXISTS
-        metadata = self.model_dump_json(indent=2)
-        with file_path.open('w') as file:
-            json.dump(metadata, file)
-            return ReturnCodes.SUCCESS
diff --git a/code/kydcap/models/device_metadata_model.py b/code/kydcap/models/device_metadata_model.py
deleted file mode 100644
index 173f92f..0000000
--- a/code/kydcap/models/device_metadata_model.py
+++ /dev/null
@@ -1,66 +0,0 @@
-import json
-import uuid
-from datetime import datetime
-from pathlib import Path
-from typing import Optional, List, Any
-
-# kydcap modules
-from kydcap.config import ReturnCodes
-
-# 3rd party libs
-from pydantic import BaseModel, Field
-
-IMMUTABLE_FIELDS = {"device_name", "device_short_name", "device_id", "date_created"}
-
-
-class DeviceMetadata(BaseModel):
-    # Required fields
-    device_name: str
-    device_short_name: str
-    device_id: str = Field(default_factory=lambda: str(uuid.uuid4()))
-    date_created: str = Field(default_factory=lambda: datetime.now().strftime('%d-%m-%YT%H:%M:%S').lower())
-
-    # Optional Fields
-    device_type: Optional[str] = None
-    device_serial_number: Optional[str] = None
-    device_firmware_version: Optional[str] = None
-    date_updated: Optional[str] = None
-
-    capture_files: Optional[List[str]] = []
-
-    def __init__(self, device_name: str, /, **data: Any):
-        super().__init__(**data)
-        self.device_name = device_name
-        self.device_short_name = device_name.lower().replace(" ", "_")
-
-    @classmethod
-    def load_from_json(cls, file_path: Path):
-        assert file_path.is_file()
-        with file_path.open('r') as file:
-            metadata_json = json.load(file)
-        metadata_model_obj = cls.model_validate_json(metadata_json)
-        return metadata_model_obj
-
-    def save_to_json(self, file_path: Path):
-        if file_path.is_file():
-            print(f"File {file_path} already exists, update instead.")
-            return ReturnCodes.FILE_ALREADY_EXISTS
-        metadata = self.model_dump_json(indent=2)
-        with file_path.open('w') as file:
-            json.dump(metadata, file)
-            return ReturnCodes.SUCCESS
-
-    @classmethod
-    def update_metadata_in_json(cls, file_path: Path, **kwargs):
-        # TODO Maybe not needed at all.
-        assert file_path.is_file()
-        for field in IMMUTABLE_FIELDS:
-            if field in kwargs:
-                print(f"Field {field} is immutable")
-                return ReturnCodes.IMMUTABLE
-        metadata = cls.load_from_json(file_path)
-        for field, value in kwargs.items():
-            if field in metadata.model_fields_set:
-                setattr(metadata, field, value)
-        metadata.date_updated = datetime.now().strftime('%d-%m-%YT%H:%M:%S').lower()
-        pass
diff --git a/code/kydcap/scripts/wifi_ctl.sh b/code/kydcap/scripts/wifi_ctl.sh
deleted file mode 100644
index 076d2fd..0000000
--- a/code/kydcap/scripts/wifi_ctl.sh
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/usr/bin/env bash
-# Note, this is not my original work. Source: https://linuxtldr.com/changing-interface-mode/
-
-function list_nic_info () {
-  ip addr show
-}
-
-function enable_monm_iw () {
-  interface=$1
-  sudo ip link set "$interface" down
-  sudo iw "$interface" set monitor control
-  sudo ip link set "$interface" up
-}
-
-function disable_monm_iw () {
-  interface=$1
-  sudo ip link set "$interface" down
-  sudo iw "$interface" set type managed
-  sudo ip link set "$interface" up
-}
-
-function enable_monm_iwconfig () {
-  interface=$1
-  sudo ifconfig "$interface" down
-  sudo iwconfig "$interface" mode monitor
-  sudo ifconfig "$interface" up
-}
-
-function disable_monm_iwconfig () {
-  interface=$1
-  sudo ifconfig "$interface" down
-  sudo iwconfig "$interface" mode managed
-  sudo ifconfig "$interface" up
-}
-
-function enable_monm_acng () {
-  interface=$1
-  sudo airmon-ng check
-  sudo airmon-ng check kill
-  sudo airmon-ng start "$interface"
-}
-
-function disable_monm_acng () {
-  interface="${1}mon"
-  sudo airmon-ng stop "$interface"
-  sudo systemctl restart NetworkManager
-}
-
-if declare -f "$1" > /dev/null
-then
-  "$@"
-else
-  echo "Unknown function '$1'" >&2
-  exit 1
-fi
\ No newline at end of file
diff --git a/code/kydcap/subcommands/__init__.py b/code/kydcap/subcommands/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/code/kydcap/subcommands/initialize_device_root_dir.py b/code/kydcap/subcommands/initialize_device_root_dir.py
deleted file mode 100644
index 88f4ef3..0000000
--- a/code/kydcap/subcommands/initialize_device_root_dir.py
+++ /dev/null
@@ -1,40 +0,0 @@
-import pathlib
-
-from kydcap.config import DEVICE_METADATA_FILE
-from kydcap.models.device_metadata_model import DeviceMetadata
-
-
-def setup_init_root_dir_parser(subparsers):
-    parser = subparsers.add_parser("init-device-root", aliases=["idr"])
-    parser.add_argument("--root_dir", type=pathlib.Path, default=pathlib.Path.cwd())
-    group = parser.add_mutually_exclusive_group()
-    group.add_argument("--dynamic", action="store_true", help="enable guided setup", default=False)
-    group.add_argument("-n", "--name", action="store", type=str, help="name of device")
-    parser.set_defaults(func=handle_idr)
-
-
-def handle_idr(args):
-    print("Entered kydcap initialize-device-root")
-    root_dir = args.root_dir
-    device_name = None
-    if args.dynamic:
-        response = "N"
-        while response == "N":
-            name = input("Please enter name of device: ")
-            # TODO extended config for other fields like apps, firmware etc.
-            response = input(f"Confirm device name: {name} [y/N]")
-            device_name = name
-    else:
-        device_name = args.name
-    root_dir.mkdir(parents=True, exist_ok=True)
-    root_dir.chdir()
-    dev_metadata_model = DeviceMetadata(device_name)
-    file_path = root_dir / device_name / DEVICE_METADATA_FILE
-    assert not file_path.exists(), f"{file_path} already exists"
-    if args.dynamic:
-        response = input(f"Confirm device metadata: {dev_metadata_model.model_dump()} [y/N]")
-        if response.lower() != "y":
-            assert False, "TODO implement dynamic setup"
-    code = dev_metadata_model.save_to_json(file_path)
-    print(f"Device metadata saved to {file_path}")
-    return code
diff --git a/code/kydcap/subcommands/sniff.py b/code/kydcap/subcommands/sniff.py
deleted file mode 100644
index 87df0a5..0000000
--- a/code/kydcap/subcommands/sniff.py
+++ /dev/null
@@ -1,104 +0,0 @@
-import subprocess
-from pathlib import Path
-
-from kydcap.config import *
-from kydcap.models.device_metadata_model import DeviceMetadata
-
-
-def setup_sniff_parser(subparsers):
-    parser = subparsers.add_parser('sniff', help='Sniff packets with tcpdump')
-    # metadata args
-    parser.add_argument("-a", "--ip-address=", help="IP address of the device to sniff", dest="device_ip")
-    # tcpdump args
-    parser_sniff_tcpdump = parser.add_argument_group('tcpdump arguments')
-    parser_sniff_tcpdump.add_argument("-i", "--interface=", help="Interface to capture on.", dest="capture_interface",
-                                      default="any")
-    parser_sniff_tcpdump.add_argument("-I", "--monitor-mode", help="Put interface into monitor mode",
-                                      action="store_true")
-    parser_sniff_tcpdump.add_argument("-n", help="Deactivate name resolution. Option is set by default.",
-                                      action="store_true", dest="no_name_resolution")
-    parser_sniff_tcpdump.add_argument("-#", "--number",
-                                      help="Print packet number at beginning of line. Set by default.",
-                                      action="store_true")
-    parser_sniff_tcpdump.add_argument("-e", help="Print link layer headers. Option is set by default.",
-                                      action="store_true", dest="print_link_layer")
-    parser_sniff_tcpdump.add_argument("-t", action="count", default=0,
-                                      help="Please see tcpdump manual for details. Unused by default.")
-    # parser_sniff_tcpdump.add_argument("--filter",type=str,default="ip  help=f"pcap filter expression. \
-    # Defaults is '{default}'")
-    # shared args
-    cap_size_group = parser.add_mutually_exclusive_group(required=False)
-    cap_size_group.add_argument("-c", "--count", type=int, help="Number of packets to capture.", default=0)
-    cap_size_group.add_argument("--mins", type=int, help="Time in minutes to capture.", default=60)
-    parser.set_defaults(func=handle_sniff)
-    # return parser
-    # parser.add_default(func=handle_sniff(args=sniff_args))
-
-
-def cwd_is_device_root_dir() -> bool:
-    device_metadata_file = Path.cwd() / DEVICE_METADATA_FILE
-    return device_metadata_file.exists()
-
-
-def start_guided_device_root_dir_setup():
-    assert False, "Not implemented"
-
-
-def handle_metadata():
-    assert not cwd_is_device_root_dir()
-    print(f"Unable to find {DEVICE_METADATA_FILE} in current working directory")
-    print("You need to setup a device root directory before using this command")
-    response = input("Would you like to be guided through the setup? [y/n]")
-    if response.lower() == "y":
-        start_guided_device_root_dir_setup()
-    else:
-        print("'kydcap init-device-root --help' for more information.")
-        exit(ReturnCodes.ABORTED)
-    # device_id = handle_capture_metadata()
-    return ReturnCodes.SUCCESS
-
-
-def handle_capture_metadata():
-    device_metadata_json = Path.cwd() / DEVICE_METADATA_FILE
-    device_metadata = DeviceMetadata.load_from_json(device_metadata_json)
-    device_id = device_metadata.device_id
-    return device_id
-
-
-def handle_sniff(args):
-    if not cwd_is_device_root_dir():
-        handle_metadata()
-    else:
-        cmd = ['sudo', 'tcpdump', '-i', args.capture_interface]
-        if args.monitor_mode:
-            cmd.append('-I')
-        if args.no_name_resolution:
-            cmd.append('-n')
-        if args.number:
-            cmd.append('-#')
-        if args.print_link_layer:
-            cmd.append('-e')
-        if args.count:
-            cmd.append('-c')
-            cmd.append(str(args.count))
-        elif args.mins:
-            pass
-        print('Complete command:' + ' '.join(cmd))
-        # TODO maybe dump this into file -> put into device metadata
-        # TODO generate pcap filename
-        # TODO construct capture metadata file
-        try:
-            start_time = datetime.now().strftime('%H:%M:%S')
-            subprocess.run(cmd)
-            stop_time = datetime.now().strftime('%H:%M:%S')
-        except KeyboardInterrupt:
-            print("Received keyboard interrupt.")
-            exit(ReturnCodes.ABORTED)
-        except subprocess.CalledProcessError as e:
-            print(f"Failed to capture packet: {e}")
-            exit(ReturnCodes.FAILURE)
-        except Exception as e:
-            print(f"Failed to capture packet: {e}")
-            exit(ReturnCodes.FAILURE)
-
-        return ReturnCodes.SUCCESS
diff --git a/code/kydcap/utils/__init__.py b/code/kydcap/utils/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/code/kydcap/utils/capture_metadata_utils.py b/code/kydcap/utils/capture_metadata_utils.py
deleted file mode 100644
index fa5b93a..0000000
--- a/code/kydcap/utils/capture_metadata_utils.py
+++ /dev/null
@@ -1,40 +0,0 @@
-import json
-from pathlib import Path
-
-from kydcap.config import ReturnCodes
-
-
-def set_device_ip_address(ip_addr: str, file_path: Path):
-    assert ip_addr is not None
-    assert file_path.is_file()
-    with file_path.open('r') as f:
-        data = json.load(f)
-    current_ip = data["device_ip_address"]
-    if current_ip is not None:
-        print(f"Device IP Address is set to {current_ip}")
-        response = input(f"Do you want to change the recorded IP address to {ip_addr}? [Y/N] ")
-        if response.upper() == "N":
-            print("Aborting change to device IP address")
-            return ReturnCodes.ABORTED
-    with file_path.open('w') as f:
-        json.dump(data, f)
-    return ReturnCodes.SUCCESS
-
-
-def set_device_mac_address(mac_addr: str, file_path: Path):
-    assert mac_addr is not None
-    assert file_path.is_file()
-    with file_path.open('r') as f:
-        data = json.load(f)
-    current_mac = data["device_mac_address"]
-    if current_mac is not None:
-        print(f"Device MAC Address is set to {current_mac}")
-        response = input(f"Do you want to change the recorded MAC address to {mac_addr}? [Y/N] ")
-        if response.upper() == "N":
-            print("Aborting change to device MAC address")
-            return ReturnCodes.ABORTED
-    with file_path.open('w') as f:
-        json.dump(data, f)
-    return ReturnCodes.SUCCESS
-
-# TODO finnish for other fields in capture metadata
diff --git a/code/kydcap/utils/device_metadata_utils.py b/code/kydcap/utils/device_metadata_utils.py
deleted file mode 100644
index 380ff3a..0000000
--- a/code/kydcap/utils/device_metadata_utils.py
+++ /dev/null
@@ -1,49 +0,0 @@
-import json
-from datetime import datetime
-from pathlib import Path
-
-from kydcap.config import ReturnCodes
-
-
-def update_firmware_version(version: str, file_path: Path):
-    assert file_path.is_file()
-    with file_path.open('r') as file:
-        metadata = json.load(file)
-    metadata['device_firmware_version'] = version
-    metadata['date_updated'] = datetime.now().strftime('%d-%m-%YT%H:%M:%S').lower()
-    with file_path.open('w') as file:
-        json.dump(metadata, file)
-    return ReturnCodes.SUCCESS
-
-
-def add_capture_file_reference(capture_file_reference: str, file_path: Path):
-    assert file_path.is_file()
-    with file_path.open('r') as file:
-        metadata = json.load(file)
-    metadata['capture_files'] = capture_file_reference
-    metadata['date_updated'] = datetime.now().strftime('%d-%m-%YT%H:%M:%S').lower()
-    with file_path.open('w') as file:
-        json.dump(metadata, file)
-    return ReturnCodes.SUCCESS
-
-
-def update_device_serial_number(device_id: str, file_path: Path):
-    assert file_path.is_file()
-    with file_path.open('r') as file:
-        metadata = json.load(file)
-    metadata['device_id'] = device_id
-    metadata['date_updated'] = datetime.now().strftime('%d-%m-%YT%H:%M:%S').lower()
-    with file_path.open('w') as file:
-        json.dump(metadata, file)
-    return ReturnCodes.SUCCESS
-
-
-def update_device_type(device_type: str, file_path: Path):
-    assert file_path.is_file()
-    with file_path.open('r') as file:
-        metadata = json.load(file)
-    metadata['device_type'] = device_type
-    metadata['date_updated'] = datetime.now().strftime('%d-%m-%YT%H:%M:%S').lower()
-    with file_path.open('w') as file:
-        json.dump(metadata, file)
-    return ReturnCodes.SUCCESS
diff --git a/code/kydcap/utils/utils.py b/code/kydcap/utils/utils.py
deleted file mode 100644
index a6d0ff2..0000000
--- a/code/kydcap/utils/utils.py
+++ /dev/null
@@ -1,29 +0,0 @@
-import shutil
-import subprocess
-
-DEPENDENCIES =
-
-def check_installed(tool) -> bool:
-    """Check if tcpdump is installed and available on the system path."""
-    return shutil.which(f'{tool}') is not None
-
-
-def ensure_installed(tool):
-    """Ensure that tcpdump is installed, raise an error if not."""
-    if not check_installed(tool):
-        raise RuntimeError("tcpdump is not installed. Please install it to continue.")
-
-
-def list_interfaces() -> str:
-    """List available network interfaces using tcpdump."""
-    ensure_installed()
-    try:
-        result = subprocess.run(['tcpdump', '--list-interfaces'], capture_output=True, text=True, check=True)
-        return result.stdout
-    except subprocess.CalledProcessError as e:
-        print(f"Failed to list interfaces: {e}")
-        return ""
-
-
-def start_tcpdump():
-    return None
diff --git a/code/kydcap/utils/wifi_ctrl_utils.py b/code/kydcap/utils/wifi_ctrl_utils.py
deleted file mode 100644
index 671d038..0000000
--- a/code/kydcap/utils/wifi_ctrl_utils.py
+++ /dev/null
@@ -1,10 +0,0 @@
-import subprocess
-
-def enable_monitor_mode(interface):
-    pass
-
-def disable_monitor_mode(interface):
-    pass
-
-def get_ap_channel(interface):
-    pass
\ No newline at end of file
diff --git a/code/tests/test_capture_metadata_model.py b/code/tests/test_capture_metadata_model.py
new file mode 100644
index 0000000..632490a
--- /dev/null
+++ b/code/tests/test_capture_metadata_model.py
@@ -0,0 +1,2 @@
+def test_save_to_json():
+    assert False