Changeset 122

Show
Ignore:
Timestamp:
08/05/10 17:01:19 (12 years ago)
Author:
andreu
Message:

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

Location:
trunk
Files:
6 added
6 modified

Legend:

Unmodified
Added
Removed
  • trunk/src/dataFlowSet.c

    r121 r122  
    851851#if defined(IPV4AGGIDR) || defined(IPV4AGGIDSNMP) 
    852852        if ( (bool == 1) && (isMplsFlow == 0) ){ 
    853           prefixKey.beginning = agCache.v4AdS>>(32-agCache.maskS)<<(32-agCache.maskS); 
     853          /*      prefixKey.beginning = agCache.v4AdS>>(32-agCache.maskS)<<(32-agCache.maskS); */ 
     854          prefixKey.beginning = agCache.v4AdS; 
    854855          res = bsearch(&prefixKey, V4PTab, nbPV4,  
    855856                        sizeof(struct PrefixV4), prefGlobalCmp); 
     
    936937#endif 
    937938#if defined(IPV4AGGIDSNMP) 
    938                 prefixKey.beginning = agCache.v4AdD>>(32-agCache.maskD)<<(32-agCache.maskD); 
     939                /*              prefixKey.beginning = agCache.v4AdD>>(32-agCache.maskD)<<(32-agCache.maskD);*/ 
     940                prefixKey.beginning = agCache.v4AdD; 
    939941                res3 = bsearch(&prefixKey, V4PTab, nbPV4,  
    940942                               sizeof(struct PrefixV4), prefGlobalCmp); 
     
    10201022#if defined(MATRIX) && defined(IPV4AGGIDR) 
    10211023                /* inter-pop matrix Accounting */ 
    1022                 prefixKey.beginning = agCache.v4AdD>>(32-agCache.maskD)<<(32-agCache.maskD); 
     1024                /*              prefixKey.beginning = agCache.v4AdD>>(32-agCache.maskD)<<(32-agCache.maskD);*/ 
     1025                prefixKey.beginning = agCache.v4AdD; 
    10231026                res2 = bsearch(&prefixKey, V4PTab, nbPV4,  
    10241027                               sizeof(struct PrefixV4), prefGlobalCmp); 
     
    10991102#endif 
    11001103          } else { /* SOURCE ADDRESS DOESN'T IN OUR LIST */ 
    1101             prefixKey.beginning = agCache.v4AdD>>(32-agCache.maskD)<<(32-agCache.maskD); 
     1104            /*      prefixKey.beginning = agCache.v4AdD>>(32-agCache.maskD)<<(32-agCache.maskD); */ 
     1105            prefixKey.beginning = agCache.v4AdD; 
    11021106            res = bsearch(&prefixKey, V4PTab, nbPV4,  
    11031107                          sizeof(struct PrefixV4), prefGlobalCmp); 
  • trunk/web/conf/get_param.php

    r120 r122  
    3030    $CONF_MAX_BGPAS = str_replace("\"","",trim($line_split[2])); 
    3131  } 
     32  if ($line_split[1] == "MATRIX_RRD_LOCATION") { 
     33    $CONF_MATRIX_RRD_LOCATION = str_replace("\"","",trim($line_split[2])); 
     34  } 
    3235 } 
    3336 
  • trunk/web/conf/menuconf.php

    r120 r122  
    66 
    77print " <ul class=\"n1\"> \n"; 
     8print "  <li><a href=\"index.php?section=confopt\">Options</a> \n"; 
    89print "  <li><a href=\"index.php?section=confrtr\">Routers</a> \n"; 
    910print "  </li> \n"; 
  • trunk/web/conf/prefv4.php

    r120 r122  
    1111$nb_prefv4 = 0; 
    1212$PREFIXV4_TABLE_INBUILT .= "<table class=\"fields\">\n"; 
    13 $PREFIXV4_TABLE_INBUILT .= "<tr> <th>Subnet</th> <th>Mask</th> <th>Sampling Value</th> </tr>\n"; 
     13$PREFIXV4_TABLE_INBUILT .= "<tr> <th>Subnet</th> <th>Mask</th> <th>Sampling Value</th><th> IDR </th> </tr>\n"; 
    1414while (!feof ($CONFfinputSUB)) { 
    1515  $CONFline = fgets($CONFfinputSUB, 512); 
    1616  $CONFline_split = split("\t",$CONFline); 
    17   $CONFsubnet =  $CONFline_split[0]; 
    18   $CONFmask =  $CONFline_split[1]; 
    19   $CONFsamp =  $CONFline_split[2]; 
    20   if ($CONFsubnet) { 
    21     $nb_prefv4 += 1; 
    22     $PREFIXV4_TABLE_INBUILT .= "<tr>\n"; 
    23     $PREFIXV4_TABLE_INBUILT .= "<td>$CONFsubnet</td><td>$CONFmask</td><td>$CONFsamp</td>\n"; 
    24     $PREFIXV4_TABLE_INBUILT .= "</tr>\n"; 
     17  $CONFline_split2 = split("-",$CONFline_split[0]); 
     18  if ($CONFline_split2[1] != NULL) { 
     19    $CONFline_split3 = split("/",$CONFline_split2[0]); 
     20    $CONFsubnet =  $CONFline_split3[0]; 
     21    $CONFmask =  $CONFline_split3[1]; 
     22    $CONFIDR = $CONFline_split2[1]; 
     23    $CONFsamp =  $CONFline_split[1]; 
     24    if ($CONFsubnet) { 
     25      $nb_prefv4 += 1; 
     26      $PREFIXV4_TABLE_INBUILT .= "<tr>\n"; 
     27      $PREFIXV4_TABLE_INBUILT .= "<td>$CONFsubnet</td><td>$CONFmask</td><td>$CONFsamp</td><td>$CONFIDR</td>\n"; 
     28      $PREFIXV4_TABLE_INBUILT .= "</tr>\n"; 
     29    } 
     30  }else{ 
     31    $CONFsubnet =  $CONFline_split[0]; 
     32    $CONFmask =  $CONFline_split[1]; 
     33    $CONFsamp =  $CONFline_split[2]; 
     34    if ($CONFsubnet) { 
     35      $nb_prefv4 += 1; 
     36      $PREFIXV4_TABLE_INBUILT .= "<tr>\n"; 
     37      $PREFIXV4_TABLE_INBUILT .= "<td>$CONFsubnet</td><td>$CONFmask</td><td>$CONFsamp</td><td> UN </td>\n"; 
     38      $PREFIXV4_TABLE_INBUILT .= "</tr>\n"; 
     39    } 
    2540  } 
    2641 } 
  • trunk/web/index.php

    r120 r122  
    3131print "         <li><a href=\"index.php?section=live\">Collector</a></li>\n"; 
    3232print "         <li><a href=\"index.php?section=conf\">Configuration</a></li>\n"; 
    33 print "         <li><a href=\"index.php?section=dm\">Data Mining</a></li>\n"; 
     33print "         <li><a href=\"index.php?section=data\">Data Mining</a></li>\n"; 
    3434print "         <li><a href=\"index.php?section=notes\">Notes</a></li>\n"; 
    3535print " </ul>\n"; 
     
    7474  print " <p> ICI texte d'introduction à la section Configuration </p>\n"; 
    7575  print "       </div>\n"; 
     76 } else if ($section == "confopt") { 
     77  include ('./conf/menuconf.php'); 
     78  include ('./conf/opt.php'); 
    7679 } else if ($section == "confrtr") { 
    7780  include ('./conf/menuconf.php'); 
     
    8992  include ('./conf/menuconf.php'); 
    9093  include ('./conf/param.php'); 
     94 } else if ($section == "data") { 
     95  include ('./data/menudata.php'); 
     96  print "       <div id=\"contenu\">\n"; 
     97  print " <p> ICI texte d'introduction à la section Data Mining </p>\n"; 
     98  print "       </div>\n"; 
     99 } else if ($section == "datamatrix") { 
     100  include ('./data/menudata.php'); 
     101  include ('./data/datamatrix.php'); 
     102 } else if ($section == "datamatgraph") { 
     103  include ('./data/menudata.php'); 
     104  include ('./data/datamatgraph.php'); 
    91105 } else { 
    92106  include ('menuintro.php'); 
  • trunk/web/var.php

    r120 r122  
    44 
    55$RENETCOL_PARAM = "/home/maintenance/CONF_RENETCOL/renetcolParam.h"; 
     6$RENETCOL_HOME = "/home/maintenance/renetcol-0.0.14beta/"; 
    67 
    78#Hardware monitoring images names (file res.php & perfsys.php)