traffic-taffy 0.3__py3-none-any.whl → 0.3.5__py3-none-any.whl

traffic_taffy/cache_info.py

@@ -47,6 +47,12 @@ def main():
     for key in contents["parameters"]:
         print(f"    {key:<16} {contents['parameters'][key]}")
 
+    print("data info:")
+    timestamps = list(contents["dissection"].keys())
+    print(f"    timestamps:      {len(timestamps)}")
+    print(f"    first:           {timestamps[1]}")  # skips 0 = global
+    print(f"    last:            {timestamps[-1]}")
+
 
 if __name__ == "__main__":
     main()

traffic_taffy/dissector.py

@@ -250,7 +250,7 @@ class PCAPDissector:
             self.timestamp = self.timestamp - self.timestamp % self.bin_size
         self.incr(self.TOTAL_COUNT, self.TOTAL_SUBKEY)
 
-        if self.dissector_level == PCAPDissectorType.THROUGH_IP.value:
+        if self.dissector_level >= PCAPDissectorType.THROUGH_IP.value:
             eth = dpkt.ethernet.Ethernet(packet)
             # these names are designed to match scapy names
             self.incr("Ethernet.dst", eth.dst)
@@ -499,6 +499,14 @@ def dissector_add_parseargs(parser, add_subgroup: bool = True):
         help="Maximum number of packets to analyze",
     )
 
+    parser.add_argument(
+        "-b",
+        "--bin-size",
+        type=int,
+        default=3600,
+        help="Bin results into this many seconds",
+    )
+
     parser.add_argument(
         "-C",
         "--cache-pcap-results",
@@ -597,7 +605,7 @@ def main():
 
     pd = PCAPDissector(
         args.input_file,
-        bin_size=0,
+        bin_size=args.bin_size,
         dissector_level=args.dissection_level,
         maximum_count=args.packet_count,
         cache_results=args.cache_pcap_results,

traffic_taffy/graph.py

@@ -26,14 +26,6 @@ def parse_args():
         epilog="Exmaple Usage: ",
     )
 
-    parser.add_argument(
-        "-g",
-        "--graph-elements",
-        default=None,
-        type=str,
-        help="Graph these particular elements; the default is packet counts",
-    )
-
     parser.add_argument(
         "-o",
         "--output-file",
@@ -49,14 +41,6 @@ def parse_args():
         help="Define verbosity level (debug, info, warning, error, fotal, critical).",
     )
 
-    parser.add_argument(
-        "-b",
-        "--bin-size",
-        type=int,
-        default=1,
-        help="Bin results into this many seconds",
-    )
-
     parser.add_argument(
         "-i",
         "--interactive",

{traffic_taffy-0.3.dist-info → traffic_taffy-0.3.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: traffic-taffy
-Version: 0.3
+Version: 0.3.5
 Summary: A tool for doing differential analysis of pcap files
 Home-page: https://github.com/hardaker/traffic-taffy
 Author: Wes Hardaker
@@ -9,6 +9,11 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Operating System :: OS Independent
 Requires-Python: >=3.7
 Description-Content-Type: text/markdown
+Requires-Dist: pandas
+Requires-Dist: rich
+Requires-Dist: seaborn
+Requires-Dist: scapy
+Requires-Dist: dpkt
 
 # Traffic Analysis of Fluctuating Flows (TAFFy)
 

{traffic_taffy-0.3.dist-info → traffic_taffy-0.3.5.dist-info}/RECORD

@@ -6,16 +6,16 @@ pcap_compare/dissector.py,sha256=iEZzLHJ7HubM3-UbZR461irXkZcpM8u_Aoa7GzWUMEY,175
 pcap_compare/dissectorresults.py,sha256=LKoyX04Qjc6B7RnqtJgIWsyVnselJ9CygLkMAp3lhw0,647
 pcap_compare/graph.py,sha256=cioVq9JYNRVqzlRJSKLveGnGSEL9FkXDUyp-Y7osSkM,5935
 traffic_taffy/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-traffic_taffy/cache_info.py,sha256=tmPmMJFhz74FDxLoqnQgki5qsUtoJBzkzk3w0ZAen0c,1369
+traffic_taffy/cache_info.py,sha256=zpuuJcPzJzyma37YJE4FwKSaOBAmzImDj0Khdn2x1FI,1623
 traffic_taffy/compare.py,sha256=-PvazIzp1ABvtZpjb1tjG9KAcnZYO_PU29FJpDNwPus,11654
 traffic_taffy/dissectmany.py,sha256=QCqnIhtMMIqHXPVg4KOIcUYaIyaDR_DCIKLoD41E1C0,2528
-traffic_taffy/dissector.py,sha256=vDGN-DGfzzz9lbke13d9uSqRMrQYI9s-8Z6JnxXdo38,21914
+traffic_taffy/dissector.py,sha256=M75VGvrv2M1NOJ2JkDaxemlxZWr10WswXN2sOTbcX9I,22085
 traffic_taffy/dissectorresults.py,sha256=LKoyX04Qjc6B7RnqtJgIWsyVnselJ9CygLkMAp3lhw0,647
 traffic_taffy/explore.py,sha256=QaRqr4UdpO72yxWMfg-WK9YkhQTXZwLzWX6K2qg18d0,6808
-traffic_taffy/graph.py,sha256=gpf_64XBH9rM7uLQhYA3p0PTButfiUvcmY5SNLnq4IA,6569
+traffic_taffy/graph.py,sha256=GZsuppEbMeJA9mr3OH-n5ba5sNT7l35P3Qv-eh1MR3E,6221
 traffic_taffy/pcap_splitter.py,sha256=qDZ0Nd81fIteQRVElyKsD1ncBi4lg07cmx8KPl_q3rY,4585
-traffic_taffy-0.3.dist-info/METADATA,sha256=_xZeNWLeWktyeWhfxTwWw-RV9s1cI7j30o09sjALHtk,877
-traffic_taffy-0.3.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
-traffic_taffy-0.3.dist-info/entry_points.txt,sha256=xabsmMHgr0Pek8ccdQoW6iAKqljueozDZW-q1hJ79eU,194
-traffic_taffy-0.3.dist-info/top_level.txt,sha256=wjeQaxXSKqUzrRtfbUlbSn8SoaL4VC73yudFAEtnIuo,14
-traffic_taffy-0.3.dist-info/RECORD,,
+traffic_taffy-0.3.5.dist-info/METADATA,sha256=sA9UeWzu1nJyFxcNOXFJ6dJNFDeGA48URLd4TpwrTx0,985
+traffic_taffy-0.3.5.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
+traffic_taffy-0.3.5.dist-info/entry_points.txt,sha256=xabsmMHgr0Pek8ccdQoW6iAKqljueozDZW-q1hJ79eU,194
+traffic_taffy-0.3.5.dist-info/top_level.txt,sha256=wjeQaxXSKqUzrRtfbUlbSn8SoaL4VC73yudFAEtnIuo,14
+traffic_taffy-0.3.5.dist-info/RECORD,,