Changeset 118 for system

Timestamp:

Dec 3, 2008, 11:36:51 AM (16 years ago)

Author:

george

Message:

• Upraveno: Z nastavení firewallu odebráno virtuální přesměrování DNS serveru na jinou IP.

Location:

system/generators

Files:

• iptables.php (modified) (3 diffs)
• traffic_shaping.php (modified) (1 diff)

system/generators/iptables.php

@@ -38 +38 @@
 {
   //echo($User['fullname']."\n");
-  $DbResult2 = $Database->select('hosts','*','block<2 AND MAC!="" AND user='.$User['id'].' ORDER BY id DESC');
+  $DbResult2 = $Database->select('hosts', '*', '(block < 2) AND (MAC != "") AND (user='.$User['id'].') AND (IP != external_ip) ORDER BY id DESC');
   while($Row = $DbResult2->fetch_array())
   {
@@ -56 +56 @@
         //  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(strtolower($Row['name']) != 'gate')
         {
           if($Row['external_ip'] != '')
@@ -96 +96 @@
 
 // SMTP NAT port 25
-$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']);
+//$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']);
 
 // Local network NAT

system/generators/traffic_shaping.php

@@ -104 +104 @@
   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é");
+  fputs($FileClassInfo, '1:'.$AllUsersClassId." Všichni uivatelé\n");
 
   // Torrent sharing