FlowAnalyzer 0.1.5__tar.gz → 0.1.6__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.
- {FlowAnalyzer-0.1.5 → FlowAnalyzer-0.1.6}/FlowAnalyzer/FlowAnalyzer.py +2 -2
- {FlowAnalyzer-0.1.5 → FlowAnalyzer-0.1.6}/FlowAnalyzer.egg-info/PKG-INFO +1 -1
- {FlowAnalyzer-0.1.5 → FlowAnalyzer-0.1.6}/PKG-INFO +1 -1
- {FlowAnalyzer-0.1.5 → FlowAnalyzer-0.1.6}/setup.py +1 -1
- {FlowAnalyzer-0.1.5 → FlowAnalyzer-0.1.6}/FlowAnalyzer/__init__.py +0 -0
- {FlowAnalyzer-0.1.5 → FlowAnalyzer-0.1.6}/FlowAnalyzer.egg-info/SOURCES.txt +0 -0
- {FlowAnalyzer-0.1.5 → FlowAnalyzer-0.1.6}/FlowAnalyzer.egg-info/dependency_links.txt +0 -0
- {FlowAnalyzer-0.1.5 → FlowAnalyzer-0.1.6}/FlowAnalyzer.egg-info/top_level.txt +0 -0
- {FlowAnalyzer-0.1.5 → FlowAnalyzer-0.1.6}/LICENSE +0 -0
- {FlowAnalyzer-0.1.5 → FlowAnalyzer-0.1.6}/README.md +0 -0
- {FlowAnalyzer-0.1.5 → FlowAnalyzer-0.1.6}/setup.cfg +0 -0
|
@@ -167,10 +167,10 @@ class FlowAnalyzer:
|
|
|
167
167
|
header = full_request[:num]
|
|
168
168
|
|
|
169
169
|
if full_request.endswith(b"\r\n\r\n"):
|
|
170
|
-
ret = re.findall(b'^\r\n\r\n.*?\r\n(.*)\r\n.*?\r\n\r\n$', full_request[num:], flags=re.DOTALL)
|
|
171
170
|
# 判断是否有file_data，没有的话就为b""空字符串
|
|
172
171
|
# 由于是多个tcp所以需要去除应该是长度的字节 不确定是不是4个字节 后期可能出现bug
|
|
173
|
-
|
|
172
|
+
ret = re.findall(b'^\r\n\r\n[0-9a-f]{1,}\r\n(.*)\r\n\x30\r\n\r\n$', full_request[num:], flags=re.DOTALL)
|
|
173
|
+
file_data = re.sub(b"\r\n[0-9a-f]{1,}\r\n", b"", ret[0]) if ret != [] else b""
|
|
174
174
|
else:
|
|
175
175
|
file_data = full_request[num+4:]
|
|
176
176
|
|
|
@@ -6,7 +6,7 @@ with open(os.path.join(os.path.dirname(__file__), "README.md"), encoding="utf-8"
|
|
|
6
6
|
|
|
7
7
|
setup(
|
|
8
8
|
name="FlowAnalyzer",
|
|
9
|
-
version="0.1.
|
|
9
|
+
version="0.1.6",
|
|
10
10
|
description="FlowAnalyzer是一个流量分析器，用于解析和处理tshark导出的JSON数据文件",
|
|
11
11
|
author="Byxs20",
|
|
12
12
|
author_email="97766819@qq.com",
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|