Changeset 913

Timestamp:

Sep 20, 2021, 9:33:31 PM (3 years ago)

Author:

chronos

Message:

• Added: Generate NAT rules to redirect public IP addresses targeted from local network. Especially important for speedtest.

File:

• trunk/Modules/NetworkConfigRouterOS/Generators/FirewallNAT.php (modified) (1 diff)

trunk/Modules/NetworkConfigRouterOS/Generators/FirewallNAT.php

@@ -121 +121 @@
     $Items[] = array('chain' => 'inet-out', 'src-address'=> '!212.111.4.174', 'action' => 'src-nat', 'to-addresses' => '77.92.221.188', 'comment' => 'Default_NAT');
 
+    // Translate own public IP addresses into local IP address for local network
+    $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 (`NetworkInterface`.`Enabled` = 1)'.
+      ' 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);
+      $Items[] = array('chain' => 'local-in', 'dst-address' => $Interface['ExternalIP'], 'action' => 'dst-nat', 'to-addresses' => $Interface['LocalIP'], 'comment' => $Name.'-ext');
+    }
+
     /*
-     // 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');
-     */
+    // 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);