Changeset 63 for trunk/tool

Timestamp:

02/04/08 10:10:35 (15 years ago)

Author:

andreu

Message:

add AS selection and rotated record (on 24hours)

Files:

• trunk/tool/renetcolGUI.py (modified) (13 diffs)

trunk/tool/renetcolGUI.py

@@ -4 +4 @@
 ##  Authors: ANDREU Francois-Xavier 
  
-##  Copyright (C) 2005 GIP RENATER 
+##  Copyright (C) 2005-2006-2007-2008 GIP RENATER 
  
 
@@ -34 +34 @@
 os.environ['PATH'] += ";%s/lib;%s/bin" % (gtkdir, gtkdir)
 
+import operator
 import threading
 import string
@@ -112 +113 @@
 oldTpl = 0
 fromRouter = ""
+myTimer = None
+myCPT = 1
 
 class InputControl(threading.Thread):
@@ -155 +158 @@
         resS = 1
         resD = 1
-        resInIndex = 1
-        resOutIndex = 1
         for i in range (0, len(tpl_def[self.flow[0]])):
             f = tpl_def[self.flow[0]][i][0]
@@ -168 +169 @@
             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 ((f==10) and (checkUpValues[f]==1)):
-                resInIndex = resInIndex & ( self.flow[1][i] == firstParseValue[f])
-            elif ((f==14) and (checkUpValues[f]==1)):
-                resOutIndex = resOutIndex & ( self.flow[1][i] == firstParseValue[f])
             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) & (resInIndex or resOutIndex)
+        res = res & (resS or resD)
         return res
 
@@ -518 +515 @@
         type           = gtk.MESSAGE_INFO,
         buttons        = gtk.BUTTONS_OK,
-        message_format = "Author : FX Andreu\nemail andreu@renater.fr\nCopyright (C) 2005 GIP RENATER\n\nThis file is part of renetcol.\n\nrenetcol is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\n\nrenetcol is distributed in the hope that it will be useful,but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\n\nYou should have received a copy of the GNU General Public License along with renetcol; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA ") 
+        message_format = "Author : FX Andreu\nemail andreu@renater.fr\nCopyright (C) 2005-2008 GIP RENATER\n\nThis file is part of renetcol.\n\nrenetcol is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\n\nrenetcol is distributed in the hope that it will be useful,but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\n\nYou should have received a copy of the GNU General Public License along with renetcol; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA ") 
     dialog.set_title('About')
     dialog.connect('response', lambda dialog, response: dialog.destroy())
@@ -589 +586 @@
     if widget.get_active()==1:
         router=1
+
+def timer_action():
+    global record_file, record_file_name, myTimer, myCPT
+    myCPT+=1
+    myTimer.cancel()
+    my_new_file_name = "%s_%s_%d" % (record_file_name,time.strftime("%Y%m%d", time.gmtime()),myCPT)
+    ##my_new_file_name = "%s_%d" % (record_file_name,myCPT)
+    print my_new_file_name
+    new_record_file = file(my_new_file_name, 'w')
+    old_record_file = record_file
+    record_file = new_record_file
+    old_record_file.close()
+    now2 = time.time()
+    reste = 86400-(operator.mod(now2,86400))
+    myTimer = threading.Timer(300.0,timer_action)
+    myTimer.start()
+
+def callback_RotRec(widget, data=None):
+    global record, myTimer
+    if ((record == 0) and (widget.get_active() == 1)):
+        info_dialog(widget, None, "You must before activated the record ! ")
+        widget.set_active(0)
+    else:
+        if widget.get_active() == 1:
+            print "STARTING RECORD ROTATION"
+            now2 = time.time()
+            reste = 86400-(operator.mod(now2,86400))
+            myTimer = threading.Timer(300.0,timer_action)
+            myTimer.start()
+        if widget.get_active() == 0:
+            myTimer.cancel()
+            print "STOPPING RECORD ROTATION"
 
 def callback_collector(widget, controlWindow):
@@ -831 +860 @@
 
 def user_quit(widget, data=None):
-    global myInputControlThread, localPort, record_file
+    global myInputControlThread, localPort, record_file, myTimer
     if myInputControlThread != None:
         myInputControlThread.kill(1)
@@ -842 +871 @@
             record_file.close()
         print "\n\n\n\n\n Input Stream closed. \n\n\n\n\n By :-) \n\n\n\n"
+    myTimer.cancel()
     gtk.main_quit()
 
@@ -1035 +1065 @@
     global window, mainTT, comboRouter, os_type, printShit
     
-    gtk.threads_init()
+    gtk.gdk.threads_init()
     
     if (os.name =="nt"):
@@ -1045 +1075 @@
 
     print "---------------------------------------------------------------"
-    print "In this version 0.0.7, you can apply rules on the collector based on the following fields:"
+    print "In this version, you can only apply rules on the collector based on the following fields:"
     print "IN_BYTES: 1,"
     print "L4_SRC_PORT: 7,"
@@ -1134 +1164 @@
     hbox.pack_start(buttonrecord, False, False, 2)
     buttonrecord.show()
+    ## incremental record
+    buttonRotRec = gtk.ToggleButton("Rot. Record")
+    buttonRotRec.connect("toggled", callback_RotRec, None)
+    mainTT.set_tip(buttonRotRec, "Stop/Start the record in a different file for each day.")
+    hbox.pack_start(buttonRotRec, False, False, 2)
+    buttonRotRec.show()
     ## control collector button
     buttoncollector = gtk.ToggleButton("Collector Control")
@@ -1219 +1255 @@
 
 ##  gtk main loop
-    gtk.threads_enter()
+    gtk.gdk.threads_enter()
     gtk.main()
-    gtk.threads_leave()
+    gtk.gdk.threads_leave()