Changeset 869

Timestamp:

Apr 1, 2020, 12:43:07 AM (4 years ago)

Author:

chronos

Message:

• Added: New SpeedLimit table to support network speed limit groups.

Location:

trunk

Files:

• Application/UpdateTrace.php (modified) (2 diffs)
• Application/Version.php (modified) (1 diff)
• Common/Global.php (modified) (5 diffs)
• Modules/Customer/Customer.php (modified) (2 diffs)
• Modules/Network/Network.php (modified) (1 diff)
• Modules/NetworkConfigRouterOS/Generators/Queue.php (modified) (14 diffs)
• Packages/Common/Common.php (modified) (2 diffs)
• Packages/Common/Generics.php (added)

trunk/Application/UpdateTrace.php

@@ -2075 +2075 @@
     KEY `Time` (`Time`)
   ) ENGINE=InnoDB DEFAULT CHARSET=utf8;');
-
+}
+
+function UpdateTo869($Manager)
+{
+  $Manager->Execute('CREATE TABLE IF NOT EXISTS `NetworkSpeedLimit` (
+    `Id` int(11) NOT NULL AUTO_INCREMENT,
+    `Name` varchar(255) CHARACTER SET utf8 NOT NULL,
+    `SpeedMaxOut` bigint(20) NOT NULL DEFAULT 0,
+    `SpeedMaxIn` bigint(20) NOT NULL DEFAULT 0,
+    `Parent` int(11) DEFAULT 0,
+    PRIMARY KEY (`Id`),
+    KEY `Parent` (`Parent`)
+  ) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;');
+  $Manager->Execute('ALTER TABLE `ServiceCustomerRel` ADD COLUMN `SpeedLimit` INT NULL AFTER `ChangeReplaceId`, ADD INDEX `SpeedLimit` (`SpeedLimit`);');
+
+  // IS menu item
+  $Manager->Execute('INSERT INTO `Action` (`Id` ,`Name` ,`Title` ,`Type` ,`URL` ,
+    `Group` ,`Icon` ,`PermissionOperation` ,`Enable`) VALUES (
+    NULL , "", "Omezení rychlosti", "1", "/is/?t=NetworkSpeedLimit&a=list", NULL , NULL , NULL , "1");');
+  $ActionId = $Manager->Database->insert_id;
+  $DbResult = $Manager->Execute('SELECT `Id` FROM `MenuItem` WHERE `Name`="Síť"');
+  if($DbResult->num_rows > 0)
+  {
+    $DbRow = $DbResult->fetch_assoc();
+    $Manager->Execute("INSERT INTO `MenuItem` (`Id` ,`Name` ,`Parent` ,`Action` ,`Menu`) ".
+        "VALUES (NULL , 'Omezení rychlosti', ".$DbRow['Id'].", '".$ActionId."', '1');");
+  }
 }
 
@@ -2176 +2202 @@
       855 => array('Revision' => 862, 'Function' => 'UpdateTo862'),
       862 => array('Revision' => 867, 'Function' => 'UpdateTo867'),
+      867 => array('Revision' => 869, 'Function' => 'UpdateTo869'),
     ));
   }

trunk/Application/Version.php

@@ -1 +1 @@
 <?php
 
-$Revision = 868; // Subversion revision
-$DatabaseRevision = 867; // SQL structure revision
-$ReleaseTime = strtotime('2020-01-13');
+$Revision = 869; // Subversion revision
+$DatabaseRevision = 869; // SQL structure revision
+$ReleaseTime = strtotime('2020-03-31');

trunk/Common/Global.php

@@ -212 +212 @@
   global $OrderDirSQL, $OrderArrowImage, $Config, $System;
 
-  if(array_key_exists('ObjectName', $_GET) and ($_GET['ObjectName'] == $ObjectName)) 
+  if(array_key_exists('ObjectName', $_GET) and ($_GET['ObjectName'] == $ObjectName))
   {
     if(array_key_exists('OrderCol', $_GET)) $_SESSION[$ObjectName.'OrderCol'] = $_GET['OrderCol'];
@@ -219 +219 @@
   if(!array_key_exists($ObjectName.'OrderCol', $_SESSION)) $_SESSION[$ObjectName.'OrderCol'] = $DefaultColumn;
   if(!array_key_exists($ObjectName.'OrderDir', $_SESSION) ) $_SESSION[$ObjectName.'OrderDir'] = $DefaultOrder;
-    
+
   // Check OrderCol
   $Found = false;
@@ -236 +236 @@
   }
   // Check OrderDir
-  if(($_SESSION[$ObjectName.'OrderDir'] != 0) and ($_SESSION[$ObjectName.'OrderDir'] != 1)) 
+  if(($_SESSION[$ObjectName.'OrderDir'] != 0) and ($_SESSION[$ObjectName.'OrderDir'] != 1))
     $_SESSION[$ObjectName.'OrderDir'] = 0;
 
@@ -246 +246 @@
     $QueryItems['OrderCol'] = $Column['Name'];
     $QueryItems['OrderDir'] = 1 - $_SESSION[$ObjectName.'OrderDir'];
-    if($Column['Name'] == $_SESSION[$ObjectName.'OrderCol']) 
+    if($Column['Name'] == $_SESSION[$ObjectName.'OrderCol'])
       $ArrowImage = '<img style="vertical-align: middle; border: 0px;" src="'.
       $System->Link('/images/'.$OrderArrowImage[$_SESSION[$ObjectName.'OrderDir']]).'" alt="order arrow">';
@@ -317 +317 @@
 function RouterOSIdent($Name)
 {
-  return(strtr(strtolower(trim($Name)), array(' ' => '-', '.' => '', '(' => '-', ')' => '-',
+  return(strtr(strtolower(trim($Name)), array(' ' => '-', '.' => '', '(' => '-', ')' => '-', ',' => '-',
   'č' => 'c', 'š' => 's', 'ě' => 'e', 'ř' => 'r', 'ž' => 'z', 'ý' => 'y',
   'á' => 'a', 'í' => 'i', 'é' => 'e', 'ů' => 'u', 'ú' => 'u', 'ď' => 'd',

trunk/Modules/Customer/Customer.php

@@ -99 +99 @@
     ));
     $this->System->FormManager->RegisterClass('ServiceCustomerRel', array(
-      'Title' => 'Vztahy služba - zákazník',
+      'Title' => 'Služby zákazníka',
       'Table' => 'ServiceCustomerRel',
       'Items' => array(
         'Service' => array('Type' => 'TService', 'Caption' => 'Služba', 'Default' => ''),
         'Customer' => array('Type' => 'TMember', 'Caption' => 'Zákazník', 'Default' => ''),
+        'SpeedLimit' => array('Type' => 'TNetworkSpeedLimit', 'Caption' => 'Omezení rychlosti', 'Default' => null, 'Null' => true),
+        'Devices' => array('Type' => 'TNetworkDeviceListService', 'Caption' => 'Zařízení', 'Default' => ''),
         'ChangeAction' => array('Type' => 'TActionEnum', 'Caption' => 'Změna - akce', 'Default' => '', 'Null' => true),
         'ChangeTime' => array('Type' => 'DateTime', 'Caption' => 'Změna - čas', 'Default' => '', 'Null' => true, 'NotInList' => true),
@@ -135 +137 @@
       'Id' => 'Id',
       'Ref' => 'Customer',
+      'Filter' => '1',
+    ));
+    $this->System->FormManager->RegisterFormType('TNetworkDeviceListService', array(
+      'Type' => 'ManyToOne',
+      'Table' => 'NetworkDevice',
+      'Id' => 'Id',
+      'Ref' => 'Service',
       'Filter' => '1',
     ));

trunk/Modules/Network/Network.php

@@ -293 +293 @@
         'UpDown' => array('Type' => 'TNetworkPortUpDown', 'Caption' => 'Změny stavu', 'Default' => ''),
       ),
+    ));
+    $this->System->FormManager->RegisterClass('NetworkSpeedLimit', array(
+      'Title' => 'Omezení přenosové rychlosti',
+      'Table' => 'NetworkSpeedLimit',
+      'Items' => array(
+        'Name' => array('Type' => 'String', 'Caption' => 'Jméno', 'Default' => ''),
+        'SpeedMaxOut' => array('Type' => 'Integer', 'Caption' => 'Max. rychlost odesílání', 'Default' => '0', 'Suffix' => 'bits/s'),
+        'SpeedMaxIn' => array('Type' => 'Integer', 'Caption' => 'Max. rychlost přijímání', 'Default' => 0, 'Suffix' => 'bits/s'),
+        'Parent' => array('Type' => 'TNetworkSpeedLimit', 'Caption' => 'Rodič', 'Default' => '', 'Null' => true),
+        'Items' => array('Type' => 'TNetworkSpeedLimitListParent', 'Caption' => 'Položky'),
+        'CustomerServices' => array('Type' => 'TServiceCustomerRelListSpeedLimit', 'Caption' => 'Služby zákazníka'),
+      ),
+    ));
+    $this->System->FormManager->RegisterFormType('TNetworkSpeedLimit', array(
+      'Type' => 'Reference',
+      'Table' => 'NetworkSpeedLimit',
+      'Id' => 'Id',
+      'Name' => 'Name',
+      'Filter' => '1',
+    ));
+    $this->System->FormManager->RegisterFormType('TNetworkSpeedLimitListParent', array(
+      'Type' => 'ManyToOne',
+      'Table' => 'NetworkSpeedLimit',
+      'Id' => 'Id',
+      'Ref' => 'Parent',
+      'Filter' => '1',
+    ));
+    $this->System->FormManager->RegisterFormType('TServiceCustomerRelListSpeedLimit', array(
+      'Type' => 'ManyToOne',
+      'Table' => 'ServiceCustomerRel',
+      'Id' => 'Id',
+      'Ref' => 'SpeedLimit',
+      'Filter' => '1',
     ));
     $this->System->FormManager->RegisterClass('NetworkInterfaceLatency', array(

trunk/Modules/NetworkConfigRouterOS/Generators/Queue.php

@@ -1 +1 @@
 <?php
+
+class SpeedLimit
+{
+  var $Min;
+  var $Max;
+  var $PacketMark;
+
+  function __construct(int $Min, int $Max, int $PacketMark = null)
+  {
+    $this->Min = $Min;
+    $this->Max = $Max;
+    $this->PacketMark = $PacketMark;
+  }
+
+  function Print()
+  {
+    $Output = '(Min: '.$this->Min.' Max: '.$this->Max;
+    if ($this->PacketMark != null) $Output .= ' PacketMark: '.$this->PacketMark;
+    $Output .= ')';
+    return $Output;
+  }
+}
+
+class SpeedLimitItem
+{
+  var $Name;
+  var $Parent;
+  var $LimitIn;
+  var $LimitOut;
+  var $SubItems;
+
+  function __construct(string $Name, SpeedLimitItem $Parent = null)
+  {
+    $this->Name = $Name;
+    $this->Parent = $Parent;
+    if ($Parent != null) $Parent->SubItems->Add($this);
+    $this->SubItems = new SpeedLimitItems();
+  }
+
+  function Print(int $Indent = 0): string
+  {
+    $Output = str_repeat(' ', $Indent * 2).$this->Name.' In:'.$this->LimitIn->Print().' Out:'.$this->LimitOut->Print()."\n";
+    $Output .= $this->SubItems->Print($Indent + 1);
+    return $Output;
+  }
+
+  function CheckName($Name, &$UsedNames)
+  {
+    if(in_array($Name, $UsedNames)) die("\n".'Duplicate name: '.$Name);
+      else $UsedNames[] = $Name;
+  }
+
+  function GetCommands(&$UsedNames = null)
+  {
+    if ($UsedNames == null) $UsedNames = array();
+
+    $this->CheckName($this->Name.'-out', $UsedNames);
+    $Item = array('name' => $this->Name.'-out', 'limit-at' => $this->LimitOut->Min, 'max-limit' => $this->LimitOut->Max,
+      'parent' => $this->GetParentName('-out'), 'packet-mark' => $this->LimitOut->PacketMark);
+    if ($this->LimitOut->PacketMark != null) $Item['packet-mark'] = $this->LimitOut->PacketMark;
+    $Output[] = $Item;
+
+    $this->CheckName($this->Name.'-in', $UsedNames);
+    $Item = array('name' => $this->Name.'-in', 'limit-at' => $this->LimitIn->Min, 'max-limit' => $this->LimitIn->Max,
+      'parent' => $this->GetParentName('-in'));
+    if ($this->LimitIn->PacketMark != null) $Item['packet-mark'] = $this->LimitIn->PacketMark;
+    $Output[] = $Item;
+
+    $Output = array_merge($Output, $this->SubItems->GetCommands($UsedNames));
+    return $Output;
+  }
+
+  function GetParentName(string $Suffix)
+  {
+    if ($this->Parent != null) return $this->Parent->Name.$Suffix;
+    return 'global';
+  }
+
+  function UpdateMinSpeeds()
+  {
+    if (($this->LimitIn->Min == 0) or ($this->LimitOut->Min == 0))
+    {
+      $SpeedMinOut = 0;
+      $SpeedMinIn = 0;
+      foreach ($this->SubItems->Items as $Index => $Item)
+      {
+        $this->SubItems->Items[$Index]->UpdateMinSpeeds();
+        $SpeedMinOut += $this->SubItems->Items[$Index]->LimitOut->Min;
+        $SpeedMinIn += $this->SubItems->Items[$Index]->LimitIn->Min;
+      }
+      if ($SpeedMinOut > $this->LimitOut->Max) $SpeedMinOut = $this->LimitOut->Max;
+      if ($SpeedMinIn > $this->LimitIn->Max) $SpeedMinIn = $this->LimitIn->Max;
+      $this->LimitOut->Min = $SpeedMinOut;
+      $this->LimitIn->Min = $SpeedMinIn;
+    }
+  }
+}
+
+class SpeedLimitItems extends GenericList
+{
+  function AddNew(string $Name, SpeedLimitItem $Parent = null)
+  {
+    $Item = new SpeedLimitItem($Name, $Parent);
+    $Item->LimitIn = new SpeedLimit();
+    $Item->LimitOut = new SpeedLimit();
+    $this->Items[] = $Item;
+    return $Item;
+  }
+
+  function Print(int $Indent = 0): string
+  {
+    $Output = '';
+    foreach ($this->Items as $SubItem)
+    {
+      $Output .= $SubItem->Print($Indent);
+    }
+    return $Output;
+  }
+
+  function GetCommands(&$UsedNames)
+  {
+    $Output = array();
+    foreach ($this->Items as $SubItem)
+    {
+      $Output = array_merge($Output, $SubItem->GetCommands($UsedNames));
+    }
+    return $Output;
+  }
+}
 
 class ConfigRouterOSQueue extends NetworkConfigItem
@@ -6 +135 @@
   var $Devices;
   var $QueueItems;
-
-  function CheckName($Name)
-  {
-    if(in_array($Name, $this->UsedNames)) die("\n".'Duplicate name: '.$Name);
-      else $this->UsedNames[] = $Name;
-  }
+  var $SpeedLimits;
 
   function Run()
@@ -29 +153 @@
 
     // Generate traffic shaping rules
-    //$TotalMaxSpeedIn = 4048; //$RealMaxSpeed; //1536;
-    //TotalMaxSpeedOut = 3048; //$RealMaxSpeed; //1536;
-    //$UsersMaxSpeedIn = 1900; //$MaxSpeed;
-    //$UsersMaxSpeedOut = 1900; //$MaxSpeed;
-
     $InDivider = 1;
     $OutDivider = 1;
@@ -49 +168 @@
 
     $DbResult = $this->Database->select('Service', '*', '(`ChangeAction` IS NULL) AND (`Id`='.TARIFF_FREE.')');
-    if($DbResult->num_rows == 1)
+    if ($DbResult->num_rows == 1)
     {
       $Service = $DbResult->fetch_array();
@@ -55 +174 @@
     } else $FreeInetSpeed = 0;
 
-    $ItemsQueue = array();
-
     // Root of tree and main limit
-    $ItemsQueue[] = array('name' => 'main-out', 'limit-at' => $UsersMaxSpeedIn, 'max-limit' => $UsersMaxSpeedIn, 'parent' => 'global');
-    $ItemsQueue[] = array('name' => 'main-in', 'limit-at' => $UsersMaxSpeedOut, 'max-limit' => $UsersMaxSpeedOut, 'parent' => 'global');
+    $Main = new SpeedLimitItem('main');
+    $Main->LimitIn = new SpeedLimit(0, $UsersMaxSpeedIn);
+    $Main->LimitOut = new SpeedLimit(0, $UsersMaxSpeedOut);
+
+    $this->LoadSpeedLimits($Main);
 
     // Slow free internet
-    $PacketMark = GetMarkByComment('free-out');
-    $ItemsQueue[] = array('name' => 'free-out', 'limit-at' => $FreeInetSpeed, 'max-limit' => $FreeInetSpeed, 'parent' => 'main-out', 'packet-mark' => $PacketMark);
-    $PacketMark = GetMarkByComment('free-in');
-    $ItemsQueue[] = array('name' => 'free-in', 'limit-at' => $FreeInetSpeed, 'max-limit' => $FreeInetSpeed, 'parent' => 'main-in', 'packet-mark' => $PacketMark);
+    $Free = new SpeedLimitItem('free', $Main);
+    $Free->LimitIn = new SpeedLimit($FreeInetSpeed, $FreeInetSpeed, GetMarkByComment('free-in'));
+    $Free->LimitOut = new SpeedLimit($FreeInetSpeed, $FreeInetSpeed, GetMarkByComment('free-out'));
 
     // Process users
@@ -74 +193 @@
       $ServiceIndex = 1;
       echo('Zákazník '.$Member['Name']."\n");
-      $DbResult4 = $this->Database->query('SELECT `Service`.*, `ServiceCustomerRel`.`Id` AS `RelId` FROM `ServiceCustomerRel` '.
+      $DbResult4 = $this->Database->query('SELECT `Service`.*, `ServiceCustomerRel`.`Id` AS `RelId`, '.
+        '`ServiceCustomerRel`.`SpeedLimit` AS `SpeedLimit` FROM `ServiceCustomerRel` '.
         'JOIN `Service` ON `Service`.`Id` = `ServiceCustomerRel`.`Service` '.
         'WHERE (`ServiceCustomerRel`.`Customer` = '.$Member['Id'].') AND (`ServiceCustomerRel`.`ChangeAction` IS NULL) '.
@@ -86 +206 @@
         $UserMaxSpeedIn = round($Service['InternetSpeedMax'] / $InDivider);
         $UserMaxSpeedOut = round($Service['InternetSpeedMax'] / $OutDivider);
-        $ItemsQueue[] = array('name' => $MemberName.'-out', 'limit-at' => $SpeedIn, 'max-limit' => $UserMaxSpeedIn, 'parent' => 'main-out');
-        $ItemsQueue[] = array('name' => $MemberName.'-in', 'limit-at' => $SpeedOut, 'max-limit' => $UserMaxSpeedOut, 'parent' => 'main-in');
-        $this->CheckName($MemberName.'-out');
-        $this->CheckName($MemberName.'-in');
+
+        // Reduce max speed by speed limits
+        $SpeedLimitItem = $Main;
+        if ($Service['SpeedLimit'] != null)
+        {
+          $SpeedLimit = $this->SpeedLimits[$Service['SpeedLimit']];
+          $SpeedLimitItem = $SpeedLimit['SpeedLimitItem'];
+          if ($UserMaxSpeedIn > $SpeedLimit['SpeedMaxIn']) $UserMaxSpeedIn = $SpeedLimit['SpeedMaxIn'];
+          if ($UserMaxSpeedOut > $SpeedLimit['SpeedMaxOut']) $UserMaxSpeedOut = $SpeedLimit['SpeedMaxOut'];
+          while ($SpeedLimit['Parent'] != null)
+          {
+            $SpeedLimit = $this->SpeedLimits[$SpeedLimit['Parent']];
+            if ($UserMaxSpeedIn > $SpeedLimit['SpeedMaxIn']) $UserMaxSpeedIn = $SpeedLimit['SpeedMaxIn'];
+            if ($UserMaxSpeedOut > $SpeedLimit['SpeedMaxOut']) $UserMaxSpeedOut = $SpeedLimit['SpeedMaxOut'];
+          }
+        }
+
+        $LimitMember = new SpeedLimitItem($MemberName, $SpeedLimitItem);
+        $LimitMember->LimitIn = new SpeedLimit($SpeedIn, $UserMaxSpeedIn);
+        $LimitMember->LimitOut = new SpeedLimit($SpeedOut, $UserMaxSpeedOut);
 
         $Filter = '(`Used` = 1) AND (`Service` = '.$Service['RelId'].')';
@@ -111 +247 @@
           while($Interface = $DbResult3->fetch_assoc())
           {
-            $Name = $Device['Name'];
-            if($Interface['Name'] != '') $Name .= '-'.$Interface['Name'];
-            $Name = RouterOSIdent($Name);
-            echo($Name.', ');
-            $PacketMark = GetMarkByComment($Name.'-out');
-            $ItemsQueue[] = array('name' => $Name.'-out', 'limit-at' => $HostSpeedIn, 'max-limit' => $UserMaxSpeedIn, 'parent' => $MemberName.'-out', 'packet-mark' => $PacketMark);
-            $PacketMark = GetMarkByComment($Name.'-in');
-            $ItemsQueue[] = array('name' => $Name.'-in', 'limit-at' => $HostSpeedOut, 'max-limit' => $UserMaxSpeedOut, 'parent' => $MemberName.'-in', 'packet-mark' => $PacketMark);
-            $this->CheckName($Name.'-out');
-            $this->CheckName($Name.'-in');
+            $DeviceName = $Device['Name'];
+            if($Interface['Name'] != '') $DeviceName .= '-'.$Interface['Name'];
+            $DeviceName = RouterOSIdent($DeviceName);
+            echo($DeviceName.', ');
+            $LimitDevice = new SpeedLimitItem($DeviceName, $LimitMember);
+            $LimitDevice->LimitIn = new SpeedLimit($HostSpeedIn, $UserMaxSpeedIn, GetMarkByComment($DeviceName.'-in'));
+            $LimitDevice->LimitOut = new SpeedLimit($HostSpeedOut, $UserMaxSpeedOut, GetMarkByComment($DeviceName.'-out'));
           }
         }
@@ -127 +260 @@
         while($Subnet = $DbResult2->fetch_assoc())
         {
-          $Subnet['Name'] = RouterOSIdent('subnet-'.$Subnet['Name']);
-          echo($Subnet['Name'].', ');
-          $PacketMark = GetMarkByComment($Subnet['Name'].'-out');
-          $ItemsQueue[] = array('name' => $Subnet['Name'].'-out', 'limit-at' => $HostSpeedIn, 'max-limit' => $UserMaxSpeedIn, 'parent' => $MemberName.'-out', 'packet-mark' => $PacketMark);
-          $PacketMark = GetMarkByComment($Subnet['Name'].'-in');
-          $ItemsQueue[] = array('name' => $Subnet['Name'].'-in', 'limit-at' => $HostSpeedOut, 'max-limit' => $UserMaxSpeedOut, 'parent' => $MemberName.'-in', 'packet-mark' => $PacketMark);
-          $this->CheckName($Subnet['Name'].'-out');
-          $this->CheckName($Subnet['Name'].'-in');
+          $SubnetName = RouterOSIdent('subnet-'.$Subnet['Name']);
+          echo($SubnetName.', ');
+          $LimitSubnet = new SpeedLimitItem($SubnetName, $LimitMember);
+          $LimitSubnet->LimitIn = new SpeedLimit($HostSpeedIn, $UserMaxSpeedIn, GetMarkByComment($SubnetName.'-in'));
+          $LimitSubnet->LimitOut = new SpeedLimit($HostSpeedOut, $UserMaxSpeedOut, GetMarkByComment($SubnetName.'-out'));
         }
         echo("\n");
@@ -140 +270 @@
       }
     }
+    $Main->UpdateMinSpeeds();
+    echo($Main->Print());
+    $ItemsQueue = $Main->GetCommands();
+    //print_r($ItemsQueue);
+    //die();
 
     //print_r($ItemsQueue);
     $Routerboard->ListUpdate($PathQueue, array('name', 'limit-at', 'max-limit', 'parent', 'packet-mark'), $ItemsQueue, array(), true);
+  }
+
+  function BuildSpeedLimit(&$SpeedLimit, $TopSpeedLimitItem)
+  {
+    $SpeedLimitName = $SpeedLimit['Name'].'-grp';
+    $SpeedLimitName = RouterOSIdent($SpeedLimitName);
+    echo($SpeedLimitName.', ');
+
+    $SpeedLimitItem = new SpeedLimitItem($SpeedLimitName, $TopSpeedLimitItem);
+    $SpeedLimitItem->LimitIn = new SpeedLimit(0, $SpeedLimit['SpeedMaxIn']);
+    $SpeedLimitItem->LimitOut = new SpeedLimit(0, $SpeedLimit['SpeedMaxOut']);
+    $SpeedLimit['SpeedLimitItem'] = $SpeedLimitItem;
+
+    foreach ($SpeedLimit['Childs'] as $ChildId)
+    {
+      $this->BuildSpeedLimit($this->SpeedLimits[$ChildId], $SpeedLimitItem);
+    }
+  }
+
+  function LoadSpeedLimits($SpeedLimitItem)
+  {
+    echo('Limit groups: ');
+    // Load all speed limits
+    $this->SpeedLimits = array();
+    $DbResult = $this->Database->query('SELECT * FROM `NetworkSpeedLimit`');
+    while ($SpeedLimit = $DbResult->fetch_array())
+    {
+      $SpeedLimit['Childs'] = array();
+      $this->SpeedLimits[$SpeedLimit['Id']] = $SpeedLimit;
+    }
+
+    // Calculate childs from parent
+    foreach ($this->SpeedLimits as $Index => $SpeedLimit)
+    {
+      if ($SpeedLimit['Parent'] != null) $this->SpeedLimits[$SpeedLimit['Parent']]['Childs'][] = $Index;
+    }
+
+    // Build speed limits from top
+    foreach ($this->SpeedLimits as $Index => $SpeedLimit)
+    {
+      if ($SpeedLimit['Parent'] == null)
+      {
+        $this->BuildSpeedLimit($this->SpeedLimits[$Index], $SpeedLimitItem);
+      }
+    }
+    echo("\n");
   }
 
@@ -257 +438 @@
   }
 
-  function BuildQueueItems($DeviceId)
+  function BuildQueueItems($DeviceId, $SpeedLimitParent)
   {
     $Device = $this->Devices[$DeviceId];
 
     // Device
-    if($Device['Parent'] != 0)
-      $ParentQueueName = $this->Devices[$Device['Parent']]['QueueName'];
-      else $ParentQueueName = 'main';
-    $Name = $Device['Name'];
-    $Name = RouterOSIdent($Name);
-    $DeviceName = $Name;
-    $this->Devices[$DeviceId]['QueueName'] = $Name;
-    echo($Name.', ');
-    $PacketMark = GetMarkByComment($Name.'-out');
-    $this->ItemsQueue[] = array('name' => $Name.'-out', 'limit-at' => $Device['MinSpeed'],
-      'max-limit' => $Device['MaxSpeed'], 'parent' => $ParentQueueName.'-out',
-      'packet-mark' => $PacketMark);
-    $PacketMark = GetMarkByComment($Name.'-in');
-    $this->ItemsQueue[] = array('name' => $Name.'-in', 'limit-at' => $Device['MinSpeed'],
-      'max-limit' => $Device['MaxSpeed'], 'parent' => $ParentQueueName.'-in',
-      'packet-mark' => $PacketMark);
-    $this->CheckName($Name.'-out');
-    $this->CheckName($Name.'-in');
+    $DeviceName = $Device['Name'];
+    $DeviceName = RouterOSIdent($DeviceName);
+    $this->Devices[$DeviceId]['QueueName'] = $DeviceName;
+    echo($DeviceName.', ');
+
+    $LimitDevice = new SpeedLimitItem($DeviceName, $SpeedLimitParent);
+    $LimitDevice->LimitIn = new SpeedLimit($Device['MinSpeed'], $Device['MaxSpeed'], GetMarkByComment($DeviceName.'-in'));
+    $LimitDevice->LimitOut = new SpeedLimit($Device['MinSpeed'], $Device['MaxSpeed'], GetMarkByComment($DeviceName.'-out'));
 
     // Interfaces
@@ -286 +457 @@
     while($Interface = $DbResult3->fetch_assoc())
     {
-      $Name = $Device['Name'];
-      if($Interface['Name'] != '') $Name .= '-'.$Interface['Name'];
-        else $Name .= '-';
-      $Name = RouterOSIdent($Name);
-      echo($Name.', ');
-      $PacketMark = GetMarkByComment($Name.'-out');
-      $this->ItemsQueue[] = array('name' => $Name.'-out', 'limit-at' => round($Device['MinSpeed'] / $IntCount),
-        'max-limit' => $Device['MaxSpeed'], 'parent' => $DeviceName.'-out',
-        'packet-mark' => $PacketMark);
-      $PacketMark = GetMarkByComment($Name.'-in');
-      $this->ItemsQueue[] = array('name' => $Name.'-in', 'limit-at' => round($Device['MinSpeed'] / $IntCount),
-        'max-limit' => $Device['MaxSpeed'], 'parent' => $DeviceName.'-in',
-        'packet-mark' => $PacketMark);
-      $this->CheckName($Name.'-out');
-      $this->CheckName($Name.'-in');
+      $InterfaceName = $Device['Name'];
+      if($Interface['Name'] != '') $InterfaceName .= '-'.$Interface['Name'];
+        else $InterfaceName .= '-';
+      $InterfaceName = RouterOSIdent($InterfaceName);
+      echo($InterfaceName.', ');
+
+      $LimitInterface = new SpeedLimitItem($InterfaceName, $LimitDevice);
+      $LimitInterface->LimitIn = new SpeedLimit(round($Device['MinSpeed'] / $IntCount), $Device['MaxSpeed'], GetMarkByComment($InterfaceName.'-in'));
+      $LimitInterface->LimitOut = new SpeedLimit(round($Device['MinSpeed'] / $IntCount), $Device['MaxSpeed'], GetMarkByComment($InterfaceName.'-out'));
     }
 
@@ -306 +471 @@
     foreach($Device['Childs'] as $DeviceChild)
     {
-      $this->BuildQueueItems($DeviceChild);
+      $this->BuildQueueItems($DeviceChild, $LimitDevice);
     }
   }
@@ -349 +514 @@
 
     // Root of tree and main limit
-    $this->ItemsQueue[] = array('name' => 'main-out', 'limit-at' => $UsersMaxSpeedIn, 'max-limit' => $UsersMaxSpeedIn, 'parent' => 'global');
-    $this->ItemsQueue[] = array('name' => 'main-in', 'limit-at' => $UsersMaxSpeedOut, 'max-limit' => $UsersMaxSpeedOut, 'parent' => 'global');
+    $Main = new SpeedLimitItem('main');
+    $Main->LimitIn = new SpeedLimit($UsersMaxSpeedIn, $UsersMaxSpeedIn);
+    $Main->LimitOut = new SpeedLimit($UsersMaxSpeedOut, $UsersMaxSpeedOut);
 
     // Slow free internet
-    $PacketMark = GetMarkByComment('free-out');
-    $this->ItemsQueue[] = array('name' => 'free-out', 'limit-at' => $FreeInetSpeed, 'max-limit' => $FreeInetSpeed, 'parent' => 'main-out', 'packet-mark' => $PacketMark);
-    $PacketMark = GetMarkByComment('free-in');
-    $this->ItemsQueue[] = array('name' => 'free-in', 'limit-at' => $FreeInetSpeed, 'max-limit' => $FreeInetSpeed, 'parent' => 'main-in', 'packet-mark' => $PacketMark);
-
-    $this->BuildTree($this->System->Config['MainRouter']['DeviceId'], 140 * 1000 * 1000);
-
-    $this->BuildQueueItems($this->System->Config['MainRouter']['DeviceId']);
-
-    //print_r($this->ItemsQueue);
-    $Routerboard->ListUpdate($PathQueue, array('name', 'limit-at', 'max-limit',
-      'parent', 'packet-mark'), $this->ItemsQueue, array(), true);
+    $Free = new SpeedLimitItem('free', $Main);
+    $Free->LimitIn = new SpeedLimit($FreeInetSpeed, $FreeInetSpeed, GetMarkByComment('free-in'));
+    $Free->LimitOut = new SpeedLimit($FreeInetSpeed, $FreeInetSpeed, GetMarkByComment('free-out'));
+
+    $this->BuildTree($this->System->Config['MainRouter']['DeviceId'], $UsersMaxSpeedIn);
+    $this->BuildQueueItems($this->System->Config['MainRouter']['DeviceId'], $Main);
+
+    echo($Main->Print());
+    //print_r($Main->GetCommands());
+    die();
+
+    print_r($this->ItemsQueue);
+    //$Routerboard->ListUpdate($PathQueue, array('name', 'limit-at', 'max-limit',
+    //  'parent', 'packet-mark'), $this->ItemsQueue, array(), true);
   }
 }

trunk/Packages/Common/Common.php

@@ -20 +20 @@
 include_once(dirname(__FILE__).'/Table.php');
 include_once(dirname(__FILE__).'/Process.php');
+include_once(dirname(__FILE__).'/Generics.php');
 
 class PackageCommon
@@ -34 +35 @@
     $this->Name = 'Common';
     $this->Version = '1.2';
-    $this->ReleaseDate = strtotime('2016-03-10');
+    $this->ReleaseDate = strtotime('2020-03-29');
     $this->Creator = 'Chronos';
     $this->License = 'GNU/GPL';
-    $this->Homepage = 'http://svn.zdechov.net/svn/PHPlib/Common/';
+    $this->Homepage = 'https://svn.zdechov.net/PHPlib/Common/';
   }
 }