Changeset 151 for trunk

Timestamp:

01/14/11 14:21:44 (12 years ago)

Author:

andreu

Message:

Warning at beginning fixed

Location:

trunk/tool

Files:

• renetcolGUI.py (modified) (2 diffs)
• renetcolRC.py (modified) (11 diffs)

trunk/tool/renetcolGUI.py

@@ -45 +45 @@
 import commands
 from optparse import OptionParser
+
+global localAddr, localPort, os_type
 
 ########### DEFAULT VALUES, YOU MUST CHANGE IT ###############################
@@ -1187 +1189 @@
     
 if __name__ == "__main__":
-    global window, mainTT, comboRouter, os_type, printShit
-    global localAddr, localPort
+    global window, mainTT, comboRouter, printShit
     
     gtk.gdk.threads_init()

trunk/tool/renetcolRC.py

@@ -4 +4 @@
 ##  Authors: ANDREU Francois-Xavier 
  
-##  Copyright (C) 2010 GIP RENATER 
+##  Copyright (C) 2010-2011 GIP RENATER 
  
 
@@ -39 +39 @@
 from optparse import OptionParser
 
+global localAddr, localPort
+global rrt, record, record_file_name
+
 ########### DEFAULT VALUES, YOU MUST CHANGE IT ###############################
 IPversion = 4
@@ -54 +57 @@
 printValue =      [ 0,1,1,0,1,0,0,1,1,0, # 0 to 9
                     0,1,1,0,0,0,1,1,0,0, # 10...
-                    1,0,0,0,0,0,0,1,1,0, #
+                    0,1,0,0,0,0,0,1,1,0, #
                     0,0,0,0,0,0,0,0,0,0, #
                     0,0,0,0,0,0,1,1,0,0, #
@@ -97 +100 @@
                     0,0,0,0,0,0,0,0,0,0 # 130 to 139
                     ]
-fieldsName =  [ "","IN_BYT","IN_PKTS","","PROT","TOS","TCP_FL","S_PORT","IPv4@S","S_MASK",
+fieldsName =  [ "","IN_BYTES","IN_PKTS","","PROT","TOS","TCP_FL","S_PORT","IPv4@S","S_MASK",
                 "InSNMP","D_PORT","IPv4@D","D_MASK","OutSNMP","NextHop","S_AS","D_AS","","",
-                "TTL","TTL","","","","","","IPv6@S","IPv6@D","IPv6_S_MASK",
+                "LT","AGE","","","","","","IPv6@S","IPv6@D","IPv6_S_MASK",
                 "IPv6_D_MASK","","","","","","","","","",
                 "","","","","","","M_T_L_T","M_T_L_@","","",
                 "","","","","","","","","","",
-                "","","","","","","","","","ROUTER",
+                "","","","","","","","","","ROUTER;TIMESTAMP",
                 "M_L_1","M_L_2","M_L_3","M_L_4","M_L_5","M_L_6","M_L_7","M_L_8","M_L_9","M_L_10",
                 "","","","","","","","","","", # 80 to 89
@@ -125 +128 @@
 router=0
 tpl_def = {}
-os_type = 0
 oldTpl = 0
 oldTplW = 0
@@ -297 +299 @@
         strFlow = ""
         strField = ""
-        underscore_line = ""
+        underscore_line = "#"
         flowCptW+=1
         if (flowCptW%6 == 0 or oldTplW != self.flow[0]):
-##        if (flowCpt%100 == 0): 
+##        if (flowCpt%100 == 0):
+            strField = "#"
             flowCptW = 0
             for i in range (0, len(tpl_def[self.flow[0]])):
@@ -323 +326 @@
                         else:
                             tabNb = int((16-l)/8) + 1
-                        for j in range (0, tabNb): 
-                            strField += ";"
+                        #for j in range (0, tabNb): 
+                        strField += ";"
                         for k in range (0, 16):
                             underscore_line += "-"
@@ -350 +353 @@
                     record_file.write(strField)
                     record_file.write("\n")
-                    record_file.write(underscore_line)
-                    record_file.write("\n")
+#                    record_file.write(underscore_line)
+#                    record_file.write("\n")
         for i in range (0, len(tpl_def[self.flow[0]])):
             f = tpl_def[self.flow[0]][i][0]
@@ -565 +568 @@
 if __name__ == "__main__":
     global comboRouter, os_type, printShit
-    global localAddr, localPort
-    global rrt, record, record_file_name
-
+
+    os_type = 0
     print ""
     print ""
@@ -589 +591 @@
 
     parser = OptionParser()
-    parser.add_option("-o", "--output", dest="out", help ="Output filename prefix, ex: \"/tmp/myrecord\", timestamp will be add to the filename")
+    parser.add_option("-o", "--output", dest="out", help ="Output filename prefix, ex: \"/tmp/myrecord\", timestamp will be added to the filename")
     parser.add_option("-t", "--time", dest="tim", help ="Round robin interval (in seconde), default is \"3600\" for 1h")
     (options, args) = parser.parse_args()
@@ -606 +608 @@
     print ""
     print ""
-    print " ---------------------------------------"
-    print "  STARTING RECORD ROTATION"
-    print "  with following parameters:"
-    print "  output filename prefix :",outputFileName
-    print "  interval: ",rrt, " seconds"
-    print " ---------------------------------------"
+    print "---------------------------------------"
+    print " STARTING RECORD ROTATION"
+    print " with following parameters:"
+    print " output filename prefix :",outputFileName
+    print " interval: ",rrt, " seconds"
+    print "---------------------------------------"
     now2 = time.time()
     reste = rrt-(operator.mod(now2,rrt))