traffic-taffy 0.3__tar.gz → 0.3.5__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {traffic-taffy-0.3 → traffic-taffy-0.3.5}/PKG-INFO +1 -1
- {traffic-taffy-0.3 → traffic-taffy-0.3.5}/setup.py +8 -1
- {traffic-taffy-0.3 → traffic-taffy-0.3.5}/traffic_taffy/cache_info.py +6 -0
- {traffic-taffy-0.3 → traffic-taffy-0.3.5}/traffic_taffy/dissector.py +10 -2
- {traffic-taffy-0.3 → traffic-taffy-0.3.5}/traffic_taffy/graph.py +0 -16
- {traffic-taffy-0.3 → traffic-taffy-0.3.5}/traffic_taffy.egg-info/PKG-INFO +1 -1
- {traffic-taffy-0.3 → traffic-taffy-0.3.5}/traffic_taffy.egg-info/SOURCES.txt +1 -0
- traffic-taffy-0.3.5/traffic_taffy.egg-info/requires.txt +5 -0
- {traffic-taffy-0.3 → traffic-taffy-0.3.5}/README.md +0 -0
- {traffic-taffy-0.3 → traffic-taffy-0.3.5}/pyproject.toml +0 -0
- {traffic-taffy-0.3 → traffic-taffy-0.3.5}/setup.cfg +0 -0
- {traffic-taffy-0.3 → traffic-taffy-0.3.5}/traffic_taffy/__init__.py +0 -0
- {traffic-taffy-0.3 → traffic-taffy-0.3.5}/traffic_taffy/compare.py +0 -0
- {traffic-taffy-0.3 → traffic-taffy-0.3.5}/traffic_taffy/dissectmany.py +0 -0
- {traffic-taffy-0.3 → traffic-taffy-0.3.5}/traffic_taffy/dissectorresults.py +0 -0
- {traffic-taffy-0.3 → traffic-taffy-0.3.5}/traffic_taffy/explore.py +0 -0
- {traffic-taffy-0.3 → traffic-taffy-0.3.5}/traffic_taffy/pcap_splitter.py +0 -0
- {traffic-taffy-0.3 → traffic-taffy-0.3.5}/traffic_taffy.egg-info/dependency_links.txt +0 -0
- {traffic-taffy-0.3 → traffic-taffy-0.3.5}/traffic_taffy.egg-info/entry_points.txt +0 -0
- {traffic-taffy-0.3 → traffic-taffy-0.3.5}/traffic_taffy.egg-info/top_level.txt +0 -0
|
@@ -5,7 +5,7 @@ with open("README.md", "r") as fh:
|
|
|
5
5
|
|
|
6
6
|
setuptools.setup(
|
|
7
7
|
name="traffic-taffy",
|
|
8
|
-
version="0.3",
|
|
8
|
+
version="0.3.5",
|
|
9
9
|
author="Wes Hardaker",
|
|
10
10
|
author_email="opensource@hardakers.net",
|
|
11
11
|
description="A tool for doing differential analysis of pcap files",
|
|
@@ -28,4 +28,11 @@ setuptools.setup(
|
|
|
28
28
|
python_requires=">=3.7",
|
|
29
29
|
test_suite="nose.collector",
|
|
30
30
|
tests_require=["nose"],
|
|
31
|
+
install_requires=[
|
|
32
|
+
"pandas",
|
|
33
|
+
"rich",
|
|
34
|
+
"seaborn",
|
|
35
|
+
"scapy",
|
|
36
|
+
"dpkt",
|
|
37
|
+
],
|
|
31
38
|
)
|
|
@@ -47,6 +47,12 @@ def main():
|
|
|
47
47
|
for key in contents["parameters"]:
|
|
48
48
|
print(f" {key:<16} {contents['parameters'][key]}")
|
|
49
49
|
|
|
50
|
+
print("data info:")
|
|
51
|
+
timestamps = list(contents["dissection"].keys())
|
|
52
|
+
print(f" timestamps: {len(timestamps)}")
|
|
53
|
+
print(f" first: {timestamps[1]}") # skips 0 = global
|
|
54
|
+
print(f" last: {timestamps[-1]}")
|
|
55
|
+
|
|
50
56
|
|
|
51
57
|
if __name__ == "__main__":
|
|
52
58
|
main()
|
|
@@ -250,7 +250,7 @@ class PCAPDissector:
|
|
|
250
250
|
self.timestamp = self.timestamp - self.timestamp % self.bin_size
|
|
251
251
|
self.incr(self.TOTAL_COUNT, self.TOTAL_SUBKEY)
|
|
252
252
|
|
|
253
|
-
if self.dissector_level
|
|
253
|
+
if self.dissector_level >= PCAPDissectorType.THROUGH_IP.value:
|
|
254
254
|
eth = dpkt.ethernet.Ethernet(packet)
|
|
255
255
|
# these names are designed to match scapy names
|
|
256
256
|
self.incr("Ethernet.dst", eth.dst)
|
|
@@ -499,6 +499,14 @@ def dissector_add_parseargs(parser, add_subgroup: bool = True):
|
|
|
499
499
|
help="Maximum number of packets to analyze",
|
|
500
500
|
)
|
|
501
501
|
|
|
502
|
+
parser.add_argument(
|
|
503
|
+
"-b",
|
|
504
|
+
"--bin-size",
|
|
505
|
+
type=int,
|
|
506
|
+
default=3600,
|
|
507
|
+
help="Bin results into this many seconds",
|
|
508
|
+
)
|
|
509
|
+
|
|
502
510
|
parser.add_argument(
|
|
503
511
|
"-C",
|
|
504
512
|
"--cache-pcap-results",
|
|
@@ -597,7 +605,7 @@ def main():
|
|
|
597
605
|
|
|
598
606
|
pd = PCAPDissector(
|
|
599
607
|
args.input_file,
|
|
600
|
-
bin_size=
|
|
608
|
+
bin_size=args.bin_size,
|
|
601
609
|
dissector_level=args.dissection_level,
|
|
602
610
|
maximum_count=args.packet_count,
|
|
603
611
|
cache_results=args.cache_pcap_results,
|
|
@@ -26,14 +26,6 @@ def parse_args():
|
|
|
26
26
|
epilog="Exmaple Usage: ",
|
|
27
27
|
)
|
|
28
28
|
|
|
29
|
-
parser.add_argument(
|
|
30
|
-
"-g",
|
|
31
|
-
"--graph-elements",
|
|
32
|
-
default=None,
|
|
33
|
-
type=str,
|
|
34
|
-
help="Graph these particular elements; the default is packet counts",
|
|
35
|
-
)
|
|
36
|
-
|
|
37
29
|
parser.add_argument(
|
|
38
30
|
"-o",
|
|
39
31
|
"--output-file",
|
|
@@ -49,14 +41,6 @@ def parse_args():
|
|
|
49
41
|
help="Define verbosity level (debug, info, warning, error, fotal, critical).",
|
|
50
42
|
)
|
|
51
43
|
|
|
52
|
-
parser.add_argument(
|
|
53
|
-
"-b",
|
|
54
|
-
"--bin-size",
|
|
55
|
-
type=int,
|
|
56
|
-
default=1,
|
|
57
|
-
help="Bin results into this many seconds",
|
|
58
|
-
)
|
|
59
|
-
|
|
60
44
|
parser.add_argument(
|
|
61
45
|
"-i",
|
|
62
46
|
"--interactive",
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|