traffic-taffy 0.6__py3-none-any.whl → 0.6.1__py3-none-any.whl
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/__init__.py +1 -1
- traffic_taffy/dissection.py +10 -3
- {traffic_taffy-0.6.dist-info → traffic_taffy-0.6.1.dist-info}/METADATA +2 -2
- {traffic_taffy-0.6.dist-info → traffic_taffy-0.6.1.dist-info}/RECORD +7 -7
- {traffic_taffy-0.6.dist-info → traffic_taffy-0.6.1.dist-info}/WHEEL +0 -0
- {traffic_taffy-0.6.dist-info → traffic_taffy-0.6.1.dist-info}/entry_points.txt +0 -0
- {traffic_taffy-0.6.dist-info → traffic_taffy-0.6.1.dist-info}/licenses/LICENSE.txt +0 -0
traffic_taffy/__init__.py
CHANGED
@@ -1 +1 @@
|
|
1
|
-
__VERSION__ = "0.6"
|
1
|
+
__VERSION__ = "0.6.1"
|
traffic_taffy/dissection.py
CHANGED
@@ -179,7 +179,9 @@ class Dissection:
|
|
179
179
|
return None
|
180
180
|
|
181
181
|
cached_file = self.pcap_file + self.cache_file_suffix
|
182
|
-
cached_contents = self.load_saved(
|
182
|
+
cached_contents = self.load_saved(
|
183
|
+
cached_file, dont_overwrite=True, force_load=force_load
|
184
|
+
)
|
183
185
|
|
184
186
|
ok_to_load = True
|
185
187
|
|
@@ -321,7 +323,12 @@ class Dissection:
|
|
321
323
|
# load the data
|
322
324
|
self.data = versioned_cache["dissection"]
|
323
325
|
|
324
|
-
def load_saved(
|
326
|
+
def load_saved(
|
327
|
+
self: Dissection,
|
328
|
+
where: str,
|
329
|
+
dont_overwrite: bool = False,
|
330
|
+
force_load: bool = False,
|
331
|
+
) -> dict:
|
325
332
|
"""Load a saved report from a cache file."""
|
326
333
|
with Path(where).open("rb") as cache_file:
|
327
334
|
contents = msgpack.load(cache_file, strict_map_key=False)
|
@@ -332,7 +339,7 @@ class Dissection:
|
|
332
339
|
)
|
333
340
|
|
334
341
|
# check that the version header matches something we understand
|
335
|
-
if contents[self.DISSECTION_KEY] != self.DISSECTION_VERSION:
|
342
|
+
if not force_load and contents[self.DISSECTION_KEY] != self.DISSECTION_VERSION:
|
336
343
|
raise ValueError(
|
337
344
|
"improper saved dissection version: report version = "
|
338
345
|
+ str(contents[self.DISSECTION_KEY])
|
@@ -1,8 +1,8 @@
|
|
1
1
|
Metadata-Version: 2.1
|
2
2
|
Name: traffic-taffy
|
3
|
-
Version: 0.6
|
3
|
+
Version: 0.6.1
|
4
4
|
Summary: A tool for doing differential analysis of pcap files
|
5
|
-
Project-URL: Homepage, https://github.
|
5
|
+
Project-URL: Homepage, https://traffic-taffy.github.io/
|
6
6
|
Author-email: Wes Hardaker <opensource@hardakers.net>
|
7
7
|
License-File: LICENSE.txt
|
8
8
|
Classifier: Operating System :: OS Independent
|
@@ -1,7 +1,7 @@
|
|
1
|
-
traffic_taffy/__init__.py,sha256=
|
1
|
+
traffic_taffy/__init__.py,sha256=lxdAZkWGZaopH508YDIVWmijx9OX55PA86SnLr2-l6w,22
|
2
2
|
traffic_taffy/compare.py,sha256=VwwxfJUYMXSVByX4HTAk3IoQz5yxBUzcWYw36f5bj4s,11855
|
3
3
|
traffic_taffy/comparison.py,sha256=MmCxK7E3RbVLS8gJ_JJOdqa2MHQ7np1Pq_VB0Scir8U,933
|
4
|
-
traffic_taffy/dissection.py,sha256=
|
4
|
+
traffic_taffy/dissection.py,sha256=k30Jv11UzgdnUYU7b-fkW12yHEY1DK2uM7ZBqR2XNkw,17141
|
5
5
|
traffic_taffy/dissectmany.py,sha256=M3myhPiatVLJrINAuHkX4bx9X7rhpJy37T_H7p1TI8w,4394
|
6
6
|
traffic_taffy/dissector.py,sha256=i2NyObydENhp11FEnLG37sLt3jn0qmC_UXnxKQ2ez9Y,10571
|
7
7
|
traffic_taffy/graph.py,sha256=Jj5Ga43I-zbetGjAIT-rzuEHr_ZZwFhGP76vkEgwNmg,4384
|
@@ -28,8 +28,8 @@ traffic_taffy/tools/dissect.py,sha256=1-b6fnIE3DPJ2xvsImPrVynKPwerQU0PrYvaMJC85Z
|
|
28
28
|
traffic_taffy/tools/explore.py,sha256=TEUqfiknqKwEq0zswfgwvKPLMSOlTUWqC8NhcwPfQO8,24146
|
29
29
|
traffic_taffy/tools/export.py,sha256=jk5ck-K9m9_Rno72fDWgfS67WKUumDL1KQpMG_j0-G8,2682
|
30
30
|
traffic_taffy/tools/graph.py,sha256=5pcO_FsASddi_zEYB9h24syuqLCaDzByIPAiR4aq6gg,2530
|
31
|
-
traffic_taffy-0.6.dist-info/METADATA,sha256=
|
32
|
-
traffic_taffy-0.6.dist-info/WHEEL,sha256=TJPnKdtrSue7xZ_AVGkp9YXcvDrobsjBds1du3Nx6dc,87
|
33
|
-
traffic_taffy-0.6.dist-info/entry_points.txt,sha256=ySz30b1Cu03CtCGMRqqg0NZJpzrVI91T5HjbEaTNnpQ,314
|
34
|
-
traffic_taffy-0.6.dist-info/licenses/LICENSE.txt,sha256=hiV1DJgDQeSM1r7P-ez5oxily11S5nsCedU0jKzKKzo,11338
|
35
|
-
traffic_taffy-0.6.dist-info/RECORD,,
|
31
|
+
traffic_taffy-0.6.1.dist-info/METADATA,sha256=HZBn_vZuMg-mBkNm-bX_c3wURdNS5N80Z9x35padlPk,1884
|
32
|
+
traffic_taffy-0.6.1.dist-info/WHEEL,sha256=TJPnKdtrSue7xZ_AVGkp9YXcvDrobsjBds1du3Nx6dc,87
|
33
|
+
traffic_taffy-0.6.1.dist-info/entry_points.txt,sha256=ySz30b1Cu03CtCGMRqqg0NZJpzrVI91T5HjbEaTNnpQ,314
|
34
|
+
traffic_taffy-0.6.1.dist-info/licenses/LICENSE.txt,sha256=hiV1DJgDQeSM1r7P-ez5oxily11S5nsCedU0jKzKKzo,11338
|
35
|
+
traffic_taffy-0.6.1.dist-info/RECORD,,
|
File without changes
|
File without changes
|
File without changes
|