Changeset 970 for trunk/Modules/NetworkConfigRouterOS/Generators/Queue.php

Timestamp:

Jul 17, 2024, 10:48:28 PM (2 months ago)

Author:

chronos

Message:

• Modified: Service internet speed min and max used as contracted speeds. Real speed will be calculated with bonus speed and further queues calculations.
• Added: Bonus internet speed service field.
• Modified: Few PHP 8.3 fixes.

File:

• trunk/Modules/NetworkConfigRouterOS/Generators/Queue.php (modified) (9 diffs)

trunk/Modules/NetworkConfigRouterOS/Generators/Queue.php

@@ -3 +3 @@
 class SpeedLimit
 {
-  var $Min;
-  var $Max;
-  var $PacketMark;
+  public int $Min;
+  public int $Max;
+  public ?int $PacketMark;
 
   function __construct(int $Min, int $Max, int $PacketMark = null)
@@ -25 +25 @@
 class SpeedLimitItem
 {
-  var $Name;
-  var $Parent;
-  var $LimitIn;
-  var $LimitOut;
-  var $FixedSpeed;
-  var $SubItems;
+  public string $Name;
+  public ?SpeedLimitItem $Parent;
+  public SpeedLimit $LimitIn;
+  public SpeedLimit $LimitOut;
+  public bool $FixedSpeed;
+  public SpeedLimitItems $SubItems;
 
   function __construct(string $Name, SpeedLimitItem $Parent = null)
@@ -184 +184 @@
     $UsersMaxSpeedIn = round($Finance->MaxSpeed / $InDivider) * 1000;
     $UsersMaxSpeedOut = round($Finance->MaxSpeed / $OutDivider) * 1000;
-    $VoipMaxSpeedIn = $TotalMaxSpeedIn - 136;
-    $VoipMaxSpeedOut = $TotalMaxSpeedOut - 136;
-    $VoipSpeedIn = 100; //$SpeedReserve;
-    $VoipSpeedOut = 100; //$SpeedReserve;
     $OutInterface = 'eth1';
     $InInterface = 'ifb0';
@@ -206 +202 @@
     $this->LoadSpeedLimits($Main);
 
-    // Slow free internet
+    // Free internet
     $Free = new SpeedLimitItem('free', $Main);
     $Free->LimitIn = new SpeedLimit($FreeInetSpeed, $FreeInetSpeed, GetMarkByComment('free-in'));
@@ -226 +222 @@
       while ($Service = $DbResult4->fetch_assoc())
       {
+        $MinSpeed = $Service['InternetSpeedMin'];
+        $MaxSpeed = $Service['InternetSpeedMax'];
+        if ($Service['InternetSpeedBonus'] > $MaxSpeed) $MaxSpeed = $Service['InternetSpeedBonus'];
+
         echo('Služba '.$Service['Name'].': ');
         $MemberName = RouterOSIdent($Member['Name'].'-'.$Member['Id'].'-'.$ServiceIndex);
-        $SpeedIn = round($Service['InternetSpeedMin'] / $InDivider);
-        $SpeedOut = round($Service['InternetSpeedMin'] / $OutDivider);
-        $UserMaxSpeedIn = round($Service['InternetSpeedMax'] / $InDivider);
-        $UserMaxSpeedOut = round($Service['InternetSpeedMax'] / $OutDivider);
+        $MinReduction = 100;
+        $SpeedIn = round($MinSpeed / $InDivider / $MinReduction);
+        $SpeedOut = round($MinSpeed / $OutDivider / $MinReduction);
+        $UserMaxSpeedIn = round($MaxSpeed / $InDivider);
+        $UserMaxSpeedOut = round($MaxSpeed / $OutDivider);
 
         // Reduce max speed by speed limits
@@ -302 +303 @@
     echo($Main->Print());
     $ItemsQueue = $Main->GetCommands();
-    $Routerboard->ListUpdate($PathQueue, array('name', 'limit-at', 'max-limit', 'parent', 'packet-mark'), $ItemsQueue, array(), true);
+    //$Routerboard->ListUpdate($PathQueue, array('name', 'limit-at', 'max-limit', 'parent', 'packet-mark'), $ItemsQueue, array(), true);
   }
 
@@ -415 +416 @@
     while (count($DevicesToCheck) > 0)
     {
-      //echo('Pass'."\n");
       $NewDevicesToCheck = array();
       foreach ($DevicesToCheck as $DeviceId)
       {
-        //echo($this->Devices[$DeviceId]['Name'].': ');
         foreach ($this->Devices[$DeviceId]['Interfaces'] as $InterfaceId)
         {
@@ -435 +434 @@
               if ($NewMaxSpeed > $Link['MaxRealSpeed'])
                 $NewMaxSpeed = $Link['MaxRealSpeed'];
-              //echo($this->Devices[$Device2Id]['Name'].' '.$Device2Id.', ');
               $this->Devices[$Device2Id]['MaxSpeed'] = $NewMaxSpeed;
               // Set nodes tree relation
               $this->Devices[$Device2Id]['Parent'] = $DeviceId;
               $this->Devices[$DeviceId]['Childs'][] = $Device2Id;
-              //echo($NewMaxSpeed.", ".count($NewDevicesToCheck).' ');
               $NewDevicesToCheck[] = $Device2Id;
             }
           }
         }
-        //echo("\n");
       }
       $DevicesToCheck = $NewDevicesToCheck;
@@ -515 +511 @@
     $InDivider = 1;
     $OutDivider = 1;
-    $TotalMaxSpeedIn = round($Finance->RealMaxSpeed / $InDivider) * 1000;
-    $TotalMaxSpeedOut = round($Finance->RealMaxSpeed / $OutDivider) * 1000;
     $UsersMaxSpeedIn = round($Finance->MaxSpeed / $InDivider) * 1000;
     $UsersMaxSpeedOut = round($Finance->MaxSpeed / $OutDivider) * 1000;
-    $VoipMaxSpeedIn = $TotalMaxSpeedIn - 136;
-    $VoipMaxSpeedOut = $TotalMaxSpeedOut - 136;
-    $VoipSpeedIn = 100; //$SpeedReserve;
-    $VoipSpeedOut = 100; //$SpeedReserve;
-    $OutInterface = 'eth1';
-    $InInterface = 'ifb0';
-    $InetInterface = $this->System->Config['MainRouter']['InetInterface'];
 
     $DbResult = $this->Database->select('Service', '*', '(`ChangeAction` IS NULL) AND (`Id`='.TARIFF_FREE.')');