Changeset 926 for trunk

Timestamp:

May 10, 2022, 11:08:30 PM (3 years ago)

Author:

chronos

Message:

• Added: Update minimum speeds in RouterOS Queue generation.

File:

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

trunk/Modules/NetworkConfigRouterOS/Generators/Queue.php

@@ -29 +29 @@
   var $LimitIn;
   var $LimitOut;
+  var $FixedSpeed;
   var $SubItems;
 
@@ -37 +38 @@
     if ($Parent != null) $Parent->SubItems->Add($this);
     $this->SubItems = new SpeedLimitItems();
+    $this->FixedSpeed = false;
   }
 
@@ -94 +96 @@
       $this->LimitOut->Min = $SpeedMinOut;
       $this->LimitIn->Min = $SpeedMinIn;
+    }
+  }
+
+  function AdjustMinSpeedsToMax(float $MultiplierIn, float $MultiplierOut): void
+  {
+    foreach ($this->SubItems->Items as $Index => $Item)
+    {
+      $this->SubItems->Items[$Index]->AdjustMinSpeedsToMax($MultiplierIn, $MultiplierOut);
+    }
+    if ($this->FixedSpeed == false)
+    {
+      $this->LimitOut->Min = round($this->LimitOut->Min * $MultiplierOut);
+      if ($this->LimitOut->Min > $this->LimitOut->Max)
+      {
+        echo($this->Name.': '.$this->LimitOut->Min.' > '.$this->LimitOut->Max."\n");
+        $this->LimitOut->Min = $this->LimitOut->Max;
+      }
+      $this->LimitIn->Min = round($this->LimitIn->Min * $MultiplierIn);
+      if ($this->LimitIn->Min > $this->LimitIn->Max)
+      {
+        echo($this->Name.': '.$this->LimitIn->Min.' > '.$this->LimitIn->Max."\n");
+        $this->LimitIn->Min = $this->LimitIn->Max;
+      }
     }
   }
@@ -185 +210 @@
     $Free->LimitIn = new SpeedLimit($FreeInetSpeed, $FreeInetSpeed, GetMarkByComment('free-in'));
     $Free->LimitOut = new SpeedLimit($FreeInetSpeed, $FreeInetSpeed, GetMarkByComment('free-out'));
+    $Free->FixedSpeed = true;
 
     // Process users
@@ -271 +297 @@
     }
     $Main->UpdateMinSpeeds();
+    $Main->AdjustMinSpeedsToMax($Main->LimitIn->Max / $Main->LimitIn->Min,
+      $Main->LimitOut->Max / $Main->LimitOut->Min);
+
     echo($Main->Print());
     $ItemsQueue = $Main->GetCommands();