Changeset 38 for tags

Timestamp:

05/22/07 02:20:09 (16 years ago)

Author:

andreu

Message:

ticket #9 correction

Files:

• tags/REL-0.0.9beta/trunk/tool/renetcolGUI_0_0_7.py (modified) (5 diffs)

tags/REL-0.0.9beta/trunk/tool/renetcolGUI_0_0_7.py

@@ -152 +152 @@
         global firstParseValue, checkUpValues, tpl_def
         res = 1
+        ctrl = 0
+        portS = 0
+        portD = 0
         for i in range (0, len(tpl_def[self.flow[0]])):
             f = tpl_def[self.flow[0]][i][0]
@@ -158 +161 @@
             elif ( i==27 or i==28 ):
                 pass
+            elif ( f==7 ) and ( checkUpValues[f]==1 ):
+                if (ctrl == 1):                   
+                    res = res & (((self.flow[1][i] >= firstParseValue[f])&(self.flow[1][i] <= firstParseValue[11])) or ((portD >= firstParseValue[f])&(portD <= firstParseValue[11])))
+                else:
+                    ctrl = 1
+                    portS = self.flow[1][i]
+            elif ( f==11 ) and ( checkUpValues[f]==1 ):
+                if (ctrl == 1):
+                    res = res & (((self.flow[1][i] <= firstParseValue[f])&(self.flow[1][i] >= firstParseValue[7])) or ((portS >= firstParseValue[7])&(portS <= firstParseValue[f])))
+                else:
+                    ctrl = 1
+                    portD = self.flow[1][i]
             elif (checkUpValues[f]==1):
                 res = res & (self.flow[1][i] == firstParseValue[f])
@@ -915 +930 @@
         if ( entry_text==""):
             checkUpValues[7] = 0
+            checkUpValues[11] = 0
         else:
             port_list = string.split(entry_text)
@@ -923 +939 @@
                 firstParseValue[11] = int(port_list[1])
                 checkUpValues[7] = 1
+                checkUpValues[11] = 1
     if id == 11: ## tcp flags
         if ( entry_text==""):
@@ -1139 +1156 @@
     hbox.pack_start(tbbox, False, True, 5)
     create_entry(2, "Required Format : a number less than 99", tbbox, "Time :", 8)
-    create_entry(11, "Required Format : a range, each number less than 65535 and space as separator: \"6881 6889\"", tbbox, "Port :", 9)
+    create_entry(11, "Port Source or Destination selection, required Format : a range, each number less than 65535 and space as separator: \"6881 6889\"", tbbox, "Port :", 9)
     #create_entry(5, "Required Format : a number less than 65535", tbbox, "Dst port :", 10)
     create_entry(3, "Required Format : a number less than 255", tbbox, "TCP Flag :", 11)