diff --git a/pcap_fuzzer/__init__.py b/pcap_fuzzer/__init__.py index 28270ee4efe2f9236e501acff2e63c8c1cb74aac..512a1c0dd06ab7d68cb4f5226fe68922518e389c 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 0a4e3f2f54dc08e6822f0b077ff58b184764e9a3..8430e1533dd6f1358f02b1fa8a75be1f7ab345e5 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 85d1eac233da3b344989ca3567e0fab7665fba02..50023af23eb5a61ad33df05e60f40b28ac5d6585 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.',