Changeset 122 for trunk/web/conf

Show
Ignore:
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/web/conf
Files:
1 added
3 modified

Legend:

Unmodified
Added
Removed
  • 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 }