Changeset 261 for trunk

Timestamp:

Nov 13, 2009, 6:37:03 PM (15 years ago)

Author:

george

Message:

• Upraveno: Nepřepočítávat max. rychlost klientů. Způsobovalo nutnost přegenerovat všechna pravidla řízení rychlosti na routeru. * Upraveno: Generování DNS vráceno na systém interních a externích adres pro doménu zdechov.net.

Location:

trunk

Files:

• finance/finance.php (modified) (1 diff)
• network/dostupnost.php (modified) (1 diff)
• system/generators/dns.php (modified) (6 diffs)
• system/generators/dns_czf.php (added)
• system/generators/dns_hovnet.php (added)
• system/generators/log (deleted)
• system/generators/nat_routerboard.php (modified) (1 diff)
• system/routerboard.php (modified) (1 diff)

trunk/finance/finance.php

@@ -76 +76 @@
       {
         case 1:
-          $Tariff['SpeedMin'] = round($Tariff['SpeedMax'] * $Aggregation);
+          // Přepočítávání rychlostí koliduje s rozdílovým zapisováním stromu front do mikrotiku. Vždy při změně počtu počítačů či domácností docházelo ke změně minima a přepočtu všeho.
+          //$Tariff['SpeedMin'] = round($Tariff['SpeedMax'] * $Aggregation);
           break;
         case 2:

trunk/network/dostupnost.php

@@ -1 +1 @@
 <?php
+
+die();
 
 include_once('../global.php');

trunk/system/generators/dns.php

@@ -114 +114 @@
   'Host' => array(),
   'Alias' => array(),
-  'Network' => array('192.168.0', '192.168.1', '192.168.2', '192.168.3', '192.168.4', '192.168.5', '192.168.6', '192.168.7', '77.92.221'),
+  'Network' => array('10.145.64', '10.145.65', '10.145.66', '10.145.67', '77.92.221'),
 );
 
@@ -136 +136 @@
 
 // CZFree records in internal server
+/*
 $DbResult = $Database->query('SELECT NetworkInterface.*, NetworkDevice.Name AS DeviceName FROM NetworkInterface JOIN NetworkDevice ON NetworkDevice.Id = NetworkInterface.Device WHERE NetworkInterface.CZFreeIP <> ""');
 while($Interface = $DbResult->fetch_assoc())
@@ -143 +144 @@
   $LocalDNS['Host'][] = array('Name' => $Name.'-czfree', 'Address' => $Interface['CZFreeIP']);
 }
+*/
 
 // Domain aliases
@@ -187 +189 @@
 }
 
-
+/*
 // === CZFree network DNS server ===
 $BaseDomain = 'zdechov.zlin.czf';
@@ -226 +228 @@
 
 // === CZFree network local address ===
-$BaseDomain = 'zdechov.zlin.czf';
+$BaseDomain = 'zdechovnet.czf';
 $CZFreeLocalDNS = array(
   'Domain' => $BaseDomain,
@@ -263 +265 @@
 }
 
+GenerateDNS($CZFreeDNS);
+GenerateDNS($CZFreeLocalDNS);
+*/
+
 GenerateDNS($LocalDNS);
 GenerateDNS($ExternalDNS);
-GenerateDNS($CZFreeDNS);
-GenerateDNS($CZFreeLocalDNS);
 
 ?>

trunk/system/generators/nat_routerboard.php

@@ -56 +56 @@
 $Items[] = array('chain' => 'srcnat', 'out-interface' => $InetInterface, 'action' => 'masquerade', 'comment' => 'Default_NAT');     
 // Redirect DNS port
-$Items[] = array('chain' => 'dstnat', 'dst-address' => '212.111.4.174', 'protocol' => 'tcp', 'dst-port' => 53, 'in-interface' => $InetInterface, 'action' => 'dst-nat', 'to-addresses' => '192.168.0.1', 'to-ports' => 53, 'comment' => 'DNS_redirection_UDP');
-$Items[] = array('chain' => 'dstnat', 'dst-address' => '212.111.4.174', 'protocol' => 'udp', 'dst-port' => 53, 'in-interface' => $InetInterface, 'action' => 'dst-nat', 'to-addresses' => '192.168.0.1', 'to-ports' => 53, 'comment' => 'DNS_redirection_UDP');
+$Items[] = array('chain' => 'dstnat', 'dst-address' => '212.111.4.174', 'protocol' => 'tcp', 'dst-port' => 53, 'in-interface' => $InetInterface, 'action' => 'dst-nat', 'to-addresses' => '10.145.64.8', 'to-ports' => 53, 'comment' => 'DNS_redirection_UDP');
+$Items[] = array('chain' => 'dstnat', 'dst-address' => '212.111.4.174', 'protocol' => 'udp', 'dst-port' => 53, 'in-interface' => $InetInterface, 'action' => 'dst-nat', 'to-addresses' => '10.145.64.8', 'to-ports' => 53, 'comment' => 'DNS_redirection_UDP');
 
 $Routerboard->ListUpdate($Path, array('chain', 'dst-address', 'in-interface', 'src-address', 'out-interface', 'to-ports', 'dst-port', 'protocol', 'action', 'to-addresses', 'comment'), $Items);

trunk/system/routerboard.php

@@ -200 +200 @@
       ksort($List[$Index]);
     }
-    //print_r($List);
-    //print_r($Values);
+    if($this->Debug) print_r($List);
+    if($this->Debug) print_r($Values);
        
     // Erase all items not existed in $Values