Changeset 112

Timestamp:

Nov 9, 2008, 8:05:48 PM (16 years ago)

Author:

george

Message:

• Opraveno: Korekce systémových skriptů po aktualizaci Centrály

Location:

system

Files:

• backup/backup-move.php (modified) (1 diff)
• backup/do-backup.php (modified) (1 diff)
• generators/dns.php (modified) (11 diffs)
• generators/iptables.php (modified) (6 diffs)
• generators/traffic_shaping.php (modified) (11 diffs)
• statistic/traffic.php (modified) (3 diffs)

system/backup/backup-move.php

@@ -1 +1 @@
 <?php
 $i = 10; // Počet záloh
-$path='/mnt/backup/';
+$path='/a/backup/system/';
 $file='backup';
 $ext='.tgz';

system/backup/do-backup.php

@@ -1 +1 @@
 <?php
-include('/a/www/centrala/global.php');
+chdir('/a/www/centrala');
+include('global.php');
 $Database->select_db('backup');
 

system/generators/dns.php

@@ -2 +2 @@
 include_once('/a/www/centrala/global.php');
 
-//$Serial = '2007070601';  // Should be changed on every change
 $Serial = date('Ymds', time());
 $ExternalServerName = 'gw-hajda.inext.cz'; 
+$MinimumTime = 7200;
 $RetryTime = 7200;
 $ExpireTime = 2419200;
-
+$RefreshTime = 28800;
+$BaseDir = '/var/named/chroot/var/named/';
 // === Local network DNS server ===
 
 // Generate DNS records
-$File = fopen('/a/config/named_internal/var/named/zdechov.net.zone', 'w');
+$File = fopen($BaseDir.'internal/zdechov.net.zone', 'w');
 fputs($File,'$ORIGIN zdechov.net.'."\n".
 '$TTL 86400'."\n".
 "zdechov.net.\tIN\tSOA\tcentrala.zdechov.net.\troot.centrala.zdechov.net.       (\n".
 "\t\t\t".$Serial."\t; serial\n".
-"\t\t\t28800\t; refresh\n".
-"\t\t\t14400\t; retry\n".
-"\t\t\t3600000\t; expire\n".
+"\t\t\t".$RefreshTime."\t; refresh\n".
+"\t\t\t".$RetryTime."\t; retry\n".
+"\t\t\t".$ExpireTime."\t; expire\n".
 "\t\t\t86400\t; ttl\n".
 "\t\t\t)\n".
@@ -58 +59 @@
 {
   $Parts = explode('.', $Network);
-  $File = fopen('/a/config/named_internal/var/named/'.$Parts[2].'.'.$Parts[1].'.'.$Parts[0].'.in-addr.arpa.zone', 'w+');
+  $File = fopen($BaseDir.'internal/'.$Parts[2].'.'.$Parts[1].'.'.$Parts[0].'.in-addr.arpa.zone', 'w+');
   fputs($File,
   '$TTL 86400'."\n".
   "@\tIN\tSOA\tcentrala.zdechov.net.\troot.centrala.zdechov.net.        (\n".
-  "\t\t\t\t".$Serial." ; serial\n".
-        "\t\t\t\t28800 ; refresh\n".
-  "\t\t\t\t14400 ; retry\n".
-  "\t\t\t\t3600000 ; expire\n".
+  "\t\t\t\t".$Serial."\t; serial\n".
+  "\t\t\t\t".$RefreshTime."\t; refresh\n".
+  "\t\t\t\t".$RetryTime."\t; retry\n".
+  "\t\t\t\t".$ExpireTime."\t; expire\n".
   "\t\t\t\t86400 ; ttl\n".
   "\t\t\t\t)\n".
@@ -83 +84 @@
 {
   $Parts = explode('.', $Network);
-  $File = fopen('/a/config/named_internal/var/named/'.$Parts[2].'.'.$Parts[1].'.'.$Parts[0].'.in-addr.arpa.zone', 'w+');
+  $File = fopen($BaseDir.'internal/'.$Parts[2].'.'.$Parts[1].'.'.$Parts[0].'.in-addr.arpa.zone', 'w+');
   fputs($File,
   '$TTL 86400'."\n".
   "@\tIN\tSOA\tcentrala.zdechov.net.\troot.centrala.zdechov.net.        (\n".
-  "\t\t\t\t".$Serial." ; serial\n".
-        "\t\t\t\t28800 ; refresh\n".
-  "\t\t\t\t14400 ; retry\n".
-  "\t\t\t\t3600000 ; expire\n".
+  "\t\t\t\t".$Serial."\t; serial\n".
+  "\t\t\t\t".$RefreshTime."\t; refresh\n".
+  "\t\t\t\t".$RetryTime."\t; retry\n".
+  "\t\t\t\t".$ExpireTime."\t; expire\n".
   "\t\t\t\t86400 ; ttl\n".
   "\t\t\t\t)\n".
@@ -106 +107 @@
 
 // Generate DNS records
-$File = fopen('/a/config/named_external/var/named/zdechov.net.zone', 'w');
+$File = fopen($BaseDir.'external/zdechov.net.zone', 'w');
 $Header = '$ORIGIN zdechov.net.'."\n".
 '$TTL 86400'."\n".
 "zdechov.net.\tIN\tSOA\t".$ExternalServerName.".\troot.centrala.zdechov.net.    (\t\n".
 "\t\t\t".$Serial."\t; serial\n".
-"\t\t\t28800\t; refresh\n".
+"\t\t\t".$RefreshTime."\t; refresh\n".
 "\t\t\t".$RetryTime."\t; retry\n".
 "\t\t\t".$ExpireTime."\t; expire\n".
@@ -136 +137 @@
 {
   $Data = strtolower($Alias['name']);
-  if(strlen($Data)<8) $Data .= "\t";
+  if(strlen($Data) < 8) $Data .= "\t";
   fputs($File, $Data."\tIN\tCNAME\t".$Alias['target']."\n");
 }
@@ -147 +148 @@
 {
   $Parts = explode('.', $Network);
-  $File = fopen('/a/config/named_external/var/named/'.$Parts[2].'.'.$Parts[1].'.'.$Parts[0].'.in-addr.arpa.zone', 'w+');
+  $File = fopen($BaseDir.'external/'.$Parts[2].'.'.$Parts[1].'.'.$Parts[0].'.in-addr.arpa.zone', 'w+');
   fputs($File,
   '$TTL 86400'."\n".
   "@\tIN\tSOA\t".$ExternalServerName.".\troot.centrala.zdechov.net.     (\n".
-  "\t\t\t\t".$Serial." ; serial\n".
-        "\t\t\t\t28800 ; refresh\n".
-  "\t\t\t\t".$RetryTime." ; retry\n".
-  "\t\t\t\t".$ExpireTime." ; expire\n".
+  "\t\t\t\t".$Serial."\t; serial\n".
+  "\t\t\t\t".$RefreshTime."\t; refresh\n".
+  "\t\t\t\t".$RetryTime."\t; retry\n".
+  "\t\t\t\t".$ExpireTime."\t; expire\n".
   "\t\t\t\t86400 ; ttl\n".
   "\t\t\t\t)\n".
@@ -174 +175 @@
 
 // Generate DNS records
-$File = fopen('/a/config/named_czfree/var/named/zdechov.zlin.czf.zone', 'w');
-$File2 = fopen('/a/config/named_internal/var/named/zdechov.zlin.czf.zone', 'w');
+$File = fopen($BaseDir.'czfree/zdechov.zlin.czf.zone', 'w');
+$File2 = fopen($BaseDir.'internal/zdechov.zlin.czf.zone', 'w');
 
 $Header = '$ORIGIN zdechov.zlin.czf.'."\n".
@@ -181 +182 @@
 $Domain.".\tIN\tSOA\t".$Nameserver.".".$Domain.".\troot.".$Nameserver.".".$Domain."     (\n".
 "\t\t\t".$Serial."\t; serial\n".
-"\t\t\t28800\t; refresh\n".
-"\t\t\t".$RetryTime."\t; retry\n".
-"\t\t\t3600000\t; expire\n".
+"\t\t\t".$RefreshTime."\t; refresh\n".
+"\t\t\t".$RetryTime."\t; retry\n".
+"\t\t\t".$ExpireTime."\t; expire\n".
 "\t\t\t86400\t; ttl\n".
 "\t\t\t)\n".
@@ -197 +198 @@
 $Domain.".\tIN\tSOA\t".$Nameserver.".".$Domain.".\troot.".$Nameserver.".".$Domain."     (\n".
 "\t\t\t".$Serial."\t; serial\n".
-"\t\t\t28800\t; refresh\n".
-"\t\t\t14400\t; retry\n".
-"\t\t\t3600000\t; expire\n".
-"\t\t\t86400\t; ttl\n".
+"\t\t\t".$RefreshTime."\t; refresh\n".
+"\t\t\t".$RetryTime."\t; retry\n".
+"\t\t\t".$ExpireTime."\t; expire\n".
 "\t\t\t)\n".
 "\t\t\tTXT\t".'"Community network ZdechovNET"'."\n".
@@ -237 +237 @@
 {
   $Parts = explode('.', $Network);
-  $File = fopen('/a/config/named_czfree/var/named/'.$Parts[2].'.'.$Parts[1].'.'.$Parts[0].'.in-addr.arpa.zone', 'w+');
-  $File2 = fopen('/a/config/named_internal/var/named/'.$Parts[2].'.'.$Parts[1].'.'.$Parts[0].'.in-addr.arpa.zone', 'w+');
+  $File = fopen($BaseDir.'czfree/'.$Parts[2].'.'.$Parts[1].'.'.$Parts[0].'.in-addr.arpa.zone', 'w+');
+  $File2 = fopen($BaseDir.'internal/'.$Parts[2].'.'.$Parts[1].'.'.$Parts[0].'.in-addr.arpa.zone', 'w+');
   $Nameserver = 'centrala';
   $Header = '$TTL 86400'."\n".
   "@\tIN\tSOA\t".$Nameserver.".".$Domain.".\troot.".$Nameserver.".".$Domain.".  (\n".
-  "\t\t\t\t".$Serial." ; serial\n".
-        "\t\t\t\t28800 ; refresh\n".
-  "\t\t\t\t14400 ; retry\n".
-  "\t\t\t\t3600000 ; expire\n".
+  "\t\t\t\t".$Serial."\t; serial\n".
+  "\t\t\t\t".$RefreshTime."\t; refresh\n".
+  "\t\t\t\t".$RetryTime."\t; retry\n".
+  "\t\t\t\t".$ExpireTime."\t; expire\n".
   "\t\t\t\t86400 ; ttl\n".
   "\t\t\t\t)\n".
@@ -255 +255 @@
   $Header = '$TTL 86400'."\n".
   "@\tIN\tSOA\t".$Nameserver.".".$Domain.".\troot.".$Nameserver.".".$Domain.".  (\n".
-  "\t\t\t\t".$Serial." ; serial\n".
-        "\t\t\t\t28800 ; refresh\n".
-  "\t\t\t\t14400 ; retry\n".
-  "\t\t\t\t3600000 ; expire\n".
+  "\t\t\t\t".$Serial."\t; serial\n".
+  "\t\t\t\t".$RefreshTime."\t; refresh\n".
+  "\t\t\t\t".$RetryTime."\t; retry\n".
+  "\t\t\t\t".$ExpireTime."\t; expire\n".
   "\t\t\t\t86400 ; ttl\n".
   "\t\t\t\t)\n".

system/generators/iptables.php

@@ -8 +8 @@
 //    exec('/sbin/iptables -t nat -A Block -p tcp --destination-port 80 -j REDIRECT --to-ports 3128');
 
+
+
+/*
 // Blocking according IP address
 $DbResult = $Database->select('users', '*', 'inet = 0'); 
@@ -18 +21 @@
   }
 }
-$DbResult = $Database->select('users', '*', 'inet = 1'); 
+$DbResult = $Database->select('users', '*', 'inet = 1');
 while($User = $DbResult->fetch_array())
 {
@@ -28 +31 @@
 }
 
+*/
+
 // Blocking according MAC address
-$DbResult = $Database->select('users', '*'); 
+$DbResult = $Database->select('users', '*');
 while($User = $DbResult->fetch_array())
 {
@@ -39 +44 @@
     if($User['inet'] == 0)
     {
-      if(($Row['block'] == 0) and ($Row['type'] == 1)) exec('/sbin/iptables -t nat -A Block -m mac --mac-source '.$Row['MAC']." -j Proxy");
-        else exec('/sbin/iptables -t nat -A Block -m mac --mac-source '.$Row['MAC']." -j Local");
+      //if(($Row['block'] == 0) and ($Row['type'] == 1)) exec('/sbin/iptables -t nat -A Block -m mac --mac-source '.$Row['MAC']." -j Proxy");
+      //    else exec('/sbin/iptables -t nat -A Block -m mac --mac-source '.$Row['MAC']." -j Local");
     } else {
       if($Row['vpn'] == 0) 
@@ -46 +51 @@
         $CZFreeLocalIP = $Row['IP'];
         //echo($Row['external_ip']."\n");
-        if($Row['name'] == 'TBC')
-        {
-          exec('/sbin/iptables -t nat -A PreroutingDNAT -m tcp -p tcp --dport 3724 -d '.$Row['external_ip'].' -j DNAT --to-destination '.$Row['IP'].':3725');  
-          exec('/sbin/iptables -t nat -A POSTROUTING -m tcp -p tcp -s '.$Row['IP'].' --sport 3725 -o eth1 -j SNAT --to-source '.$Row['external_ip'].':3724');  
-        }
+        //if($Row['name'] == 'TBC')
+        //{
+        //  exec('/sbin/iptables -t nat -A PreroutingDNAT -m tcp -p tcp --dport 3724 -d '.$Row['external_ip'].' -j DNAT --to-destination '.$Row['IP'].':3725');
+        //  exec('/sbin/iptables -t nat -A POSTROUTING -m tcp -p tcp -s '.$Row['IP'].' --sport 3725 -o eth1 -j SNAT --to-source '.$Row['external_ip'].':3724');
+        //}
         if(strtolower($Row['name']) != 'centrala')
         {
           if($Row['external_ip'] != '')
           {
-            exec('/sbin/iptables -t nat -A PreroutingDNAT -i eth1 -d '.$Row['external_ip'].' -j DNAT --to-destination '.$Row['IP']);  
-            exec('/sbin/iptables -t nat -A PreroutingDNAT -i eth1 -d '.$Row['external_ip'].' -j ACCEPT');  
-            exec('/sbin/iptables -t nat -A POSTROUTING -s '.$Row['IP'].' -o eth1 -j SNAT --to-source '.$Row['external_ip']);  
+            exec('/sbin/iptables -t nat -A PreroutingDNAT -i eth1 -d '.$Row['external_ip'].' -j DNAT --to-destination '.$Row['IP']);
+            exec('/sbin/iptables -t nat -A PreroutingDNAT -i eth1 -d '.$Row['external_ip'].' -j ACCEPT');
+            exec('/sbin/iptables -t nat -A POSTROUTING -s '.$Row['IP'].' -o eth1 -j SNAT --to-source '.$Row['external_ip']);
           }
-          exec('/sbin/iptables -t nat -A Block -m mac --mac-source '.$Row['MAC']." -j Proxy");
+          //exec('/sbin/iptables -t nat -A Block -m mac --mac-source '.$Row['MAC']." -j Proxy");
         }
       }
-      else 
+      else
       {
         $CZFreeLocalIP = $Row['external_ip'];
  //echo('vpn');
-        //exec('/sbin/iptables -t nat -A PreroutingDNAT -s '.$Row['IP'].' -p udp -m udp --dport 55556 -j DROP');  
-        if($Row['external_ip'] != '') exec('/sbin/iptables -t nat -A PreroutingDNAT -d '.$Row['external_ip'].' -j ACCEPT');  
+        //exec('/sbin/iptables -t nat -A PreroutingDNAT -s '.$Row['IP'].' -p udp -m udp --dport 55556 -j DROP');
+        if($Row['external_ip'] != '') exec('/sbin/iptables -t nat -A PreroutingDNAT -d '.$Row['external_ip'].' -j ACCEPT');
         exec('/sbin/iptables -t nat -A Block -s '.ToVpnIp($Row)." -j Proxy");
 
-        if($Row['vpn'] == 1) 
-        {
-          exec('/sbin/iptables -t nat -A Block -m mac --mac-source '.$Row['MAC']." -j Local");
-        } else if($Row['vpn'] == 2) exec('/sbin/iptables -t nat -A Block -m mac --mac-source '.$Row['MAC']." -j Proxy");
+        //if($Row['vpn'] == 1)
+        //{
+          //exec('/sbin/iptables -t nat -A Block -m mac --mac-source '.$Row['MAC']." -j Local");
+        //} else if($Row['vpn'] == 2) exec('/sbin/iptables -t nat -A Block -m mac --mac-source '.$Row['MAC']." -j Proxy");
       }
       if($Row['czfree_ip'] != '')
       {
         // CZFree
-        exec('/sbin/iptables -t nat -A PreroutingDNAT -i tun0 -d '.$Row['czfree_ip'].' -j DNAT --to-destination '.$CZFreeLocalIP);  
-        exec('/sbin/iptables -t nat -A PreroutingDNAT -i tun0 -d '.$Row['czfree_ip'].' -j ACCEPT');  
-        exec('/sbin/iptables -t nat -A POSTROUTING -s '.$CZFreeLocalIP.' -o tun0 -j SNAT --to-source '.$Row['czfree_ip']);  
+        exec('/sbin/iptables -t nat -A PreroutingDNAT -i tun0 -d '.$Row['czfree_ip'].' -j DNAT --to-destination '.$CZFreeLocalIP);
+        exec('/sbin/iptables -t nat -A PreroutingDNAT -i tun0 -d '.$Row['czfree_ip'].' -j ACCEPT');
+        exec('/sbin/iptables -t nat -A POSTROUTING -s '.$CZFreeLocalIP.' -o tun0 -j SNAT --to-source '.$Row['czfree_ip']);
       }
     }
@@ -87 +92 @@
 }
 
+
 // SMTP NAT port 25
-$DbResult = $Database->select('hosts', '*', 'name="MAIL"');
+$DbResult = $Database->select('hosts', '*', 'name="mail"');
 $Row = $DbResult->fetch_array();
-exec('/sbin/iptables -t nat -A PreroutingDNAT -p tcp -m tcp --dport 25 -d 212.111.4.174 -j DROP');  
-exec('/sbin/iptables -t nat -A PreroutingDNAT -p tcp -m tcp --dport 25 -d '.$Row['external_ip'].' -j DNAT --to-destination '.$Row['IP']);  
-exec('/sbin/iptables -t nat -A PreroutingDNAT -p tcp -m tcp --dport 25 -d '.$Row['external_ip'].' -j ACCEPT');  
-exec('/sbin/iptables -t nat -A POSTROUTING -p tcp -m tcp --dport 25 -s 212.111.4.174 -o eth1 -j SNAT --to-source '.$Row['external_ip']);  
+exec('/sbin/iptables -t nat -A PreroutingDNAT -p tcp -m tcp --dport 25 -d 212.111.4.174 -j DROP');
+exec('/sbin/iptables -t nat -A PreroutingDNAT -p tcp -m tcp --dport 25 -d '.$Row['external_ip'].' -j DNAT --to-destination '.$Row['IP']);
+exec('/sbin/iptables -t nat -A PreroutingDNAT -p tcp -m tcp --dport 25 -d '.$Row['external_ip'].' -j ACCEPT');
+exec('/sbin/iptables -t nat -A POSTROUTING -p tcp -m tcp --dport 25 -s 212.111.4.174 -o eth1 -j SNAT --to-source '.$Row['external_ip']);
 
 // Local network NAT
-$DbResult = $Database->select('hosts', '*', 'name="GATE"');
+$DbResult = $Database->select('hosts', '*', 'name="gate"');
 $Row = $DbResult->fetch_array();
 exec('/sbin/iptables -t nat -A POSTROUTING -s 192.168.0.0/255.255.0.0 -o eth1 -j SNAT --to-source '.$Row['external_ip']);

system/generators/traffic_shaping.php

@@ -23 +23 @@
 $VoipSpeedIn = 100; //$SpeedReserve;
 $VoipSpeedOut = 100; //$SpeedReserve;
+$InetInterface = 'eth1';
+$OutInterface = 'eth1';
+$InInterface = 'ifb0';
 $FreeInetSpeed = 64;
 
@@ -36 +39 @@
   if($Enabled)
   {
-    exec('/sbin/iptables -t mangle -A FORWARD -j MARK --set-mark 0');
-    exec('/sbin/iptables -t mangle -i eth1 -A FORWARD -j MARK --set-mark 1');
-    exec('/sbin/iptables -t mangle -o eth1 -A FORWARD -j MARK --set-mark 1');
+    //exec('/sbin/iptables -t mangle -A FORWARD -j MARK --set-mark 0');
+    //exec('/sbin/iptables -t mangle -i eth1 -A FORWARD -j MARK --set-mark 1');
+    //exec('/sbin/iptables -t mangle -o eth1 -A FORWARD -j MARK --set-mark 1');
   }
 
@@ -44 +47 @@
   
   // In going traffic
-  fputs($File, "/sbin/tc qdisc del dev imq0 root\n");
+  fputs($File, "/sbin/tc qdisc del dev ".$InInterface." root\n");
   if($Enabled)
   { 
-    fputs($File, "/sbin/tc qdisc add dev imq0 root handle 1:0 htb default 2\n");
+    fputs($File, "/sbin/tc qdisc add dev ".$InInterface." root handle 1:0 htb default 2\n");
     fputs($FileClassInfo, "1:1 Základní\n");
-    fputs($File, "/sbin/tc class add dev imq0 parent 1:0 classid 1:1 htb rate ".$TotalMaxSpeedIn."kbit quantum 1500\n");
+    fputs($File, "/sbin/tc class add dev ".$InInterface." 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 ".$FreeInetSpeed."kbit prio 3 quantum 1500\n");
-    fputs($File, "/sbin/tc qdisc add dev imq0 parent 1:".$FreeInetClass." handle ".$FreeInetClass.": sfq perturb 10\n");
+    fputs($File, "/sbin/tc class add dev ".$InInterface." parent 1:1 classid 1:".$FreeInetClass." htb rate ".$FreeInetSpeed."kbit prio 3 quantum 1500\n");
+    fputs($File, "/sbin/tc qdisc add dev ".$InInterface." parent 1:".$FreeInetClass." handle ".$FreeInetClass.": sfq perturb 10\n");
   }
   // Out going traffic
-  fputs($File, "/sbin/tc qdisc del dev imq1 root\n");
+  fputs($File, "/sbin/tc qdisc del dev ".$OutInterface." root\n");
   if($Enabled)
   {
-    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 ".$FreeInetSpeed."kbit prio 3 quantum 1500\n");
-    fputs($File, "/sbin/tc qdisc add dev imq1 parent 1:".$FreeInetClass." handle ".$FreeInetClass.": sfq perturb 10\n");
+    fputs($File, "/sbin/tc qdisc add dev ".$OutInterface." root handle 1:0 htb default 2\n");
+    fputs($FileClassInfo, "1:1 Základní\n");
+    fputs($File, "/sbin/tc class add dev ".$OutInterface." parent 1:0 classid 1:1 htb rate ".$TotalMaxSpeedOut."kbit quantum 1500\n");
+    fputs($FileClassInfo, "1:2 Internet zdarma\n");
+    fputs($File, "/sbin/tc class add dev ".$OutInterface." parent 1:1 classid 1:".$FreeInetClass." htb rate ".$FreeInetSpeed."kbit prio 3 quantum 1500\n");
+    fputs($File, "/sbin/tc qdisc add dev ".$OutInterface." parent 1:".$FreeInetClass." handle ".$FreeInetClass.": sfq perturb 10\n");
   }
   
@@ -76 +81 @@
 
   // VoIP in going traffic
-  fputs($File, "/sbin/tc class add dev imq0 parent 1:1 classid 1:".$VoipClassId." htb rate ".$VoipSpeedIn."kbit ceil ".$VoipMaxSpeedIn."kbit quantum 12000 burst 6k cburst 3k prio ".$Prio."\n");
-  fputs($File, "/sbin/tc qdisc add dev imq0 parent 1:".$VoipClassId." handle ".$VoipClassId.": sfq perturb 10\n");
-  fputs($File, "/sbin/tc filter add dev imq0 parent 1:0 protocol ip handle ".$VoipClassId." fw flowid 1:".$VoipClassId."\n");
+  fputs($File, "/sbin/tc class add dev ".$InInterface." parent 1:1 classid 1:".$VoipClassId." htb rate ".$VoipSpeedIn."kbit ceil ".$VoipMaxSpeedIn."kbit quantum 12000 burst 6k cburst 3k prio ".$Prio."\n");
+  fputs($File, "/sbin/tc qdisc add dev ".$InInterface." parent 1:".$VoipClassId." handle ".$VoipClassId.": sfq perturb 10\n");
+  fputs($File, "/sbin/tc filter add dev ".$InInterface." parent 1:0 protocol ip handle ".$VoipClassId." fw flowid 1:".$VoipClassId."\n");
   // VoIP out going traffic
-  fputs($File, "/sbin/tc class add dev imq1 parent 1:1 classid 1:".$VoipClassId." htb rate ".$VoipSpeedOut."kbit ceil ".$VoipMaxSpeedOut."kbit quantum 12000 burst 6k cburst 3k prio ".$Prio."\n");
-  fputs($File, "/sbin/tc qdisc add dev imq1 parent 1:".$VoipClassId." handle ".$VoipClassId.": sfq perturb 10\n");
-  fputs($File, "/sbin/tc filter add dev imq1 parent 1:0 protocol ip handle ".$VoipClassId." fw flowid 1:".$VoipClassId."\n");
+  fputs($File, "/sbin/tc class add dev ".$OutInterface." parent 1:1 classid 1:".$VoipClassId." htb rate ".$VoipSpeedOut."kbit ceil ".$VoipMaxSpeedOut."kbit quantum 12000 burst 6k cburst 3k prio ".$Prio."\n");
+  fputs($File, "/sbin/tc qdisc add dev ".$OutInterface." parent 1:".$VoipClassId." handle ".$VoipClassId.": sfq perturb 10\n");
+  fputs($File, "/sbin/tc filter add dev ".$OutInterface." parent 1:0 protocol ip handle ".$VoipClassId." fw flowid 1:".$VoipClassId."\n");
   fputs($FileClassInfo, '1:'.$VoipClassId." VoIP\n");
 
@@ -97 +102 @@
   $AllUsersClassId = $ClassId;
   $ClassId = $ClassId + 1;
-  fputs($File, "/sbin/tc class add dev imq0 parent 1:1 classid 1:".$AllUsersClassId." htb rate ".$UsersMaxSpeedIn."kbit prio 1 quantum 1500\n");
-  fputs($File, "/sbin/tc class add dev imq1 parent 1:1 classid 1:".$AllUsersClassId." htb rate ".$UsersMaxSpeedOut."kbit prio 1 quantum 1500\n");
-  fputs($FileClassInfo, '1:'.$AllUsersClassId." Všichni uživatelé\n");
+  fputs($File, "/sbin/tc class add dev ".$InInterface." parent 1:1 classid 1:".$AllUsersClassId." htb rate ".$UsersMaxSpeedIn."kbit prio 1 quantum 1500\n");
+  fputs($File, "/sbin/tc class add dev ".$OutInterface." parent 1:1 classid 1:".$AllUsersClassId." htb rate ".$UsersMaxSpeedOut."kbit prio 1 quantum 1500\n");
+  fputs($FileClassInfo, '1:'.$AllUsersClassId." Všichni uivatelé");
 
   // Torrent sharing
@@ -108 +113 @@
 
   // Torrent out going traffic
-  fputs($File, "/sbin/tc class add dev imq1 parent 1:".$AllUsersClassId." classid 1:".$TorrentClassId." htb rate ".$TorrentSpeedOut."kbit ceil ".$UsersMaxSpeedOut."kbit prio ".$Prio." quantum 1500\n");
-  fputs($File, "/sbin/tc qdisc add dev imq1 parent 1:".$TorrentClassId." handle ".$TorrentClassId.":0 sfq perturb 10\n");
-  fputs($File, "/sbin/tc filter add dev imq1 parent 1:0 protocol ip handle ".$TorrentClassId." fw flowid 1:".$TorrentClassId."\n");
+  fputs($File, "/sbin/tc class add dev ".$OutInterface." parent 1:".$AllUsersClassId." classid 1:".$TorrentClassId." htb rate ".$TorrentSpeedOut."kbit ceil ".$UsersMaxSpeedOut."kbit prio ".$Prio." quantum 1500\n");
+  fputs($File, "/sbin/tc qdisc add dev ".$OutInterface." parent 1:".$TorrentClassId." handle ".$TorrentClassId.":0 sfq perturb 10\n");
+  fputs($File, "/sbin/tc filter add dev ".$OutInterface." parent 1:0 protocol ip handle ".$TorrentClassId." fw flowid 1:".$TorrentClassId."\n");
   fputs($FileClassInfo, '1:'.$TorrentClassId." Torrent\n");
   // Torrent in going traffic
-  fputs($File, "/sbin/tc class add dev imq0 parent 1:".$AllUsersClassId." classid 1:".$TorrentClassId." htb rate ".$TorrentSpeedOut."kbit ceil ".$UsersMaxSpeedOut."kbit prio ".$Prio." quantum 1500\n");
-  fputs($File, "/sbin/tc qdisc add dev imq0 parent 1:".$TorrentClassId." handle ".$TorrentClassId.":0 sfq perturb 10\n");
-  fputs($File, "/sbin/tc filter add dev imq0 parent 1:0 protocol ip handle ".$TorrentClassId." fw flowid 1:".$TorrentClassId."\n");
+  fputs($File, "/sbin/tc class add dev ".$InInterface." parent 1:".$AllUsersClassId." classid 1:".$TorrentClassId." htb rate ".$TorrentSpeedOut."kbit ceil ".$UsersMaxSpeedOut."kbit prio ".$Prio." quantum 1500\n");
+  fputs($File, "/sbin/tc qdisc add dev ".$InInterface." parent 1:".$TorrentClassId." handle ".$TorrentClassId.":0 sfq perturb 10\n");
+  fputs($File, "/sbin/tc filter add dev ".$InInterface." parent 1:0 protocol ip handle ".$TorrentClassId." fw flowid 1:".$TorrentClassId."\n");
   fputs($FileClassInfo, '1:'.$TorrentClassId." Torrent\n");
 
@@ -130 +135 @@
 
     fputs($File, "# === ".$User['fullname']." ===\n");
-    fputs($File, "/sbin/tc class add dev imq0 parent 1:".$AllUsersClassId." classid 1:".$UserClassId." htb rate ".$SpeedIn."bit ceil ".$UserMaxSpeedIn."bit prio 1 quantum ".$Quantum."\n");
-    //fputs($File, "/sbin/tc qdisc add dev imq0 parent 1:".$UserClassId." handle ".$UserClassId.":0 htb r2q 10\n");
-    //fputs($File, "/sbin/tc class add dev imq0 parent ".$UserClassId.":0 classid ".$UserClassId.":".$UserClassId." htb rate ".$UserMaxSpeedIn."bit prio 1\n");
-    fputs($File, "/sbin/tc class add dev imq1 parent 1:".$AllUsersClassId." classid 1:".$UserClassId." htb rate ".$SpeedOut."bit ceil ".$UserMaxSpeedOut."bit prio 1 quantum ".$Quantum."\n");
-    //fputs($File, "/sbin/tc qdisc add dev imq1 parent 1:".$UserClassId." handle ".$UserClassId.":0 htb r2q 10\n");
-    //fputs($File, "/sbin/tc class add dev imq1 parent ".$UserClassId.":0 classid ".$UserClassId.":".$UserClassId." htb rate ".$UserMaxSpeedOut."bit prio 1\n");
+    fputs($File, "/sbin/tc class add dev ".$InInterface." parent 1:".$AllUsersClassId." classid 1:".$UserClassId." htb rate ".$SpeedIn."bit ceil ".$UserMaxSpeedIn."bit prio 1 quantum ".$Quantum."\n");
+    //fputs($File, "/sbin/tc qdisc add dev ".$InInterface." parent 1:".$UserClassId." handle ".$UserClassId.":0 htb r2q 10\n");
+    //fputs($File, "/sbin/tc class add dev ".$InInterface." parent ".$UserClassId.":0 classid ".$UserClassId.":".$UserClassId." htb rate ".$UserMaxSpeedIn."bit prio 1\n");
+    fputs($File, "/sbin/tc class add dev ".$OutInterface." parent 1:".$AllUsersClassId." classid 1:".$UserClassId." htb rate ".$SpeedOut."bit ceil ".$UserMaxSpeedOut."bit prio 1 quantum ".$Quantum."\n");
+    //fputs($File, "/sbin/tc qdisc add dev ".$OutInterface." parent 1:".$UserClassId." handle ".$UserClassId.":0 htb r2q 10\n");
+    //fputs($File, "/sbin/tc class add dev ".$OutInterface." parent ".$UserClassId.":0 classid ".$UserClassId.":".$UserClassId." htb rate ".$UserMaxSpeedOut."bit prio 1\n");
     fputs($FileClassInfo, '1:'.$UserClassId.' '.$User['fullname']."\n");
 
@@ -168 +173 @@
         $SpeedDivider = 1;
 
-              if($Host['name'] == 'CENTRALA')
+              if($Host['name'] == 'centrala')
               {
                 $Host['IP'] = $Host['external_ip'];
@@ -180 +185 @@
               //if($Row['name'] == 'TERMINAL2') $Prio = 0; 
         //      if($Row['name'] = 'TERMINAL2') $Prio = 0;
-        if($Host['name'] == 'VOIP-HAJDA') $Protocol = ' -p tcp'; 
+        if($Host['name'] == 'voip-hajda') $Protocol = ' -p tcp'; 
           else $Protocol = '';
         //      if($Host['name'] == 'KARLOS') $UserMaxSpeedIn = 128000;
-        if($Host['name'] == 'GAME') 
+        /*
+if($Host['name'] == 'GAME') 
         {
           exec('/sbin/iptables -t mangle -F game-server');        
                 $TableOut = 'game-server';
                 $TableIn = 'game-server';
-        }
-        if($Host['name'] == 'TBC') continue;
+        }*/
+        //if($Host['name'] == 'TBC') continue;
 
         // In going traffic
-        exec('/sbin/iptables -t mangle -A '.$TableIn.' -i eth1 -d '.$Host['IP'].$Protocol." -j MARK --set-mark ".$HostClassId); 
-              fputs($File, "/sbin/tc class add dev imq0 parent 1:".$UserClassId." classid 1:".$HostClassId." htb rate ".$HostSpeedIn."bit ceil ".$UserMaxSpeedIn."bit prio ".$Prio." quantum ".$Quantum."\n");
-              fputs($File, "/sbin/tc qdisc add dev imq0 parent 1:".$HostClassId." handle ".$HostClassId.":0 sfq perturb 10\n");
-            //fputs($File, "/sbin/tc filter add dev imq0 parent 1:0 protocol ip handle ".$HostClassId." fw flowid 1:".$UserClassId."\n");
-            fputs($File, "/sbin/tc filter add dev imq0 parent 1:0 protocol ip handle ".$HostClassId." fw flowid 1:".$HostClassId."\n");
+        //exec('/sbin/iptables -t mangle -A '.$TableIn.' -i eth1 -d '.$Host['IP'].$Protocol." -j MARK --set-mark ".$HostClassId); 
+              fputs($File, "/sbin/tc class add dev ".$InInterface." parent 1:".$UserClassId." classid 1:".$HostClassId." htb rate ".$HostSpeedIn."bit ceil ".$UserMaxSpeedIn."bit prio ".$Prio." quantum ".$Quantum."\n");
+              fputs($File, "/sbin/tc qdisc add dev ".$InInterface." parent 1:".$HostClassId." handle ".$HostClassId.":0 sfq perturb 10\n");
+            //fputs($File, "/sbin/tc filter add dev ".$InInterface." parent 1:0 protocol ip handle ".$HostClassId." fw flowid 1:".$UserClassId."\n");
+            fputs($File, "/sbin/tc filter add dev ".$InInterface." parent 1:0 protocol ip prio 1 u32 match ip dst ".$Host['external_ip']."/32 flowid 1:".$HostClassId."\n");
         
         // Out going traffic
-        exec('/sbin/iptables -t mangle -A '.$TableOut.' -o eth1 -s '.$Host['IP'].$Protocol." -j MARK --set-mark ".$HostClassId);
-        fputs($File, "/sbin/tc class add dev imq1 parent 1:".$UserClassId." classid 1:".$HostClassId." htb rate ".$HostSpeedOut."bit ceil ".$UserMaxSpeedOut."bit prio ".$Prio." quantum ".$Quantum."\n");
-              fputs($File, "/sbin/tc qdisc add dev imq1 parent 1:".$HostClassId." handle ".$HostClassId.":0 sfq perturb 10\n");
-              //fputs($File, "/sbin/tc filter add dev imq1 parent 1:0 protocol ip handle ".$HostClassId." fw flowid 1:".$UserClassId."\n");
-              fputs($File, "/sbin/tc filter add dev imq1 parent 1:0 protocol ip handle ".$HostClassId." fw flowid 1:".$HostClassId."\n");
+        //exec('/sbin/iptables -t mangle -A '.$TableOut.' -o eth1 -s '.$Host['IP'].$Protocol." -j MARK --set-mark ".$HostClassId);
+        fputs($File, "/sbin/tc class add dev ".$OutInterface." parent 1:".$UserClassId." classid 1:".$HostClassId." htb rate ".$HostSpeedOut."bit ceil ".$UserMaxSpeedOut."bit prio ".$Prio." quantum ".$Quantum."\n");
+              fputs($File, "/sbin/tc qdisc add dev ".$OutInterface." parent 1:".$HostClassId." handle ".$HostClassId.":0 sfq perturb 10\n");
+              //fputs($File, "/sbin/tc filter add dev ".$OutInterface." parent 1:0 protocol ip handle ".$HostClassId." fw flowid 1:".$UserClassId."\n");
+              fputs($File, "/sbin/tc filter add dev ".$OutInterface." parent 1:0 protocol ip prio 1 u32 match ip src ".$Host['external_ip']."/32 flowid 1:".$HostClassId."\n");
                //echo($Row['id'].',');
       }
@@ -213 +219 @@
       }
       // VoIP devices
+/*
       if(($Host['name'] == 'HAJDA-VOIP') || ($Host['name'] == 'NAVRATIL-VOIP')) 
       {
@@ -260 +267 @@
         
       }
-      
-      
+*/
+
     }
   }
   //echo($Row['id'].',');
-  
-  }
-  
+
+  }
+
   // In going traffic
   // exec('/sbin/iptables -t mangle -A FORWARD -m mark --mark 1 -j LOG --log-prefix "TRAFFIC " --log-level info');
-  exec('/sbin/iptables -t mangle -A FORWARD -i eth1 -j IMQ --todev 0');
-  exec('/sbin/iptables -t mangle -A INPUT -i eth1 -j IMQ --todev 0');
+  //exec('/sbin/iptables -t mangle -A FORWARD -i eth1 -j IMQ --todev 0');
+  //exec('/sbin/iptables -t mangle -A INPUT -i eth1 -j IMQ --todev 0');
   // Out going traffic
-  exec('/sbin/iptables -t mangle -A FORWARD -o eth1 -j IMQ --todev 1');
-  exec('/sbin/iptables -t mangle -A OUTPUT -o eth1 -j IMQ --todev 1');
-  exec('/sbin/iptables-save >/etc/sysconfig/iptables');
+  //exec('/sbin/iptables -t mangle -A FORWARD -o eth1 -j IMQ --todev 1');
+  //exec('/sbin/iptables -t mangle -A OUTPUT -o eth1 -j IMQ --todev 1');
+
+  fputs($File, "\n# Interface redirection\n");
+  fputs($File, "/sbin/tc qdisc del dev ".$InetInterface." ingress\n");
+  fputs($File, "/sbin/tc qdisc add dev ".$InetInterface." ingress\n");
+  fputs($File, "/sbin/tc filter add dev ".$InetInterface." parent ffff: protocol ip prio 10 u32 match u32 0 0 flowid 1:1 action mirred egress redirect dev ifb0\n");
+
+  //fputs($File, "/sbin/tc qdisc del dev ".$InetInterface." root handle 1: htb default 10\n");
+  //fputs($File, "/sbin/tc qdisc add dev ".$InetInterface." root handle 1: htb default 10\n");
+  //fputs($File, "/sbin/tc filter add dev ".$InetInterface." parent 1: protocol ip prio 10 u32 match u32 0 0 flowid 1:1 action mirred egress redirect dev ifb1\n");
+
+  //exec('/sbin/iptables-save >/etc/sysconfig//sbin/iptables');
   fclose($File);
   fclose($FileClassInfo);

system/statistic/traffic.php

@@ -1 +1 @@
 <?php
 
-include('../../html/global.php');
+chdir('/a/www/centrala/');
+include('global.php');
 $Database->select_db('statistic');
 $Config['Web']['ShowError'] = 1;
@@ -144 +145 @@
 
   $Database->select_db('statistic');
-  $HDD = round(disk_free_space('/')/1024);
-  $HDD2 = round(disk_free_space('/mnt/sda1')/1024);
+  $HDD = round(disk_free_space('/') / 1024);
+  $HDD2 = round(disk_free_space('/mnt/Samsung500') / 1024);
  
   // Na�en�teploty
@@ -185 +186 @@
     'ping_nix' => $Ping,
     'inet_down' => $NetworkStat['eth1']['down_avg'], 'inet_up' => $NetworkStat['eth1']['up_avg'],
-    'eth0_down' => $NetworkStat['eth0']['down_avg'], 'eth0_up' => $NetworkStat['eth0']['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'],
-    'eth2_down' => $NetworkStat['eth2']['down_avg'], 'eth2_up' => $NetworkStat['eth2']['up_avg']);
+//    'eth2_down' => $NetworkStat['eth2']['down_avg'], 'eth2_up' => $NetworkStat['eth2']['up_avg']);
   $Database->insert('traffic', $NewItem);
+
   //echo(serialize($NewItem)."\n");
     //$LevelDivider = 10;