xbase-util 0.7.5__tar.gz → 0.7.7__tar.gz

{xbase_util-0.7.5 → xbase_util-0.7.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: xbase_util
-Version: 0.7.5
+Version: 0.7.7
 Summary: 网络安全基础工具
 Home-page: https://gitee.com/jimonik/xbase_util.git
 Author: xyt

{xbase_util-0.7.5 → xbase_util-0.7.7}/setup.py

@@ -3,7 +3,7 @@ from distutils.core import setup
 from setuptools import find_packages
 
 setup(name="xbase_util",
-      version="0.7.5",
+      version="0.7.7",
       description="网络安全基础工具",
       long_description="包含提取，预测，训练的基础工具",
       author="xyt",

{xbase_util-0.7.5 → xbase_util-0.7.7}/test/test.py

@@ -30,5 +30,7 @@ if __name__ == '__main__':
         packet_objs = pickle.load(f)
     skey = f"10.28.7.16:54398"
     reassemble_tcp_res = reassemble_tcp(packet_objs, skey)
-    reassemble_session_result = reassemble_session(reassemble_tcp_res, skey)
-    print(reassemble_session_result)
+    all_packets = reassemble_session(reassemble_tcp_res, skey)
+    time_period = [( abs(item['res_time']-item['req_time'])) for item in
+                   all_packets if item['res_time'] != 0 and item['req_time'] != 0]
+    print(all_packets)

{xbase_util-0.7.5 → xbase_util-0.7.7}/xbase_util/pcap_util.py

@@ -160,8 +160,8 @@ def reassemble_tcp(packets, skey, num_packets=1000):
         else:
             previous = item['tcp']['seq']
             results[-1]['data'] = results[-1]['data'] + item['tcp']['data']
-    if skey != results[0]['key']:
-        results.insert(0, {'data': b'', 'key': skey})
+    # if skey != results[0]['key']:
+    #     results.insert(0, {'data': b'', 'key': skey,'ts':0})
     return results
 
 
@@ -231,16 +231,19 @@ def reassemble_session(reassemble_tcp_res, skey):
         header, body = parse_req_or_res1(packet['data'])
         if index == len(reassemble_tcp_res) - 1:
             packet_list.append(copy.deepcopy(my_map))
+        my_map['key'] = packet['key']
         if packet['key'] == skey:
             if index != 0:
                 packet_list.append(copy.deepcopy(my_map))
             my_map["req_header"] = header
             my_map["req_body"] = body
             my_map["req_time"] = packet['ts']
+            my_map["req_size"] = len(packet['data'])
         else:
             my_map["res_header"] = header
             my_map["res_body"] = body
             my_map["res_time"] = packet['ts']
+            my_map["res_size"] = len(packet['data'])
     return packet_list
 
 

{xbase_util-0.7.5 → xbase_util-0.7.7}/xbase_util.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: xbase-util
-Version: 0.7.5
+Version: 0.7.7
 Summary: 网络安全基础工具
 Home-page: https://gitee.com/jimonik/xbase_util.git
 Author: xyt