traffic-taffy 0.5.5__py3-none-any.whl → 0.5.6__py3-none-any.whl

traffic_taffy/__init__.py

@@ -1 +1 @@
-__VERSION__ = "0.5.5"
+__VERSION__ = "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/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/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.dist-info → traffic_taffy-0.5.6.dist-info}/METADATA

@@ -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.5.dist-info → traffic_taffy-0.5.6.dist-info}/RECORD

@@ -1,8 +1,8 @@
-traffic_taffy/__init__.py,sha256=V-xYqF0o3J2i1kBnMgotAxdH0cteTXuZ3Z9Wujg9uBo,22
+traffic_taffy/__init__.py,sha256=bzOhFUIQlCdC61joh43BrAkK-ns_1TJAXxkswf9jr6Q,22
 traffic_taffy/compare.py,sha256=wgClLO5qHQirv4fKQ20gI9H2PD7noMIGS98LUdqRx8Q,10643
 traffic_taffy/comparison.py,sha256=goGJbJsr8mzMqRvrJOXxW9QJaLZUg4W85Ji7Bjl-UKA,583
-traffic_taffy/dissection.py,sha256=mdwDtOrcyz389KALQXDeyDND0EYCKgkVPAxkY5h0-_w,15588
-traffic_taffy/dissectmany.py,sha256=UGKCrrH7VOzIR8TL_JMdW8NrbiHF-b-rDMI9jiGK5fI,3023
+traffic_taffy/dissection.py,sha256=FHVi4AXAqXrSzXz-d9SKkbPBD03EDDvKYWE2Opi9r6U,16575
+traffic_taffy/dissectmany.py,sha256=hbCX-AEMTquTaqTpb05D8ek5dS5z9nr28BC5e27mzo8,3403
 traffic_taffy/dissector.py,sha256=4jgwK45fDju86wzU5uzbo4r4Rr5IopqjIyb92il8A3A,9617
 traffic_taffy/dissectorresults.py,sha256=LKoyX04Qjc6B7RnqtJgIWsyVnselJ9CygLkMAp3lhw0,647
 traffic_taffy/graph.py,sha256=UxRQRnv8WuwjFt_hesk4B31-I2fUnAJlLzM5pHvrNus,3996
@@ -24,11 +24,11 @@ traffic_taffy/tests/test_value_printing.py,sha256=3k-d1bpa6tD8qcrgNVoZhhG7kwylI2
 traffic_taffy/tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 traffic_taffy/tools/cache_info.py,sha256=QC-BiaJ_uHwH-B05a29qdW7oTHfKmO1PT31d_FvIJlU,1965
 traffic_taffy/tools/compare.py,sha256=tJW5PZHpbiFN5YlIu3IIz6vkFowYuxhgmWVO9JAJ4Co,3438
-traffic_taffy/tools/dissect.py,sha256=ifADbYhoe3Rh3l_6ufmdcHt1ut5EJ45XeIR0isNnYK0,3063
+traffic_taffy/tools/dissect.py,sha256=QST4NlH1HbzepJLAHFlghm47MDBd0CHBjquRnqqs_SY,3276
 traffic_taffy/tools/explore.py,sha256=HWyRWc0GpK0jpoVyGqkeFyqSwVE9NLxGh4r4iW7HLYM,24968
 traffic_taffy/tools/export.py,sha256=jk5ck-K9m9_Rno72fDWgfS67WKUumDL1KQpMG_j0-G8,2682
 traffic_taffy/tools/graph.py,sha256=gcyI0C8E21Uuon3j_n58tV-kKSn8wXjov-JSCKjPukI,2466
-traffic_taffy-0.5.5.dist-info/METADATA,sha256=A9pRSFdxqN4J607jl_O2mzqqKnXJMuWZVP3e4FjK0ug,1526
-traffic_taffy-0.5.5.dist-info/WHEEL,sha256=TJPnKdtrSue7xZ_AVGkp9YXcvDrobsjBds1du3Nx6dc,87
-traffic_taffy-0.5.5.dist-info/entry_points.txt,sha256=ySz30b1Cu03CtCGMRqqg0NZJpzrVI91T5HjbEaTNnpQ,314
-traffic_taffy-0.5.5.dist-info/RECORD,,
+traffic_taffy-0.5.6.dist-info/METADATA,sha256=wFX9sA44cLQKAqqJkDOHZ8b6pVibn7iEkM1Yy54-9_U,1526
+traffic_taffy-0.5.6.dist-info/WHEEL,sha256=TJPnKdtrSue7xZ_AVGkp9YXcvDrobsjBds1du3Nx6dc,87
+traffic_taffy-0.5.6.dist-info/entry_points.txt,sha256=ySz30b1Cu03CtCGMRqqg0NZJpzrVI91T5HjbEaTNnpQ,314
+traffic_taffy-0.5.6.dist-info/RECORD,,