Changeset 122 for trunk

Timestamp:

08/05/10 17:01:19 (13 years ago)

Author:

andreu

Message:

Update of web site and change in aggregation calculation mode in dataFlowSet.c

Location:

trunk

Files:

• src/dataFlowSet.c (modified) (4 diffs)
• web/IMGTMP (added)
• web/conf/get_param.php (modified) (1 diff)
• web/conf/menuconf.php (modified) (1 diff)
• web/conf/opt.php (added)
• web/conf/prefv4.php (modified) (1 diff)
• web/data (added)
• web/data/datamatgraph.php (added)
• web/data/datamatrix.php (added)
• web/data/menudata.php (added)
• web/index.php (modified) (3 diffs)
• web/var.php (modified) (1 diff)

trunk/src/dataFlowSet.c

@@ -851 +851 @@
 #if defined(IPV4AGGIDR) || defined(IPV4AGGIDSNMP)
         if ( (bool == 1) && (isMplsFlow == 0) ){
-          prefixKey.beginning = agCache.v4AdS>>(32-agCache.maskS)<<(32-agCache.maskS);
+          /*      prefixKey.beginning = agCache.v4AdS>>(32-agCache.maskS)<<(32-agCache.maskS); */
+          prefixKey.beginning = agCache.v4AdS;
           res = bsearch(&prefixKey, V4PTab, nbPV4, 
                         sizeof(struct PrefixV4), prefGlobalCmp);
@@ -936 +937 @@
 #endif
 #if defined(IPV4AGGIDSNMP)
-                prefixKey.beginning = agCache.v4AdD>>(32-agCache.maskD)<<(32-agCache.maskD);
+                /*              prefixKey.beginning = agCache.v4AdD>>(32-agCache.maskD)<<(32-agCache.maskD);*/
+                prefixKey.beginning = agCache.v4AdD;
                 res3 = bsearch(&prefixKey, V4PTab, nbPV4, 
                                sizeof(struct PrefixV4), prefGlobalCmp);
@@ -1020 +1022 @@
 #if defined(MATRIX) && defined(IPV4AGGIDR)
                 /* inter-pop matrix Accounting */
-                prefixKey.beginning = agCache.v4AdD>>(32-agCache.maskD)<<(32-agCache.maskD);
+                /*              prefixKey.beginning = agCache.v4AdD>>(32-agCache.maskD)<<(32-agCache.maskD);*/
+                prefixKey.beginning = agCache.v4AdD;
                 res2 = bsearch(&prefixKey, V4PTab, nbPV4, 
                                sizeof(struct PrefixV4), prefGlobalCmp);
@@ -1099 +1102 @@
 #endif
           } else { /* SOURCE ADDRESS DOESN'T IN OUR LIST */
-            prefixKey.beginning = agCache.v4AdD>>(32-agCache.maskD)<<(32-agCache.maskD);
+            /*      prefixKey.beginning = agCache.v4AdD>>(32-agCache.maskD)<<(32-agCache.maskD); */
+            prefixKey.beginning = agCache.v4AdD;
             res = bsearch(&prefixKey, V4PTab, nbPV4, 
                           sizeof(struct PrefixV4), prefGlobalCmp);

trunk/web/conf/get_param.php

@@ -30 +30 @@
     $CONF_MAX_BGPAS = str_replace("\"","",trim($line_split[2]));
   }
+  if ($line_split[1] == "MATRIX_RRD_LOCATION") {
+    $CONF_MATRIX_RRD_LOCATION = str_replace("\"","",trim($line_split[2]));
+  }
  }
 

trunk/web/conf/menuconf.php

@@ -6 +6 @@
 
 print " <ul class=\"n1\"> \n";
+print "  <li><a href=\"index.php?section=confopt\">Options</a> \n";
 print "  <li><a href=\"index.php?section=confrtr\">Routers</a> \n";
 print "  </li> \n";

trunk/web/conf/prefv4.php

@@ -11 +11 @@
 $nb_prefv4 = 0;
 $PREFIXV4_TABLE_INBUILT .= "<table class=\"fields\">\n";
-$PREFIXV4_TABLE_INBUILT .= "<tr> <th>Subnet</th> <th>Mask</th> <th>Sampling Value</th> </tr>\n";
+$PREFIXV4_TABLE_INBUILT .= "<tr> <th>Subnet</th> <th>Mask</th> <th>Sampling Value</th><th> IDR </th> </tr>\n";
 while (!feof ($CONFfinputSUB)) {
   $CONFline = fgets($CONFfinputSUB, 512);
   $CONFline_split = split("\t",$CONFline);
-  $CONFsubnet =  $CONFline_split[0];
-  $CONFmask =  $CONFline_split[1];
-  $CONFsamp =  $CONFline_split[2];
-  if ($CONFsubnet) {
-    $nb_prefv4 += 1;
-    $PREFIXV4_TABLE_INBUILT .= "<tr>\n";
-    $PREFIXV4_TABLE_INBUILT .= "<td>$CONFsubnet</td><td>$CONFmask</td><td>$CONFsamp</td>\n";
-    $PREFIXV4_TABLE_INBUILT .= "</tr>\n";
+  $CONFline_split2 = split("-",$CONFline_split[0]);
+  if ($CONFline_split2[1] != NULL) {
+    $CONFline_split3 = split("/",$CONFline_split2[0]);
+    $CONFsubnet =  $CONFline_split3[0];
+    $CONFmask =  $CONFline_split3[1];
+    $CONFIDR = $CONFline_split2[1];
+    $CONFsamp =  $CONFline_split[1];
+    if ($CONFsubnet) {
+      $nb_prefv4 += 1;
+      $PREFIXV4_TABLE_INBUILT .= "<tr>\n";
+      $PREFIXV4_TABLE_INBUILT .= "<td>$CONFsubnet</td><td>$CONFmask</td><td>$CONFsamp</td><td>$CONFIDR</td>\n";
+      $PREFIXV4_TABLE_INBUILT .= "</tr>\n";
+    }
+  }else{
+    $CONFsubnet =  $CONFline_split[0];
+    $CONFmask =  $CONFline_split[1];
+    $CONFsamp =  $CONFline_split[2];
+    if ($CONFsubnet) {
+      $nb_prefv4 += 1;
+      $PREFIXV4_TABLE_INBUILT .= "<tr>\n";
+      $PREFIXV4_TABLE_INBUILT .= "<td>$CONFsubnet</td><td>$CONFmask</td><td>$CONFsamp</td><td> UN </td>\n";
+      $PREFIXV4_TABLE_INBUILT .= "</tr>\n";
+    }
   }
  }

trunk/web/index.php

@@ -31 +31 @@
 print "         <li><a href=\"index.php?section=live\">Collector</a></li>\n";
 print "         <li><a href=\"index.php?section=conf\">Configuration</a></li>\n";
-print "         <li><a href=\"index.php?section=dm\">Data Mining</a></li>\n";
+print "         <li><a href=\"index.php?section=data\">Data Mining</a></li>\n";
 print "         <li><a href=\"index.php?section=notes\">Notes</a></li>\n";
 print " </ul>\n";
@@ -74 +74 @@
   print " <p> ICI texte d'introduction à la section Configuration </p>\n";
   print "       </div>\n";
+ } else if ($section == "confopt") {
+  include ('./conf/menuconf.php');
+  include ('./conf/opt.php');
  } else if ($section == "confrtr") {
   include ('./conf/menuconf.php');
@@ -89 +92 @@
   include ('./conf/menuconf.php');
   include ('./conf/param.php');
+ } else if ($section == "data") {
+  include ('./data/menudata.php');
+  print "       <div id=\"contenu\">\n";
+  print " <p> ICI texte d'introduction à la section Data Mining </p>\n";
+  print "       </div>\n";
+ } else if ($section == "datamatrix") {
+  include ('./data/menudata.php');
+  include ('./data/datamatrix.php');
+ } else if ($section == "datamatgraph") {
+  include ('./data/menudata.php');
+  include ('./data/datamatgraph.php');
  } else {
   include ('menuintro.php');

trunk/web/var.php

@@ -4 +4 @@
 
 $RENETCOL_PARAM = "/home/maintenance/CONF_RENETCOL/renetcolParam.h";
+$RENETCOL_HOME = "/home/maintenance/renetcol-0.0.14beta/";
 
 #Hardware monitoring images names (file res.php & perfsys.php)