xbase-util 0.8.5__tar.gz → 0.8.6__tar.gz

{xbase_util-0.8.5 → xbase_util-0.8.6}/PKG-INFO

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

{xbase_util-0.8.5 → xbase_util-0.8.6}/setup.py

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

{xbase_util-0.8.5 → xbase_util-0.8.6}/xbase_util/pcap_util.py

@@ -366,8 +366,8 @@ def reassemble_tcp_pcap(p):
             info[key]['max'] = seq
         packets2.append(packet)
     if len(keys) == 1:
-        key = f"{packets['pkt'][IP].dst}:{packets['pkt'][IP].dport}"
-        ack = packets['pkt'][TCP].ack
+        key = f"{packets2[0]['pkt'][IP].dst}:{packets2[0]['pkt'][IP].dport}"
+        ack = packets2[0]['pkt'][TCP].ack
         info[key] = {
             "min": ack,
             "max": ack,
@@ -375,8 +375,7 @@ def reassemble_tcp_pcap(p):
             "wrapack": False,
         }
         keys.append(key)
-    packets = packets2
-    if len(packets) == 0:
+    if len(packets2) == 0:
         return []
     needwrap = False
     if info[keys[0]] and info[keys[0]]['max'] - info[keys[0]]['min'] > 0x7fffffff:
@@ -388,13 +387,13 @@ def reassemble_tcp_pcap(p):
         info[keys[0]]['wrapack'] = True
         needwrap = True
     if needwrap:
-        for packet in packets:
+        for packet in packets2:
             key = f"{packet['ip']['addr1']}:{packet['tcp']['sport']}"
             if info[key]['wrapseq'] and packet['tcp']['seq'] < 0x7fffffff:
                 packet['tcp']['seq'] += 0xffffffff
             if info[key]['wrapack'] and packet['tcp']['ack'] < 0x7fffffff:
                 packet['tcp']['ack'] += 0xffffffff
-    clientKey = f"{packets[0]['pkt'][IP].src}:{packets[0]['pkt'][IP].sport}"
+    clientKey = f"{packets2[0]['pkt'][IP].src}:{packets2[0]['pkt'][IP].sport}"
 
     def compare_packets(a, b):
         a_seq = a['pkt'][TCP].seq
@@ -413,14 +412,14 @@ def reassemble_tcp_pcap(p):
             return (a_seq + len(a_data) - 1) - b_ack
         return a_ack - (b_seq + len(b_data) - 1)
 
-    packets.sort(key=cmp_to_key(compare_packets))
+    packets2.sort(key=cmp_to_key(compare_packets))
     # del packets[num_packets:]
     # Now divide up conversation
     clientSeq = 0
     hostSeq = 0
     previous = 0
     results = []
-    for i, item in enumerate(packets):
+    for i, item in enumerate(packets2):
         sip = item['pkt'][IP].src
         sport = item['pkt'][IP].sport
         seq = item['pkt'][TCP].seq

{xbase_util-0.8.5 → xbase_util-0.8.6}/xbase_util/test.py

@@ -1,13 +1,7 @@
-import re
-from collections import Counter
-
-import numpy as np
 from scapy.packet import Raw
 from scapy.utils import rdpcap
 
-from xbase_util.common_util import get_res_status_code_list
 from xbase_util.pcap_util import reassemble_tcp_pcap, reassemble_session_pcap
-from xbase_util.xbase_constant import res_status_code_pattern
 
 if __name__ == '__main__':
     packets_scapy = reassemble_tcp_pcap(rdpcap("gzip2.pcap"))

{xbase_util-0.8.5 → xbase_util-0.8.6}/xbase_util.egg-info/PKG-INFO

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