traffic-taffy 0.9.1__py3-none-any.whl → 0.9.3__py3-none-any.whl

traffic_taffy/__init__.py

@@ -1 +1 @@
-__VERSION__ = "0.9.1"
+__VERSION__ = "0.9.3"

traffic_taffy/algorithms/statistical.py

@@ -64,7 +64,10 @@ class ComparisonStatistical(ComparisonSlicesAlgorithm):
                     left_count = 0
                     right_count = right_side[key][subkey]
                     left_percentage = 0.0
-                    right_percentage = right_side[key][subkey] / right_side_total
+                    if right_side_total == 0:
+                        right_percentage = 100
+                    else:
+                        right_percentage = right_side[key][subkey] / right_side_total
                     new_right_count += 1  # this value wasn't in the left
 
                     report[key][subkey] = CompareSlicesReport(

traffic_taffy/dissector.py

@@ -47,6 +47,7 @@ class TTL_CFG:
 
 
 POST_DISSECT_HOOK: str = "post_dissect"
+INIT_HOOK: str = "init_hooks"
 
 
 def dissector_default(name: str, value: Any) -> None:
@@ -455,6 +456,7 @@ def dissector_handle_arguments(args) -> None:
     """Handle checking and loading arguments."""
     check_dissector_level(args.dissection_level)
     dissector_load_extra_modules(args.modules)
+    call_hooks(INIT_HOOK)
 
 
 def dissector_load_extra_modules(modules: List[str]) -> None:

traffic_taffy/hooks/ip2asn.py

@@ -3,7 +3,7 @@ from logging import error, info, debug
 import ip2asn
 
 from traffic_taffy.hooks import register_hook
-from traffic_taffy.dissector import POST_DISSECT_HOOK
+from traffic_taffy.dissector import POST_DISSECT_HOOK, INIT_HOOK
 from traffic_taffy.dissection import Dissection
 from traffic_taffy.taffy_config import taffy_default, TaffyConfig
 
@@ -12,8 +12,8 @@ i2a = None
 taffy_default("modules.ip2asn.database", "ip2asn-combined.tsv")
 
 
-@register_hook(POST_DISSECT_HOOK)
-def ip_to_asn(dissection: Dissection, **kwargs):
+@register_hook(INIT_HOOK)
+def init_ip2asn(**kwargs):
     global i2a
 
     if i2a is None:
@@ -28,6 +28,11 @@ def ip_to_asn(dissection: Dissection, **kwargs):
         i2a = ip2asn.IP2ASN(db_path)
         info("  ... loaded")
 
+
+@register_hook(POST_DISSECT_HOOK)
+def ip_to_asn(dissection: Dissection, **kwargs):
+    init_ip2asn()
+
     timestamps = dissection.data.keys()
 
     for timestamp in timestamps:

traffic_taffy/hooks/labels.py

@@ -30,6 +30,8 @@ def split_dns_names(dissection: Dissection, **kwargs):
                     parts = value.split(".")
                     if parts[-1] == "":
                         parts = parts[:-1]  # drop the empty end "." split
+                    if len(parts) == 0:
+                        continue
                     dissection.data[timestamp][key + "_tld"][parts[-1]] += count
                     if len(parts) > 1:
                         dissection.data[timestamp][key + "_sld"][parts[-2]] += count

traffic_taffy/hooks/psl.py

@@ -2,7 +2,7 @@ from logging import info
 import dnssplitter
 
 from traffic_taffy.hooks import register_hook
-from traffic_taffy.dissector import POST_DISSECT_HOOK
+from traffic_taffy.dissector import POST_DISSECT_HOOK, INIT_HOOK
 from traffic_taffy.dissection import Dissection
 from traffic_taffy.taffy_config import taffy_default, TaffyConfig
 
@@ -11,8 +11,8 @@ splitter = None
 taffy_default("modules.psl.database", "__internal__")
 
 
-@register_hook(POST_DISSECT_HOOK)
-def split_dns_names(dissection: Dissection, **kwargs):
+@register_hook(INIT_HOOK)
+def init_splitter(**kwargs):
     global splitter
 
     if not splitter:
@@ -28,6 +28,11 @@ def split_dns_names(dissection: Dissection, **kwargs):
             info(f"loading PSL from {path}")
             splitter.load_psl_file(path)
 
+
+@register_hook(POST_DISSECT_HOOK)
+def split_dns_names(dissection: Dissection, **kwargs):
+    init_splitter()
+
     timestamps = dissection.data.keys()
 
     for timestamp in timestamps:

traffic_taffy/tools/config.py

@@ -33,48 +33,48 @@ except ModuleNotFoundError:
     logging.debug("psl module not loadable")
 
 
+def taffy_config_parse_args() -> Namespace:
+    """Parse the command line arguments."""
+
+    config: TaffyConfig = TaffyConfig()
+    config.config_option_names = ["-y", "--config"]
+    config[TT_CFG.LOG_LEVEL] = "info"
+
+    config.read_configfile_from_arguments(sys.argv)
+
+    parser = ArgumentParser(
+        formatter_class=RichHelpFormatter,
+        description=__doc__,
+        epilog="Example Usage: taffy-config > defaults.yml",
+    )
+
+    parser.add_argument(
+        "-y",
+        "--config",
+        default=None,
+        type=str,
+        help="Configuration file (YAML) to load.",
+    )
+
+    parser.add_argument(
+        "--log-level",
+        "--ll",
+        default="info",
+        help="Define the logging verbosity level (debug, info, warning, error, fotal, critical).",
+    )
+
+    args = parser.parse_args()
+    log_level = args.log_level.upper()
+    logging.basicConfig(level=log_level, format="%(levelname)-10s:\t%(message)s")
+
+    config.load_namespace(args)
+    return config
+
+
 def main() -> None:
     """Dissect a pcap file and report contents."""
 
-    def parse_args() -> Namespace:
-        """Parse the command line arguments."""
-
-        config: TaffyConfig = TaffyConfig()
-        config.config_option_names = ["-y", "--config"]
-        config[TT_CFG.LOG_LEVEL] = "info"
-
-        config.read_configfile_from_arguments(sys.argv)
-
-        parser = ArgumentParser(
-            formatter_class=RichHelpFormatter,
-            description=__doc__,
-            epilog="Example Usage: taffy-config > defaults.yml",
-        )
-
-        parser.add_argument(
-            "-y",
-            "--config",
-            default=None,
-            type=str,
-            help="Configuration file (YAML) to load.",
-        )
-
-        parser.add_argument(
-            "--log-level",
-            "--ll",
-            default="info",
-            help="Define the logging verbosity level (debug, info, warning, error, fotal, critical).",
-        )
-
-        args = parser.parse_args()
-        log_level = args.log_level.upper()
-        logging.basicConfig(level=log_level, format="%(levelname)-10s:\t%(message)s")
-
-        config.load_namespace(args)
-        return config
-
-    config = parse_args()
-    config.as_namespace()
+    config = taffy_config_parse_args()
 
     print(yaml.dump(dict(config)))
 

{traffic_taffy-0.9.1.dist-info → traffic_taffy-0.9.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: traffic-taffy
-Version: 0.9.1
+Version: 0.9.3
 Summary: A tool for doing differential analysis of pcap files
 Project-URL: Homepage, https://traffic-taffy.github.io/
 Author-email: Wes Hardaker <opensource@hardakers.net>
@@ -56,6 +56,12 @@ might be coming that will cause merge conflicts.
 
 # Copyright and License
 
+Traffic-taffy was created by [Wes Hardaker], a computer scientist at
+[USC/ISI], with support from the Comcast Innovation Fund.
+
+[Wes Hardaker]: https://ant.isi.edu/~hardaker/
+[USC/ISI]: https://www.isi.edu/
+
 This project is copyrighted by the University of Southern California,
 Information Sciences institute.  It is released under the Apache 2.0
 license.

{traffic_taffy-0.9.1.dist-info → traffic_taffy-0.9.3.dist-info}/RECORD

@@ -1,10 +1,10 @@
-traffic_taffy/__init__.py,sha256=u9pJ9wMqnfaUDvpAnje_QL_Ge7wmEMvP3I7LcFNVbmw,22
+traffic_taffy/__init__.py,sha256=QTKEpzY_ZMDccPfhHR5VeIEETRWrA3oohe60v8oSycU,22
 traffic_taffy/compare.py,sha256=g9rU6oa_2Wy0nUJ7K6TI8JTctyGCRvYEUakDBf7blOY,8644
 traffic_taffy/comparison.py,sha256=KJxOp4UqhfRkF4LI1PMDRIefeyTm2w5sbdr7VUTS4KM,1451
 traffic_taffy/config.py,sha256=DgTu2kA1Ec4Hbwl_44kTsdyJYvxAabgJk9a7aOH2XXU,4444
 traffic_taffy/dissection.py,sha256=dW6UxJ_RY5oMipyh3J2CvsjP-E9Llly7IgjbPFSSTzU,24571
 traffic_taffy/dissectmany.py,sha256=SWFXFyERNCi0j7hiMDEeJJdPYDpa0SOlSj1V8AqpXUA,5189
-traffic_taffy/dissector.py,sha256=Q5dYLY8ZVPt2Iz4T0asdmBBwma2YPBk9XOwtmOATX10,15626
+traffic_taffy/dissector.py,sha256=M5MHVPwfeMHa6s4TG8ZiiNjk7qaht65wdqm0nmRHdQ8,15682
 traffic_taffy/graph.py,sha256=EfkxH5D9PNlDpvftkh9GyUusV05EV537QGB7JOMeW4w,4730
 traffic_taffy/graphdata.py,sha256=r_QNXO3FzC7Vx4123SdCliAh7j2NCQ4Lb5uoOJnlt2M,3376
 traffic_taffy/taffy_config.py,sha256=AmdQbWAhoiV7aTNSpV1exJfd5eA0a3sYTIjikHkMPwY,1124
@@ -13,15 +13,15 @@ traffic_taffy/algorithms/comparecorrelation.py,sha256=gakZJotZNOVj96y4_-vtt_ka8p
 traffic_taffy/algorithms/comparecorrelationchanges.py,sha256=-ztWKpNN5lm_6e7hTSZytwzuK1RpMpfe1ksQgsb0_tk,7646
 traffic_taffy/algorithms/compareseries.py,sha256=cVonTV6TnMZAaHlGqZ6shn0aDQTTHzK-tPvUAk3OkuQ,4165
 traffic_taffy/algorithms/compareslices.py,sha256=aIDhISKi-m8uD65pBd3A2naoxYD9zeay6y7mAk4hXdg,4336
-traffic_taffy/algorithms/statistical.py,sha256=McP8fdg4P2zRHm57Gq7xKLukrvh7ITZNlj4lhv51IPE,4158
+traffic_taffy/algorithms/statistical.py,sha256=7ddz3nPaTbhCNpfNcWx2sLmnv3ZYnmvEc72M9cAOU-0,4281
 traffic_taffy/dissector_engine/__init__.py,sha256=Hu-UQtz7yhivmQLUP5b8tFQLEhy2bfvrRV3Q4aZp6vg,2202
 traffic_taffy/dissector_engine/dnstap.py,sha256=rBzVlB0D3YVhHOsr17cbnCIZU13g20srgR4sE7ZfNUE,4810
 traffic_taffy/dissector_engine/dpkt.py,sha256=YgFceo_6cy1VN-ODIijSsOfH3w8OzHPbpUS463is3YI,10949
 traffic_taffy/dissector_engine/scapy.py,sha256=WrZUfV_viR2Tro0kM3QKUkufIcM3RyYaZ3ncA1yZsaU,4897
 traffic_taffy/hooks/__init__.py,sha256=Bvhl6RnyBqQkWuCU6TS0O_ZHe4qCQsC4HE8FELigWPw,661
-traffic_taffy/hooks/ip2asn.py,sha256=FCjTbHQZEuOvlw1fMyQgcJFiZrJfpNpUVZTdsxtUldw,2132
-traffic_taffy/hooks/labels.py,sha256=QayehHzvaqILf_bP3avwGXa-xL4IBEndo6ILbLtqcKU,1860
-traffic_taffy/hooks/psl.py,sha256=ym1vzBS9esgIRxZi5hWFcUl0vax5go_f9-2P_6kynts,2031
+traffic_taffy/hooks/ip2asn.py,sha256=7UA52L6jej0RYBptzP9izO0yXMcqH7wcp2ocDRUN5dg,2216
+traffic_taffy/hooks/labels.py,sha256=5jHXq3-kxDQj9PRYgak-gDzE8dvSUiCEq9mBs9nE014,1933
+traffic_taffy/hooks/psl.py,sha256=A3maHS9FOholOEv1LuX0xSO3u34GyqeYl9_EtJG1pMY,2119
 traffic_taffy/iana/tables.msgpak,sha256=d-R5Xw9yG9t4RqGJRrpE6cjH4YfaxQBwQiBhNjKZbwI,172825
 traffic_taffy/output/__init__.py,sha256=qqlAUA99fxWlHEns-ji7A2RrcA8RA-AKXK7n2D737c8,3312
 traffic_taffy/output/console.py,sha256=QizlMIRbUKm7S57SojBiTAOB4KM9DCcj8EKiH1roO6U,3031
@@ -44,13 +44,13 @@ traffic_taffy/tests/test_value_printing.py,sha256=rhmCUqnh1Lk1TTZvZi7ksvUWm4XDB4
 traffic_taffy/tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 traffic_taffy/tools/cache_info.py,sha256=ZanO6jDlTdfJ7w0N_7BkLyJj4NyZGShaH7SrUulbIoE,2085
 traffic_taffy/tools/compare.py,sha256=oT5fIqfPeY6nGI9vSVAoKDsAVzzqfXJDzyOw2BhPfSI,3509
-traffic_taffy/tools/config.py,sha256=XVsKA0E429K2HCyjuPuHwS1iPBkscQxa82Zu53Wmpqw,2458
+traffic_taffy/tools/config.py,sha256=RwJYyfI1yiAKbMzU5mcPTguBiH-hGRy5vk_YvAAjPuM,2343
 traffic_taffy/tools/dissect.py,sha256=B-7e7aqEOWtJ-0P2Y-mzmrzoDqVrDCJ2JzGR45QtuuQ,3073
 traffic_taffy/tools/explore.py,sha256=gUcOfAgangJJI1si1gLPUoWRUKmWUAXSP0oTD2JJygw,24149
 traffic_taffy/tools/export.py,sha256=9zBBGhZK95b4ZiLJ8XK30GPsaBjgR84Sk1HoPIxRpTI,2844
 traffic_taffy/tools/graph.py,sha256=KiKDY9R8JLT5-JouANoi_1WGcdFMhXsLnYlhPsFRWpM,2316
-traffic_taffy-0.9.1.dist-info/METADATA,sha256=DnMSh8c3gJmQqp_kP6NZCiHfsC29fJ8dZf8pfLv4olU,2033
-traffic_taffy-0.9.1.dist-info/WHEEL,sha256=TJPnKdtrSue7xZ_AVGkp9YXcvDrobsjBds1du3Nx6dc,87
-traffic_taffy-0.9.1.dist-info/entry_points.txt,sha256=F0lqjvw94nQ3hY4eerN7faT9aKhhGUHbqBhuEr9q1r8,361
-traffic_taffy-0.9.1.dist-info/licenses/LICENSE.txt,sha256=hiV1DJgDQeSM1r7P-ez5oxily11S5nsCedU0jKzKKzo,11338
-traffic_taffy-0.9.1.dist-info/RECORD,,
+traffic_taffy-0.9.3.dist-info/METADATA,sha256=G_or2oWTR_IcAq8WvyhloYLjDc9i8ySjOQ9U2Y9LKvc,2241
+traffic_taffy-0.9.3.dist-info/WHEEL,sha256=TJPnKdtrSue7xZ_AVGkp9YXcvDrobsjBds1du3Nx6dc,87
+traffic_taffy-0.9.3.dist-info/entry_points.txt,sha256=F0lqjvw94nQ3hY4eerN7faT9aKhhGUHbqBhuEr9q1r8,361
+traffic_taffy-0.9.3.dist-info/licenses/LICENSE.txt,sha256=hiV1DJgDQeSM1r7P-ez5oxily11S5nsCedU0jKzKKzo,11338
+traffic_taffy-0.9.3.dist-info/RECORD,,