Changeset 208 for trunk/system

Timestamp:

May 6, 2009, 8:21:23 AM (16 years ago)

Author:

george

Message:

• Upraveno: Tabulka hosts rozdělena na NetworkDevice, NetworkInterface, NetworkInterfaceType a NetworkLink. Jeden počítač může mít více rozhraní. Nově se již nepočítá pouze s stromovou topologií, ale s celkovou sítí s okruhy. Sloupce Parent byl proto nahrazen tabulkou NetworkLink, ve které jsou uchovány informace o tom, co kam je připojeno. Každé rozhraní má definovaný typ dle NetworkInterfaceType.
• Upraveno: Tabulka HostType přejmenována na NetworkDeviceType.
• Smazáno: Původní složka komunikačního programu sunrisechat. Nově nahrazena složkou chat pro podporu IRC.

Location:

trunk/system

Files:

• generators/dhcp_routerboard.php (modified) (1 diff)
• generators/nat_routerboard.php (modified) (1 diff)
• generators/netwatch.php (modified) (1 diff)
• generators/traffic_shaping_routerboard.php (modified) (2 diffs)
• netwatch_import.php (modified) (1 diff)
• traffic-flow.php (modified) (1 diff)

trunk/system/generators/dhcp_routerboard.php

@@ -12 +12 @@
   $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`');
-  while($Host = $DbResult2->fetch_assoc())
+  $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='.$Host['MAC'].' address='.$Host['IP'].' server=dhcp'.$I.' comment='.$Host['name'];
+    $Commands[] = '/ip dhcp-server lease add mac-address='.$Interface['MAC'].' address='.$Interface['LocalIP'].' server=dhcp'.$I.' comment='.$Interface['DeviceName'].'-'.$Interface['Name'];
   }
   $Commands = implode(';', $Commands);

trunk/system/generators/nat_routerboard.php

@@ -14 +14 @@
   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())
+  $DbResult2 = $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())
   {
-    $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'].'"';
+    $Name = $Interface['DeviceName'].'-'.$Interface['Name'];
+    $Name = RouterOSIdent($Name);
+    echo($Name.'('.$Interface['LocalIP'].'), ');
+    $Commands[] = ' /ip firewall nat add chain=srcnat src-address='.$Interface['LocalIP'].' out-interface='.$InetInterface.' action=src-nat to-addresses='.$Interface['ExternalIP'].' comment="'.$Name.'"';
+    $Commands[] = ' /ip firewall nat add chain=dstnat dst-address='.$Interface['ExternalIP'].' in-interface='.$InetInterface.' action=dst-nat to-addresses='.$Interface['LocalIP'].' comment="'.$Name.'"';
   }
 

trunk/system/generators/netwatch.php

@@ -15 +15 @@
     $I = explode('.', $Subnet['AddressRange']);
     $I = $I[2];
-    $DbResult2 = $Database->query('SELECT * FROM hosts WHERE (IP LIKE "192.168.'.$I.'.%") ORDER BY IP');
-    while($Host = $DbResult2->fetch_assoc())
+    $DbResult2 = $Database->query('SELECT NetworkInterface.*, NetworkDevice.Name AS DeviceName FROM NetworkInterface LEFT JOIN NetworkDevice ON NetworkDevice.Id = NetworkInterface.Device WHERE (NetworkInterface.LocalIP LIKE "192.168.'.$I.'.%") ORDER BY NetworkInterface.LocalIP');
+    while($Interface = $DbResult2->fetch_assoc())
     {
-      $Commands[] = '/tool netwatch add host='.$Host['IP'].' interval=1m comment='.$Host['name'];
+      $Commands[] = '/tool netwatch add host='.$Interface['LocalIP'].' interval=1m comment='.$Interface['DeviceName'].'-'.$Interface['Name'];
     }
   }

trunk/system/generators/traffic_shaping_routerboard.php

@@ -62 +62 @@
 $Index = 0;
 $DbResult = $Database->query('SELECT Member.*, Subject.Name FROM Member LEFT JOIN Subject ON Subject.Id = Member.Subject');
-while($Member = $DbResult->fetch_array())
+while($Member = $DbResult->fetch_assoc())
 {
   $Member['Name'] = RouterOSIdent($Member['Name']);
@@ -88 +88 @@
   }
 
-  $DbResult2 = $Database->select('hosts', '*', '(block=0) AND (MAC != "") AND (user='.$Member['Id'].')');
-  while($Host = $DbResult2->fetch_array())
+  $DbResult2 = $Database->select('NetworkDevice', '*', 'Member = '.$Member['Id']);
+  while($Device = $DbResult2->fetch_assoc())
   {
-    $Host['name'] = RouterOSIdent($Host['name']);
-    echo($Host['name'].', ');
-    $IPParts = explode('.', $Host['IP']);
-    $Subnet = $IPParts[2];
-    $Commands[] = ' /ip firewall mangle add chain=inet-out-'.$Subnet.' src-address='.$Host['IP'].' out-interface='.$InetInterface.' action=mark-packet new-packet-mark='.$PacketMark.' passthrough=no comment="'.$Host['name'].'"';
-    $Commands[] = ' /queue tree add name='.$Host['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-'.$Subnet.' dst-address='.$Host['IP'].' in-interface='.$InetInterface.' action=mark-packet new-packet-mark='.$PacketMark.' passthrough=no comment="'.$Host['name'].'"';
-    $Commands[] = ' /queue tree add name='.$Host['name'].'-in limit-at='.$HostSpeedOut.' max-limit='.$UserMaxSpeedOut.' parent='.$Member['Name'].'-in packet-mark='.$PacketMark.' queue=wireless-default';
-    $PacketMark++;
+    $DbResult3 = $Database->select('NetworkInterface', '*', 'Device = '.$Device['Id']);
+    while($Interface = $DbResult3->fetch_assoc())
+    {
+      $Name = $Device['Name'].'-'.$Interface['Name'];
+      $Name = RouterOSIdent($Name);
+      echo($Name.', ');
+      $IPParts = explode('.', $Interface['LocalIP']);
+      $Subnet = $IPParts[2];
+      $Commands[] = ' /ip firewall mangle add chain=inet-out-'.$Subnet.' src-address='.$Interface['LocalIP'].' out-interface='.$InetInterface.' action=mark-packet new-packet-mark='.$PacketMark.' passthrough=no comment="'.$Name.'"';
+      $Commands[] = ' /queue tree add name='.$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-'.$Subnet.' dst-address='.$Interface['LocalIP'].' in-interface='.$InetInterface.' action=mark-packet new-packet-mark='.$PacketMark.' passthrough=no comment="'.$Name.'"';
+      $Commands[] = ' /queue tree add name='.$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)
-    {
-      //print_r($Commands);
-      $Commands = addslashes(implode(';', $Commands));
-      $Command = '/usr/bin/ssh -l '.$Config['MainRouter']['UserName'].' -i id_dsa '.$Config['MainRouter']['HostName'].' "'.$Commands.'"';
-      $Output = array();
-      exec($Command, $Output);
-      print_r($Output);
-      $Commands = array();
-      $Index = 0;
+      // Posílej po menších částech
+      if($Index > 50)
+      {
+        //print_r($Commands);
+        $Commands = addslashes(implode(';', $Commands));
+        $Command = '/usr/bin/ssh -l '.$Config['MainRouter']['UserName'].' -i id_dsa '.$Config['MainRouter']['HostName'].' "'.$Commands.'"';
+        $Output = array();
+        exec($Command, $Output);
+        print_r($Output);
+        $Commands = array();
+        $Index = 0;
+      }
+      $Index++;
     }
-    $Index++;
   }
   

trunk/system/netwatch_import.php

@@ -33 +33 @@
     {
       $Online = 1;
-      $Values = array('online' => $Online,  'last_online' => 'NOW()');
+      $Values = array('Online' => $Online,  'LastOnline' => 'NOW()');
     } else 
     {
       $Online = 0;
-      $Values = array('online' => $Online);
+      $Values = array('Online' => $Online);
     }
 
-    $DbResult = $Database->update('hosts', 'IP="'.$Properties['host'].'"', $Values);
+    $DbResult = $Database->update('NetworkInterface', 'LocalIP = "'.$Properties['host'].'"', $Values);
     if($Online == 1)
     {
-      $DbResult = $Database->select('hosts', 'id', 'IP="'.$Properties['host'].'"');
+      $DbResult = $Database->select('NetworkInterface', 'Id', 'LocalIP = "'.$Properties['host'].'"');
       $DbRow = $DbResult->fetch_array();
-      $HostId = $DbRow['id'];
+      $HostId = $DbRow['Id'];
       $DbResult2 = $Database->select('stat_hosts', '*', '(host_id="'.$HostId.'") AND (time = DATE_FORMAT(NOW(), "%Y-%m-%d %H:00:00"))');
       if($DbResult2->num_rows == 0) $Database->query('REPLACE INTO stat_hosts (host_id, time) VALUES ("'.$HostId.'", DATE_FORMAT(NOW(), "%Y-%m-%d %H:00:00"))');          

trunk/system/traffic-flow.php

@@ -1 +1 @@
 <?php
-include_once('/a/www/centrala/global.php');
+include_once('../global.php');
 
-$Config['Web']['ShowErrors'] = 1;
+//$Config['Web']['ShowErrors'] = 1;
 
 $Commands = array();