From 45e2d316d6c16bec9398b64fea444219f8bf75ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20De=20Keersmaeker?=
 <francois.dekeersmaeker@uclouvain.be>
Date: Fri, 12 Jul 2024 16:30:49 +0200
Subject: [PATCH] Fixed imports

---
 pcap_fuzzer/__init__.py    | 2 +-
 pcap_fuzzer/pcap_fuzzer.py | 7 ++-----
 setup.py                   | 2 +-
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/pcap_fuzzer/__init__.py b/pcap_fuzzer/__init__.py
index 28270ee..512a1c0 100644
--- a/pcap_fuzzer/__init__.py
+++ b/pcap_fuzzer/__init__.py
@@ -2,7 +2,7 @@
 Initialization script for package `pcap_fuzzer`.
 """
 
-from pcap_fuzzer import fuzz_pcaps
+from .pcap_fuzzer import fuzz_pcaps
 
 __all__ = [
     "fuzz_pcaps"
diff --git a/pcap_fuzzer/pcap_fuzzer.py b/pcap_fuzzer/pcap_fuzzer.py
index 0a4e3f2..8430e15 100644
--- a/pcap_fuzzer/pcap_fuzzer.py
+++ b/pcap_fuzzer/pcap_fuzzer.py
@@ -14,7 +14,7 @@ import scapy.all as scapy
 from scapy.layers import dhcp, dns, http
 from scapy.contrib import coap, igmp, igmpv3
 # Custom Packet utilities
-from packet.Packet import Packet
+from .packet.Packet import Packet
 
 
 def strictly_positive_int(value: any) -> int:
@@ -61,7 +61,7 @@ def fuzz_pcaps(pcaps: Union[str, list], output: str, random_range: int = 1, pack
     :param dry_run: if True, do not write output PCAP file
     """
     # If input PCAP is a single file, convert to list of one element
-    pcaps = [pcaps] if isinstance(pcaps) != list else pcaps
+    pcaps = [pcaps] if not isinstance(pcaps, list) else pcaps
     
     # Loop on given input PCAP files
     for input_pcap in pcaps:
@@ -166,9 +166,6 @@ if __name__ == "__main__":
     if args.output is not None and len(args.input_pcaps) > 1:
         logging.warning("Multiple input PCAP files specified, ignoring output PCAP file name.")
 
-    print(args.input_pcaps)
-    exit()
-
 
     ### MAIN PROGRAM ###
     fuzz_pcaps(
diff --git a/setup.py b/setup.py
index 85d1eac..50023af 100644
--- a/setup.py
+++ b/setup.py
@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name='pcap_fuzzer',
-    version='0.2.0',
+    version='0.3.0',
     author='François De Keersmaeker',
     author_email='francois.dekeersmaeker@uclouvain.be',
     description='Randomly edit packet fields in a PCAP file.',
-- 
GitLab