Changeset 111 for system

Timestamp:

Nov 3, 2008, 7:48:12 PM (16 years ago)

Author:

george

Message:

• Upraveno: Generovací skripty.

Location:

system

Files:

• bandwidth2.php (modified) (2 diffs)
• generators/dhcp_routerboard.php (modified) (3 diffs)
• generators/netwatch.php (modified) (1 diff)
• generators/traffic_shaping.php (modified) (3 diffs)
• netwatch_import.php (modified) (1 diff)
• statistic/traffic.php (modified) (1 diff)
• traffic-flow.php (added)

system/bandwidth2.php

@@ -17 +17 @@
 {
   $Output = array();
-  exec('iptables -t mangle -L '.$Table.' -v -x -n', $Output);
+  exec('/sbin/iptables -t mangle -L '.$Table.' -v -x -n', $Output);
   array_shift($Output);
   array_shift($Output);
@@ -61 +61 @@
       //$Hosts[$HostIp]['ports'] = array();
       $Output2 = array();
-      exec('iptables -t mangle -L '.$SubTable.' -v -x -n', $Output2);
+      exec('/sbin/iptables -t mangle -L '.$SubTable.' -v -x -n', $Output2);
       array_shift($Output2);
       array_shift($Output2);

system/generators/dhcp_routerboard.php

@@ -24 +24 @@
 $Commands = array();
 //$MaxSubnet = 1;
-for($i = 1; $i <= 4; $i++)
+$Commands[] = '/ip dhcp-server lease { remove [find]}';
+for($i = 0; $i <= 5; $i++)
 {
 /*
@@ -35 +36 @@
   while($Row = $DbResult->fetch_array())
   {
-    $Data = $Row['name'];
-    if(strlen($Data) < 9) $Data .= "\t";
+//    $Data = $Row['name'];
+//    if(strlen($Data) < 9) $Data .= "\t";
 //    fputs($File, "  host ".$Data."\t{ fixed-address ".$Row['IP'].";\thardware ethernet ".$Row['MAC']."; }\n");
-    $Commands[] = '/ip dhcp-server lease remove [/ip dhcp-server lease find mac-address='.$Row['MAC'].']';
     $Commands[] = '/ip dhcp-server lease add mac-address='.$Row['MAC'].' address='.$Row['IP'].' server=dhcp'.$i.' comment='.$Row['name'];
   }
@@ -46 +46 @@
 //fclose($File);
 $Commands = implode(';', $Commands);
-$Command = '/usr/bin/ssh -l admin-ssh -i /root/.ssh/id_dsa rt-hajda-5 "'.$Commands.'"';
+$Command = '/usr/bin/ssh -l admin-ssh -i /root/.ssh/id_dsa rt-hajda-0 "'.$Commands.'"';
 echo($Command);
 exec($Command, $Output);

system/generators/netwatch.php

@@ -5 +5 @@
 //$MaxSubnet = 1;
 $Commands[] = '/tool netwatch remove [/tool netwatch find]';
-for($i = 0; $i <= 4; $i++)
-{
-  $DbResult = $Database->select('hosts', '*', "IP LIKE '192.168.".$i."%' ORDER BY IP");
+//for($i = 0; $i <= 4; $i++)
+//{
+  $DbResult = $Database->select('hosts', '*', 'IP != "" ORDER BY IP');
   while($Row = $DbResult->fetch_array())
   {
     $Commands[] = '/tool netwatch add host='.$Row['IP'].' interval=1m comment='.$Row['name'];
   }
-}
+//}
 $Commands = implode(';', $Commands);
-$Command = '/usr/bin/ssh -l admin-ssh -i /root/.ssh/id_dsa rt-hajda-5 "'.$Commands.'"';
+$Command = '/usr/bin/ssh -l admin-ssh -i /root/.ssh/id_dsa rt-hajda-0 "'.$Commands.'"';
 echo($Command);
 exec($Command, $Output);

system/generators/traffic_shaping.php

@@ -23 +23 @@
 $VoipSpeedIn = 100; //$SpeedReserve;
 $VoipSpeedOut = 100; //$SpeedReserve;
+$FreeInetSpeed = 64;
 
 
@@ -50 +51 @@
     fputs($File, "/sbin/tc class add dev imq0 parent 1:0 classid 1:1 htb rate ".$TotalMaxSpeedIn."kbit quantum 1500\n");
     fputs($FileClassInfo, "1:2 Internet zdarma\n");
-    fputs($File, "/sbin/tc class add dev imq0 parent 1:1 classid 1:".$FreeInetClass." htb rate 32kbit prio 3 quantum 1500\n");
+    fputs($File, "/sbin/tc class add dev imq0 parent 1:1 classid 1:".$FreeInetClass." htb rate ".$FreeInetSpeed."kbit prio 3 quantum 1500\n");
     fputs($File, "/sbin/tc qdisc add dev imq0 parent 1:".$FreeInetClass." handle ".$FreeInetClass.": sfq perturb 10\n");
   }
@@ -59 +60 @@
     fputs($File, "/sbin/tc qdisc add dev imq1 root handle 1:0 htb default 2\n");
     fputs($File, "/sbin/tc class add dev imq1 parent 1:0 classid 1:1 htb rate ".$TotalMaxSpeedOut."kbit quantum 1500\n");
-    fputs($File, "/sbin/tc class add dev imq1 parent 1:1 classid 1:".$FreeInetClass." htb rate 32kbit prio 3 quantum 1500\n");
+    fputs($File, "/sbin/tc class add dev imq1 parent 1:1 classid 1:".$FreeInetClass." htb rate ".$FreeInetSpeed."kbit prio 3 quantum 1500\n");
     fputs($File, "/sbin/tc qdisc add dev imq1 parent 1:".$FreeInetClass." handle ".$FreeInetClass.": sfq perturb 10\n");
   }

system/netwatch_import.php

@@ -8 +8 @@
 $Commands[] = '/tool netwatch print terse';
 $Commands = implode(';', $Commands);
-$Command = '/usr/bin/ssh -l admin-ssh -i /root/.ssh/id_dsa rt-hajda-5 "'.$Commands.'"';
+$Command = '/usr/bin/ssh -l admin-ssh -i /root/.ssh/id_dsa rt-hajda-0 "'.$Commands.'"';
 //echo($Command."\n");
 exec($Command, $Output);

system/statistic/traffic.php

@@ -186 +186 @@
     'inet_down' => $NetworkStat['eth1']['down_avg'], 'inet_up' => $NetworkStat['eth1']['up_avg'],
     'eth0_down' => $NetworkStat['eth0']['down_avg'], 'eth0_up' => $NetworkStat['eth0']['up_avg'], 
-    'wlan0_down' => $NetworkStat['wlan0']['down_avg'], 'wlan0_up' => $NetworkStat['wlan0']['up_avg'],
-    'wlan1_down' => $NetworkStat['wlan1']['down_avg'], 'wlan1_up' => $NetworkStat['wlan1']['up_avg'],
-    'wlan2_down' => $NetworkStat['wlan2']['down_avg'], 'wlan2_up' => $NetworkStat['wlan2']['up_avg'],
+//    'wlan0_down' => $NetworkStat['wlan0']['down_avg'], 'wlan0_up' => $NetworkStat['wlan0']['up_avg'],
+//    'wlan1_down' => $NetworkStat['wlan1']['down_avg'], 'wlan1_up' => $NetworkStat['wlan1']['up_avg'],
+//    'wlan2_down' => $NetworkStat['wlan2']['down_avg'], 'wlan2_up' => $NetworkStat['wlan2']['up_avg'],
     'eth2_down' => $NetworkStat['eth2']['down_avg'], 'eth2_up' => $NetworkStat['eth2']['up_avg']);
   $Database->insert('traffic', $NewItem);