Changeset 5742

Timestamp:

07/15/10 23:40:31 (3 years ago)

Author:

diogo

Message:

performance increase: thread replaced by process

Location:

zion/trunk/umit

Files:

• scan/zion/gui/Plot.py (modified) (1 diff)
• scan/zion/gui/ZionScanNotebookPage.py (modified) (12 diffs)
• zion/core/zion.py (modified) (6 diffs)

zion/trunk/umit/scan/zion/gui/Plot.py

@@ -140 +140 @@
         """
         self.__input = input
+        self.__draw_content(self)

zion/trunk/umit/scan/zion/gui/ZionScanNotebookPage.py

@@ -25 +25 @@
 import thread
 import getopt
+from multiprocessing import Process, Queue
 
 from higwidgets.higframe import HIGFrameRNet
@@ -41 +42 @@
 from umit.scan.zion.gui.AttractorWidget import AttractorWidget
 from umit.zion.scan import probe
-from umit.zion.core import address, options, zion, host, connector
+from umit.zion.core import address, options, zion, host
 from umit.zion.core.host import PORT_STATE_OPEN
 
@@ -333 +334 @@
 
         self.pack_end(self.result)
-        
-        # signals needed to update info
-        self.connector = connector.Connector()
-        
-        self.connector.connect('scan_finished', self.update_port_info)
-        self.connector.connect('isn_samples_finished', self.update_info, 'Creating time series\n')
-        self.connector.connect('timeseries_created', self.update_info, 'Building attractors\n')
-        self.connector.connect('attractors_built', self.update_attractors)
-        self.connector.connect('fingerprint_finished', self.update_info, 'Performing OS fingerprint matching\n')
-        self.connector.connect('matching_finished', self.update_host_information)
-        self.connector.connect('honeyd_finished', self.honeyd_finished)
-        self.connector.connect('synproxy_finished', self.synproxy_finished)
-        self.connector.connect('update_status', self.update_info)
-        
         self.result.get_hosts_view().set_current_page(0)
+        
+        # construct communication queues
+        self.q1 = Queue()
+        self.q2 = Queue()
+        fd = self.q2._reader.fileno()
+        # observe received messages in queue
+        gobject.io_add_watch(fd, gobject.IO_IN, self.update)
 
     def update_target(self, target):
@@ -361 +355 @@
         return False
     
-    def update_info(self, obj, text):
+    def update_info(self, text):
         """
         Update information page.
@@ -367 +361 @@
         self.result.get_hosts_view().get_scans_page().write(text)
         
-    def update_port_info(self, obj, host):
+    def update_port_info(self, host):
         """
         Update the port scan information of host.
         """
         self.result.update_host_info(host)
-        self.update_info(None, 'Host scanning finished\n')
-        
-    def update_attractors(self, obj, attractors):
+        self.update_info('Host scanning finished\n')
+        
+    def update_attractors(self, attractors):
         """
         Update the scans page with the graph of attractors
         """
         self.result.get_hosts_view().get_scans_page().update_attractors(attractors)
-        self.update_info(None, 'Building fingerprint\n')
-        
-    def update_host_information(self, obj, info):
+        
+    def update_host_information(self, info):
         """
         Update information about OS running on host.
         """
         self.result.get_hosts_view().get_scans_page().update_os_info(info)
-        self.update_info(None, 'OS detection finished\n')
-        
-    def honeyd_finished(self, obj, result):
+        self.update_info('OS detection finished\n')
+        
+    def honeyd_finished(self, result):
         """
         Write information about honeyd detection result
         """
         if result:
-            self.update_info(None, 'Target is honeyd\n')
+            self.update_info('Target is honeyd\n')
         else:
-            self.update_info(None, 'Target isnt honeyd\n')
-            
-    def synproxy_finished(self, obj, result):
+            self.update_info('Target isnt honeyd\n')
+            
+    def synproxy_finished(self, result):
         """
         Write information about synproxy detection result
         """
         if result:
-            self.update_info(None, 'Target is synproxy\n')
+            self.update_info('Target is synproxy\n')
         else:
-            self.update_info(None, 'Target isnt synproxy\n')            
+            self.update_info('Target isnt synproxy\n')   
+            
+    def update(self, fd, cond):
+        """
+        Update interface with the information received by zion process
+        """
+        signal, params = self.q2.get()
+        
+        if signal=='update_status':
+            self.update_info(params)
+        elif signal=='scan_finished':
+            self.update_port_info(params)
+        elif signal=='attractors_built':
+            self.update_attractors(params)
+        elif signal=='matching_finished':
+            self.update_host_information(params)
+        elif signal=='honeyd_finished':
+            self.honeyd_finished(params)
+        elif signal=='synproxy_finished':
+            self.synproxy_finished(params)
+        return True            
 
 class ZionProfileHoneyd(ZionProfile):
@@ -445 +458 @@
                 
         for target in targets:
-            z = zion.Zion(opts,  [target], self.connector)
-            z.start()
+            z = zion.Zion(opts,  [target])
+            p = Process(target=z.run, args=(self.q2,))
+            p.start()
 
 class ZionProfileOS(ZionProfile):
@@ -459 +473 @@
         """
         """
-        z = zion.Zion(options.Options(), [], self.connector)
+        z = zion.Zion(options.Options(), [])
         
         self.result.get_hosts_view().get_scans_page().clean()
@@ -487 +501 @@
         z.get_option_object().add("-d")
         z.get_option_object().add("--forge-addr",saddr)
-        z.start()
+        
+        p = Process(target=z.run, args=(self.q2,))
+        p.start()
+           
 
 class ZionProfilePrompt(ZionProfile):
@@ -538 +555 @@
             self.result.get_hosts_view().get_scans_page().show_attractor_box()
             
-        z = zion.Zion(zion_options, [], self.connector)
+        z = zion.Zion(zion_options, [])
             
         for a in addrs:
@@ -552 +569 @@
         
         # run zion
-        z.start()
+        p = Process(target=z.run, args=(self.q2,))
+        p.start()
         
 
@@ -562 +580 @@
         """
         ZionProfile.__init__(self, target)
+        # remove attractor box
+        self.result.get_hosts_view().get_scans_page().hide_attractor_box()
         
     def start(self):
@@ -592 +612 @@
                 
         for target in targets:
-            z = zion.Zion(opts,  [target], self.connector)
-            z.start()
+            z = zion.Zion(opts,  [target])
+            p = Process(target=z.run, args=(self.q2,))
+            p.start()
 
 PROFILE_CLASS = {'1': ZionProfileHoneyd,

zion/trunk/umit/zion/core/zion.py

@@ -24 +24 @@
 import random
 import time
-import thread, threading
 import sqlite3
 import sys
@@ -45 +44 @@
 ALPHA_LIMIT = 0.1
 
-class Zion(threading.Thread):
+class Zion(object):
     """
     """
-    def __init__(self, option, target=[], connector=None):
+    def __init__(self, option, target=[]):
         """
         """
@@ -55 +54 @@
         self.__capture_result = []
         self.__attractors = []
-        self.__connector = connector
-        threading.Thread.__init__ (self)
 
     def get_option_object(self):
@@ -185 +182 @@
                         
 
-    def run(self):
-        """
-        """
+    def run(self, outq=None):
+        """
+        """
+        self.__outq = outq
+        
         if self.__option.has(options.OPTION_HELP):
 
@@ -210 +209 @@
             self.do_forge(['tcp.seq'])
             
-            self.notify('isn_samples_finished')
+            self.notify('update_status', 'Creating time series\n')
 
             print 'Calculating PRNG'
             Rt = self.calculate_PRNG()
             
-            self.notify('timeseries_created')
+            self.notify('update_status', 'Building attractors\n')
             
             print 'Creating attractors'
             self.__classification(Rt)
             
-            self.notify('fingerprint_finished')
+            self.notify('update_status', 'Performing OS fingerprint matching\n')
             
             print 'Matching'
@@ -451 +450 @@
     def notify(self, signal, param=None):
         """
-        If a connector exists, emits the signal.
-        """
-        if self.__connector!=None:
-            if param==None:
-                self.__connector.emit(signal)
-            else:
-                self.__connector.emit(signal, param)
+        If a out queue exists, output the information.
+        """
+        if self.__outq!=None:
+            self.__outq.put((signal, param))