new stuff on Sniffer. Now, a list of each flow is created. I just nee…

…d to commit it on the databasa, and it is done :)
AndersonPaschoalon · Jun 28, 2017 · 4b871dd · 4b871dd
1 parent 433ccdc
commit 4b871dd
Show file tree

Hide file tree

Showing 7 changed files with 270 additions and 127 deletions.
diff --git a/MesserTG/sniffer/.idea/workspace.xml b/MesserTG/sniffer/.idea/workspace.xml
diff --git a/MesserTG/sniffer/FlowId.py b/MesserTG/sniffer/FlowId.py
@@ -1,4 +1,5 @@
 from fnvhash import fnv1a_32
+from fnvhash import fnv1a_64
 import collections
 
 class OrderedSet(collections.MutableSet):
@@ -78,7 +79,8 @@ def getNumberOfFlows(self, flow_string):
         :param flow_string: concatenation of ether_type|ip_src|ip_dst|ip_proto|src_port|dst_port
         :return: current number of flows
         '''
-        flow_hash = fnv1a_32(bytes(flow_string, 'ascii'))
+        #flow_hash = fnv1a_32(bytes(flow_string, 'ascii'))
+        flow_hash = fnv1a_64(bytes(flow_string, 'ascii'))
         self._set_flow_hashes.add(flow_hash);
         return len(self._set_flow_hashes)
 
@@ -92,7 +94,8 @@ def getFlowId(self, flow_string):
         :param flow_string: concatenation of ether_type|ip_src|ip_dst|ip_proto|src_port|dst_port
         :return:
         """
-        flow_hash = fnv1a_32(bytes(flow_string, 'ascii'))
+        #flow_hash = fnv1a_32(bytes(flow_string, 'ascii'))
+        flow_hash = fnv1a_64(bytes(flow_string, 'ascii'))
         self._set_flow_hashes.add(flow_hash);
         return self._set_flow_hashes.index(flow_hash)
 

diff --git a/MesserTG/sniffer/__pycache__/FlowId.cpython-35.pyc b/MesserTG/sniffer/__pycache__/FlowId.cpython-35.pyc
diff --git a/MesserTG/sniffer/__pycache__/traffic.cpython-35.pyc b/MesserTG/sniffer/__pycache__/traffic.cpython-35.pyc
diff --git a/MesserTG/sniffer/liveCapture_enp3s0.log b/MesserTG/sniffer/liveCapture_enp3s0.log
@@ -1,3 +1,6 @@
 [INFO] (MainThread) Program execution time: 16.228895 s
 [INFO] (MainThread) Program execution time: 18.069224 s
 [INFO] (MainThread) Program execution time: 16.261960 s
+[INFO] (MainThread) Program execution time: 16.701102 s
+[INFO] (MainThread) Program execution time: 16.322237 s
+[INFO] (MainThread) Program execution time: 16.798822 s