Changeset 261


Ignore:
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:
2 added
1 deleted
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/finance/finance.php

    r226 r261  
    7676      {
    7777        case 1:
    78           $Tariff['SpeedMin'] = round($Tariff['SpeedMax'] * $Aggregation);
     78          // 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.
     79          //$Tariff['SpeedMin'] = round($Tariff['SpeedMax'] * $Aggregation);
    7980          break;
    8081        case 2:

  • trunk/network/dostupnost.php

    r246 r261  
    11<?php
     2
     3die();
    24
    35include_once('../global.php');

  • trunk/system/generators/dns.php

    r245 r261  
    114114  'Host' => array(),
    115115  'Alias' => array(),
    116   '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'),
     116  'Network' => array('10.145.64', '10.145.65', '10.145.66', '10.145.67', '77.92.221'),
    117117);
    118118
    … …  
    136136
    137137// CZFree records in internal server
     138/*
    138139$DbResult = $Database->query('SELECT NetworkInterface.*, NetworkDevice.Name AS DeviceName FROM NetworkInterface JOIN NetworkDevice ON NetworkDevice.Id = NetworkInterface.Device WHERE NetworkInterface.CZFreeIP <> ""');
    139140while($Interface = $DbResult->fetch_assoc())
    … …  
    143144  $LocalDNS['Host'][] = array('Name' => $Name.'-czfree', 'Address' => $Interface['CZFreeIP']);
    144145}
     146*/
    145147
    146148// Domain aliases
    … …  
    187189}
    188190
    189 
     191/*
    190192// === CZFree network DNS server ===
    191193$BaseDomain = 'zdechov.zlin.czf';
    … …  
    226228
    227229// === CZFree network local address ===
    228 $BaseDomain = 'zdechov.zlin.czf';
     230$BaseDomain = 'zdechovnet.czf';
    229231$CZFreeLocalDNS = array(
    230232  'Domain' => $BaseDomain,
    … …  
    263265}
    264266
     267GenerateDNS($CZFreeDNS);
     268GenerateDNS($CZFreeLocalDNS);
     269*/
     270
    265271GenerateDNS($LocalDNS);
    266272GenerateDNS($ExternalDNS);
    267 GenerateDNS($CZFreeDNS);
    268 GenerateDNS($CZFreeLocalDNS);
    269273
    270274?>

  • trunk/system/generators/nat_routerboard.php

    r254 r261  
    5656$Items[] = array('chain' => 'srcnat', 'out-interface' => $InetInterface, 'action' => 'masquerade', 'comment' => 'Default_NAT');     
    5757// Redirect DNS port
    58 $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');
    59 $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');
     58$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');
     59$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');
    6060
    6161$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

    r260 r261  
    200200      ksort($List[$Index]);
    201201    }
    202     //print_r($List);
    203     //print_r($Values);
     202    if($this->Debug) print_r($List);
     203    if($this->Debug) print_r($Values);
    204204       
    205205    // Erase all items not existed in $Values
Note: See TracChangeset for help on using the changeset viewer.