Changeset 555

Timestamp:

Jul 8, 2013, 12:55:56 AM (11 years ago)

Author:

chronos

Message:

• Opraveno: Generování čísla služby při generování síťových front.
• Přidáno: Kontrola duplicity generovaných jmen u front.

Location:

trunk

Files:

• Common/Version.php (modified) (1 diff)
• Modules/NetworkConfigRouterOS/Generators/Queue.php (modified) (4 diffs)

trunk/Common/Version.php

@@ -1 +1 @@
 <?php
 
-$Revision = 554; // Subversion revision
+$Revision = 555; // Subversion revision
 $DatabaseRevision = 551; // SQL structure revision
 $ReleaseTime = '2013-07-07';

trunk/Modules/NetworkConfigRouterOS/Generators/Queue.php

@@ -15 +15 @@
 $Routerboard->HostName = $Config['MainRouter']['HostName'];
 $Routerboard->Debug = true;
+
+$UsedNames = array();
+
+function CheckName($Name)
+{
+  global $UsedNames;
+  
+  if(in_array($Name, $UsedNames)) die("\n".'Duplicate name: '.$Name);
+  else $UsedNames[] = $Name;
+}
 
 $Finance = &$System->Modules['Finance'];
@@ -72 +82 @@
     $UserMaxSpeedIn = round($Service['InternetSpeedMax'] / $InDivider) * 1000;
     $UserMaxSpeedOut = round($Service['InternetSpeedMax'] / $OutDivider) * 1000;
-    if($ServiceIndex == 1)
-    {
-      $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');
-    }
+    $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');
+    CheckName($MemberName.'-out');
+    CheckName($MemberName.'-in');
 
     $Filter = '(`Used` = 1) AND (`Service` = '.$Service['RelId'].')';
@@ -108 +117 @@
         $PacketMark = GetMarkByComment($Name.'-in');
         $ItemsQueue[] = array('name' => $Name.'-in', 'limit-at' => $HostSpeedOut, 'max-limit' => $UserMaxSpeedOut, 'parent' => $MemberName.'-in', 'packet-mark' => $PacketMark);
+        CheckName($Name.'-out');
+        CheckName($Name.'-in');
       }
     }
@@ -122 +133 @@
       $PacketMark = GetMarkByComment($Subnet['Name'].'-in');
       $ItemsQueue[] = array('name' => $Subnet['Name'].'-in', 'limit-at' => $HostSpeedOut, 'max-limit' => $UserMaxSpeedOut, 'parent' => $MemberName.'-in', 'packet-mark' => $PacketMark);
+      CheckName($Subnet['Name'].'-out');
+      CheckName($Subnet['Name'].'-in');
     }
     echo("\n");
+    $ServiceIndex++;
   }
 }