Changeset 738 for trunk/Modules/NetworkConfigRouterOS/Generators

Timestamp:

Apr 14, 2015, 10:20:16 PM (10 years ago)

Author:

chronos

Message:

• Removed: Spaces on end of line.
• Modified: Tabs converted to spaces.

Location:

trunk/Modules/NetworkConfigRouterOS/Generators

Files:

• AddressPortability.php (modified) (1 diff)
• Common.php (modified) (9 diffs)
• DHCP.php (modified) (1 diff)
• FirewallFilter.php (modified) (3 diffs)
• FirewallMangle.php (modified) (6 diffs)
• FirewallNAT.php (modified) (6 diffs)
• Netwatch.php (modified) (1 diff)
• NetwatchImport.php (modified) (4 diffs)
• Queue.php (modified) (3 diffs)
• Signal.php (modified) (1 diff)

trunk/Modules/NetworkConfigRouterOS/Generators/AddressPortability.php

@@ -6 +6 @@
 $Path = array('ip', 'dhcp-server', 'lease');
 
-$Host = array();  
+$Host = array();
 
 function ConvertExpireTime2($Time)

trunk/Modules/NetworkConfigRouterOS/Generators/Common.php

@@ -6 +6 @@
 {
   global $Database;
-  
+
   $DbResult = $Database->query('SELECT `Id` FROM `NetworkMark` WHERE `Comment`="'.$Comment.'"');
   if($DbResult->num_rows > 0)
@@ -16 +16 @@
     $DbResult = $Database->query('INSERT INTO `NetworkMark` (`Comment`) VALUES ("'.$Comment.'")');
     return($Database->insert_id);
-  } 
+  }
 }
 
@@ -22 +22 @@
 {
   global $Database;
-  
+
   $DbResult = $Database->query('SELECT `Id` FROM `NetworkMangleSubgroup` WHERE `AddressRange`="'.$AddressRange.'"');
   if($DbResult->num_rows > 0)
@@ -32 +32 @@
     $DbResult = $Database->query('INSERT INTO `NetworkMangleSubgroup` (`AddressRange`) VALUES ("'.$AddressRange.'")');
     return($Database->insert_id);
-  } 
+  }
 }
 
@@ -38 +38 @@
 {
   global $Config;
-  
+
   $Found = false;
   foreach($Tree['Items'] as $Index => $Node)
@@ -50 +50 @@
   if($Found == false)
   {
-    if($InterSubnets and ($Tree['Address']->Prefix < $Config['MainRouter']['MangleRuleSubgroupMinPrefix']) and 
+    if($InterSubnets and ($Tree['Address']->Prefix < $Config['MainRouter']['MangleRuleSubgroupMinPrefix']) and
     ($Address->Prefix > ($Tree['Address']->Prefix + 1)))
     {
@@ -61 +61 @@
     } else
     {
-      
+
       $NewNode = array('Address' => $Address, 'Name' => $Name, 'Items' => array(), 'ForceMark' => $ForceMark);
-      
+
       // Should be existed items placed under new node?
       $Found = false;
       foreach($Tree['Items'] as $Index => $Node)
       {
-        if(($Node['Address']->Address == $NewNode['Address']->Address) and 
-        ($Node['Address']->Prefix == $NewNode['Address']->Prefix)) $Found = true;        
-        
+        if(($Node['Address']->Address == $NewNode['Address']->Address) and
+        ($Node['Address']->Prefix == $NewNode['Address']->Prefix)) $Found = true;
+
         //echo($Index.',');
         if($Address->Contain($Node['Address']))
@@ -78 +78 @@
         }
       }
-      if($Found == false) $Tree['Items'][] = $NewNode;      
+      if($Found == false) $Tree['Items'][] = $NewNode;
     }
   }
@@ -89 +89 @@
   {
     ShowSubnetNode($Item, $Indent + 1);
-  }  
+  }
 }
 

trunk/Modules/NetworkConfigRouterOS/Generators/DHCP.php

@@ -29 +29 @@
     $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')));    
+
+  print_r($Routerboard->ListUpdate($Path, array('mac-address', 'address', 'server', 'comment'), $Items, array('server' => $Server, 'dynamic' => 'no')));
   echo("\n");
 }

trunk/Modules/NetworkConfigRouterOS/Generators/FirewallFilter.php

@@ -24 +24 @@
 
 // Inet traffic groups
-//$Items[] = array('chain' => 'forward', 'out-interface' => $InetInterface, 'action' => 'jump', 'jump-target' => 'inet-out', 'comment' => 'inet-out');     
+//$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');
 
@@ -63 +63 @@
   $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'].'), ');
@@ -75 +75 @@
         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']);

trunk/Modules/NetworkConfigRouterOS/Generators/FirewallMangle.php

@@ -30 +30 @@
   $NewAddress->AddressFromString($Subnet['AddressRange']);
   $NewAddress->Prefix = $Subnet['Mask'];
-  InsertToAddressTree($AddressTree, $NewAddress, 'subnet-'.RouterOSIdent($Subnet['Name'])); 
+  InsertToAddressTree($AddressTree, $NewAddress, 'subnet-'.RouterOSIdent($Subnet['Name']));
 }
 
@@ -58 +58 @@
     }
   }
-  
+
   $DbResult2 = $System->Database->select('NetworkSubnet', '*', '`Member`='.$Member['Id']);
   while($Subnet = $DbResult2->fetch_assoc())
@@ -80 +80 @@
 {
   global $InetInterface, $ItemsFirewall;
-  
+
   foreach($Node['Items'] as $Index => $Item)
   {
@@ -89 +89 @@
       $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');
@@ -100 +100 @@
       $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);      
-    }    
+
+      $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)
@@ -133 +133 @@
 // Slow free internet
 $PacketMark = GetMarkByComment('free-out');
-$ItemsFirewall[] = array('chain' => 'inet-1-out', 'out-interface' => $InetInterface, 
+$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');
+$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', 'timeout' => '1d', 
-        'comment' => 'unregistred-clients');
+$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', 'timeout' => '1d',
+  'comment' => 'unregistred-clients');
 
 //print_r($ItemsFirewall);

trunk/Modules/NetworkConfigRouterOS/Generators/FirewallNAT.php

@@ -34 +34 @@
 
 // Skip local subnet
-//$Items[] = array('chain' => 'inet-out', 'dst-address' => '172.16.1.1/30', 'action' => 'accept', 'comment' => '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');
 
@@ -46 +46 @@
   $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 (`NetworkInterface`.`LocalIP` <> "")'.
   ' AND (`NetworkDevice`.`Member` = '.$Member['Id'].') AND (`NetworkInterface`.`LocalIP` != `NetworkInterface`.`ExternalIP`) ORDER BY `id` DESC');
   while($Interface = $DbResult2->fetch_assoc())
@@ -57 +57 @@
     {
       $Items[] = array('chain' => 'inet-out', 'src-address' => $Interface['LocalIP'], 'action' => 'src-nat',  'to-addresses' => $Interface['ExternalIP'], 'comment' => $Name.'-out');
-      if($Interface['InboundNATPriority'] > 0) 
+      if($Interface['InboundNATPriority'] > 0)
         $Items[] = array('chain' => 'inet-in', 'dst-address' => $Interface['ExternalIP'], 'action' => 'dst-nat', 'to-addresses' => $Interface['LocalIP'], 'comment' => $Name.'-in');
-    } else 
+    } 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');
@@ -68 +68 @@
   $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'].'), ');
@@ -82 +82 @@
         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']);
@@ -114 +114 @@
 
 // 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');
+$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, 
-        'action' => 'dst-nat', 'to-addresses' => '10.145.64.8', 'to-ports' => 82, 'comment' => 'Redirect_unregistred');
+$Items[] = array('chain' => 'dstnat', 'dst-address' => '!10.145.0.0/16',
+  'src-address-list' => 'unregistred', 'in-interface' => $LocalInterface,
+  'action' => 'dst-nat', 'to-addresses' => '10.145.64.8', 'to-ports' => 82, 'comment' => 'Redirect_unregistred');
 
 /*

trunk/Modules/NetworkConfigRouterOS/Generators/Netwatch.php

@@ -35 +35 @@
     }
   }
-  $Routerboard->ListUpdate($Path, array('host', 'interval', 'comment'), $Items);    
+  $Routerboard->ListUpdate($Path, array('host', 'interval', 'comment'), $Items);
   echo("\n");
 }

trunk/Modules/NetworkConfigRouterOS/Generators/NetwatchImport.php

@@ -21 +21 @@
   // 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');
+    'WHERE (`Configure` = 1) AND (`Member` IS NULL) GROUP BY DHCP');
   while($Subnet = $DbResult3->fetch_assoc())
   {
@@ -54 +54 @@
         array('LastOnline' => TimeToMysqlDateTime($StartTime)));
 
-        if($Interface['Online'] != $Interface['NewOnline'])
+    if($Interface['Online'] != $Interface['NewOnline'])
     {
-        // Online state changed
+      // Online state changed
       $DbResult = $System->Database->query('INSERT INTO `NetworkInterfaceUpDown` (`Interface`,
-        `State`, `Time`, `Duration`) VALUES ('.$Interface['Id'].', '.$Interface['NewOnline'].', "'.
+        `State`, `Time`, `Duration`) VALUES ('.$Interface['Id'].', '.$Interface['NewOnline'].', "'.
          TimeToMysqlDateTime($StartTime).'", NULL)');
       // Update previous record duration in UpDown table
@@ -64 +64 @@
       '`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'].')');
+      'WHERE (`TM`.`Duration` IS NULL) AND (`TM`.`Interface` ='.$Interface['Id'].')');
       $System->Database->update('NetworkInterface', '`Id` = "'.$Interface['Id'].'"',
         array('Online' => $Interface['NewOnline']));
@@ -75 +75 @@
   while($DbRow = $DbResult->fetch_assoc())
   {
-        echo('IP '.$DbRow['LocalIP'].' online but time not updated.'."\n");
+    echo('IP '.$DbRow['LocalIP'].' online but time not updated.'."\n");
   }
   $DbResult = $System->Database->select('NetworkInterface', '*', '(`Online` = 0) AND '.

trunk/Modules/NetworkConfigRouterOS/Generators/Queue.php

@@ -22 +22 @@
 {
   global $UsedNames;
-  
+
   if(in_array($Name, $UsedNames)) die("\n".'Duplicate name: '.$Name);
   else $UsedNames[] = $Name;
@@ -53 +53 @@
 if($DbResult->num_rows == 1)
 {
-        $Service = $DbResult->fetch_array();
+  $Service = $DbResult->fetch_array();
   $FreeInetSpeed = $Service['InternetSpeedMax'] * 1000;
 } else $FreeInetSpeed = 0;
@@ -128 +128 @@
       }
     }
-  
+
     $DbResult2 = $System->Database->select('NetworkSubnet', '*', '`Service`='.$Service['RelId']);
     while($Subnet = $DbResult2->fetch_assoc())

trunk/Modules/NetworkConfigRouterOS/Generators/Signal.php

@@ -35 +35 @@
       if($DbResult->num_rows > 0)
       {
-        $DbRow = $DbResult->fetch_assoc();
+        $DbRow = $DbResult->fetch_assoc();
         $Interface = $DbRow['Id'];
       } else $Interface = null;