Changeset 239 for trunk/system/generators

Timestamp:

Aug 2, 2009, 10:28:58 AM (16 years ago)

Author:

george

Message:

• Upraveno: Vylepšena třída Routerboard pro načítání z/do nastavení do routerů Mikrotik.
• Upraveno: Skripty pro generování DHCP a Netwatch routerů byly upraveny pro použití třídy Routerboar.
• Upraveno: Zobrazování editačních políček formuláře lépe viditelné v IE8.

Location:

trunk/system/generators

Files:

• dhcp_routerboard.php (modified) (2 diffs)
• linux (added)
• linux/dhcp.php (added)
• linux/iptables.php (added)
• linux/nat.php (added)
• linux/traffic_shaping.php (added)
• netwatch.php (modified) (3 diffs)

trunk/system/generators/dhcp_routerboard.php

@@ -2 +2 @@
 
 if(isset($_SERVER['REMOTE_ADDR'])) die();
-include_once('../../global.php');
+include('../../global.php');
+include('../routerboard.php');
+$Path = array('ip', 'dhcp-server', 'lease');
+
+$Routerboard = new Routerboard();
+$Routerboard->UserName = $Config['MainRouter']['UserName'];
+$Routerboard->Timeout = $Config['MainRouter']['ConnectTimeout'];
 
 $DbResult = $Database->query('SELECT * FROM `NetworkSubnet` WHERE `Member` = 0');
@@ -8 +14 @@
 {
   echo($Subnet['DHCP']);
+  $Routerboard->HostName = $Subnet['DHCP'];
   $I = explode('.', $Subnet['AddressRange']);
   $I = $I[2];
-  $Commands = array();
-  $Commands[] = '/ip dhcp-server lease { remove [find server=dhcp'.$I.']}';
+  $Items = array();
   $DbResult2 = $Database->query('SELECT NetworkInterface.*, NetworkDevice.Name AS DeviceName FROM `NetworkInterface` LEFT JOIN NetworkDevice ON NetworkDevice.Id = NetworkInterface.Device WHERE (`LocalIP` LIKE "192.168.'.$I.'.%") AND (`MAC` != "00:00:00:00:00:00") ORDER BY `LocalIP`');
   while($Interface = $DbResult2->fetch_assoc())
   {
-    $Commands[] = '/ip dhcp-server lease add mac-address='.$Interface['MAC'].' address='.$Interface['LocalIP'].' server=dhcp'.$I.' comment='.$Interface['DeviceName'].'-'.$Interface['Name'];
+    $Name = $Interface['DeviceName'];
+    if($Interface['Name'] != '') $Name .= '-'.$Interface['Name'];
+    $Items[] = array('mac-address' => $Interface['MAC'], 'address' => $Interface['LocalIP'], 'server' => 'dhcp'.$I, 'comment' => $Name);
   }
-  $Commands = implode(';', $Commands);
-  $Command = '/usr/bin/ssh -o ConnectTimeout=5 -l '.$Config['MainRouter']['UserName'].' -i id_dsa '.$Subnet['DHCP'].' "'.$Commands.'"';
-  //echo($Command."\n");
-  $Output = '';
-  exec($Command, $Output);
-  print_r($Output);
+ 
+  print_r($Routerboard->ListUpdate($Path, array('mac-address', 'address', 'server', 'comment'), $Items, array('server' => 'dhcp'.$I)));    
   echo("\n");
 }

trunk/system/generators/netwatch.php

@@ -2 +2 @@
 
 if(isset($_SERVER['REMOTE_ADDR'])) die();
-include_once('../../global.php');
+include('../../global.php');
+include('../routerboard.php');
+$Path = array('tool', 'netwatch');
+
+$Routerboard = new Routerboard();
+$Routerboard->UserName = $Config['MainRouter']['UserName'];
+$Routerboard->Timeout = $Config['MainRouter']['ConnectTimeout'];
 
 $DbResult3 = $Database->query('SELECT DISTINCT (`DHCP`) FROM `NetworkSubnet` WHERE `Member` = 0');
@@ -8 +14 @@
 {
   echo($Router['DHCP']."\n");
-  $Commands = array();
-  $Commands[] = '/tool netwatch remove [find]';
+  $Routerboard->HostName = $Router['DHCP'];
+  $Items = array();
   $DbResult = $Database->query('SELECT * FROM `NetworkSubnet` WHERE `DHCP`="'.$Router['DHCP'].'"');
   while($Subnet = $DbResult->fetch_assoc())
@@ -22 +28 @@
       if($Interface['Name'] != '') $Name .= '-'.$Interface['Name'];
       echo($Name.', ');
-      $Commands[] = '/tool netwatch add host='.$Interface['LocalIP'].' interval=1m comment='.$Name;
+      $Items[] = array('host' => $Interface['LocalIP'], 'interval' => '00:01:00', 'comment' => $Name);
     }
   }
-  $Commands = implode(';', $Commands);
-  $Command = '/usr/bin/ssh -o ConnectTimeout='.$Config['MainRouter']['ConnectTimeout'].' -l '.$Config['MainRouter']['UserName'].' -i id_dsa '.$Router['DHCP'].' "'.$Commands.'"';
-  //echo($Command."\n");
-  $Output = '';
-  exec($Command, $Output);
-  print_r($Output);
+  $Routerboard->ListUpdate($Path, array('host', 'interval', 'comment'), $Items);    
   echo("\n");
 }