Changeset 56 for trunk/tool

Timestamp:

09/12/07 14:21:34 (16 years ago)

Author:

andreu

Message:

renetcolGUI.py removed, bugs correction

Files:

• trunk/tool/renetcolGUI.py (moved) (moved from trunk/tool/renetcolGUI_0_0_7.py) (12 diffs)

trunk/tool/renetcolGUI.py

@@ -47 +47 @@
 IPversion = 4
 localAddr = ''
-localAddr6 = '2001:660:3001:4012:30ec:9207:2a75:1583'
+localAddr6 = '0::'
 localPort = 2222
-collectorAddr = "193.51.183.225"
-collectorAddr6 = "2001:660:3000:1011:10::"
+collectorAddr = "127.0.0.1"
+collectorAddr6 = "0::"
 collectorPort = 52571  # if you change it, apply the modification on
                        # the renetcolSender.h file and recompil the collector 
@@ -149 +149 @@
         self.flow = [ data[0], data[1] ]
 
+# flow selection
     def enable(self):
-        global firstParseValue, checkUpValues, tpl_def
+        global firstParseValue, checkUpValues, tpl_def, fromRouter
         res = 1
+        resS = 1
+        resD = 1
         for i in range (0, len(tpl_def[self.flow[0]])):
             f = tpl_def[self.flow[0]][i][0]
-            if ( f==8 or f==12 or f==15 or f==18 or f==47) and ( checkUpValues[f]==1 ):
-                res = res & ( ((struct.unpack('>L',(socket.inet_aton(self.flow[1][i])))[0] & mask[1-1]) == firstParseValue[f])| ((struct.unpack('>L',(socket.inet_aton(self.flow[1][i])))[0] & mask[1-1]) == firstParseValue[f]) )
+            # or f==15 or f==18 or f==47
+            if ( f==8 ) and ( checkUpValues[f]==1 ):
+                resS = resS & ( ((struct.unpack('>L',(socket.inet_aton(self.flow[1][i])))[0] & mask[1-1]) == firstParseValue[f]) )
+            elif ( f==12 ) and ( checkUpValues[f]==1 ):
+                resD = resD & ( ((struct.unpack('>L',(socket.inet_aton(self.flow[1][i])))[0] & mask[1-1]) == firstParseValue[f]) )
             elif ( i==27 or i==28 ):
                 pass
+            elif ( (f==1) and (checkUpValues[f]==1) ):
+                res = res & ( (self.flow[1][i] <= ((firstParseValue[f])+((firstParseValue[f])*5/100))) and ((self.flow[1][i] >= ((firstParseValue[f])-((firstParseValue[f])*5/100)))) )
             elif (checkUpValues[f]==1):
                 res = res & (self.flow[1][i] == firstParseValue[f])
+        if ( checkUpValues[69]==1 ):
+            res = res & ( (fromRouter == firstParseValue[69]) )
+        res = res & (resS or resD)
         return res
-                
+
+# flow print
     def print_flow2(self):
         global printValue, tpl_def, flowCpt, fieldsName, oldTpl, os_type, fromRouter
@@ -258 +270 @@
         oldTpl = self.flow[0]
 
+# flow record
     def write_flow2(self):
         global printValue, record_file, tpl_def
@@ -713 +726 @@
         s.close()
 
+# dialog box to collector control
 def prefix_callback( widget, entry, id):
     global collPrefix, coll_window, router, localPort
@@ -738 +752 @@
                             is_good = 0
                     else:
+                        value = value+"/32"
                         mask[1] = 0xffffffffL
                         is_good = 1
@@ -791 +806 @@
         check_dialog( widget, None, "Internal program error ;) !")
 
+# collector control button
 def prefix_entry(maxLen, tooltip_Text, parent, lab, id):
     global mainTT
@@ -822 +838 @@
     gtk.main_quit()
 
+# Flow Selection
 def enter_callback( widget, entry, id):
     global firstParseValue
@@ -906 +923 @@
             checkUpValues[1] = 0
         else:
-            size_list = string.split(entry_text)
-            if (len(size_list)!=2)or((re.search('\D',size_list[0]))or(int(size_list[0])>999999999)or(int(size_list[0])<=0) or (re.search('\D',size_list[1]))or(int(size_list[1])>999999999)or(int(size_list[1])<=0)):
-                check_dialog( widget, None, "Wrong value !")
-            else:
-                firstParseValue[1] = int(size_list[0])
-                if ( int(size_list[1]) == 999999999 ):
-                    firstParseValue[1] = 100000000000
+            if (re.search('\D',entry_text)) or (int(entry_text) > 999999999) or (int(entry_text) <= 0):
+                check_dialog( widget, None, "Wrong value !")
+            else:
+                firstParseValue[1] = int(entry_text)
+                if ( int(entry_text) == 0 ):
+                    firstParseValue[1] = 1000000000
                 else:
-                    firstParseValue[1] = int(size_list[1])
+                    firstParseValue[1] = int(entry_text)
                 checkUpValues[1] = 1
     if id == 7: ## pkts
@@ -994 +1010 @@
             checkUpValues[69] = 0
         else:
-            if (re.match('^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}?$',entry_text)):
-                adip = struct.unpack('>L',socket.inet_aton(entry_text))[0]
-                firstParseValue[69] = adip
+            if (re.match('^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}(/\d{1,2})?$',entry_text)):
+                splitter = entry_text.split('/')
+                adip = struct.unpack('>L',socket.inet_aton(splitter[0]))[0]
+                if len(splitter)>1:
+                    bits = int(splitter[1])
+                    if bits <= 32 and bits > 0:
+                        mask[0] = 0xffffffffL << (32 - bits)
+                    else:
+                        check_dialog( widget, None, "Wrong value in mask!")
+                else:
+                    mask[0] = 0xffffffffL
+                firstParseValue[69] = splitter[0]
                 checkUpValues[69] = 1
             else:
@@ -1015 +1040 @@
     print "---------------------------------------------------------------"
     print "In this version 0.0.7, you can apply rules on the collector based on the following fields:"
+    print "IN_BYTES: 1,"
     print "L4_SRC_PORT: 7,"
     print "IPV4_SRC_ADDR: 8,"
@@ -1161 +1187 @@
     create_entry(5, "Required Format : a number less than 65535", dbbox, "SNMP Index In|Out :", 4)
     create_entry(4, "Required Format : a number less than 9999", dbbox, "Packet NB :", 7)
-    create_entry(17, "Required Format : a range, each number less than 999999999 and space as separator: \"48 54\"", dbbox, "Bytes :", 6)
+    create_entry(17, "Required Format : a number less than 999999999, each flow who the size equal this number +/- 5%", dbbox, "Bytes :", 6)
     tbbox = gtk.HButtonBox()
     hbox.pack_start(tbbox, False, True, 5)
@@ -1176 +1202 @@
     kbbox = gtk.HButtonBox()
     hbox.pack_start(kbbox, False, True, 5)
-    create_entry(18, "Required Format : \n an IP address like x.x.x.x", kbbox, "The flows from this Router :", 18)
+    create_entry(18, "Required Format : \n an IP address like x.x.x.x or x.x.x.x/x", kbbox, "The flows sending by this Router :", 18)
 
 ##  Show