database/stats.sql

@@ -5,7 +5,7 @@ DROP TABLE IF EXISTS identifiers;
 CREATE TABLE identifiers (
 	`ID`					SERIAL,
 	`Identifier`			VARCHAR(255) NOT NULL
-) Engine=MyISAM;
+) Engine=InnoDB;
 
 /* For queries */
 CREATE INDEX identifiers_idx1 ON identifiers (`Identifier`);
@@ -28,12 +28,12 @@ CREATE TABLE stats (
 	`Limit`					MEDIUMINT UNSIGNED NOT NULL,
 	`Rate`					MEDIUMINT UNSIGNED NOT NULL,
 	`PPS`					MEDIUMINT UNSIGNED NOT NULL,
-	`Queue_Len`				MEDIUMINT UNSIGNED NOT NULL,
-	`Total_Bytes`			BIGINT UNSIGNED NOT NULL,
-	`Total_Packets`			BIGINT UNSIGNED NOT NULL,
-	`Total_Overlimits`		BIGINT UNSIGNED NOT NULL,
-	`Total_Dropped`			BIGINT UNSIGNED NOT NULL
-) Engine=MyISAM;
+	`QueueLen`				MEDIUMINT UNSIGNED NOT NULL,
+	`TotalBytes`			BIGINT UNSIGNED NOT NULL,
+	`TotalPackets`			BIGINT UNSIGNED NOT NULL,
+	`TotalOverlimits`		BIGINT UNSIGNED NOT NULL,
+	`TotalDropped`			BIGINT UNSIGNED NOT NULL
+) Engine=InnoDB;
 
 /* For queries */
 CREATE INDEX stats_idx1 ON stats (`IdentifierID`);
@@ -56,7 +56,7 @@ CREATE TABLE stats_basic (
 	`Timestamp`				INTEGER UNSIGNED NOT NULL,
 
 	`Counter`				BIGINT UNSIGNED NOT NULL
-) Engine=MyISAM;
+) Engine=InnoDB;
 
 /* For queries */
 CREATE INDEX stats_basic_idx1 ON stats (`IdentifierID`);

dicts/dictionary

 # Basic radius dictionary
-# Copyright (C) 2009-2013, AllWorldIT
+# Copyright (C) 2009-2015, AllWorldIT
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

dicts/dictionary.allworldit

 # AllWorldIT vendor radius dictionary
-# Copyright (C) 2009-2013, AllWorldIT
+# Copyright (C) 2009-2015, AllWorldIT
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -21,4 +21,5 @@ VENDOR		AllWorldIT								42109
 ATTRIBUTE	OpenTrafficShaper-Traffic-Limit         1       string          AllWorldIT
 ATTRIBUTE	OpenTrafficShaper-Traffic-Group         2       integer         AllWorldIT
 ATTRIBUTE	OpenTrafficShaper-Traffic-Class         3       integer         AllWorldIT
+ATTRIBUTE	OpenTrafficShaper-Traffic-Pool          4       string          AllWorldIT
 

awitpt @ 932340ef

-Subproject commit 932340ef7336dc40bdd3d35d2023bde1310e9066

opentrafficshaper/constants.pm

 # OpenTrafficShaper constants package
-# Copyright (C) 2013, AllWorldIT
-# 
+# Copyright (C) 2007-2023, AllWorldIT
+#
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
@@ -33,6 +33,7 @@ our (@ISA,@EXPORT,@EXPORT_OK);
 	SHAPER_NOTLIVE
 	SHAPER_PENDING
 	SHAPER_LIVE
+	SHAPER_CONFLICT
 );
 
 
@@ -41,9 +42,9 @@ our (@ISA,@EXPORT,@EXPORT_OK);
 # CFGM_ONLINE - Online
 # CFGM_CHANGED - Changed
 use constant {
-	CFGM_OFFLINE => 0,
-	CFGM_CHANGED => 1,
-	CFGM_ONLINE => 2,
+	CFGM_OFFLINE => 1,
+	CFGM_CHANGED => 2,
+	CFGM_ONLINE => 3,
 	CFGM_NEW => 4,
 };
 
@@ -51,10 +52,12 @@ use constant {
 # SHAPER_NOTLIVE - Nothing is going on yet, something should happen
 # SHAPER_PENDING - Waiting on shaper to do a change
 # SHAPER_LIVE - Shaper is up to date with our config
+# SHAPER_CONFLICT - Item is in conflict
 use constant {
-	SHAPER_NOTLIVE => 0,
-	SHAPER_PENDING => 1,
-	SHAPER_LIVE => 2,
+	SHAPER_NOTLIVE => 1,
+	SHAPER_PENDING => 2,
+	SHAPER_LIVE => 4,
+	SHAPER_CONFLICT => 8,
 };