Changeset 187 for trunk/system

Timestamp:

Apr 5, 2009, 3:54:46 PM (16 years ago)

Author:

george

Message:

• Přidáno: Možnost registrace podsítí pro klienty.
• Upraveno: Skripty pro generování nastavení routerů byly upraveny pro podporu tabulky NetworkSubnet.

Location:

trunk/system

Files:

• generators/dhcp_routerboard.php (modified) (3 diffs)
• generators/nat_routerboard.php (modified) (3 diffs)
• generators/netwatch.php (modified) (2 diffs)
• generators/traffic_shaping_routerboard.php (modified) (6 diffs)
• netwatch_import.php (modified) (2 diffs)

trunk/system/generators/dhcp_routerboard.php

@@ -3 +3 @@
 include_once('../../global.php');
 
-$UserName = 'admin-ssh';
-
-$DbResult = $Database->query('SELECT * FROM NetworkSubnet');
+$DbResult = $Database->query('SELECT * FROM `NetworkSubnet` WHERE `Member` = 0');
 while($Subnet = $DbResult->fetch_assoc())
 {
@@ -13 +11 @@
   $Commands = array();
   $Commands[] = '/ip dhcp-server lease { remove [find server=dhcp'.$I.']}';
-  $DbResult2 = $Database->query('SELECT * FROM hosts WHERE (IP LIKE "192.168.'.$I.'.%") AND (MAC != "00:00:00:00:00:00") ORDER BY IP');
+  $DbResult2 = $Database->query('SELECT * FROM `hosts` WHERE (`IP` LIKE "192.168.'.$I.'.%") AND (`MAC` != "00:00:00:00:00:00") ORDER BY `IP`');
   while($Host = $DbResult2->fetch_assoc())
   {
@@ -19 +17 @@
   }
   $Commands = implode(';', $Commands);
-  $Command = '/usr/bin/ssh -l '.$UserName.' -i id_dsa '.$Subnet['DHCP'].' "'.$Commands.'"';
+  $Command = '/usr/bin/ssh -l '.$Config['MainRouter']['UserName'].' -i id_dsa '.$Subnet['DHCP'].' "'.$Commands.'"';
   //echo($Command."\n");
   $Output = '';

trunk/system/generators/nat_routerboard.php

@@ -3 +3 @@
 include_once('../../global.php');
 
-$InetInterface = 'ether3';
-$Router = '192.168.0.11';
+$InetInterface = $Config['MainRouter']['InetInterface'];
 
 $Commands = array();
@@ -12 +11 @@
 while($Member = $DbResult->fetch_assoc())
 {
-  echo($Member['Name']."\n");
+  echo($Member['Name'].': ');
+  // Hosts
   $DbResult2 = $Database->select('hosts', '*', '(external_ip <> "") AND (user='.$Member['Id'].') AND (IP != external_ip) ORDER BY id DESC');
   while($Host = $DbResult2->fetch_assoc())
   {
-    echo($Host['name']."\n");
+    $Host['name'] = RouterOSIdent($Host['name']);
+    echo($Host['name'].'('.$Host['IP'].'), ');
     $Commands[] = ' /ip firewall nat add chain=srcnat src-address='.$Host['IP'].' out-interface='.$InetInterface.' action=src-nat to-addresses='.$Host['external_ip'].' comment="'.$Host['name'].'"';
     $Commands[] = ' /ip firewall nat add chain=dstnat dst-address='.$Host['external_ip'].' in-interface='.$InetInterface.' action=dst-nat to-addresses='.$Host['IP'].' comment="'.$Host['name'].'"';
   }
+
+  // Subnets
+  $DbResult2 = $Database->select('NetworkSubnet', '*', 'Member='.$Member['Id']);
+  while($Subnet = $DbResult2->fetch_assoc())
+  {
+    $Subnet['Name'] = RouterOSIdent('subnet-'.$Subnet['Name']);
+    echo($Subnet['Name'].'('.$Subnet['AddressRange'].'/'.$Subnet['Mask'].'), ');
+    $Range = CIDRToAddressRange($Subnet['ExtAddressRange'], $Subnet['ExtMask']);
+    $Range = $Range['From'].'-'.$Range['To'];
+    $Commands[] = ' /ip firewall nat add chain=srcnat src-address-list='.$Subnet['AddressRange'].'/'.$Subnet['Mask'].' out-interface='.$InetInterface.' action=src-nat to-addresses='.$Range.' comment="'.$Subnet['Name'].'"';
+    $Range = CIDRToAddressRange($Subnet['AddressRange'], $Subnet['Mask']);
+    $Range = $Range['From'].'-'.$Range['To'];
+    $Commands[] = ' /ip firewall nat add chain=dstnat dst-address-list='.$Subnet['ExtAddressRange'].'/'.$Subnet['ExtMask'].' in-interface='.$InetInterface.' action=dst-nat to-addresses='.$Range.' comment="'.$Subnet['Name'].'"';
+  }
+  echo("\n");
 }
 
@@ -29 +45 @@
 
 $Commands = addslashes(implode(';', $Commands));
-$Command = '/usr/bin/ssh -l admin-ssh -i id_dsa '.$Router.' "'.$Commands.'"';
+$Command = '/usr/bin/ssh -l '.$Config['MainRouter']['UserName'].' -i id_dsa '.$Config['MainRouter']['HostName'].' "'.$Commands.'"';
+$Output = array();
 echo($Command."\n");
-//exec($Command, $Output);
+exec($Command, $Output);
 //array_pop($Output);
 //print_r($Output);

trunk/system/generators/netwatch.php

@@ -3 +3 @@
 include_once('../../global.php');
 
-$UserName = 'admin-ssh';
-
-$DbResult3 = $Database->query('SELECT DISTINCT (`DHCP`) FROM `NetworkSubnet`');
+$DbResult3 = $Database->query('SELECT DISTINCT (`DHCP`) FROM `NetworkSubnet` WHERE `Member` = 0');
 while($Router = $DbResult3->fetch_assoc())
 {
@@ -23 +21 @@
   }
   $Commands = implode(';', $Commands);
-  $Command = '/usr/bin/ssh -l '.$UserName.' -i id_dsa '.$Router['DHCP'].' "'.$Commands.'"';
+  $Command = '/usr/bin/ssh -l '.$Config['MainRouter']['UserName'].' -i id_dsa '.$Router['DHCP'].' "'.$Commands.'"';
   //echo($Command."\n");
   $Output = '';

trunk/system/generators/traffic_shaping_routerboard.php

@@ -26 +26 @@
 $OutInterface = 'eth1';
 $InInterface = 'ifb0';
+$InetInterface = $Config['MainRouter']['InetInterface'];
 $FreeInetSpeed = 64 * 1024;
-
-$InetInterface = 'ether3';
-$Router = '192.168.0.11';
 
 $Commands = array();
@@ -43 +41 @@
 
 // Divide rules by subnet number
-foreach(array(0, 1, 2, 3, 4, 5, 7) as $Subnet)
+$DbResult = $Database->query('SELECT Id, AddressRange, Mask FROM NetworkSubnet WHERE Member = 0');
+while($Subnet = $DbResult->fetch_assoc())
 {
-  $Commands[] = ' /ip firewall mangle add chain=inet-out src-address=192.168.'.$Subnet.'.0/24 out-interface='.$InetInterface.' action=jump jump-target=inet-out-'.$Subnet;
-  $Commands[] = ' /ip firewall mangle add chain=inet-in dst-address=192.168.'.$Subnet.'.0/24 in-interface='.$InetInterface.' action=jump jump-target=inet-in-'.$Subnet;
+  $Commands[] = ' /ip firewall mangle add chain=inet-out src-address='.$Subnet['AddressRange'].'/'.$Subnet['Mask'].' out-interface='.$InetInterface.' action=jump jump-target=inet-out-'.$Subnet['Id'];
+  $Commands[] = ' /ip firewall mangle add chain=inet-in dst-address='.$Subnet['AddressRange'].'/'.$Subnet['Mask'].' in-interface='.$InetInterface.' action=jump jump-target=inet-in-'.$Subnet['Id'];
 }
 
@@ -62 +61 @@
 while($Member = $DbResult->fetch_array())
 {
-  $Member['Name'] = strtr(strtolower(trim($Member['Name'])), array(' ' => '-', '(' => '-', ')' => '-',
-  'č' => 'c', 'š' => 's', 'ě' => 'e', 'ř' => 'r', 'ž' => 'z', 'ý' => 'y', 'á' => 'a', 'í' => 'i', 'é' => 'e', 'ů' => 'u', 'ú' => 'u', 'ď' => 'd', 'ť' => 't', 'ň' => 'n', 'ó' => 'o',
-  'Č' => 'c', 'Š' => 's', 'Ě' => 'e', 'Ř' => 'r', 'Ž' => 'z', 'Ý' => 'y', 'Á' => 'a', 'Í' => 'i', 'É' => 'e', 'Ů' => 'u', 'Ú' => 'u', 'Ď' => 'd', 'Ť' => 't', 'Ň' => 'n', 'Ó' => 'o',
-));
+  $Member['Name'] = RouterOSIdent($Member['Name']);
 
   echo('Uživatel '.$Member['Name'].": ");
@@ -77 +73 @@
   $Commands[] = ' /queue tree add name='.$Member['Name'].'-in limit-at='.$SpeedOut.' max-limit='.$UserMaxSpeedOut.' parent=main-in queue=wireless-default';
 
-  $DbResult2 = $Database->select('hosts', 'COUNT(*)', "block=0 AND MAC!='' AND user=".$Member['Id']);
+  $DbResult2 = $Database->select('hosts', 'COUNT(*)', '(block = 0) AND (MAC != "") AND (user = '.$Member['Id'].')');
   $Row = $DbResult2->fetch_array();
   $HostCount = $Row[0];
-  $HostSpeedIn = round($SpeedIn / $HostCount);
-  $HostSpeedOut = round($SpeedOut / $HostCount);
+  if($HostCount > 0)
+  {
+    $HostSpeedIn = round($SpeedIn / $HostCount);
+    $HostSpeedOut = round($SpeedOut / $HostCount);
+  } else
+  {
+    $HostSpeedIn = $SpeedIn;
+    $HostSpeedOut = $SpeedOut;
+  }
 
-  $DbResult2 = $Database->select('hosts', '*', "block=0 AND MAC!='' AND user=".$Member['Id']);
+  $DbResult2 = $Database->select('hosts', '*', 'block=0 AND MAC!="" AND user='.$Member['Id']);
   while($Host = $DbResult2->fetch_array())
   {
-    $Host['name'] = strtolower($Host['name']);
+    $Host['name'] = RouterOSIdent($Host['name']);
     echo($Host['name'].', ');
     $IPParts = explode('.', $Host['IP']);
@@ -100 +103 @@
     if($Index > 50)
           {
+      //print_r($Commands);
       $Commands = addslashes(implode(';', $Commands));
-      $Command = '/usr/bin/ssh -l admin-ssh -i id_dsa '.$Router.' "'.$Commands.'"';
-      //echo($Command."\n");
+      $Command = '/usr/bin/ssh -l '.$Config['MainRouter']['UserName'].' -i id_dsa '.$Config['MainRouter']['HostName'].' "'.$Commands.'"';
+      $Output = array();
       exec($Command, $Output);
       print_r($Output);
@@ -110 +114 @@
     $Index++;
   }
+  
+  $DbResult2 = $Database->select('NetworkSubnet', '*', 'Member='.$Member['Id']);
+  while($Subnet = $DbResult2->fetch_array())
+  {
+    $Subnet['Name'] = RouterOSIdent('subnet-'.$Subnet['Name']);
+    echo($Subnet['Name'].', ');
+    $IPParts = explode('.', $Subnet['AddressRange']);
+    $SubnetNumber = $IPParts[2];
+    $Commands[] = ' /ip firewall mangle add chain=inet-out-'.$SubnetNumber.' src-address='.$Subnet['AddressRange'].'/'.$Subnet['Mask'].' out-interface='.$InetInterface.' action=mark-packet new-packet-mark='.$PacketMark.' passthrough=no comment="'.$Subnet['Name'].'"';
+    $Commands[] = ' /queue tree add name='.$Subnet['Name'].'-out limit-at='.$HostSpeedIn.' max-limit='.$UserMaxSpeedIn.' parent='.$Member['Name'].'-out packet-mark='.$PacketMark.' queue=wireless-default';
+    $PacketMark++;
+    $Commands[] = ' /ip firewall mangle add chain=inet-in-'.$SubnetNumber.' dst-address='.$Subnet['AddressRange'].'/'.$Subnet['Mask'].' in-interface='.$InetInterface.' action=mark-packet new-packet-mark='.$PacketMark.' passthrough=no comment="'.$Subnet['Name'].'"';
+    $Commands[] = ' /queue tree add name='.$Subnet['Name'].'-in limit-at='.$HostSpeedOut.' max-limit='.$UserMaxSpeedOut.' parent='.$Member['Name'].'-in packet-mark='.$PacketMark.' queue=wireless-default';
+    $PacketMark++;
+
+    // Posílej po menších částech
+    if($Index > 50)
+          {
+      $Commands = addslashes(implode(';', $Commands));
+      $Command = '/usr/bin/ssh -l '.$Config['MainRouter']['UserName'].' -i id_dsa '.$Config['MainRouter']['HostName'].' "'.$Commands.'"';
+      //echo($Command."\n");
+      $Output = array();
+      exec($Command, $Output);
+      print_r($Output);
+          $Commands = array();
+            $Index = 0;
+          }
+    $Index++;
+  }
+  
   echo("\n");
 }
 //print_r($Commands);
 $Commands = addslashes(implode(';', $Commands));
-$Command = '/usr/bin/ssh -l admin-ssh -i id_dsa '.$Router.' "'.$Commands.'"';
+$Command = '/usr/bin/ssh -l '.$Config['MainRouter']['UserName'].' -i id_dsa '.$Config['MainRouter']['HostName'].' "'.$Commands.'"';
 //echo($Command."\n");
+$Output = array();
 exec($Command, $Output);
 //array_pop($Output);

trunk/system/netwatch_import.php

@@ -1 +1 @@
 <?php
+
 include_once('../global.php');
 
-$UserName = 'admin-ssh';
 $Config['Web']['ShowErrors'] = 1;
 
-$DbResult3 = $Database->query('SELECT DISTINCT (`DHCP`) FROM `NetworkSubnet`');
+$DbResult3 = $Database->query('SELECT DISTINCT (`DHCP`) FROM `NetworkSubnet` WHERE `Member` = 0');
 while($Router = $DbResult3->fetch_assoc())
 {
@@ -11 +11 @@
   $Commands[] = '/tool netwatch print terse';
   $Commands = implode(';', $Commands);
-  $Command = '/usr/bin/ssh -l '.$UserName.' -i generators/id_dsa '.$Router['DHCP'].' "'.$Commands.'"';
+  $Command = '/usr/bin/ssh -l '.$Config['MainRouter']['UserName'].' -i generators/id_dsa '.$Router['DHCP'].' "'.$Commands.'"';
   //echo($Command."\n");
   $Output = '';