Changeset 249 for trunk/system

Timestamp:

Sep 28, 2009, 1:35:25 PM (15 years ago)

Author:

george

Message:

• Opraveno: Podpora CIDR pro generování statických položek DHCP serverů. Označení serverů je nyní ve tvaru dhcp a číslo id podsítě z databáze.

File:

• trunk/system/generators/dhcp_routerboard.php (modified) (1 diff)

trunk/system/generators/dhcp_routerboard.php

@@ -16 +16 @@
   echo($Subnet['DHCP']);
   $Routerboard->HostName = $Subnet['DHCP'];
-  $I = explode('.', $Subnet['AddressRange']);
-  $I = $I[2];
   $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`');
+  $Server = 'dhcp'.$Subnet['Id'];
+  $DbResult2 = $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`');
+  echo($Database->error);
   while($Interface = $DbResult2->fetch_assoc())
   {
     $Name = $Interface['DeviceName'];
     if($Interface['Name'] != '') $Name .= '-'.$Interface['Name'];
-    $Items[] = array('mac-address' => $Interface['MAC'], 'address' => $Interface['LocalIP'], 'server' => 'dhcp'.$I, 'comment' => $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' => 'dhcp'.$I)));    
+  print_r($Routerboard->ListUpdate($Path, array('mac-address', 'address', 'server', 'comment'), $Items, array('server' => $Server)));    
   echo("\n");
 }