traffic-taffy 0.5.5__tar.gz → 0.5.6__tar.gz

{traffic_taffy-0.5.5 → traffic_taffy-0.5.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: traffic-taffy
-Version: 0.5.5
+Version: 0.5.6
 Summary: A tool for doing differential analysis of pcap files
 Project-URL: Homepage, https://github.com/hardaker/traffic-taffy
 Author-email: Wes Hardaker <opensource@hardakers.net>

traffic_taffy-0.5.6/traffic_taffy/__init__.py

@@ -0,0 +1 @@
+__VERSION__ = "0.5.6"

{traffic_taffy-0.5.5 → traffic_taffy-0.5.6}/traffic_taffy/dissection.py

@@ -283,6 +283,26 @@ class Dissection:
 
         # save it
         info(f"caching PCAP data to '{where}'")
+
+        # convert int keys that are too large
+        for timestamp in versioned_cache["dissection"]:
+            for key in versioned_cache["dissection"][timestamp]:
+                versioned_cache["dissection"][timestamp][key] = dict(
+                    versioned_cache["dissection"][timestamp][key]
+                )
+                # sigh -- msgpack can't handle large int based dictionary keys
+                fix_list = []
+                for subkey in versioned_cache["dissection"][timestamp][key]:
+                    if isinstance(subkey, int) and subkey > 2**32 - 1:
+                        info(f"converting {key} {subkey}")
+                        fix_list.append(subkey)
+
+                for subkey in fix_list:
+                    versioned_cache["dissection"][timestamp][key][
+                        str(subkey)
+                    ] = versioned_cache["dissection"][timestamp][key][subkey]
+                    del versioned_cache["dissection"][timestamp][key][subkey]
+
         with open(where, "wb") as saveto:
             msgpack.dump(versioned_cache, saveto)
 

{traffic_taffy-0.5.5 → traffic_taffy-0.5.6}/traffic_taffy/dissectmany.py

@@ -83,7 +83,16 @@ class PCAPDissectMany:
 
         return dissection
 
-    def load_all(self, return_as_list: bool = False):
+    def load_all(self, return_as_list: bool = False, dont_fork: bool = False):
+        if dont_fork:
+            # handle each one individually -- typically for inserting debugging stops
+            dissections = []
+            for pcap_file in self.pcap_files:
+                dissection = self.load_pcap(pcap_file)
+                dissections.append(dissection)
+            return dissections
+
+        # use all available resources
         with ProcessPoolExecutor() as executor:
             dissections = executor.map(self.load_pcap, self.pcap_files)
             if return_as_list:  # convert from generator

{traffic_taffy-0.5.5 → traffic_taffy-0.5.6}/traffic_taffy/tools/dissect.py

@@ -33,6 +33,12 @@ def main():
             help="Print results in an FSDB formatted output",
         )
 
+        parser.add_argument(
+            "--dont-fork",
+            action="store_true",
+            help="Do not fork into multiple processes per file (still fork per file)",
+        )
+
         dissector_add_parseargs(parser)
         limitor_add_parseargs(parser)
 
@@ -61,7 +67,7 @@ def main():
         force_overwrite=args.force_overwrite,
         force_load=args.force_load,
     )
-    dissections = pdm.load_all(True)
+    dissections = pdm.load_all(True, dont_fork=args.dont_fork)
 
     # merge them into a single dissection
     dissection = dissections.pop(0)

traffic_taffy-0.5.5/traffic_taffy/__init__.py

@@ -1 +0,0 @@
-__VERSION__ = "0.5.5"