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
 

opentrafficshaper.conf

@@ -19,7 +19,7 @@
 # PID file to write our PID to
 #
 # default:
-# pid_file=/var/run/opentrafficshaper/opentrafficshaper.pid
+# pid_file=/run/opentrafficshaper/opentrafficshaper.pid
 
 
 # State file, this file is used to store persistent information

opentrafficshaper/POE/Filter/HybridHTTP/WebSocketFrame.pm

-# POE::Filter::HybridHTTP::WebSocketFrame - Copyright 2013-2014, AllworldIT
+# POE::Filter::HybridHTTP::WebSocketFrame - Copyright 2007-2023, AllworldIT
 # Hybrid HTTP filter support for WebSocketFrames
 #
 # This program is free software: you can redistribute it and/or modify
@@ -33,7 +33,7 @@
 # the same terms as Perl 5.10.
 ##
 
-package POE::Filter::HybridHTTP::WebSocketFrame;
+package opentrafficshaper::POE::Filter::HybridHTTP::WebSocketFrame;
 
 use bytes;
 
@@ -110,7 +110,7 @@ sub next {
 		return Encode::decode('UTF-8', $bytes);
 	}
 
-	return; 
+	return;
 }
 
 sub fin	{ @_ > 1 ? $_[0]->{fin}	= $_[1] : $_[0]->{fin} }
@@ -189,7 +189,7 @@ sub next_bytes {
 			$offset += 8;
 		}
 		# XXX - not sure how to return this sanely
-        if ($payload_len > $self->{'max_payload_size'}) {
+		if ($payload_len > $self->{'max_payload_size'}) {
 			$self->{'buffer'} = '';
 			return;
 		}

awitpt @ 932340ef

-Subproject commit 932340ef7336dc40bdd3d35d2023bde1310e9066

opentrafficshaper/constants.pm

 # OpenTrafficShaper constants package
-# Copyright (C) 2013-2014, 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