Changeset 781 for trunk/Modules/NetworkConfigRouterOS

Timestamp:

Jan 8, 2016, 11:00:11 PM (9 years ago)

Author:

chronos

Message:

• Modified: Network configure actions now can be executed through cmd.php interface using "php cmd.php config <action>".

Location:

trunk/Modules/NetworkConfigRouterOS

Files:

• Generators/DHCP.php (modified) (1 diff)
• Generators/DNS.php (modified) (1 diff)
• Generators/FirewallFilter.php (modified) (1 diff)
• Generators/FirewallMangle.php (modified) (1 diff)
• Generators/FirewallNAT.php (modified) (1 diff)
• Generators/Netwatch.php (modified) (1 diff)
• Generators/NetwatchImport.php (modified) (1 diff)
• Generators/Queue.php (modified) (1 diff)
• Generators/Signal.php (modified) (1 diff)
• NetworkConfigRouterOS.php (modified) (2 diffs)

trunk/Modules/NetworkConfigRouterOS/Generators/DHCP.php

@@ -1 +1 @@
 <?php
 
-if(isset($_SERVER['REMOTE_ADDR'])) die();
-include_once(dirname(__FILE__).'/../../../Application/System.php');
-$System = new System();
-$System->ShowPage = false;
-$System->Run();
-$Path = array('ip', 'dhcp-server', 'lease');
 
-$Routerboard = new Routerboard();
-$Routerboard->UserName = $Config['MainRouter']['UserName'];
-$Routerboard->Timeout = $Config['MainRouter']['ConnectTimeout'];
-$Routerboard->Debug = true;
+class ConfigRouterOSDHCP extends NetworkConfigItem
+{
+  function Run()
+  {
+    $Path = array('ip', 'dhcp-server', 'lease');
 
-$DbResult = $System->Database->query('SELECT * FROM `NetworkSubnet` WHERE `Configure`=1');
-while($Subnet = $DbResult->fetch_assoc())
-{
-  echo($Subnet['DHCP']);
-  $Routerboard->HostName = $Subnet['DHCP'];
-  $Items = array();
-  $Server = 'dhcp'.$Subnet['Id'];
-  $DbResult2 = $System->Database->query('SELECT NetworkInterface.*, NetworkDevice.Name AS DeviceName FROM `NetworkInterface` '.
-    ' LEFT JOIN NetworkDevice ON NetworkDevice.Id = NetworkInterface.Device WHERE '.
-    ' CompareNetworkPrefix(INET_ATON(LocalIP), INET_ATON("'.$Subnet['AddressRange'].'"), '.$Subnet['Mask'].') AND (`MAC` != "00:00:00:00:00:00") ORDER BY `LocalIP`');
-  while($Interface = $DbResult2->fetch_assoc())
-  {
-    $Name = $Interface['DeviceName'];
-    if($Interface['Name'] != '') $Name .= '-'.$Interface['Name'];
-    $Items[] = array('mac-address' => $Interface['MAC'], 'address' => $Interface['LocalIP'], 'server' => $Server, 'comment' => $Name);
+    $Routerboard = new Routerboard();
+    $Routerboard->UserName = $this->System->Config['MainRouter']['UserName'];
+    $Routerboard->Timeout = $this->System->Config['MainRouter']['ConnectTimeout'];
+    $Routerboard->Debug = true;
+
+    $DbResult = $this->Database->query('SELECT * FROM `NetworkSubnet` WHERE `Configure`=1');
+    while($Subnet = $DbResult->fetch_assoc())
+    {
+      echo($Subnet['DHCP']);
+      $Routerboard->HostName = $Subnet['DHCP'];
+      $Items = array();
+      $Server = 'dhcp'.$Subnet['Id'];
+      $DbResult2 = $this->Database->query('SELECT NetworkInterface.*, NetworkDevice.Name AS DeviceName FROM `NetworkInterface` '.
+          ' LEFT JOIN NetworkDevice ON NetworkDevice.Id = NetworkInterface.Device WHERE '.
+          ' CompareNetworkPrefix(INET_ATON(LocalIP), INET_ATON("'.$Subnet['AddressRange'].'"), '.$Subnet['Mask'].') AND (`MAC` != "00:00:00:00:00:00") ORDER BY `LocalIP`');
+      while($Interface = $DbResult2->fetch_assoc())
+      {
+        $Name = $Interface['DeviceName'];
+        if($Interface['Name'] != '') $Name .= '-'.$Interface['Name'];
+        $Items[] = array('mac-address' => $Interface['MAC'], 'address' => $Interface['LocalIP'], 'server' => $Server, 'comment' => $Name);
+      }
+
+      print_r($Routerboard->ListUpdate($Path, array('mac-address', 'address', 'server', 'comment'), $Items, array('server' => $Server, 'dynamic' => 'no')));
+      echo("\n");
+    }
   }
+}
 
-  print_r($Routerboard->ListUpdate($Path, array('mac-address', 'address', 'server', 'comment'), $Items, array('server' => $Server, 'dynamic' => 'no')));
-  echo("\n");
-}

trunk/Modules/NetworkConfigRouterOS/Generators/DNS.php

@@ -1 +1 @@
 <?php
 
-if(isset($_SERVER['REMOTE_ADDR'])) die();
-include_once(dirname(__FILE__).'/../../../Application/System.php');
-$System = new System();
-$System->ShowPage = false;
-$System->Run();
-$Path = array('ip', 'dns', 'static');
+class ConfigRouterOSDNS extends NetworkConfigItem
+{
+  function Run()
+  {
+    $Path = array('ip', 'dns', 'static');
 
-$Routerboard = new Routerboard($Config['MainRouter']['HostName']);
-$Routerboard->UserName = $Config['MainRouter']['UserName'];
-$Routerboard->Timeout = $Config['MainRouter']['ConnectTimeout'];
-$Routerboard->Debug = true;
+    $Routerboard = new Routerboard($this->System->Config['MainRouter']['HostName']);
+    $Routerboard->UserName = $this->System->Config['MainRouter']['UserName'];
+    $Routerboard->Timeout = $this->System->Config['MainRouter']['ConnectTimeout'];
+    $Routerboard->Debug = true;
 
-$DbResult = $System->Database->query('SELECT * FROM `NetworkDomain`');
-while($Domain = $DbResult->fetch_assoc())
-{
-  $DomainName = $Domain['Name'];
+    $DbResult = $this->Database->query('SELECT * FROM `NetworkDomain`');
+    while($Domain = $DbResult->fetch_assoc())
+    {
+      $DomainName = $Domain['Name'];
 
-  // Get full domain name from parent items
-  $CurrentDomain = $Domain;
-  while($CurrentDomain['Parent'] > 0)
-  {
-    $DbResult2 = $System->Database->query('SELECT * FROM `NetworkDomain` WHERE `Id`='.$CurrentDomain['Parent']);
-    $CurrentDomain = $DbResult2->fetch_assoc();
-    $DomainName .= '.'.$CurrentDomain['Name'];
-  }
+      // Get full domain name from parent items
+      $CurrentDomain = $Domain;
+      while($CurrentDomain['Parent'] > 0)
+      {
+        $DbResult2 = $this->Database->query('SELECT * FROM `NetworkDomain` WHERE `Id`='.$CurrentDomain['Parent']);
+        $CurrentDomain = $DbResult2->fetch_assoc();
+        $DomainName .= '.'.$CurrentDomain['Name'];
+      }
 
-  $Items = array();
+      $Items = array();
 
-  // Devices, Interfaces
-  $DbResult2 = $System->Database->query('SELECT `NetworkInterface`.*, `NetworkDevice`.`Name` AS `DeviceName` FROM `NetworkInterface` '.
-    'JOIN `NetworkDevice` ON `NetworkInterface`.`Device`=`NetworkDevice`.`Id` '.
-    'WHERE (`NetworkDevice`.`Used`=1)');
-  while($Interface = $DbResult2->fetch_assoc())
-  {
-    $Name = $Interface['DeviceName'];
-    if($Interface['Name'] != '') $Name .= '-'.$Interface['Name'];
-    $NameFull = $Name.'.'.$DomainName;
-    $NameExtFull = $Name.'-ext.'.$DomainName;
-    if($Interface['LocalIP'] != '')
-      $Items[] = array('name' => $NameFull, 'address' => $Interface['LocalIP']);
-    if($Interface['IPv6'] != '')
-      $Items[] = array('name' => $NameFull, 'address' => $Interface['IPv6']);
-    if($Interface['ExternalIP'] != '')
-      $Items[] = array('name' => $NameExtFull, 'address' => $Interface['ExternalIP']);
-  }
+      // Devices, Interfaces
+      $DbResult2 = $this->Database->query('SELECT `NetworkInterface`.*, `NetworkDevice`.`Name` AS `DeviceName` FROM `NetworkInterface` '.
+          'JOIN `NetworkDevice` ON `NetworkInterface`.`Device`=`NetworkDevice`.`Id` '.
+          'WHERE (`NetworkDevice`.`Used`=1)');
+      while($Interface = $DbResult2->fetch_assoc())
+      {
+        $Name = $Interface['DeviceName'];
+        if($Interface['Name'] != '') $Name .= '-'.$Interface['Name'];
+        $NameFull = $Name.'.'.$DomainName;
+        $NameExtFull = $Name.'-ext.'.$DomainName;
+        if($Interface['LocalIP'] != '')
+          $Items[] = array('name' => $NameFull, 'address' => $Interface['LocalIP']);
+        if($Interface['IPv6'] != '')
+          $Items[] = array('name' => $NameFull, 'address' => $Interface['IPv6']);
+        if($Interface['ExternalIP'] != '')
+          $Items[] = array('name' => $NameExtFull, 'address' => $Interface['ExternalIP']);
+      }
 
-  // Domain aliases
-  $DbResult2 = $System->Database->query('SELECT `NetworkDomainAlias`.*, `NetworkInterface`.`LocalIP` AS `LocalIP`, '.
-    '`NetworkInterface`.`IPv6` AS `IPv6`, `NetworkInterface`.`ExternalIP` AS `ExternalIP` FROM `NetworkDomainAlias` '.
-    'JOIN `NetworkDevice` ON SUBSTR(`NetworkDomainAlias`.`Target`, 1, LENGTH(`NetworkDevice`.`Name` ))=`NetworkDevice`.`Name` '.
-    'JOIN `NetworkInterface` ON `NetworkInterface`.`Device`=`NetworkDevice`.`Id` '.
-    'WHERE (`NetworkDevice`.`Used`=1) AND '.
-    '(CONCAT_WS("-", `NetworkDevice`.`Name`, NULLIF(`NetworkInterface`.`Name`, "")) = `NetworkDomainAlias`.`Target`)');
-  while($Alias = $DbResult2->fetch_assoc())
-  {
-    $Name = $Alias['Name'];
-    $NameFull = $Name.'.'.$DomainName;
-    $NameExtFull = $Name.'-ext.'.$DomainName;
-    if($Alias['LocalIP'] != '')
-      $Items[] = array('name' => $NameFull, 'address' => $Alias['LocalIP']);
-    if($Alias['IPv6'] != '')
-      $Items[] = array('name' => $NameFull, 'address' => $Alias['IPv6']);
-    if($Alias['ExternalIP'] != '')
-      $Items[] = array('name' => $NameExtFull, 'address' => $Alias['ExternalIP']);
-  }
+      // Domain aliases
+      $DbResult2 = $this->Database->query('SELECT `NetworkDomainAlias`.*, `NetworkInterface`.`LocalIP` AS `LocalIP`, '.
+          '`NetworkInterface`.`IPv6` AS `IPv6`, `NetworkInterface`.`ExternalIP` AS `ExternalIP` FROM `NetworkDomainAlias` '.
+          'JOIN `NetworkDevice` ON SUBSTR(`NetworkDomainAlias`.`Target`, 1, LENGTH(`NetworkDevice`.`Name` ))=`NetworkDevice`.`Name` '.
+          'JOIN `NetworkInterface` ON `NetworkInterface`.`Device`=`NetworkDevice`.`Id` '.
+          'WHERE (`NetworkDevice`.`Used`=1) AND '.
+          '(CONCAT_WS("-", `NetworkDevice`.`Name`, NULLIF(`NetworkInterface`.`Name`, "")) = `NetworkDomainAlias`.`Target`)');
+      while($Alias = $DbResult2->fetch_assoc())
+      {
+        $Name = $Alias['Name'];
+        $NameFull = $Name.'.'.$DomainName;
+        $NameExtFull = $Name.'-ext.'.$DomainName;
+        if($Alias['LocalIP'] != '')
+          $Items[] = array('name' => $NameFull, 'address' => $Alias['LocalIP']);
+        if($Alias['IPv6'] != '')
+          $Items[] = array('name' => $NameFull, 'address' => $Alias['IPv6']);
+        if($Alias['ExternalIP'] != '')
+          $Items[] = array('name' => $NameExtFull, 'address' => $Alias['ExternalIP']);
+      }
 
-  $DbResult2 = $System->Database->query('SELECT * FROM `NetworkDomainServer` WHERE `Domain`='.$Domain['Id']);
-  while($Server = $DbResult2->fetch_assoc())
-  {
-    $Routerboard->HostName = $Server['Address'];
-    $Routerboard->ListUpdate($Path, array('name', 'address'), $Items);
+      $DbResult2 = $this->Database->query('SELECT * FROM `NetworkDomainServer` WHERE `Domain`='.$Domain['Id']);
+      while($Server = $DbResult2->fetch_assoc())
+      {
+        $Routerboard->HostName = $Server['Address'];
+        $Routerboard->ListUpdate($Path, array('name', 'address'), $Items);
+      }
+    }
   }
 }

trunk/Modules/NetworkConfigRouterOS/Generators/FirewallFilter.php

@@ -1 +1 @@
 <?php
 
-if(isset($_SERVER['REMOTE_ADDR'])) die();
-include_once(dirname(__FILE__).'/../../../Application/System.php');
-$System = new System();
-$System->ShowPage = false;
-$System->Run();
-$Path = array('ip', 'firewall', 'filter');
+class ConfigRouterOSFirewallFilter extends NetworkConfigItem
+{
+  function Run()
+  {
+    $Path = array('ip', 'firewall', 'filter');
 
-$Routerboard = new Routerboard($Config['MainRouter']['HostName']);
-$Routerboard->UserName = $Config['MainRouter']['UserName'];
-$Routerboard->Timeout = $Config['MainRouter']['ConnectTimeout'];
-$Routerboard->Debug = true;
+    $Routerboard = new Routerboard($this->SystemConfig['MainRouter']['HostName']);
+    $Routerboard->UserName = $this->SystemConfig['MainRouter']['UserName'];
+    $Routerboard->Timeout = $this->SystemConfig['MainRouter']['ConnectTimeout'];
+    $Routerboard->Debug = true;
 
-$InetInterface = $Config['MainRouter']['InetInterface'];
-$LocalInterface = $Config['MainRouter']['LocalInterface'];
+    $InetInterface = $this->SystemConfig['MainRouter']['InetInterface'];
+    $LocalInterface = $this->SystemConfig['MainRouter']['LocalInterface'];
 
-$Items = array();
+    $Items = array();
 
 
-// Total inet traffic measuring
-$Items[] = array('chain' => 'forward', 'out-interface' => $InetInterface, 'action' => 'passthrough', 'comment' => 'total-out');
-$Items[] = array('chain' => 'forward', 'in-interface' => $InetInterface, 'action' => 'passthrough', 'comment' => 'total-in');
+    // Total inet traffic measuring
+    $Items[] = array('chain' => 'forward', 'out-interface' => $InetInterface, 'action' => 'passthrough', 'comment' => 'total-out');
+    $Items[] = array('chain' => 'forward', 'in-interface' => $InetInterface, 'action' => 'passthrough', 'comment' => 'total-in');
 
-// Inet traffic groups
-//$Items[] = array('chain' => 'forward', 'out-interface' => $InetInterface, 'action' => 'jump', 'jump-target' => 'inet-out', 'comment' => 'inet-out');
-//$Items[] = array('chain' => 'forward', 'in-interface' => $InetInterface, 'action' => 'jump', 'jump-target' => 'inet-in', 'comment' => 'inet-in');
+    // Inet traffic groups
+    //$Items[] = array('chain' => 'forward', 'out-interface' => $InetInterface, 'action' => 'jump', 'jump-target' => 'inet-out', 'comment' => 'inet-out');
+    //$Items[] = array('chain' => 'forward', 'in-interface' => $InetInterface, 'action' => 'jump', 'jump-target' => 'inet-in', 'comment' => 'inet-in');
 
-// Input to router
-$Items[] = array('chain' => 'input', 'in-interface' => $InetInterface, 'protocol' => 'icmp', 'action' => 'accept', 'comment' => 'local-ping');
-$Items[] = array('chain' => 'input', 'in-interface' => $InetInterface, 'src-address' => '216.66.80.30', 'action' => 'accept', 'comment' => 'ipv6-tunnel');
-$Items[] = array('chain' => 'input', 'in-interface' => $InetInterface, 'action' => 'drop', 'comment' => 'drop-rest-input');
+    // Input to router
+    $Items[] = array('chain' => 'input', 'in-interface' => $InetInterface, 'protocol' => 'icmp', 'action' => 'accept', 'comment' => 'local-ping');
+    $Items[] = array('chain' => 'input', 'in-interface' => $InetInterface, 'src-address' => '216.66.80.30', 'action' => 'accept', 'comment' => 'ipv6-tunnel');
+    $Items[] = array('chain' => 'input', 'in-interface' => $InetInterface, 'action' => 'drop', 'comment' => 'drop-rest-input');
 
-// Allowed SMTP servers
-$Items[] = array('chain' => 'forward', 'out-interface' => $InetInterface, 'protocol' => 'tcp', 'dst-port' => 25, 'src-address' => '10.145.64.8', 'action' => 'accept', 'comment' => 'smtp.zdechov.net');
-$Items[] = array('chain' => 'forward', 'out-interface' => $InetInterface, 'protocol' => 'tcp', 'dst-port' => 25, 'dst-address' => '212.111.0.12', 'action' => 'accept', 'comment' => 'smtp.inext.cz');
-$Items[] = array('chain' => 'forward', 'out-interface' => $InetInterface, 'protocol' => 'tcp', 'dst-port' => 25, 'dst-address' => '93.89.98.3', 'action' => 'accept', 'comment' => 'smtp.sychrovnet.cz');
-$Items[] = array('chain' => 'forward', 'out-interface' => $InetInterface, 'protocol' => 'tcp', 'dst-port' => 25, 'dst-address' => '77.75.72.43', 'action' => 'accept', 'comment' => 'smtp.seznam.cz');
-$Items[] = array('chain' => 'forward', 'out-interface' => $InetInterface, 'protocol' => 'tcp', 'dst-port' => 25, 'dst-address' => '82.119.226.113', 'action' => 'accept', 'comment' => 'smtp.svarko.cz');
-$Items[] = array('chain' => 'forward', 'out-interface' => $InetInterface, 'protocol' => 'tcp', 'dst-port' => 25, 'action' => 'drop', 'comment' => 'drop-rest-smtp');
+    // Allowed SMTP servers
+    $Items[] = array('chain' => 'forward', 'out-interface' => $InetInterface, 'protocol' => 'tcp', 'dst-port' => 25, 'src-address' => '10.145.64.8', 'action' => 'accept', 'comment' => 'smtp.zdechov.net');
+    $Items[] = array('chain' => 'forward', 'out-interface' => $InetInterface, 'protocol' => 'tcp', 'dst-port' => 25, 'dst-address' => '212.111.0.12', 'action' => 'accept', 'comment' => 'smtp.inext.cz');
+    $Items[] = array('chain' => 'forward', 'out-interface' => $InetInterface, 'protocol' => 'tcp', 'dst-port' => 25, 'dst-address' => '93.89.98.3', 'action' => 'accept', 'comment' => 'smtp.sychrovnet.cz');
+    $Items[] = array('chain' => 'forward', 'out-interface' => $InetInterface, 'protocol' => 'tcp', 'dst-port' => 25, 'dst-address' => '77.75.72.43', 'action' => 'accept', 'comment' => 'smtp.seznam.cz');
+    $Items[] = array('chain' => 'forward', 'out-interface' => $InetInterface, 'protocol' => 'tcp', 'dst-port' => 25, 'dst-address' => '82.119.226.113', 'action' => 'accept', 'comment' => 'smtp.svarko.cz');
+    $Items[] = array('chain' => 'forward', 'out-interface' => $InetInterface, 'protocol' => 'tcp', 'dst-port' => 25, 'action' => 'drop', 'comment' => 'drop-rest-smtp');
 
 
 
 
-// Insert blocked addresses
-$DbResult = $System->Database->query('SELECT Member.*, Subject.Name FROM Member JOIN Subject ON Member.Subject = Subject.Id WHERE Member.Blocked=1');
-while($Member = $DbResult->fetch_assoc())
-{
-  echo($Member['Name'].': ');
-  // Hosts
-  $DbResult2 = $System->Database->query('SELECT NetworkInterface.*, NetworkDevice.Name AS DeviceName FROM NetworkInterface LEFT JOIN NetworkDevice ON NetworkDevice.Id = NetworkInterface.Device WHERE (NetworkInterface.ExternalIP <> "") AND (NetworkDevice.Member = '.$Member['Id'].') AND (NetworkInterface.LocalIP != NetworkInterface.ExternalIP) ORDER BY id DESC');
-  while($Interface = $DbResult2->fetch_assoc())
-  {
-    $Name = $Interface['DeviceName'];
-    if($Interface['Name'] != '') $Name .= '-'.$Interface['Name'];
-    $Name = RouterOSIdent($Name);
-    echo($Name.'('.$Interface['LocalIP'].'), ');
-    $Items[] = array('chain' => 'forward', 'out-interface' => $InetInterface, 'src-address' => $Interface['LocalIP'], 'action' => 'drop', 'comment' => $Name.'-out-drop');
-    $Items[] = array('chain' => 'forward', 'in-interface' => $InetInterface, 'dst-address' => $Interface['LocalIP'], 'action' => 'drop', 'comment' => $Name.'-in-drop');
+    // Insert blocked addresses
+    $DbResult = $this->Database->query('SELECT Member.*, Subject.Name FROM Member JOIN Subject ON Member.Subject = Subject.Id WHERE Member.Blocked=1');
+    while($Member = $DbResult->fetch_assoc())
+    {
+      echo($Member['Name'].': ');
+      // Hosts
+      $DbResult2 = $this->Database->query('SELECT NetworkInterface.*, NetworkDevice.Name AS DeviceName FROM NetworkInterface LEFT JOIN NetworkDevice ON NetworkDevice.Id = NetworkInterface.Device WHERE (NetworkInterface.ExternalIP <> "") AND (NetworkDevice.Member = '.$Member['Id'].') AND (NetworkInterface.LocalIP != NetworkInterface.ExternalIP) ORDER BY id DESC');
+      while($Interface = $DbResult2->fetch_assoc())
+      {
+        $Name = $Interface['DeviceName'];
+        if($Interface['Name'] != '') $Name .= '-'.$Interface['Name'];
+        $Name = RouterOSIdent($Name);
+        echo($Name.'('.$Interface['LocalIP'].'), ');
+        $Items[] = array('chain' => 'forward', 'out-interface' => $InetInterface, 'src-address' => $Interface['LocalIP'], 'action' => 'drop', 'comment' => $Name.'-out-drop');
+        $Items[] = array('chain' => 'forward', 'in-interface' => $InetInterface, 'dst-address' => $Interface['LocalIP'], 'action' => 'drop', 'comment' => $Name.'-in-drop');
+      }
+
+      // Subnets
+      $DbResult2 = $this->Database->select('NetworkSubnet', '*', 'Member='.$Member['Id']);
+      while($Subnet = $DbResult2->fetch_assoc())
+      {
+        $Subnet['Name'] = RouterOSIdent('subnet-'.$Subnet['Name']);
+        echo($Subnet['Name'].'('.$Subnet['AddressRange'].'/'.$Subnet['Mask'].'), ');
+        $NewAddress = new NetworkAddressIPv4();
+        $NewAddress->AddressFromString($Subnet['ExtAddressRange']);
+        $NewAddress->Prefix = $Subnet['ExtMask'];
+        $Range = $NewAddress->GetRange();
+        if($Subnet['ExtMask'] != 32) $Range = $Range['From']->AddressToString().'-'.$Range['To']->AddressToString();
+        else $Range = $Range['From']->AddressToString();
+        if($Subnet['Mask'] == 32) $Src = $Subnet['AddressRange'];
+        else $Src = $Subnet['AddressRange'].'/'.$Subnet['Mask'];
+        $Items[] = array('chain' => 'forward', 'out-interface' => $InetInterface, 'src-address' => $Src, 'action' => 'drop','comment' => $Subnet['Name'].'-out-drop');
+
+        $NewAddress = new NetworkAddressIPv4();
+        $NewAddress->AddressFromString($Subnet['AddressRange']);
+        $NewAddress->Prefix = $Subnet['Mask'];
+        $Range = $NewAddress->GetRange();
+        if($Subnet['Mask'] != 32) $Range = $Range['From']->AddressToString().'-'.$Range['To']->AddressToString();
+        else $Range = $Range['From']->AddressToString();
+        if($Subnet['ExtMask'] == 32) $Dest = $Subnet['ExtAddressRange'];
+        else $Dest = $Subnet['ExtAddressRange'].'/'.$Subnet['ExtMask'];
+        $Items[] = array('chain' => 'forward', 'in-interface' => $InetInterface, 'dst-address' => $Dest, 'action' => 'drop', 'comment' => $Subnet['Name'].'-in-drop');
+      }
+      echo("\n");
+    }
+
+    //print_r($Items);
+    $Routerboard->ListUpdate($Path, array('chain', 'dst-address', 'in-interface', 'src-address', 'out-interface', 'dst-port', 'protocol', 'action', 'comment', 'jump-target', 'src-port'), $Items);
+
   }
-
-  // Subnets
-  $DbResult2 = $System->Database->select('NetworkSubnet', '*', 'Member='.$Member['Id']);
-  while($Subnet = $DbResult2->fetch_assoc())
-  {
-    $Subnet['Name'] = RouterOSIdent('subnet-'.$Subnet['Name']);
-    echo($Subnet['Name'].'('.$Subnet['AddressRange'].'/'.$Subnet['Mask'].'), ');
-      $NewAddress = new NetworkAddressIPv4();
-      $NewAddress->AddressFromString($Subnet['ExtAddressRange']);
-      $NewAddress->Prefix = $Subnet['ExtMask'];
-      $Range = $NewAddress->GetRange();
-      if($Subnet['ExtMask'] != 32) $Range = $Range['From']->AddressToString().'-'.$Range['To']->AddressToString();
-        else $Range = $Range['From']->AddressToString();
-      if($Subnet['Mask'] == 32) $Src = $Subnet['AddressRange'];
-        else $Src = $Subnet['AddressRange'].'/'.$Subnet['Mask'];
-      $Items[] = array('chain' => 'forward', 'out-interface' => $InetInterface, 'src-address' => $Src, 'action' => 'drop','comment' => $Subnet['Name'].'-out-drop');
-
-      $NewAddress = new NetworkAddressIPv4();
-      $NewAddress->AddressFromString($Subnet['AddressRange']);
-      $NewAddress->Prefix = $Subnet['Mask'];
-      $Range = $NewAddress->GetRange();
-      if($Subnet['Mask'] != 32) $Range = $Range['From']->AddressToString().'-'.$Range['To']->AddressToString();
-        else $Range = $Range['From']->AddressToString();
-      if($Subnet['ExtMask'] == 32) $Dest = $Subnet['ExtAddressRange'];
-        else $Dest = $Subnet['ExtAddressRange'].'/'.$Subnet['ExtMask'];
-      $Items[] = array('chain' => 'forward', 'in-interface' => $InetInterface, 'dst-address' => $Dest, 'action' => 'drop', 'comment' => $Subnet['Name'].'-in-drop');
-  }
-  echo("\n");
 }
-
-//print_r($Items);
-$Routerboard->ListUpdate($Path, array('chain', 'dst-address', 'in-interface', 'src-address', 'out-interface', 'dst-port', 'protocol', 'action', 'comment', 'jump-target', 'src-port'), $Items);

trunk/Modules/NetworkConfigRouterOS/Generators/FirewallMangle.php

@@ -1 +1 @@
 <?php
-if(isset($_SERVER['REMOTE_ADDR'])) die();
 
-$Enabled = 1;
-$ClassesEnabled = 1;
-$SessionDisable = true;
-include_once(dirname(__FILE__).'/../../../Application/System.php');
-$System = new System();
-$System->ShowPage = false;
-$System->Run();
-$PathFirewall = array('ip', 'firewall', 'mangle');
+class ConfigRouterOSFirewallMangle extends NetworkConfigItem
+{
+  function Run()
+  {
+    $PathFirewall = array('ip', 'firewall', 'mangle');
 
-$Routerboard = new Routerboard();
-$Routerboard->UserName = $Config['MainRouter']['UserName'];
-$Routerboard->Timeout = $Config['MainRouter']['ConnectTimeout'];
-$Routerboard->HostName = $Config['MainRouter']['HostName'];
-$Routerboard->Debug = true;
+    $Routerboard = new Routerboard();
+    $Routerboard->UserName = $this->System->Config['MainRouter']['UserName'];
+    $Routerboard->Timeout = $this->System->Config['MainRouter']['ConnectTimeout'];
+    $Routerboard->HostName = $this->System->Config['MainRouter']['HostName'];
+    $Routerboard->Debug = true;
 
-$InetInterface = $Config['MainRouter']['InetInterface'];
+    $InetInterface = $Config['MainRouter']['InetInterface'];
 
 
-// Generate address tree
-$AddressTree = array('Address' => new NetworkAddressIPv4(), 'Name' => 'main', 'Items' => array(), 'ForceMark' => false);
+    // Generate address tree
+    $AddressTree = array('Address' => new NetworkAddressIPv4(), 'Name' => 'main', 'Items' => array(), 'ForceMark' => false);
 
-// Divide rules by subnet number
-$DbResult = $System->Database->query('SELECT `Id`, `Name`, `AddressRange`, `Mask` FROM `NetworkSubnet` WHERE `Member` IS NULL');
-while($Subnet = $DbResult->fetch_assoc())
-{
-  $NewAddress = new NetworkAddressIPv4();
-  $NewAddress->AddressFromString($Subnet['AddressRange']);
-  $NewAddress->Prefix = $Subnet['Mask'];
-  InsertToAddressTree($AddressTree, $NewAddress, 'subnet-'.RouterOSIdent($Subnet['Name']));
-}
+    // Divide rules by subnet number
+    $DbResult = $this->System->Database->query('SELECT `Id`, `Name`, `AddressRange`, `Mask` FROM `NetworkSubnet` WHERE `Member` IS NULL');
+    while($Subnet = $DbResult->fetch_assoc())
+    {
+      $NewAddress = new NetworkAddressIPv4();
+      $NewAddress->AddressFromString($Subnet['AddressRange']);
+      $NewAddress->Prefix = $Subnet['Mask'];
+      InsertToAddressTree($AddressTree, $NewAddress, 'subnet-'.RouterOSIdent($Subnet['Name']));
+    }
 
-// Process users
-$DbResult = $System->Database->query('SELECT `Member`.*, `Subject`.`Name` FROM `Member` '.
-  'LEFT JOIN `Subject` ON `Subject`.`Id` = `Member`.`Subject` '.
-  'WHERE `Member`.`Blocked` = 0');
-while($Member = $DbResult->fetch_assoc())
-{
-  $Member['Name'] = RouterOSIdent($Member['Name'].'-'.$Member['Id'] );
-  echo('Uživatel '.$Member['Name'].': ');
+    // Process users
+    $DbResult = $this->System->Database->query('SELECT `Member`.*, `Subject`.`Name` FROM `Member` '.
+        'LEFT JOIN `Subject` ON `Subject`.`Id` = `Member`.`Subject` '.
+        'WHERE `Member`.`Blocked` = 0');
+    while($Member = $DbResult->fetch_assoc())
+    {
+      $Member['Name'] = RouterOSIdent($Member['Name'].'-'.$Member['Id'] );
+      echo('Uživatel '.$Member['Name'].': ');
 
-  $DbResult2 = $System->Database->select('NetworkDevice', '*', '`Used` = 1 AND `Member` = '.$Member['Id']);
-  while($Device = $DbResult2->fetch_assoc())
-  {
-    $DbResult3 = $System->Database->select('NetworkInterface', '*', '`Device` = '.$Device['Id'].' AND `LocalIP` != ""');
-    while($Interface = $DbResult3->fetch_assoc())
+      $DbResult2 = $this->System->Database->select('NetworkDevice', '*', '`Used` = 1 AND `Member` = '.$Member['Id']);
+      while($Device = $DbResult2->fetch_assoc())
+      {
+        $DbResult3 = $this->Database->select('NetworkInterface', '*', '`Device` = '.$Device['Id'].' AND `LocalIP` != ""');
+        while($Interface = $DbResult3->fetch_assoc())
+        {
+          $Name = $Device['Name'];
+          if($Interface['Name'] != '') $Name .= '-'.$Interface['Name'];
+          $Name = RouterOSIdent($Name);
+          echo($Name.', ');
+          $NewAddress = new NetworkAddressIPv4();
+          $NewAddress->AddressFromString($Interface['LocalIP']);
+          $NewAddress->Prefix = 32;
+          InsertToAddressTree($AddressTree, $NewAddress, $Name);
+        }
+      }
+
+      $DbResult2 = $this->Database->select('NetworkSubnet', '*', '`Member`='.$Member['Id']);
+      while($Subnet = $DbResult2->fetch_assoc())
+      {
+        $Subnet['Name'] = RouterOSIdent('subnet-'.$Subnet['Name']);
+        echo($Subnet['Name'].', ');
+        $NewAddress = new NetworkAddressIPv4();
+        $NewAddress->AddressFromString($Subnet['AddressRange']);
+        $NewAddress->Prefix = $Subnet['Mask'];
+        if($Subnet['Member'] != 0) $ForceMark = true;
+        else $ForceMark = false;
+        echo($ForceMark.', ');
+        InsertToAddressTree($AddressTree, $NewAddress, $Subnet['Name'], false, $ForceMark);
+      }
+      echo("\n");
+    }
+
+    ShowSubnetNode($AddressTree);
+
+    function ProcessNode($Node)
     {
-      $Name = $Device['Name'];
-      if($Interface['Name'] != '') $Name .= '-'.$Interface['Name'];
-      $Name = RouterOSIdent($Name);
-      echo($Name.', ');
-      $NewAddress = new NetworkAddressIPv4();
-      $NewAddress->AddressFromString($Interface['LocalIP']);
-      $NewAddress->Prefix = 32;
-      InsertToAddressTree($AddressTree, $NewAddress, $Name);
+      global $InetInterface, $ItemsFirewall;
+
+      foreach($Node['Items'] as $Index => $Item)
+      {
+        if(count($Item['Items']) == 0)
+        {
+          // Hosts
+          $ParentSubnetId = GetSubgroupByRange($Node['Address']->AddressToString().'/'.$Node['Address']->Prefix);
+          $Address = $Item['Address']->AddressToString();
+          if($Item['Address']->Prefix != 32) $Address .= '/'.$Item['Address']->Prefix;
+
+          $PacketMark = GetMarkByComment($Item['Name'].'-out');
+          $ItemsFirewall[] = array('chain' => 'inet-'.$ParentSubnetId.'-out', 'src-address' => $Address, 'out-interface' =>  $InetInterface, 'action' => 'mark-packet', 'new-packet-mark' => $PacketMark, 'passthrough' => 'no', 'comment' => $Item['Name'].'-out');
+          $PacketMark = GetMarkByComment($Item['Name'].'-in');
+          $ItemsFirewall[] = array('chain' => 'inet-'.$ParentSubnetId.'-in', 'dst-address' => $Address, 'in-interface' => $InetInterface, 'action' => 'mark-packet', 'new-packet-mark' => $PacketMark, 'passthrough' => 'no', 'comment' => $Item['Name'].'-in');
+        } else
+        {
+          // Subnets
+          $ParentSubnetId = GetSubgroupByRange($Node['Address']->AddressToString().'/'.$Node['Address']->Prefix);
+          $SubnetId = GetSubgroupByRange($Item['Address']->AddressToString().'/'.$Item['Address']->Prefix);
+          $PacketMark = GetMarkByComment($Item['Name'].'-out');
+
+          $Address = $Item['Address']->AddressToString();
+          if($Item['Address']->Prefix != 32) $Address .= '/'.$Item['Address']->Prefix;
+
+          $ItemsFirewall[] = array('chain' => 'inet-'.$ParentSubnetId.'-out', 'src-address' => $Address, 'out-interface' => $InetInterface, 'action' => 'jump', 'jump-target' => 'inet-'.$SubnetId.'-out', 'comment' => $Item['Name'].'-out');
+          $ItemsFirewall[] = array('chain' => 'inet-'.$ParentSubnetId.'-in', 'dst-address' => $Address, 'in-interface' => $InetInterface, 'action' => 'jump', 'jump-target' => 'inet-'.$SubnetId.'-in', 'comment' => $Item['Name'].'-in');
+
+          ProcessNode($Item);
+        }
+      }
+      if($Node['ForceMark'] == true)
+      {
+        // Mark member subnets
+        $ParentSubnetId = GetSubgroupByRange($Node['Address']->AddressToString().'/'.$Node['Address']->Prefix);
+
+        $PacketMark = GetMarkByComment($Node['Name'].'-out');
+        $ItemsFirewall[] = array('chain' => 'inet-'.$ParentSubnetId.'-out', 'src-address' => '', 'out-interface' =>  $InetInterface, 'action' => 'mark-packet', 'new-packet-mark' => $PacketMark, 'passthrough' => 'no', 'comment' => $Node['Name'].'-all-out');
+        $PacketMark = GetMarkByComment($Node['Name'].'-in');
+        $ItemsFirewall[] = array('chain' => 'inet-'.$ParentSubnetId.'-in', 'dst-address' => '', 'in-interface' => $InetInterface, 'action' => 'mark-packet', 'new-packet-mark' => $PacketMark, 'passthrough' => 'no', 'comment' => $Node['Name'].'-all-in');
+      }
     }
-  }
 
-  $DbResult2 = $System->Database->select('NetworkSubnet', '*', '`Member`='.$Member['Id']);
-  while($Subnet = $DbResult2->fetch_assoc())
-  {
-    $Subnet['Name'] = RouterOSIdent('subnet-'.$Subnet['Name']);
-    echo($Subnet['Name'].', ');
-    $NewAddress = new NetworkAddressIPv4();
-    $NewAddress->AddressFromString($Subnet['AddressRange']);
-    $NewAddress->Prefix = $Subnet['Mask'];
-    if($Subnet['Member'] != 0) $ForceMark = true;
-      else $ForceMark = false;
-    echo($ForceMark.', ');
-    InsertToAddressTree($AddressTree, $NewAddress, $Subnet['Name'], false, $ForceMark);
-  }
-  echo("\n");
-}
+    // Generate firewall rules
+    $ItemsFirewall = array();
 
-ShowSubnetNode($AddressTree);
+    // Root of tree and main limit
+    $ItemsFirewall[] = array('chain' => 'forward', 'out-interface' => $InetInterface, 'dst-address' => '!77.92.221.0/24', 'action' => 'jump', 'jump-target' => 'inet-1-out', 'comment' => 'main-out');
+    $ItemsFirewall[] = array('chain' => 'forward', 'in-interface' => $InetInterface, 'src-address' => '!77.92.221.0/24', 'action' => 'jump', 'jump-target' => 'inet-1-in', 'comment' => 'main-in');
 
-function ProcessNode($Node)
-{
-  global $InetInterface, $ItemsFirewall;
+    ProcessNode($AddressTree);
 
-  foreach($Node['Items'] as $Index => $Item)
-  {
-    if(count($Item['Items']) == 0)
-    {
-      // Hosts
-      $ParentSubnetId = GetSubgroupByRange($Node['Address']->AddressToString().'/'.$Node['Address']->Prefix);
-      $Address = $Item['Address']->AddressToString();
-      if($Item['Address']->Prefix != 32) $Address .= '/'.$Item['Address']->Prefix;
+    // Limited free internet
+    $PacketMark = GetMarkByComment('free-out');
+    $ItemsFirewall[] = array('chain' => 'inet-1-out', 'out-interface' => $InetInterface,
+        'action' => 'mark-packet', 'new-packet-mark' => $PacketMark, 'comment' => 'free-out', 'passthrough' => 'yes');
+    $PacketMark = GetMarkByComment('free-in');
+    $ItemsFirewall[] = array('chain' => 'inet-1-in', 'in-interface' => $InetInterface,
+        'action' => 'mark-packet', 'new-packet-mark' => $PacketMark, 'comment' => 'free-in', 'passthrough' => 'no');
+    // Unregistred clients add to address list
+    $ItemsFirewall[] = array('chain' => 'inet-1-out', 'out-interface' => $InetInterface, 'src-address' => '10.145.0.0/16',
+        'action' => 'add-src-to-address-list', 'address-list' => 'unregistred', 'address-list-timeout' => '1d',
+        'comment' => 'unregistred-clients');
 
-      $PacketMark = GetMarkByComment($Item['Name'].'-out');
-      $ItemsFirewall[] = array('chain' => 'inet-'.$ParentSubnetId.'-out', 'src-address' => $Address, 'out-interface' =>  $InetInterface, 'action' => 'mark-packet', 'new-packet-mark' => $PacketMark, 'passthrough' => 'no', 'comment' => $Item['Name'].'-out');
-      $PacketMark = GetMarkByComment($Item['Name'].'-in');
-      $ItemsFirewall[] = array('chain' => 'inet-'.$ParentSubnetId.'-in', 'dst-address' => $Address, 'in-interface' => $InetInterface, 'action' => 'mark-packet', 'new-packet-mark' => $PacketMark, 'passthrough' => 'no', 'comment' => $Item['Name'].'-in');
-    } else
-    {
-      // Subnets
-      $ParentSubnetId = GetSubgroupByRange($Node['Address']->AddressToString().'/'.$Node['Address']->Prefix);
-      $SubnetId = GetSubgroupByRange($Item['Address']->AddressToString().'/'.$Item['Address']->Prefix);
-      $PacketMark = GetMarkByComment($Item['Name'].'-out');
-
-      $Address = $Item['Address']->AddressToString();
-      if($Item['Address']->Prefix != 32) $Address .= '/'.$Item['Address']->Prefix;
-
-      $ItemsFirewall[] = array('chain' => 'inet-'.$ParentSubnetId.'-out', 'src-address' => $Address, 'out-interface' => $InetInterface, 'action' => 'jump', 'jump-target' => 'inet-'.$SubnetId.'-out', 'comment' => $Item['Name'].'-out');
-      $ItemsFirewall[] = array('chain' => 'inet-'.$ParentSubnetId.'-in', 'dst-address' => $Address, 'in-interface' => $InetInterface, 'action' => 'jump', 'jump-target' => 'inet-'.$SubnetId.'-in', 'comment' => $Item['Name'].'-in');
-
-      ProcessNode($Item);
-    }
-  }
-  if($Node['ForceMark'] == true)
-  {
-    // Mark member subnets
-    $ParentSubnetId = GetSubgroupByRange($Node['Address']->AddressToString().'/'.$Node['Address']->Prefix);
-
-    $PacketMark = GetMarkByComment($Node['Name'].'-out');
-    $ItemsFirewall[] = array('chain' => 'inet-'.$ParentSubnetId.'-out', 'src-address' => '', 'out-interface' =>  $InetInterface, 'action' => 'mark-packet', 'new-packet-mark' => $PacketMark, 'passthrough' => 'no', 'comment' => $Node['Name'].'-all-out');
-    $PacketMark = GetMarkByComment($Node['Name'].'-in');
-    $ItemsFirewall[] = array('chain' => 'inet-'.$ParentSubnetId.'-in', 'dst-address' => '', 'in-interface' => $InetInterface, 'action' => 'mark-packet', 'new-packet-mark' => $PacketMark, 'passthrough' => 'no', 'comment' => $Node['Name'].'-all-in');
+    //print_r($ItemsFirewall);
+    $Routerboard->ListUpdate($PathFirewall, array('chain', 'dst-address', 'in-interface', 'action', 'new-packet-mark', 'passthrough', 'comment', 'out-interface', 'src-address', 'jump-target'), $ItemsFirewall, array(), true);
   }
 }
-
-// Generate firewall rules
-$ItemsFirewall = array();
-
-// Root of tree and main limit
-$ItemsFirewall[] = array('chain' => 'forward', 'out-interface' => $InetInterface, 'dst-address' => '!77.92.221.0/24', 'action' => 'jump', 'jump-target' => 'inet-1-out', 'comment' => 'main-out');
-$ItemsFirewall[] = array('chain' => 'forward', 'in-interface' => $InetInterface, 'src-address' => '!77.92.221.0/24', 'action' => 'jump', 'jump-target' => 'inet-1-in', 'comment' => 'main-in');
-
-ProcessNode($AddressTree);
-
-// Limited free internet
-$PacketMark = GetMarkByComment('free-out');
-$ItemsFirewall[] = array('chain' => 'inet-1-out', 'out-interface' => $InetInterface,
-  'action' => 'mark-packet', 'new-packet-mark' => $PacketMark, 'comment' => 'free-out', 'passthrough' => 'yes');
-$PacketMark = GetMarkByComment('free-in');
-$ItemsFirewall[] = array('chain' => 'inet-1-in', 'in-interface' => $InetInterface,
-  'action' => 'mark-packet', 'new-packet-mark' => $PacketMark, 'comment' => 'free-in', 'passthrough' => 'no');
-// Unregistred clients add to address list
-$ItemsFirewall[] = array('chain' => 'inet-1-out', 'out-interface' => $InetInterface, 'src-address' => '10.145.0.0/16',
-  'action' => 'add-src-to-address-list', 'address-list' => 'unregistred', 'address-list-timeout' => '1d',
-  'comment' => 'unregistred-clients');
-
-//print_r($ItemsFirewall);
-$Routerboard->ListUpdate($PathFirewall, array('chain', 'dst-address', 'in-interface', 'action', 'new-packet-mark', 'passthrough', 'comment', 'out-interface', 'src-address', 'jump-target'), $ItemsFirewall, array(), true);

trunk/Modules/NetworkConfigRouterOS/Generators/FirewallNAT.php

@@ -1 +1 @@
 <?php
 
-if(isset($_SERVER['REMOTE_ADDR'])) die();
-include_once(dirname(__FILE__).'/../../../Application/System.php');
-$System = new System();
-$System->ShowPage = false;
-$System->Run();
-$Path = array('ip', 'firewall', 'nat');
+class ConfigRouterOSFirewallNAT extends NetworkConfigItem
+{
+  function Run()
+  {
+    $Path = array('ip', 'firewall', 'nat');
 
-$Routerboard = new Routerboard($Config['MainRouter']['HostName']);
-$Routerboard->UserName = $Config['MainRouter']['UserName'];
-$Routerboard->Timeout = $Config['MainRouter']['ConnectTimeout'];
-$Routerboard->Debug = true;
+    $Routerboard = new Routerboard($this->System->Config['MainRouter']['HostName']);
+    $Routerboard->UserName = $this->System->Config['MainRouter']['UserName'];
+    $Routerboard->Timeout = $this->System->Config['MainRouter']['ConnectTimeout'];
+    $Routerboard->Debug = true;
 
-$InetInterface = $Config['MainRouter']['InetInterface'];
-$LocalInterface = $Config['MainRouter']['LocalInterface'];
-$IPCentrala = '10.145.64.8';
+    $InetInterface = $this->System->Config['MainRouter']['InetInterface'];
+    $LocalInterface = $this->System->Config['MainRouter']['LocalInterface'];
+    $IPCentrala = '10.145.64.8';
 
-$Items = array();
+    $Items = array();
 
-/*
-// NTP redirect
-$Items[] = array('chain' => 'srcnat', 'src-address' => '10.145.66.1', 'protocol' => 'udp', 'src-port' => 123, 'action' => 'src-nat', 'to-addresses' => '10.145.64.1', 'comment' => 'NTP_redirect_4');
-$Items[] = array('chain' => 'srcnat', 'src-address' => '10.145.66.161', 'protocol' => 'udp', 'src-port' => 123, 'action' => 'src-nat', 'to-addresses' => '10.145.64.1', 'comment' => 'NTP_redirect_5');
-$Items[] = array('chain' => 'srcnat', 'src-address' => '10.145.66.193', 'protocol' => 'udp', 'src-port' => 123, 'action' => 'src-nat', 'to-addresses' => '10.145.64.1', 'comment' => 'NTP_redirect_1');
-$Items[] = array('chain' => 'srcnat', 'src-address' => '10.145.66.225', 'protocol' => 'udp', 'src-port' => 123, 'action' => 'src-nat', 'to-addresses' => '10.145.64.1', 'comment' => 'NTP_redirect_2');
-$Items[] = array('chain' => 'srcnat', 'src-address' => '10.145.66.250', 'protocol' => 'udp', 'src-port' => 123, 'action' => 'src-nat', 'to-addresses' => '10.145.64.1', 'comment' => 'NTP_redirect_3');
-$Items[] = array('chain' => 'srcnat', 'src-address' => '10.145.66.253', 'protocol' => 'udp', 'src-port' => 123, 'action' => 'src-nat', 'to-addresses' => '10.145.64.1', 'comment' => 'NTP_redirect_6');
-*/
+    /*
+     // NTP redirect
+     $Items[] = array('chain' => 'srcnat', 'src-address' => '10.145.66.1', 'protocol' => 'udp', 'src-port' => 123, 'action' => 'src-nat', 'to-addresses' => '10.145.64.1', 'comment' => 'NTP_redirect_4');
+     $Items[] = array('chain' => 'srcnat', 'src-address' => '10.145.66.161', 'protocol' => 'udp', 'src-port' => 123, 'action' => 'src-nat', 'to-addresses' => '10.145.64.1', 'comment' => 'NTP_redirect_5');
+     $Items[] = array('chain' => 'srcnat', 'src-address' => '10.145.66.193', 'protocol' => 'udp', 'src-port' => 123, 'action' => 'src-nat', 'to-addresses' => '10.145.64.1', 'comment' => 'NTP_redirect_1');
+     $Items[] = array('chain' => 'srcnat', 'src-address' => '10.145.66.225', 'protocol' => 'udp', 'src-port' => 123, 'action' => 'src-nat', 'to-addresses' => '10.145.64.1', 'comment' => 'NTP_redirect_2');
+     $Items[] = array('chain' => 'srcnat', 'src-address' => '10.145.66.250', 'protocol' => 'udp', 'src-port' => 123, 'action' => 'src-nat', 'to-addresses' => '10.145.64.1', 'comment' => 'NTP_redirect_3');
+     $Items[] = array('chain' => 'srcnat', 'src-address' => '10.145.66.253', 'protocol' => 'udp', 'src-port' => 123, 'action' => 'src-nat', 'to-addresses' => '10.145.64.1', 'comment' => 'NTP_redirect_6');
+     */
 
-// Chain for inet interface
-$Items[] = array('chain' => 'srcnat', 'out-interface' => $InetInterface, 'action' => 'jump', 'jump-target' => 'inet-out', 'comment' => 'inet-out');
-$Items[] = array('chain' => 'dstnat', 'in-interface' => $InetInterface, 'action' => 'jump', 'jump-target' => 'inet-in', 'comment' => 'inet-in');
+    // Chain for inet interface
+    $Items[] = array('chain' => 'srcnat', 'out-interface' => $InetInterface, 'action' => 'jump', 'jump-target' => 'inet-out', 'comment' => 'inet-out');
+    $Items[] = array('chain' => 'dstnat', 'in-interface' => $InetInterface, 'action' => 'jump', 'jump-target' => 'inet-in', 'comment' => 'inet-in');
 
-// Skip local subnet
-//$Items[] = array('chain' => 'inet-out', 'dst-address' => '172.16.1.1/30', 'action' => 'accept', 'comment' => 'Local_subnet');
-//$Items[] = array('chain' => 'inet-in', 'dst-address' => '172.16.1.1/30', 'action' => 'accept', 'comment' => 'Local_subnet');
+    // Skip local subnet
+    //$Items[] = array('chain' => 'inet-out', 'dst-address' => '172.16.1.1/30', 'action' => 'accept', 'comment' => 'Local_subnet');
+    //$Items[] = array('chain' => 'inet-in', 'dst-address' => '172.16.1.1/30', 'action' => 'accept', 'comment' => 'Local_subnet');
 
-$DbResult = $System->Database->query('SELECT `Member`.*, `Subject`.`Name` FROM `Member` '.
-  'LEFT JOIN `Subject` ON `Subject`.`Id` = `Member`.`Subject` '.
-  'WHERE `Member`.`Blocked` = 0');
-while($Member = $DbResult->fetch_assoc())
-{
-  echo($Member['Name'].': ');
-  // Hosts
-  $DbResult2 = $System->Database->query('SELECT `NetworkInterface`.*, `NetworkDevice`.`Name` AS `DeviceName`, `NetworkDevice`.`InboundNATPriority` FROM `NetworkInterface`'.
-  ' LEFT JOIN `NetworkDevice` ON `NetworkDevice`.`Id` = `NetworkInterface`.`Device` WHERE (`NetworkInterface`.`ExternalIP` <> "")'.
-  ' AND (`NetworkInterface`.`LocalIP` <> "")'.
-  ' AND (`NetworkDevice`.`Member` = '.$Member['Id'].') AND (`NetworkInterface`.`LocalIP` != `NetworkInterface`.`ExternalIP`) ORDER BY `id` DESC');
-  while($Interface = $DbResult2->fetch_assoc())
-  {
-    $Name = $Interface['DeviceName'];
-    if($Interface['Name'] != '') $Name .= '-'.$Interface['Name'];
-    $Name = RouterOSIdent($Name);
-    echo($Name.'('.$Interface['LocalIP'].'), ');
-    if($Member['Blocked'] == 0)
+    $DbResult = $this->Database->query('SELECT `Member`.*, `Subject`.`Name` FROM `Member` '.
+        'LEFT JOIN `Subject` ON `Subject`.`Id` = `Member`.`Subject` '.
+        'WHERE `Member`.`Blocked` = 0');
+    while($Member = $DbResult->fetch_assoc())
     {
-      $Items[] = array('chain' => 'inet-out', 'src-address' => $Interface['LocalIP'], 'action' => 'src-nat',  'to-addresses' => $Interface['ExternalIP'], 'comment' => $Name.'-out');
-      if($Interface['InboundNATPriority'] > 0)
-        $Items[] = array('chain' => 'inet-in', 'dst-address' => $Interface['ExternalIP'], 'action' => 'dst-nat', 'to-addresses' => $Interface['LocalIP'], 'comment' => $Name.'-in');
-    } else
-    {
-      $Items[] = array('chain' => 'dstnat', 'src-address' => $Interface['LocalIP'], 'protocol' => 'tcp', 'dst-port' => 80, 'action' => 'dst-nat',  'to-addresses' => $IPCentrala, 'to-ports' => 81, 'comment' => $Name.'-out');
+      echo($Member['Name'].': ');
+      // Hosts
+      $DbResult2 = $this->Database->query('SELECT `NetworkInterface`.*, `NetworkDevice`.`Name` AS `DeviceName`, `NetworkDevice`.`InboundNATPriority` FROM `NetworkInterface`'.
+          ' LEFT JOIN `NetworkDevice` ON `NetworkDevice`.`Id` = `NetworkInterface`.`Device` WHERE (`NetworkInterface`.`ExternalIP` <> "")'.
+          ' AND (`NetworkInterface`.`LocalIP` <> "")'.
+          ' AND (`NetworkDevice`.`Member` = '.$Member['Id'].') AND (`NetworkInterface`.`LocalIP` != `NetworkInterface`.`ExternalIP`) ORDER BY `id` DESC');
+      while($Interface = $DbResult2->fetch_assoc())
+      {
+        $Name = $Interface['DeviceName'];
+        if($Interface['Name'] != '') $Name .= '-'.$Interface['Name'];
+        $Name = RouterOSIdent($Name);
+        echo($Name.'('.$Interface['LocalIP'].'), ');
+        if($Member['Blocked'] == 0)
+        {
+          $Items[] = array('chain' => 'inet-out', 'src-address' => $Interface['LocalIP'], 'action' => 'src-nat',  'to-addresses' => $Interface['ExternalIP'], 'comment' => $Name.'-out');
+          if($Interface['InboundNATPriority'] > 0)
+            $Items[] = array('chain' => 'inet-in', 'dst-address' => $Interface['ExternalIP'], 'action' => 'dst-nat', 'to-addresses' => $Interface['LocalIP'], 'comment' => $Name.'-in');
+        } else
+        {
+          $Items[] = array('chain' => 'dstnat', 'src-address' => $Interface['LocalIP'], 'protocol' => 'tcp', 'dst-port' => 80, 'action' => 'dst-nat',  'to-addresses' => $IPCentrala, 'to-ports' => 81, 'comment' => $Name.'-out');
+        }
+      }
+
+      // Subnets
+      $DbResult2 = $this->Database->select('NetworkSubnet', '*', '`Member`='.$Member['Id']);
+      while($Subnet = $DbResult2->fetch_assoc())
+      {
+        $Subnet['Name'] = RouterOSIdent('subnet-'.$Subnet['Name']);
+        echo($Subnet['Name'].'('.$Subnet['AddressRange'].'/'.$Subnet['Mask'].'), ');
+        if($Member['Blocked'] == 0)
+        {
+          $NewAddress = new NetworkAddressIPv4();
+          $NewAddress->AddressFromString($Subnet['ExtAddressRange']);
+          $NewAddress->Prefix = $Subnet['ExtMask'];
+          $Range = $NewAddress->GetRange();
+          if($Subnet['ExtMask'] != 32) $Range = $Range['From']->AddressToString().'-'.$Range['To']->AddressToString();
+          else $Range = $Range['From']->AddressToString();
+          if($Subnet['Mask'] == 32) $Src = $Subnet['AddressRange'];
+          else $Src = $Subnet['AddressRange'].'/'.$Subnet['Mask'];
+          $Items[] = array('chain' => 'inet-out', 'src-address' => $Src, 'action' => 'src-nat', 'to-addresses' => $Range, 'comment' => $Subnet['Name'].'-out');
+
+          $NewAddress = new NetworkAddressIPv4();
+          $NewAddress->AddressFromString($Subnet['AddressRange']);
+          $NewAddress->Prefix = $Subnet['Mask'];
+          $Range = $NewAddress->GetRange();
+          if($Subnet['Mask'] != 32) $Range = $Range['From']->AddressToString().'-'.$Range['To']->AddressToString();
+          else $Range = $Range['From']->AddressToString();
+          if($Subnet['ExtMask'] == 32) $Dest = $Subnet['ExtAddressRange'];
+          else $Dest = $Subnet['ExtAddressRange'].'/'.$Subnet['ExtMask'];
+          $Items[] = array('chain' => 'inet-in', 'dst-address' => $Dest, 'action' => 'dst-nat', 'to-addresses' => $Range, 'comment' => $Subnet['Name'].'-in');
+        } else
+        {
+          if($Subnet['Mask'] == 32) $Src = $Subnet['AddressRange'];
+          else $Src = $Subnet['AddressRange'].'/'.$Subnet['Mask'];
+          $Items[] = array('chain' => 'dstnat', 'src-address' => $Src, 'protocol' => 'tcp', 'dst-port' => 80, 'action' => 'dst-nat',  'to-addresses' => $IPCentrala, 'to-ports' => 81, 'comment' => $Subnet['Name'].'-out');
+        }
+      }
+      echo("\n");
     }
+
+    // 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' => '10.145.64.8', 'to-ports' => 53, 'comment' => 'DNS_redirection_TCP');
+    $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');
+
+    // Chain for local interface
+    $Items[] = array('chain' => 'srcnat', 'out-interface' => $LocalInterface, 'action' => 'jump', 'jump-target' => 'local-out', 'comment' => 'local-out');
+    $Items[] = array('chain' => 'dstnat', 'in-interface' => $LocalInterface, 'action' => 'jump', 'jump-target' => 'local-in', 'comment' => 'local-in');
+
+    // Accept free-access clients
+    $Items[] = array('chain' => 'dstnat', 'dst-address' => '!10.145.0.0/16',
+        'src-address-list' => 'free-access', 'in-interface' => $LocalInterface,
+        'action' => 'accept', 'comment' => 'Free_access');
+    // Redirect unregistred clients to free access activation page
+    $Items[] = array('chain' => 'dstnat', 'dst-address' => '!10.145.0.0/16',
+        'src-address-list' => 'unregistred', 'in-interface' => $LocalInterface, 'protocol' => 'tcp',
+        'action' => 'dst-nat', 'to-addresses' => '10.145.64.70', 'to-ports' => 8080, 'comment' => 'Redirect_unregistred');
+
+    // Masquerade hosts without public ip
+    $Items[] = array('chain' => 'inet-out', 'src-address'=> '!212.111.4.174', 'action' => 'src-nat', 'to-addresses' => '77.92.221.188', 'comment' => 'Default_NAT');
+
+    /*
+     // Route public addresses localy
+     $DbResult = $this->Database->query('SELECT Member.*, Subject.Name FROM Member JOIN Subject ON Member.Subject = Subject.Id');
+     while($Member = $DbResult->fetch_assoc())
+     {
+     echo($Member['Name'].': ');
+     // Hosts
+     $DbResult2 = $this->Database->query('SELECT NetworkInterface.*, NetworkDevice.Name AS DeviceName FROM NetworkInterface LEFT JOIN NetworkDevice ON NetworkDevice.Id = NetworkInterface.Device WHERE (NetworkInterface.ExternalIP <> "") AND (NetworkDevice.Member = '.$Member['Id'].') AND (NetworkInterface.LocalIP != NetworkInterface.ExternalIP) ORDER BY id DESC');
+     while($Interface = $DbResult2->fetch_assoc())
+     {
+     $Name = $Interface['DeviceName'];
+     if($Interface['Name'] != '') $Name .= '-'.$Interface['Name'];
+     $Name = RouterOSIdent($Name);
+     echo($Name.'('.$Interface['LocalIP'].'), ');
+     $Items[] = array('chain' => 'local-in', 'dst-address' => $Interface['ExternalIP'], 'action' => 'dst-nat', 'to-addresses' => $Interface['LocalIP'], 'comment' => $Name.'-in-local');
+     }
+     echo("\n");
+     }
+
+     // Map returned local traffic to virtual subnet
+     $Items[] = array('chain' => 'local-out', 'src-address' => '10.145.0.0/16', 'dst-address' => '10.145.0.0/16', 'action' => 'netmap',  'to-addresses' => '10.45.0.0-10.45.255.255', 'comment' => 'map-local');
+     */
+
+    //print_r($Items);
+    $Routerboard->ListUpdate($Path, array('chain', 'dst-address', 'in-interface', 'src-address', 'out-interface', 'to-ports', 'dst-port', 'protocol', 'action', 'to-addresses', 'comment', 'jump-target', 'src-port'), $Items);
   }
-
-  // Subnets
-  $DbResult2 = $System->Database->select('NetworkSubnet', '*', '`Member`='.$Member['Id']);
-  while($Subnet = $DbResult2->fetch_assoc())
-  {
-    $Subnet['Name'] = RouterOSIdent('subnet-'.$Subnet['Name']);
-    echo($Subnet['Name'].'('.$Subnet['AddressRange'].'/'.$Subnet['Mask'].'), ');
-    if($Member['Blocked'] == 0)
-    {
-      $NewAddress = new NetworkAddressIPv4();
-      $NewAddress->AddressFromString($Subnet['ExtAddressRange']);
-      $NewAddress->Prefix = $Subnet['ExtMask'];
-      $Range = $NewAddress->GetRange();
-      if($Subnet['ExtMask'] != 32) $Range = $Range['From']->AddressToString().'-'.$Range['To']->AddressToString();
-        else $Range = $Range['From']->AddressToString();
-      if($Subnet['Mask'] == 32) $Src = $Subnet['AddressRange'];
-        else $Src = $Subnet['AddressRange'].'/'.$Subnet['Mask'];
-      $Items[] = array('chain' => 'inet-out', 'src-address' => $Src, 'action' => 'src-nat', 'to-addresses' => $Range, 'comment' => $Subnet['Name'].'-out');
-
-      $NewAddress = new NetworkAddressIPv4();
-      $NewAddress->AddressFromString($Subnet['AddressRange']);
-      $NewAddress->Prefix = $Subnet['Mask'];
-      $Range = $NewAddress->GetRange();
-      if($Subnet['Mask'] != 32) $Range = $Range['From']->AddressToString().'-'.$Range['To']->AddressToString();
-        else $Range = $Range['From']->AddressToString();
-      if($Subnet['ExtMask'] == 32) $Dest = $Subnet['ExtAddressRange'];
-        else $Dest = $Subnet['ExtAddressRange'].'/'.$Subnet['ExtMask'];
-      $Items[] = array('chain' => 'inet-in', 'dst-address' => $Dest, 'action' => 'dst-nat', 'to-addresses' => $Range, 'comment' => $Subnet['Name'].'-in');
-    } else
-    {
-      if($Subnet['Mask'] == 32) $Src = $Subnet['AddressRange'];
-        else $Src = $Subnet['AddressRange'].'/'.$Subnet['Mask'];
-      $Items[] = array('chain' => 'dstnat', 'src-address' => $Src, 'protocol' => 'tcp', 'dst-port' => 80, 'action' => 'dst-nat',  'to-addresses' => $IPCentrala, 'to-ports' => 81, 'comment' => $Subnet['Name'].'-out');
-    }
-  }
-  echo("\n");
 }
-
-// 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' => '10.145.64.8', 'to-ports' => 53, 'comment' => 'DNS_redirection_TCP');
-$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');
-
-// Chain for local interface
-$Items[] = array('chain' => 'srcnat', 'out-interface' => $LocalInterface, 'action' => 'jump', 'jump-target' => 'local-out', 'comment' => 'local-out');
-$Items[] = array('chain' => 'dstnat', 'in-interface' => $LocalInterface, 'action' => 'jump', 'jump-target' => 'local-in', 'comment' => 'local-in');
-
-// Accept free-access clients
-$Items[] = array('chain' => 'dstnat', 'dst-address' => '!10.145.0.0/16',
-  'src-address-list' => 'free-access', 'in-interface' => $LocalInterface,
-  'action' => 'accept', 'comment' => 'Free_access');
-// Redirect unregistred clients to free access activation page
-$Items[] = array('chain' => 'dstnat', 'dst-address' => '!10.145.0.0/16',
-  'src-address-list' => 'unregistred', 'in-interface' => $LocalInterface, 'protocol' => 'tcp',
-  'action' => 'dst-nat', 'to-addresses' => '10.145.64.70', 'to-ports' => 8080, 'comment' => 'Redirect_unregistred');
-
-// Masquerade hosts without public ip
-$Items[] = array('chain' => 'inet-out', 'src-address'=> '!212.111.4.174', 'action' => 'src-nat', 'to-addresses' => '77.92.221.188', 'comment' => 'Default_NAT');
-
-/*
-// Route public addresses localy
-$DbResult = $System->Database->query('SELECT Member.*, Subject.Name FROM Member JOIN Subject ON Member.Subject = Subject.Id');
-while($Member = $DbResult->fetch_assoc())
-{
-  echo($Member['Name'].': ');
-  // Hosts
-  $DbResult2 = $System->Database->query('SELECT NetworkInterface.*, NetworkDevice.Name AS DeviceName FROM NetworkInterface LEFT JOIN NetworkDevice ON NetworkDevice.Id = NetworkInterface.Device WHERE (NetworkInterface.ExternalIP <> "") AND (NetworkDevice.Member = '.$Member['Id'].') AND (NetworkInterface.LocalIP != NetworkInterface.ExternalIP) ORDER BY id DESC');
-  while($Interface = $DbResult2->fetch_assoc())
-  {
-    $Name = $Interface['DeviceName'];
-    if($Interface['Name'] != '') $Name .= '-'.$Interface['Name'];
-    $Name = RouterOSIdent($Name);
-    echo($Name.'('.$Interface['LocalIP'].'), ');
-    $Items[] = array('chain' => 'local-in', 'dst-address' => $Interface['ExternalIP'], 'action' => 'dst-nat', 'to-addresses' => $Interface['LocalIP'], 'comment' => $Name.'-in-local');
-  }
-  echo("\n");
-}
-
-// Map returned local traffic to virtual subnet
-$Items[] = array('chain' => 'local-out', 'src-address' => '10.145.0.0/16', 'dst-address' => '10.145.0.0/16', 'action' => 'netmap',  'to-addresses' => '10.45.0.0-10.45.255.255', 'comment' => 'map-local');
-*/
-
-//print_r($Items);
-$Routerboard->ListUpdate($Path, array('chain', 'dst-address', 'in-interface', 'src-address', 'out-interface', 'to-ports', 'dst-port', 'protocol', 'action', 'to-addresses', 'comment', 'jump-target', 'src-port'), $Items);

trunk/Modules/NetworkConfigRouterOS/Generators/Netwatch.php

@@ -1 +1 @@
 <?php
 
-if(isset($_SERVER['REMOTE_ADDR'])) die();
-include_once(dirname(__FILE__).'/../../../Application/System.php');
-$System = new System();
-$System->ShowPage = false;
-$System->Run();
-$Path = array('tool', 'netwatch');
+class ConfigRouterOSNetwatch extends NetworkConfigItem
+{
+  function Run()
+  {
+    $Path = array('tool', 'netwatch');
 
-$Routerboard = new Routerboard();
-$Routerboard->UserName = $Config['MainRouter']['UserName'];
-$Routerboard->Timeout = $Config['MainRouter']['ConnectTimeout'];
-$Routerboard->Debug = true;
+    $Routerboard = new Routerboard();
+    $Routerboard->UserName = $this->System->Config['MainRouter']['UserName'];
+    $Routerboard->Timeout = $this->System->Config['MainRouter']['ConnectTimeout'];
+    $Routerboard->Debug = true;
 
-$DbResult3 = $System->Database->query('SELECT DISTINCT (`DHCP`) FROM `NetworkSubnet` WHERE `Configure` = 1'); // WHERE `Member` = 0');
-while($Router = $DbResult3->fetch_assoc())
-{
-  echo($Router['DHCP']."\n");
-  $Routerboard->HostName = $Router['DHCP'];
-  $Items = array();
-  $DbResult = $System->Database->query('SELECT * FROM `NetworkSubnet` WHERE (`Configure` = 1) AND (`DHCP`="'.$Router['DHCP'].'")');
-  while($Subnet = $DbResult->fetch_assoc())
-  {
-    $I = explode('.', $Subnet['AddressRange']);
-    $I = $I[2];
-    $DbResult2 = $System->Database->query('SELECT `NetworkInterface`.*, `NetworkDevice`.`Name` AS `DeviceName` FROM `NetworkInterface`'.
-    ' LEFT JOIN `NetworkDevice` ON `NetworkDevice`.`Id` = `NetworkInterface`.`Device` WHERE CompareNetworkPrefix(INET_ATON(`LocalIP`), INET_ATON("'.$Subnet['AddressRange'].'"), '.$Subnet['Mask'].')'.
-    ' AND (`NetworkDevice`.`Used` = 1) ORDER BY `NetworkInterface`.`LocalIP`');
-    while($Interface = $DbResult2->fetch_assoc())
+    $DbResult3 = $this->Database->query('SELECT DISTINCT (`DHCP`) FROM `NetworkSubnet` WHERE `Configure` = 1'); // WHERE `Member` = 0');
+    while($Router = $DbResult3->fetch_assoc())
     {
-      $Name = $Interface['DeviceName'];
-      if($Interface['Name'] != '') $Name .= '-'.$Interface['Name'];
-      echo($Name.', ');
-      $Items[] = array('host' => $Interface['LocalIP'], 'interval' => '00:01:00', 'comment' => $Name);
+      echo($Router['DHCP']."\n");
+      $Routerboard->HostName = $Router['DHCP'];
+      $Items = array();
+      $DbResult = $this->Database->query('SELECT * FROM `NetworkSubnet` WHERE (`Configure` = 1) AND (`DHCP`="'.$Router['DHCP'].'")');
+      while($Subnet = $DbResult->fetch_assoc())
+      {
+        $I = explode('.', $Subnet['AddressRange']);
+        $I = $I[2];
+        $DbResult2 = $this->Database->query('SELECT `NetworkInterface`.*, `NetworkDevice`.`Name` AS `DeviceName` FROM `NetworkInterface`'.
+            ' LEFT JOIN `NetworkDevice` ON `NetworkDevice`.`Id` = `NetworkInterface`.`Device` WHERE CompareNetworkPrefix(INET_ATON(`LocalIP`), INET_ATON("'.$Subnet['AddressRange'].'"), '.$Subnet['Mask'].')'.
+            ' AND (`NetworkDevice`.`Used` = 1) ORDER BY `NetworkInterface`.`LocalIP`');
+        while($Interface = $DbResult2->fetch_assoc())
+        {
+          $Name = $Interface['DeviceName'];
+          if($Interface['Name'] != '') $Name .= '-'.$Interface['Name'];
+          echo($Name.', ');
+          $Items[] = array('host' => $Interface['LocalIP'], 'interval' => '00:01:00', 'comment' => $Name);
+        }
+      }
+      $Routerboard->ListUpdate($Path, array('host', 'interval', 'comment'), $Items);
+      echo("\n");
     }
   }
-  $Routerboard->ListUpdate($Path, array('host', 'interval', 'comment'), $Items);
-  echo("\n");
 }

trunk/Modules/NetworkConfigRouterOS/Generators/NetwatchImport.php

@@ -1 +1 @@
 <?php
 
-if(isset($_SERVER['REMOTE_ADDR'])) die();
-include_once(dirname(__FILE__).'/../../../Application/System.php');
-$System = new System();
-$System->ShowPage = false;
-$System->Run();
+class ConfigRouterOSNetwatchImport extends NetworkConfigItem
+{
+  function NetwatchImport()
+  {
+    $StartTime = time();
 
-function NetwatchImport()
-{
-  global $System, $Config;
+    // Load all interfaces to memory
+    $Interfaces = array();
+    $DbResult = $this->Database->select('NetworkInterface', '`Id`, `LocalIP` AS `IP`, `Online`, 0 AS `NewOnline`');
+    while($DbRow = $DbResult->fetch_assoc())
+      $Interfaces[$DbRow['IP']] = $DbRow;
 
-  $StartTime = time();
+      // Load netwatch status from all DHCP routers
+      $DbResult3 = $this->Database->query('SELECT `DHCP`, `AddressRange`, `Mask` FROM `NetworkSubnet` '.
+          'WHERE (`Configure` = 1) AND (`Member` IS NULL) GROUP BY DHCP');
+      while($Subnet = $DbResult3->fetch_assoc())
+      {
+        echo($Subnet['AddressRange'].'/'.$Subnet['Mask'].' on router '.$Subnet['DHCP']."\n");
+        $Routerboard = new RouterosAPI();
+        $Routerboard->Connect($Subnet['DHCP'], $this->System->Config['API']['UserName'],
+          $this->System->Config['API']['Password']);
+        if(!$Routerboard->Connected) continue;
+        $Routerboard->Write('/tool/netwatch/getall', false);
+        $Routerboard->Write('=.proplist=host,status');
+        $Read = $Routerboard->Read(false);
+        $List = $Routerboard->ParseResponse($Read);
+        foreach($List as $Properties)
+        {
+          $IP = $Properties['host'];
+          if($Properties['status'] == 'up') $Online = 1;
+          else $Online = 0;
 
-  // Load all interfaces to memory
-  $Interfaces = array();
-  $DbResult = $System->Database->select('NetworkInterface', '`Id`, `LocalIP` AS `IP`, `Online`, 0 AS `NewOnline`');
-  while($DbRow = $DbResult->fetch_assoc())
-    $Interfaces[$DbRow['IP']] = $DbRow;
+          if($Online)
+          {
+            if(array_key_exists($IP, $Interfaces))
+              $Interfaces[$IP]['NewOnline'] = 1;
+              else echo('IP '.$IP.' not found.'."\n");
+          }
+        }
+      }
 
-  // Load netwatch status from all DHCP routers
-  $DbResult3 = $System->Database->query('SELECT `DHCP`, `AddressRange`, `Mask` FROM `NetworkSubnet` '.
-    'WHERE (`Configure` = 1) AND (`Member` IS NULL) GROUP BY DHCP');
-  while($Subnet = $DbResult3->fetch_assoc())
-  {
-    echo($Subnet['AddressRange'].'/'.$Subnet['Mask'].' on router '.$Subnet['DHCP']."\n");
-    $Routerboard = new RouterosAPI();
-    $Routerboard->Connect($Subnet['DHCP'], $Config['API']['UserName'], $Config['API']['Password']);
-    if(!$Routerboard->Connected) continue;
-    $Routerboard->Write('/tool/netwatch/getall', false);
-    $Routerboard->Write('=.proplist=host,status');
-    $Read = $Routerboard->Read(false);
-    $List = $Routerboard->ParseResponse($Read);
-    foreach($List as $Properties)
-    {
-      $IP = $Properties['host'];
-      if($Properties['status'] == 'up') $Online = 1;
-        else $Online = 0;
+      foreach($Interfaces as $Index => $Interface)
+      {
+        // Update last online time if still online
+        if($Interface['NewOnline'])
+          $DbResult = $this->Database->update('NetworkInterface', '`Id` = "'.$Interface['Id'].'"',
+              array('LastOnline' => TimeToMysqlDateTime($StartTime)));
 
-      if($Online)
+          if($Interface['Online'] != $Interface['NewOnline'])
+          {
+            // Online state changed
+            $DbResult = $this->Database->query('INSERT INTO `NetworkInterfaceUpDown` (`Interface`,
+        `State`, `Time`, `Duration`) VALUES ('.$Interface['Id'].', '.$Interface['NewOnline'].', "'.
+                TimeToMysqlDateTime($StartTime).'", NULL)');
+            // Update previous record duration in UpDown table
+            $System->Database->query('UPDATE `NetworkInterfaceUpDown` AS `TM` SET `Duration` = TIMESTAMPDIFF(SECOND, '.
+                '`TM`.`Time`, (SELECT `Time` FROM (SELECT * FROM `NetworkInterfaceUpDown`) AS `TA` WHERE (`TA`.`Time` > `TM`.`Time`) '.
+                'AND (`TA`.`Interface`=`TM`.`Interface`) ORDER BY `TA`.`Time` ASC LIMIT 1)) '.
+                'WHERE (`TM`.`Duration` IS NULL) AND (`TM`.`Interface` ='.$Interface['Id'].')');
+            $System->Database->update('NetworkInterface', '`Id` = "'.$Interface['Id'].'"',
+                array('Online' => $Interface['NewOnline']));
+          }
+      }
+
+      // Set offline all interfaces which were not updated as online
+      $DbResult = $this->Database->select('NetworkInterface', '*', '(`Online` = 1) AND '.
+          '(`LastOnline` < "'.TimeToMysqlDateTime($StartTime).'")');
+      while($DbRow = $DbResult->fetch_assoc())
       {
-        if(array_key_exists($IP, $Interfaces))
-          $Interfaces[$IP]['NewOnline'] = 1;
-          else echo('IP '.$IP.' not found.'."\n");
+        echo('IP '.$DbRow['LocalIP'].' online but time not updated.'."\n");
       }
-    }
+      $DbResult = $this->Database->select('NetworkInterface', '*', '(`Online` = 0) AND '.
+          '(`LastOnline` >= "'.TimeToMysqlDateTime($StartTime).'")');
+      while($DbRow = $DbResult->fetch_assoc())
+      {
+        echo('IP '.$DbRow['LocalIP'].' not online but time updated.'."\n");
+      }
+
+      // Update device online state
+      $DbResult = $this->Database->select('NetworkInterface', '`Device`, SUM(`Online`) AS `SumOnline`', '`Online` = 1 GROUP BY `Device`');
+      while($Device = $DbResult->fetch_assoc())
+      {
+        if($Device['SumOnline'] > 0)
+          $System->Database->update('NetworkDevice', 'Id='.$Device['Device'], array('LastOnline' => TimeToMysqlDateTime($StartTime), 'Online' => 1));
+      }
+      $DbResult = $this->Database->update('NetworkDevice', '`LastOnline` < "'.TimeToMysqlDateTime($StartTime).'"', array('Online' => 0));
+
+      // Update interface online statistics
+      $DbResult = $this->Database->select('NetworkInterface', 'Id', '`Online` = 1');
+      while($Interface = $DbResult->fetch_assoc())
+      {
+        $DbResult2 = $this->Database->select('NetworkInterfaceStat', '*', '(`NetworkInterface`="'.$Interface['Id'].'") AND (`Time` = DATE_FORMAT(NOW(), "%Y-%m-%d %H:00:00"))');
+        if($DbResult2->num_rows == 0) $System->Database->query('REPLACE INTO `NetworkInterfaceStat` (`NetworkInterface`, `Time`, `PingCount`) VALUES ("'.$Interface['Id'].'", DATE_FORMAT(NOW(), "%Y-%m-%d %H:00:00"), 1)');
+        else $this->Database->query('UPDATE `NetworkInterfaceStat` SET `PingCount` = `PingCount` + 1 WHERE (`NetworkInterface`="'.$Interface['Id'].'") AND (`Time` = DATE_FORMAT(NOW(), "%Y-%m-%d %H:00:00"))');
+      }
   }
 
-  foreach($Interfaces as $Index => $Interface)
+  function Run()
   {
-    // Update last online time if still online
-    if($Interface['NewOnline'])
-      $DbResult = $System->Database->update('NetworkInterface', '`Id` = "'.$Interface['Id'].'"',
-        array('LastOnline' => TimeToMysqlDateTime($StartTime)));
-
-    if($Interface['Online'] != $Interface['NewOnline'])
-    {
-      // Online state changed
-      $DbResult = $System->Database->query('INSERT INTO `NetworkInterfaceUpDown` (`Interface`,
-        `State`, `Time`, `Duration`) VALUES ('.$Interface['Id'].', '.$Interface['NewOnline'].', "'.
-         TimeToMysqlDateTime($StartTime).'", NULL)');
-      // Update previous record duration in UpDown table
-      $System->Database->query('UPDATE `NetworkInterfaceUpDown` AS `TM` SET `Duration` = TIMESTAMPDIFF(SECOND, '.
-      '`TM`.`Time`, (SELECT `Time` FROM (SELECT * FROM `NetworkInterfaceUpDown`) AS `TA` WHERE (`TA`.`Time` > `TM`.`Time`) '.
-      'AND (`TA`.`Interface`=`TM`.`Interface`) ORDER BY `TA`.`Time` ASC LIMIT 1)) '.
-      'WHERE (`TM`.`Duration` IS NULL) AND (`TM`.`Interface` ='.$Interface['Id'].')');
-      $System->Database->update('NetworkInterface', '`Id` = "'.$Interface['Id'].'"',
-        array('Online' => $Interface['NewOnline']));
-    }
-  }
-
-  // Set offline all interfaces which were not updated as online
-  $DbResult = $System->Database->select('NetworkInterface', '*', '(`Online` = 1) AND '.
-    '(`LastOnline` < "'.TimeToMysqlDateTime($StartTime).'")');
-  while($DbRow = $DbResult->fetch_assoc())
-  {
-    echo('IP '.$DbRow['LocalIP'].' online but time not updated.'."\n");
-  }
-  $DbResult = $System->Database->select('NetworkInterface', '*', '(`Online` = 0) AND '.
-    '(`LastOnline` >= "'.TimeToMysqlDateTime($StartTime).'")');
-  while($DbRow = $DbResult->fetch_assoc())
-  {
-    echo('IP '.$DbRow['LocalIP'].' not online but time updated.'."\n");
-  }
-
-  // Update device online state
-  $DbResult = $System->Database->select('NetworkInterface', '`Device`, SUM(`Online`) AS `SumOnline`', '`Online` = 1 GROUP BY `Device`');
-  while($Device = $DbResult->fetch_assoc())
-  {
-    if($Device['SumOnline'] > 0)
-      $System->Database->update('NetworkDevice', 'Id='.$Device['Device'], array('LastOnline' => TimeToMysqlDateTime($StartTime), 'Online' => 1));
-  }
-  $DbResult = $System->Database->update('NetworkDevice', '`LastOnline` < "'.TimeToMysqlDateTime($StartTime).'"', array('Online' => 0));
-
-  // Update interface online statistics
-  $DbResult = $System->Database->select('NetworkInterface', 'Id', '`Online` = 1');
-  while($Interface = $DbResult->fetch_assoc())
-  {
-    $DbResult2 = $System->Database->select('NetworkInterfaceStat', '*', '(`NetworkInterface`="'.$Interface['Id'].'") AND (`Time` = DATE_FORMAT(NOW(), "%Y-%m-%d %H:00:00"))');
-    if($DbResult2->num_rows == 0) $System->Database->query('REPLACE INTO `NetworkInterfaceStat` (`NetworkInterface`, `Time`, `PingCount`) VALUES ("'.$Interface['Id'].'", DATE_FORMAT(NOW(), "%Y-%m-%d %H:00:00"), 1)');
-      else $System->Database->query('UPDATE `NetworkInterfaceStat` SET `PingCount` = `PingCount` + 1 WHERE (`NetworkInterface`="'.$Interface['Id'].'") AND (`Time` = DATE_FORMAT(NOW(), "%Y-%m-%d %H:00:00"))');
+    RepeatFunction(60, array($this, 'NetwatchImport'));
   }
 }
-
-RepeatFunction(60, 'NetwatchImport');

trunk/Modules/NetworkConfigRouterOS/Generators/Queue.php

@@ -1 +1 @@
 <?php
-if(isset($_SERVER['REMOTE_ADDR'])) die();
 
-$Enabled = 1;
-$ClassesEnabled = 1;
-$SessionDisable = true;
-include_once(dirname(__FILE__).'/../../../Application/System.php');
-$System = new System();
-$System->ShowPage = false;
-$System->Run();
-$PathQueue = array('queue', 'tree');
+class ConfigRouterOSQueue extends NetworkConfigItem
+{
+  var $UsedNames;
 
-$Routerboard = new Routerboard();
-$Routerboard->UserName = $Config['MainRouter']['UserName'];
-$Routerboard->Timeout = $Config['MainRouter']['ConnectTimeout'];
-$Routerboard->HostName = $Config['MainRouter']['HostName'];
-$Routerboard->Debug = true;
+  function CheckName($Name)
+  {
+    if(in_array($Name, $this->UsedNames)) die("\n".'Duplicate name: '.$Name);
+      else $this->UsedNames[] = $Name;
+  }
 
-$UsedNames = array();
+  function Run()
+  {
+    $PathQueue = array('queue', 'tree');
 
-function CheckName($Name)
-{
-  global $UsedNames;
+    $Routerboard = new Routerboard();
+    $Routerboard->UserName = $this->System->Config['MainRouter']['UserName'];
+    $Routerboard->Timeout = $this->System->Config['MainRouter']['ConnectTimeout'];
+    $Routerboard->HostName = $this->System->Config['MainRouter']['HostName'];
+    $Routerboard->Debug = true;
 
-  if(in_array($Name, $UsedNames)) die("\n".'Duplicate name: '.$Name);
-  else $UsedNames[] = $Name;
-}
+    $this->UsedNames = array();
 
-$Finance = &$System->Modules['Finance'];
-$Finance->LoadMonthParameters(0);
+    $Finance = &$this->System->Modules['Finance'];
+    $Finance->LoadMonthParameters(0);
 
-// Generate traffic shaping rules
-//$TotalMaxSpeedIn = 4048; //$RealMaxSpeed; //1536;
-//TotalMaxSpeedOut = 3048; //$RealMaxSpeed; //1536;
-//$UsersMaxSpeedIn = 1900; //$MaxSpeed;
-//$UsersMaxSpeedOut = 1900; //$MaxSpeed;
+    // Generate traffic shaping rules
+    //$TotalMaxSpeedIn = 4048; //$RealMaxSpeed; //1536;
+    //TotalMaxSpeedOut = 3048; //$RealMaxSpeed; //1536;
+    //$UsersMaxSpeedIn = 1900; //$MaxSpeed;
+    //$UsersMaxSpeedOut = 1900; //$MaxSpeed;
 
-$InDivider = 1;
-$OutDivider = 1;
-$TotalMaxSpeedIn = round($Finance->RealMaxSpeed / $InDivider) * 1000;
-$TotalMaxSpeedOut = round($Finance->RealMaxSpeed / $OutDivider) * 1000;
-$UsersMaxSpeedIn = round($Finance->MaxSpeed / $InDivider) * 1000;
-$UsersMaxSpeedOut = round($Finance->MaxSpeed / $OutDivider) * 1000;
-$VoipMaxSpeedIn = $TotalMaxSpeedIn - 136;
-$VoipMaxSpeedOut = $TotalMaxSpeedOut - 136;
-$VoipSpeedIn = 100; //$SpeedReserve;
-$VoipSpeedOut = 100; //$SpeedReserve;
-$OutInterface = 'eth1';
-$InInterface = 'ifb0';
-$InetInterface = $Config['MainRouter']['InetInterface'];
+    $InDivider = 1;
+    $OutDivider = 1;
+    $TotalMaxSpeedIn = round($Finance->RealMaxSpeed / $InDivider) * 1000;
+    $TotalMaxSpeedOut = round($Finance->RealMaxSpeed / $OutDivider) * 1000;
+    $UsersMaxSpeedIn = round($Finance->MaxSpeed / $InDivider) * 1000;
+    $UsersMaxSpeedOut = round($Finance->MaxSpeed / $OutDivider) * 1000;
+    $VoipMaxSpeedIn = $TotalMaxSpeedIn - 136;
+    $VoipMaxSpeedOut = $TotalMaxSpeedOut - 136;
+    $VoipSpeedIn = 100; //$SpeedReserve;
+    $VoipSpeedOut = 100; //$SpeedReserve;
+    $OutInterface = 'eth1';
+    $InInterface = 'ifb0';
+    $InetInterface = $this->System->Config['MainRouter']['InetInterface'];
 
-$DbResult = $System->Database->select('Service', '*', '(`ChangeAction` IS NULL) AND (`Id`='.TARIFF_FREE.')');
-if($DbResult->num_rows == 1)
-{
-  $Service = $DbResult->fetch_array();
-  $FreeInetSpeed = $Service['InternetSpeedMax'] * 1000;
-} else $FreeInetSpeed = 0;
+    $DbResult = $this->Database->select('Service', '*', '(`ChangeAction` IS NULL) AND (`Id`='.TARIFF_FREE.')');
+    if($DbResult->num_rows == 1)
+    {
+      $Service = $DbResult->fetch_array();
+      $FreeInetSpeed = $Service['InternetSpeedMax'] * 1000;
+    } else $FreeInetSpeed = 0;
 
-$ItemsQueue = array();
+    $ItemsQueue = array();
 
-// Root of tree and main limit
-$ItemsQueue[] = array('name' => 'main-out', 'limit-at' => $UsersMaxSpeedIn, 'max-limit' => $UsersMaxSpeedIn, 'parent' => 'global');
-$ItemsQueue[] = array('name' => 'main-in', 'limit-at' => $UsersMaxSpeedOut, 'max-limit' => $UsersMaxSpeedOut, 'parent' => 'global');
+    // Root of tree and main limit
+    $ItemsQueue[] = array('name' => 'main-out', 'limit-at' => $UsersMaxSpeedIn, 'max-limit' => $UsersMaxSpeedIn, 'parent' => 'global');
+    $ItemsQueue[] = array('name' => 'main-in', 'limit-at' => $UsersMaxSpeedOut, 'max-limit' => $UsersMaxSpeedOut, 'parent' => 'global');
 
-// Divide rules by subnet number
-$DbResult = $System->Database->query('SELECT `Id`, `Name`, `AddressRange`, `Mask` FROM `NetworkSubnet`');
-// Slow free internet
-$PacketMark = GetMarkByComment('free-out');
-$ItemsQueue[] = array('name' => 'free-out', 'limit-at' => $FreeInetSpeed, 'max-limit' => $FreeInetSpeed, 'parent' => 'main-out', 'packet-mark' => $PacketMark);
-$PacketMark = GetMarkByComment('free-in');
-$ItemsQueue[] = array('name' => 'free-in', 'limit-at' => $FreeInetSpeed, 'max-limit' => $FreeInetSpeed, 'parent' => 'main-in', 'packet-mark' => $PacketMark);
+    // Divide rules by subnet number
+    $DbResult = $this->Database->query('SELECT `Id`, `Name`, `AddressRange`, `Mask` FROM `NetworkSubnet`');
+    // Slow free internet
+    $PacketMark = GetMarkByComment('free-out');
+    $ItemsQueue[] = array('name' => 'free-out', 'limit-at' => $FreeInetSpeed, 'max-limit' => $FreeInetSpeed, 'parent' => 'main-out', 'packet-mark' => $PacketMark);
+    $PacketMark = GetMarkByComment('free-in');
+    $ItemsQueue[] = array('name' => 'free-in', 'limit-at' => $FreeInetSpeed, 'max-limit' => $FreeInetSpeed, 'parent' => 'main-in', 'packet-mark' => $PacketMark);
 
-// Process users
-$DbResult = $System->Database->query('SELECT `Member`.*, `Subject`.`Name` FROM `Member` LEFT JOIN `Subject` ON `Subject`.`Id` = `Member`.`Subject` WHERE `Member`.`Blocked`=0');
-while($Member = $DbResult->fetch_assoc())
-{
-  $ServiceIndex = 1;
-  echo('Zákazník '.$Member['Name']."\n");
-  $DbResult4 = $System->Database->query('SELECT `Service`.*, `ServiceCustomerRel`.`Id` AS `RelId` FROM `ServiceCustomerRel` '.
-    'JOIN `Service` ON `Service`.`Id` = `ServiceCustomerRel`.`Service` '.
-    'WHERE (`ServiceCustomerRel`.`Customer` = '.$Member['Id'].') AND (`ServiceCustomerRel`.`ChangeAction` IS NULL) '.
-    'AND (`Service`.`InternetSpeedMax` > 0) AND (`Service`.`InternetSpeedMin` > 0)');
-  while($Service = $DbResult4->fetch_assoc())
-  {
-    echo('Služba '.$Service['Name'].': ');
-    $MemberName = RouterOSIdent($Member['Name'].'-'.$Member['Id'].'-'.$ServiceIndex);
-    $SpeedIn = round($Service['InternetSpeedMin'] / $InDivider) * 1000;
-    $SpeedOut = round($Service['InternetSpeedMin'] / $OutDivider) * 1000;
-    $UserMaxSpeedIn = round($Service['InternetSpeedMax'] / $InDivider) * 1000;
-    $UserMaxSpeedOut = round($Service['InternetSpeedMax'] / $OutDivider) * 1000;
-    $ItemsQueue[] = array('name' => $MemberName.'-out', 'limit-at' => $SpeedIn, 'max-limit' => $UserMaxSpeedIn, 'parent' => 'main-out');
-    $ItemsQueue[] = array('name' => $MemberName.'-in', 'limit-at' => $SpeedOut, 'max-limit' => $UserMaxSpeedOut, 'parent' => 'main-in');
-    CheckName($MemberName.'-out');
-    CheckName($MemberName.'-in');
+    // Process users
+    $DbResult = $this->Database->query('SELECT `Member`.*, `Subject`.`Name` FROM `Member` LEFT JOIN `Subject` ON `Subject`.`Id` = `Member`.`Subject` WHERE `Member`.`Blocked`=0');
+    while($Member = $DbResult->fetch_assoc())
+    {
+      $ServiceIndex = 1;
+      echo('Zákazník '.$Member['Name']."\n");
+      $DbResult4 = $this->Database->query('SELECT `Service`.*, `ServiceCustomerRel`.`Id` AS `RelId` FROM `ServiceCustomerRel` '.
+          'JOIN `Service` ON `Service`.`Id` = `ServiceCustomerRel`.`Service` '.
+          'WHERE (`ServiceCustomerRel`.`Customer` = '.$Member['Id'].') AND (`ServiceCustomerRel`.`ChangeAction` IS NULL) '.
+          'AND (`Service`.`InternetSpeedMax` > 0) AND (`Service`.`InternetSpeedMin` > 0)');
+      while($Service = $DbResult4->fetch_assoc())
+      {
+        echo('Služba '.$Service['Name'].': ');
+        $MemberName = RouterOSIdent($Member['Name'].'-'.$Member['Id'].'-'.$ServiceIndex);
+        $SpeedIn = round($Service['InternetSpeedMin'] / $InDivider) * 1000;
+        $SpeedOut = round($Service['InternetSpeedMin'] / $OutDivider) * 1000;
+        $UserMaxSpeedIn = round($Service['InternetSpeedMax'] / $InDivider) * 1000;
+        $UserMaxSpeedOut = round($Service['InternetSpeedMax'] / $OutDivider) * 1000;
+        $ItemsQueue[] = array('name' => $MemberName.'-out', 'limit-at' => $SpeedIn, 'max-limit' => $UserMaxSpeedIn, 'parent' => 'main-out');
+        $ItemsQueue[] = array('name' => $MemberName.'-in', 'limit-at' => $SpeedOut, 'max-limit' => $UserMaxSpeedOut, 'parent' => 'main-in');
+        $this->CheckName($MemberName.'-out');
+        $this->CheckName($MemberName.'-in');
 
-    $Filter = '(`Used` = 1) AND (`Service` = '.$Service['RelId'].')';
-    $DbResult2 = $System->Database->select('NetworkDevice', 'COUNT(*)', $Filter);
-    $Row = $DbResult2->fetch_row();
-    $HostCount = $Row[0];
-    if($HostCount > 0)
-    {
-      $HostSpeedIn = round($SpeedIn / $HostCount);
-      $HostSpeedOut = round($SpeedOut / $HostCount);
-    } else
-    {
-      $HostSpeedIn = $SpeedIn;
-      $HostSpeedOut = $SpeedOut;
-    }
+        $Filter = '(`Used` = 1) AND (`Service` = '.$Service['RelId'].')';
+        $DbResult2 = $this->Database->select('NetworkDevice', 'COUNT(*)', $Filter);
+        $Row = $DbResult2->fetch_row();
+        $HostCount = $Row[0];
+        if($HostCount > 0)
+        {
+          $HostSpeedIn = round($SpeedIn / $HostCount);
+          $HostSpeedOut = round($SpeedOut / $HostCount);
+        } else
+        {
+          $HostSpeedIn = $SpeedIn;
+          $HostSpeedOut = $SpeedOut;
+        }
 
-    $DbResult2 = $System->Database->select('NetworkDevice', '*', $Filter);
-    while($Device = $DbResult2->fetch_assoc())
-    {
-      $DbResult3 = $System->Database->select('NetworkInterface', '*', '`Device` = '.$Device['Id'].' AND `LocalIP` != ""');
-      while($Interface = $DbResult3->fetch_assoc())
-      {
-        $Name = $Device['Name'];
-        if($Interface['Name'] != '') $Name .= '-'.$Interface['Name'];
-        $Name = RouterOSIdent($Name);
-        echo($Name.', ');
-        $IPParts = explode('.', $Interface['LocalIP']);
-        $Subnet = $IPParts[2];
-        $PacketMark = GetMarkByComment($Name.'-out');
-        $ItemsQueue[] = array('name' => $Name.'-out', 'limit-at' => $HostSpeedIn, 'max-limit' => $UserMaxSpeedIn, 'parent' => $MemberName.'-out', 'packet-mark' => $PacketMark);
-        $PacketMark = GetMarkByComment($Name.'-in');
-        $ItemsQueue[] = array('name' => $Name.'-in', 'limit-at' => $HostSpeedOut, 'max-limit' => $UserMaxSpeedOut, 'parent' => $MemberName.'-in', 'packet-mark' => $PacketMark);
-        CheckName($Name.'-out');
-        CheckName($Name.'-in');
+        $DbResult2 = $this->Database->select('NetworkDevice', '*', $Filter);
+        while($Device = $DbResult2->fetch_assoc())
+        {
+          $DbResult3 = $this->Database->select('NetworkInterface', '*', '`Device` = '.$Device['Id'].' AND `LocalIP` != ""');
+          while($Interface = $DbResult3->fetch_assoc())
+          {
+            $Name = $Device['Name'];
+            if($Interface['Name'] != '') $Name .= '-'.$Interface['Name'];
+            $Name = RouterOSIdent($Name);
+            echo($Name.', ');
+            $IPParts = explode('.', $Interface['LocalIP']);
+            $Subnet = $IPParts[2];
+            $PacketMark = GetMarkByComment($Name.'-out');
+            $ItemsQueue[] = array('name' => $Name.'-out', 'limit-at' => $HostSpeedIn, 'max-limit' => $UserMaxSpeedIn, 'parent' => $MemberName.'-out', 'packet-mark' => $PacketMark);
+            $PacketMark = GetMarkByComment($Name.'-in');
+            $ItemsQueue[] = array('name' => $Name.'-in', 'limit-at' => $HostSpeedOut, 'max-limit' => $UserMaxSpeedOut, 'parent' => $MemberName.'-in', 'packet-mark' => $PacketMark);
+            $this->CheckName($Name.'-out');
+            $this->CheckName($Name.'-in');
+          }
+        }
+
+        $DbResult2 = $this->Database->select('NetworkSubnet', '*', '`Service`='.$Service['RelId']);
+        while($Subnet = $DbResult2->fetch_assoc())
+        {
+          $Subnet['Name'] = RouterOSIdent('subnet-'.$Subnet['Name']);
+          echo($Subnet['Name'].', ');
+          $IPParts = explode('.', $Subnet['AddressRange']);
+          $SubnetNumber = $IPParts[2];
+          $PacketMark = GetMarkByComment($Subnet['Name'].'-out');
+          $ItemsQueue[] = array('name' => $Subnet['Name'].'-out', 'limit-at' => $HostSpeedIn, 'max-limit' => $UserMaxSpeedIn, 'parent' => $MemberName.'-out', 'packet-mark' => $PacketMark);
+          $PacketMark = GetMarkByComment($Subnet['Name'].'-in');
+          $ItemsQueue[] = array('name' => $Subnet['Name'].'-in', 'limit-at' => $HostSpeedOut, 'max-limit' => $UserMaxSpeedOut, 'parent' => $MemberName.'-in', 'packet-mark' => $PacketMark);
+          $this->CheckName($Subnet['Name'].'-out');
+          $this->CheckName($Subnet['Name'].'-in');
+        }
+        echo("\n");
+        $ServiceIndex++;
       }
     }
 
-    $DbResult2 = $System->Database->select('NetworkSubnet', '*', '`Service`='.$Service['RelId']);
-    while($Subnet = $DbResult2->fetch_assoc())
-    {
-      $Subnet['Name'] = RouterOSIdent('subnet-'.$Subnet['Name']);
-      echo($Subnet['Name'].', ');
-      $IPParts = explode('.', $Subnet['AddressRange']);
-      $SubnetNumber = $IPParts[2];
-      $PacketMark = GetMarkByComment($Subnet['Name'].'-out');
-      $ItemsQueue[] = array('name' => $Subnet['Name'].'-out', 'limit-at' => $HostSpeedIn, 'max-limit' => $UserMaxSpeedIn, 'parent' => $MemberName.'-out', 'packet-mark' => $PacketMark);
-      $PacketMark = GetMarkByComment($Subnet['Name'].'-in');
-      $ItemsQueue[] = array('name' => $Subnet['Name'].'-in', 'limit-at' => $HostSpeedOut, 'max-limit' => $UserMaxSpeedOut, 'parent' => $MemberName.'-in', 'packet-mark' => $PacketMark);
-      CheckName($Subnet['Name'].'-out');
-      CheckName($Subnet['Name'].'-in');
-    }
-    echo("\n");
-    $ServiceIndex++;
+    //print_r($ItemsQueue);
+    $Routerboard->ListUpdate($PathQueue, array('name', 'limit-at', 'max-limit', 'parent', 'packet-mark'), $ItemsQueue, array(), true);
   }
 }
-
-//print_r($ItemsQueue);
-$Routerboard->ListUpdate($PathQueue, array('name', 'limit-at', 'max-limit', 'parent', 'packet-mark'), $ItemsQueue, array(), true);

trunk/Modules/NetworkConfigRouterOS/Generators/Signal.php

@@ -1 +1 @@
 <?php
 
-if(array_key_exists('REMOTE_ADDR', $_SERVER)) die();
-include_once(dirname(__FILE__).'/../../../Application/System.php');
-$System = new System();
-$System->ShowPage = false;
-$System->Run();
+class ConfigRouterOSSignal extends NetworkConfigItem
+{
+  function ReadWirelessRegistration()
+  {
+    $Time = time();
 
-function ReadWirelessRegistration()
-{
-  global $System, $Config;
+    // Load netwatch status from all DHCP routers
+    $DbResult3 = $this->Database->query('SELECT `Id`, '.
+        '(SELECT `LocalIP` FROM `NetworkInterface` WHERE `NetworkInterface`.`Device` = `NetworkDevice`.`Id` LIMIT 1) AS `LocalIP` '.
+        'FROM `NetworkDevice` WHERE (`API` = 1) AND (`Used` = 1)');
+    while($Device = $DbResult3->fetch_assoc())
+    {
+      echo($Device['LocalIP']."\n");
+      $Routerboard = new RouterosAPI();
+      //$Routerboard->SSL = true;
+      //$Routerboard->Port = 8729;
+      $Routerboard->Connect($Device['LocalIP'], $this->System->Config['API']['UserName'], $this->System->Config['API']['Password']);
+      if(!$Routerboard->Connected) continue;
+      $Routerboard->Write('/interface/wireless/registration-table/getall', false);
+      $Routerboard->Write('=.proplist=signal-strength,mac-address,rx-rate,tx-rate', false);
+      $Routerboard->Write('=stats=');
+      $Read = $Routerboard->Read(false);
+      $Array = $Routerboard->ParseResponse($Read);
+      foreach($Array as $Properties)
+      {
+        $DbResult = $this->Database->select('NetworkInterface', 'Id', 'MAC="'.$Properties['mac-address'].'"');
+        if($DbResult->num_rows > 0)
+        {
+          $DbRow = $DbResult->fetch_assoc();
+          $Interface = $DbRow['Id'];
+        } else $Interface = null;
 
-  $Time = time();
-
-  // Load netwatch status from all DHCP routers
-  $DbResult3 = $System->Database->query('SELECT `Id`, '.
-    '(SELECT `LocalIP` FROM `NetworkInterface` WHERE `NetworkInterface`.`Device` = `NetworkDevice`.`Id` LIMIT 1) AS `LocalIP` '.
-    'FROM `NetworkDevice` WHERE (`API` = 1) AND (`Used` = 1)');
-  while($Device = $DbResult3->fetch_assoc())
-  {
-    echo($Device['LocalIP']."\n");
-    $Routerboard = new RouterosAPI();
-    //$Routerboard->SSL = true;
-    //$Routerboard->Port = 8729;
-    $Routerboard->Connect($Device['LocalIP'], $Config['API']['UserName'], $Config['API']['Password']);
-    if(!$Routerboard->Connected) continue;
-    $Routerboard->Write('/interface/wireless/registration-table/getall', false);
-    $Routerboard->Write('=.proplist=signal-strength,mac-address,rx-rate,tx-rate', false);
-    $Routerboard->Write('=stats=');
-    $Read = $Routerboard->Read(false);
-    $Array = $Routerboard->ParseResponse($Read);
-    foreach($Array as $Properties)
-    {
-      $DbResult = $System->Database->select('NetworkInterface', 'Id', 'MAC="'.$Properties['mac-address'].'"');
-      if($DbResult->num_rows > 0)
-      {
-        $DbRow = $DbResult->fetch_assoc();
-        $Interface = $DbRow['Id'];
-      } else $Interface = null;
-
-      if(strpos($Properties['signal-strength'], '@') === false)
-      {
-        $Strength = $Properties['signal-strength'];
-      } else {
-        $Parts = explode('@', $Properties['signal-strength']);
-        if(substr($Parts[0], -3) == 'dBm')
-          $Strength = substr($Parts[0], 0, -3); // without dBm
-          else $Strength = $Parts[0];
+        if(strpos($Properties['signal-strength'], '@') === false)
+        {
+          $Strength = $Properties['signal-strength'];
+        } else {
+          $Parts = explode('@', $Properties['signal-strength']);
+          if(substr($Parts[0], -3) == 'dBm')
+            $Strength = substr($Parts[0], 0, -3); // without dBm
+            else $Strength = $Parts[0];
+        }
+        $RateRx = substr($Properties['rx-rate'], 0, -3); // without MHz
+        $RateTx = substr($Properties['tx-rate'], 0, -3); // without MHz
+        $this->Database->insert('NetworkSignal', array('MAC' => $Properties['mac-address'],
+            'Value' => $Strength, 'RateRx' => $RateRx, 'RateTx' => $RateTx,
+            'Time' => TimeToMysqlDateTime($Time), 'Interface' => $Interface, 'Device' => $Device['Id']));
+        /*
+         $DbResult = $this->Database->select('Measure', 'Id', '`Name` = "'.$Properties['mac-address'].'"');
+         if($DbResult->num_rows > 0)
+         {
+         $this->Database->insert('Measure', array('Name' => $Properties['mac-address']));
+         $Id = $this->Database->LastInsertId;
+         } else {
+         $DbRow = $DbResult->fetch_assoc();
+         $Id = $DbRow['Id'];
+         }
+         $Measure = new Measure($Id);
+         $Measure->Load($Id);
+         $Measure->AddValue($Properties['signal-strength']);
+         */
       }
-      $RateRx = substr($Properties['rx-rate'], 0, -3); // without MHz
-      $RateTx = substr($Properties['tx-rate'], 0, -3); // without MHz
-      $System->Database->insert('NetworkSignal', array('MAC' => $Properties['mac-address'],
-        'Value' => $Strength, 'RateRx' => $RateRx, 'RateTx' => $RateTx,
-        'Time' => TimeToMysqlDateTime($Time), 'Interface' => $Interface, 'Device' => $Device['Id']));
-      /*
-      $DbResult = $System->Database->select('Measure', 'Id', '`Name` = "'.$Properties['mac-address'].'"');
-      if($DbResult->num_rows > 0)
-      {
-        $System->Database->insert('Measure', array('Name' => $Properties['mac-address']));
-        $Id = $System->Database->LastInsertId;
-      } else {
-        $DbRow = $DbResult->fetch_assoc();
-        $Id = $DbRow['Id'];
-      }
-      $Measure = new Measure($Id);
-      $Measure->Load($Id);
-      $Measure->AddValue($Properties['signal-strength']);
-      */
     }
   }
+
+  function Run()
+  {
+    RepeatFunction(60 * 60, array($this, 'ReadWirelessRegistration'));
+  }
 }
-
-RepeatFunction(60 * 60, 'ReadWirelessRegistration');

trunk/Modules/NetworkConfigRouterOS/NetworkConfigRouterOS.php

@@ -4 +4 @@
 include_once(dirname(__FILE__).'/RouterboardAPI.php');
 include_once(dirname(__FILE__).'/Generators/Common.php');
+
+// Config actions
+include_once(dirname(__FILE__).'/Generators/Signal.php');
+include_once(dirname(__FILE__).'/Generators/DHCP.php');
+include_once(dirname(__FILE__).'/Generators/DNS.php');
+include_once(dirname(__FILE__).'/Generators/Netwatch.php');
+include_once(dirname(__FILE__).'/Generators/NetwatchImport.php');
+include_once(dirname(__FILE__).'/Generators/FirewallFilter.php');
+include_once(dirname(__FILE__).'/Generators/FirewallNAT.php');
+include_once(dirname(__FILE__).'/Generators/FirewallMangle.php');
+include_once(dirname(__FILE__).'/Generators/Queue.php');
 
 class ModuleNetworkConfigRouterOS extends AppModule
@@ -41 +52 @@
       ),
     ));
+
+    $this->System->ModuleManager->Modules['NetworkConfig']->RegisterConfigItem('routeros-dns', 'ConfigRouterOSDNS');
+    $this->System->ModuleManager->Modules['NetworkConfig']->RegisterConfigItem('routeros-dhcp', 'ConfigRouterOSDHCP');
+    $this->System->ModuleManager->Modules['NetworkConfig']->RegisterConfigItem('routeros-signal', 'ConfigRouterOSSignal');
+    $this->System->ModuleManager->Modules['NetworkConfig']->RegisterConfigItem('routeros-netwatch', 'ConfigRouterOSNetwatch');
+    $this->System->ModuleManager->Modules['NetworkConfig']->RegisterConfigItem('routeros-netwatch-import', 'ConfigRouterOSNetwatchImport');
+    $this->System->ModuleManager->Modules['NetworkConfig']->RegisterConfigItem('routeros-firewall-filter', 'ConfigRouterOSFirewallFilter');
+    $this->System->ModuleManager->Modules['NetworkConfig']->RegisterConfigItem('routeros-firewall-nat', 'ConfigRouterOSFirewallNAT');
+    $this->System->ModuleManager->Modules['NetworkConfig']->RegisterConfigItem('routeros-firewall-mangle', 'ConfigRouterOSFirewallMangle');
+    $this->System->ModuleManager->Modules['NetworkConfig']->RegisterConfigItem('routeros-queue', 'ConfigRouterOSQueue');
   }
 }