Merge branch 'master' into next

diff --git a/doc/language_issues.de b/doc/language_issues.de
index 40ad3112afaef5f050fb8923025cb3573c9ac763..e3c8842488e900dfe728e551fbd4e4a57f22451c 100644 (file)
--- a/doc/language_issues.de
+++ b/doc/language_issues.de
@@ -5,6 +5,7 @@ WARNING: translation string unused: HDD temperature
 WARNING: translation string unused: Level7 rule
 WARNING: translation string unused: Local VPN IP
 WARNING: translation string unused: Ping
+WARNING: translation string unused: Queuelenght
 WARNING: translation string unused: Remote IP
 WARNING: translation string unused: Remote VPN IP
 WARNING: translation string unused: Resolv
@@ -146,6 +147,7 @@ WARNING: translation string unused: err rs 8 untar
 WARNING: translation string unused: error config
 WARNING: translation string unused: error external access
 WARNING: translation string unused: expected
+WARNING: translation string unused: expertoptions
 WARNING: translation string unused: exportkey
 WARNING: translation string unused: external access rule changed
 WARNING: translation string unused: extrahd unable to read
@@ -257,6 +259,7 @@ WARNING: translation string unused: monthly volume
 WARNING: translation string unused: monthly volume start day
 WARNING: translation string unused: monthly volume start day short
 WARNING: translation string unused: mount
+WARNING: translation string unused: mtu QoS
 WARNING: translation string unused: nat-traversal
 WARNING: translation string unused: net address
 WARNING: translation string unused: net config type

diff --git a/doc/language_issues.en b/doc/language_issues.en
index 2ad18eb027001080e5117346a45643f36a1cb007..6c1fc21c36717dc434c35b2d7d2d3cdcf170c5d8 100644 (file)
--- a/doc/language_issues.en
+++ b/doc/language_issues.en
@@ -5,6 +5,7 @@ WARNING: translation string unused: HDD temperature
 WARNING: translation string unused: Level7 rule
 WARNING: translation string unused: Local VPN IP
 WARNING: translation string unused: Ping
+WARNING: translation string unused: Queuelenght
 WARNING: translation string unused: Remote IP
 WARNING: translation string unused: Remote VPN IP
 WARNING: translation string unused: Resolv
@@ -169,6 +170,7 @@ WARNING: translation string unused: err rs 8 untar
 WARNING: translation string unused: error config
 WARNING: translation string unused: error external access
 WARNING: translation string unused: expected
+WARNING: translation string unused: expertoptions
 WARNING: translation string unused: exportkey
 WARNING: translation string unused: external access rule changed
 WARNING: translation string unused: extrahd unable to read
@@ -283,6 +285,7 @@ WARNING: translation string unused: monthly volume
 WARNING: translation string unused: monthly volume start day
 WARNING: translation string unused: monthly volume start day short
 WARNING: translation string unused: mount
+WARNING: translation string unused: mtu QoS
 WARNING: translation string unused: nat-traversal
 WARNING: translation string unused: net address
 WARNING: translation string unused: net config type

diff --git a/doc/language_issues.es b/doc/language_issues.es
index eb45ffbe4a51dba087590e727984f61b25b54735..78a02226687c86282549937b48c619b2a2498e6f 100644 (file)
--- a/doc/language_issues.es
+++ b/doc/language_issues.es
@@ -5,6 +5,7 @@ WARNING: translation string unused: HDD temperature
 WARNING: translation string unused: Level7 rule
 WARNING: translation string unused: Local VPN IP
 WARNING: translation string unused: Ping
+WARNING: translation string unused: Queuelenght
 WARNING: translation string unused: Remote IP
 WARNING: translation string unused: Remote VPN IP
 WARNING: translation string unused: Resolv
@@ -167,6 +168,7 @@ WARNING: translation string unused: err rs 8 untar
 WARNING: translation string unused: error config
 WARNING: translation string unused: error external access
 WARNING: translation string unused: expected
+WARNING: translation string unused: expertoptions
 WARNING: translation string unused: exportkey
 WARNING: translation string unused: external access rule changed
 WARNING: translation string unused: extrahd unable to read
@@ -281,6 +283,7 @@ WARNING: translation string unused: monthly volume
 WARNING: translation string unused: monthly volume start day
 WARNING: translation string unused: monthly volume start day short
 WARNING: translation string unused: mount
+WARNING: translation string unused: mtu QoS
 WARNING: translation string unused: nat-traversal
 WARNING: translation string unused: net address
 WARNING: translation string unused: net config type
@@ -604,6 +607,7 @@ WARNING: untranslated string: proxy reports daily
 WARNING: untranslated string: proxy reports monthly
 WARNING: untranslated string: proxy reports today
 WARNING: untranslated string: proxy reports weekly
+WARNING: untranslated string: qos enter bandwidths
 WARNING: untranslated string: route config changed
 WARNING: untranslated string: routing config added
 WARNING: untranslated string: routing config changed

diff --git a/doc/language_issues.fr b/doc/language_issues.fr
index f2f3e00104eafab8b60a45ff2fc612a04ff0568a..4c185286ccc7097dcf377be00d61f8dde30bb782 100644 (file)
--- a/doc/language_issues.fr
+++ b/doc/language_issues.fr
@@ -5,6 +5,7 @@ WARNING: translation string unused: HDD temperature
 WARNING: translation string unused: Level7 rule
 WARNING: translation string unused: Local VPN IP
 WARNING: translation string unused: Ping
+WARNING: translation string unused: Queuelenght
 WARNING: translation string unused: Remote IP
 WARNING: translation string unused: Remote VPN IP
 WARNING: translation string unused: Resolv
@@ -167,6 +168,7 @@ WARNING: translation string unused: err rs 8 untar
 WARNING: translation string unused: error config
 WARNING: translation string unused: error external access
 WARNING: translation string unused: expected
+WARNING: translation string unused: expertoptions
 WARNING: translation string unused: exportkey
 WARNING: translation string unused: external access rule changed
 WARNING: translation string unused: extrahd unable to read
@@ -281,6 +283,7 @@ WARNING: translation string unused: monthly volume
 WARNING: translation string unused: monthly volume start day
 WARNING: translation string unused: monthly volume start day short
 WARNING: translation string unused: mount
+WARNING: translation string unused: mtu QoS
 WARNING: translation string unused: nat-traversal
 WARNING: translation string unused: net address
 WARNING: translation string unused: net config type
@@ -588,6 +591,7 @@ WARNING: untranslated string: proxy reports daily
 WARNING: untranslated string: proxy reports monthly
 WARNING: untranslated string: proxy reports today
 WARNING: untranslated string: proxy reports weekly
+WARNING: untranslated string: qos enter bandwidths
 WARNING: untranslated string: route config changed
 WARNING: untranslated string: routing config added
 WARNING: untranslated string: routing config changed

diff --git a/doc/language_issues.nl b/doc/language_issues.nl
index f43280a018f17888928d239f8aa6b88a166e384b..5a23c69c6ab1d68bc024a8737ecb0a05d5acf875 100644 (file)
--- a/doc/language_issues.nl
+++ b/doc/language_issues.nl
@@ -5,6 +5,7 @@ WARNING: translation string unused: HDD temperature
 WARNING: translation string unused: Level7 rule
 WARNING: translation string unused: Local VPN IP
 WARNING: translation string unused: Ping
+WARNING: translation string unused: Queuelenght
 WARNING: translation string unused: Remote IP
 WARNING: translation string unused: Remote VPN IP
 WARNING: translation string unused: Resolv
@@ -169,6 +170,7 @@ WARNING: translation string unused: err rs 8 untar
 WARNING: translation string unused: error config
 WARNING: translation string unused: error external access
 WARNING: translation string unused: expected
+WARNING: translation string unused: expertoptions
 WARNING: translation string unused: exportkey
 WARNING: translation string unused: external access rule changed
 WARNING: translation string unused: extrahd unable to read
@@ -283,6 +285,7 @@ WARNING: translation string unused: monthly volume
 WARNING: translation string unused: monthly volume start day
 WARNING: translation string unused: monthly volume start day short
 WARNING: translation string unused: mount
+WARNING: translation string unused: mtu QoS
 WARNING: translation string unused: nat-traversal
 WARNING: translation string unused: net address
 WARNING: translation string unused: net config type
@@ -508,6 +511,7 @@ WARNING: untranslated string: bytes
 WARNING: untranslated string: ccd iroute2
 WARNING: untranslated string: new
 WARNING: untranslated string: outgoing firewall reserved groupname
+WARNING: untranslated string: qos enter bandwidths
 WARNING: untranslated string: route config changed
 WARNING: untranslated string: routing config added
 WARNING: untranslated string: routing config changed

diff --git a/doc/language_issues.pl b/doc/language_issues.pl
index eb45ffbe4a51dba087590e727984f61b25b54735..78a02226687c86282549937b48c619b2a2498e6f 100644 (file)
--- a/doc/language_issues.pl
+++ b/doc/language_issues.pl
@@ -5,6 +5,7 @@ WARNING: translation string unused: HDD temperature
 WARNING: translation string unused: Level7 rule
 WARNING: translation string unused: Local VPN IP
 WARNING: translation string unused: Ping
+WARNING: translation string unused: Queuelenght
 WARNING: translation string unused: Remote IP
 WARNING: translation string unused: Remote VPN IP
 WARNING: translation string unused: Resolv
@@ -167,6 +168,7 @@ WARNING: translation string unused: err rs 8 untar
 WARNING: translation string unused: error config
 WARNING: translation string unused: error external access
 WARNING: translation string unused: expected
+WARNING: translation string unused: expertoptions
 WARNING: translation string unused: exportkey
 WARNING: translation string unused: external access rule changed
 WARNING: translation string unused: extrahd unable to read
@@ -281,6 +283,7 @@ WARNING: translation string unused: monthly volume
 WARNING: translation string unused: monthly volume start day
 WARNING: translation string unused: monthly volume start day short
 WARNING: translation string unused: mount
+WARNING: translation string unused: mtu QoS
 WARNING: translation string unused: nat-traversal
 WARNING: translation string unused: net address
 WARNING: translation string unused: net config type
@@ -604,6 +607,7 @@ WARNING: untranslated string: proxy reports daily
 WARNING: untranslated string: proxy reports monthly
 WARNING: untranslated string: proxy reports today
 WARNING: untranslated string: proxy reports weekly
+WARNING: untranslated string: qos enter bandwidths
 WARNING: untranslated string: route config changed
 WARNING: untranslated string: routing config added
 WARNING: untranslated string: routing config changed

diff --git a/doc/language_issues.ru b/doc/language_issues.ru
index e83f42b16635d713cfeb5cc3d8f23c8cd7e13bb5..0196084cb458b3af22b610698ebee5e04f1fc772 100644 (file)
--- a/doc/language_issues.ru
+++ b/doc/language_issues.ru
@@ -5,6 +5,7 @@ WARNING: translation string unused: HDD temperature
 WARNING: translation string unused: Level7 rule
 WARNING: translation string unused: Local VPN IP
 WARNING: translation string unused: Ping
+WARNING: translation string unused: Queuelenght
 WARNING: translation string unused: Remote IP
 WARNING: translation string unused: Remote VPN IP
 WARNING: translation string unused: Resolv
@@ -166,6 +167,7 @@ WARNING: translation string unused: err rs 8 untar
 WARNING: translation string unused: error config
 WARNING: translation string unused: error external access
 WARNING: translation string unused: expected
+WARNING: translation string unused: expertoptions
 WARNING: translation string unused: exportkey
 WARNING: translation string unused: external access rule changed
 WARNING: translation string unused: filename
@@ -275,6 +277,7 @@ WARNING: translation string unused: monthly volume
 WARNING: translation string unused: monthly volume start day
 WARNING: translation string unused: monthly volume start day short
 WARNING: translation string unused: mount
+WARNING: translation string unused: mtu QoS
 WARNING: translation string unused: nat-traversal
 WARNING: translation string unused: net address
 WARNING: translation string unused: net config type
@@ -569,6 +572,7 @@ WARNING: untranslated string: proxy reports daily
 WARNING: untranslated string: proxy reports monthly
 WARNING: untranslated string: proxy reports today
 WARNING: untranslated string: proxy reports weekly
+WARNING: untranslated string: qos enter bandwidths
 WARNING: untranslated string: route config changed
 WARNING: untranslated string: routing config added
 WARNING: untranslated string: routing config changed

diff --git a/doc/language_missings b/doc/language_missings
index 168295044fb2c5c427efdd7ca4b8a32535dfc30e..a4eebcd70a296ca791ea7e868c04c6abe6b49bf0 100644 (file)
--- a/doc/language_missings
+++ b/doc/language_missings
@@ -98,6 +98,7 @@
 < proxy reports monthly
 < proxy reports today
 < proxy reports weekly
+< qos enter bandwidths
 < server restart
 < snort working
 < static routes
@@ -236,6 +237,7 @@
 < proxy reports monthly
 < proxy reports today
 < proxy reports weekly
+< qos enter bandwidths
 < server restart
 < Set time on boot
 < static routes
@@ -328,6 +330,7 @@
 < proxy reports monthly
 < proxy reports today
 < proxy reports weekly
+< qos enter bandwidths
 < server restart
 < static routes
 < visit us at
@@ -423,6 +426,7 @@
 < proxy reports monthly
 < proxy reports today
 < proxy reports weekly
+< qos enter bandwidths
 < server restart
 < static routes
 < visit us at

diff --git a/html/cgi-bin/qos.cgi b/html/cgi-bin/qos.cgi
index 31232cab0004f3450e2ef5b979761cc652014432..de732842ca429d780f0ab93a8f4c60a727140a76 100644 (file)
--- a/html/cgi-bin/qos.cgi
+++ b/html/cgi-bin/qos.cgi
@@ -497,20 +497,21 @@ elsif ($qossettings{'ACTION'} eq $Lang::tr{'save'})
 }
 elsif ($qossettings{'ACTION'} eq $Lang::tr{'template'} )
 {
-       my @UP;
-       #print "UP<br />";
-       for(my $i = 1; $i <= 10; $i++) {
-       $UP[$i] = int($qossettings{'OUT_SPD'} / $i );
-       #print $i."=".$UP[$i]." ";
-       }
-       my @DOWN;
-       #print "<br /><br />Down<br />";
-       for(my $i = 1; $i <= 20; $i++) {
-       $DOWN[$i] = int($qossettings{'INC_SPD'} / $i);
-       #print $i."=".$DOWN[$i]." ";
-       }
-       open( FILE, "> $classfile" ) or die "Unable to write $classfile";
-       print FILE <<END
+       if (($qossettings{'OUT_SPD'} > 0) && ($qossettings{'INC_SPD'} > 0)) {
+               my @UP;
+               #print "UP<br />";
+               for(my $i = 1; $i <= 10; $i++) {
+               $UP[$i] = int($qossettings{'OUT_SPD'} / $i );
+               #print $i."=".$UP[$i]." ";
+               }
+               my @DOWN;
+               #print "<br /><br />Down<br />";
+               for(my $i = 1; $i <= 20; $i++) {
+               $DOWN[$i] = int($qossettings{'INC_SPD'} / $i);
+               #print $i."=".$DOWN[$i]." ";
+               }
+               open( FILE, "> $classfile" ) or die "Unable to write $classfile";
+               print FILE <<END
 imq0;200;1;$DOWN[10];$DOWN[1];;;8;VoIP;
 imq0;203;4;$DOWN[20];$DOWN[1];;;0;VPN;
 imq0;204;5;$DOWN[20];$DOWN[1];;;8;Webtraffic;
@@ -524,9 +525,9 @@ $qossettings{'RED_DEV'};120;7;1;$UP[1];;;1;P2P;
 $qossettings{'RED_DEV'};103;4;$UP[2];$UP[1];;;2;VPN;
 END
 ;
-       close FILE;
-       open( FILE, "> $level7file" ) or die "Unable to write $level7file";
-       print FILE <<END
+               close FILE;
+               open( FILE, "> $level7file" ) or die "Unable to write $level7file";
+               print FILE <<END
 102;$qossettings{'RED_DEV'};dns;;;
 102;$qossettings{'RED_DEV'};rtp;;;
 102;$qossettings{'RED_DEV'};skypetoskype;;;
@@ -548,9 +549,9 @@ END
 220;imq0;bittorrent;;;
 END
 ;
-       close FILE;
-       open( FILE, "> $portfile" ) or die "Unable to write $portfile";
-       print FILE <<END
+               close FILE;
+               open( FILE, "> $portfile" ) or die "Unable to write $portfile";
+               print FILE <<END
 101;$qossettings{'RED_DEV'};icmp;;;;;
 102;$qossettings{'RED_DEV'};tcp;;;;53;
 102;$qossettings{'RED_DEV'};udp;;;;53;
@@ -573,22 +574,25 @@ END
 204;imq0;tcp;;80;;;
 END
 ;
-       close FILE;
-       if ($qossettings{'DEF_INC_SPD'} eq '') {
-               $qossettings{'DEF_INC_SPD'} = int($qossettings{'INC_SPD'} * 0.9);
-       }
-       if ($qossettings{'DEF_OUT_SPD'} eq '') {
-               $qossettings{'DEF_OUT_SPD'} = int($qossettings{'OUT_SPD'} * 0.9);
+               close FILE;
+               if ($qossettings{'DEF_INC_SPD'} eq '') {
+                       $qossettings{'DEF_INC_SPD'} = int($qossettings{'INC_SPD'} * 0.9);
+               }
+               if ($qossettings{'DEF_OUT_SPD'} eq '') {
+                       $qossettings{'DEF_OUT_SPD'} = int($qossettings{'OUT_SPD'} * 0.9);
+               }
+               $qossettings{'DEFCLASS_INC'} = "210";
+               $qossettings{'DEFCLASS_OUT'} = "110";
+               $qossettings{'ACK'} ="101";
+               $qossettings{'ENABLED'} = 'on';
+               &General::writehash("${General::swroot}/qos/settings", \%qossettings);
+               system("/usr/local/bin/qosctrl generate >/dev/null 2>&1");
+               system("/usr/bin/touch /var/ipfire/qos/enable");
+               system("/usr/local/bin/qosctrl start >/dev/null 2>&1");
+               system("logger -t ipfire 'QoS started'");
+       } else {
+               $message = $Lang::tr{'qos enter bandwidths'};
        }
-       $qossettings{'DEFCLASS_INC'} = "210";
-       $qossettings{'DEFCLASS_OUT'} = "110";
-       $qossettings{'ACK'} ="101";
-       $qossettings{'ENABLED'} = 'on';
-       &General::writehash("${General::swroot}/qos/settings", \%qossettings);
-       system("/usr/local/bin/qosctrl generate >/dev/null 2>&1");
-       system("/usr/bin/touch /var/ipfire/qos/enable");
-       system("/usr/local/bin/qosctrl start >/dev/null 2>&1");
-       system("logger -t ipfire 'QoS started'");
 }
 elsif ($qossettings{'ACTION'} eq $Lang::tr{'status'} )
 {

diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index 93529d805400badbddc25d4b914ef6e9af28f2bb..f9405d7be7a32e43ca475d125fc5f1f6b05ac1c7 100644 (file)
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -1523,6 +1523,7 @@
 'psk' => 'PSK',
 'pulse' => 'Puls',
 'pulse dial' => 'Pulswahl:',
+'qos enter bandwidths' => 'Bitte geben Sie ihre Downstream- und Upstream-Bandbreite an!',
 'qos graphs' => 'Qos Diagramme',
 'qos warning' => 'Die Regel <strong>muss</strong> wieder gespeichert werden, ansonsten wird sie verworfen!',
 'quick playlist' => 'Quick Playlist',

diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index c4629a5ad8b26e8718dd49d69463eb9bcb503ebe..46076fd6c264bfa11c07143aa8b7c8974a531441 100644 (file)
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -1551,6 +1551,7 @@
 'pulse' => 'Pulse',
 'pulse dial' => 'Pulse dial:',
 'qos add subclass' => 'Add subclass',
+'qos enter bandwidths' => 'You will need to enter your downstream and upstream bandwidth!',
 'qos graphs' => 'Qos Graphs',
 'qos warning' => 'The rule <strong>must</strong> be saved, otherwise it will be discarded!',
 'quick control' => 'Quick Control',