X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=html%2Fcgi-bin%2Fqos.cgi;h=26e0eef5084c815cfe67eee1860bde0e493e89a1;hb=ec3573fc83603317b0e9dd195426d8947a1c25f2;hp=8a3d0024f5156a225c760475524a684974d1da73;hpb=33e1f48cfbb2a62fabf089b0e1e0e9480e86f2b8;p=people%2Fpmueller%2Fipfire-2.x.git diff --git a/html/cgi-bin/qos.cgi b/html/cgi-bin/qos.cgi index 8a3d0024f5..26e0eef508 100644 --- a/html/cgi-bin/qos.cgi +++ b/html/cgi-bin/qos.cgi @@ -64,8 +64,6 @@ my $portfile = "/var/ipfire/qos/portconfig"; my $tosfile = "/var/ipfire/qos/tosconfig"; &General::readhash("${General::swroot}/ethernet/settings", \%netsettings); -&Header::showhttpheaders(); - $qossettings{'ENABLED'} = 'off'; $qossettings{'EDIT'} = 'no'; $qossettings{'OUT_SPD'} = ''; @@ -120,8 +118,19 @@ my %mainsettings = (); &General::readhash("${General::swroot}/main/settings", \%mainsettings); &General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", \%color); -&Header::openpage('QoS', 1, ''); -&Header::openbigbox('100%', 'left', '', $errormessage); +my @querry = split(/\?/,$ENV{'QUERY_STRING'}); +$querry[0] = '' unless defined $querry[0]; +$querry[1] = 'hour' unless defined $querry[1]; + +if ( $querry[0] ne ""){ + print "Content-type: image/png\n\n"; + binmode(STDOUT); + &Graphs::updateqosgraph($querry[0],$querry[1]); +}else{ + &Header::showhttpheaders(); + + &Header::openpage('QoS', 1, ''); + &Header::openbigbox('100%', 'left', '', $errormessage); ############################################################################################################################ ############################################################################################################################ @@ -139,10 +148,10 @@ END ; close FILE; } else { - $qossettings{'ACTION'} = 'Parentklasse hinzufuegen'; + $qossettings{'ACTION'} = $Lang::tr{'parentclass add'}; } } -elsif ($qossettings{'DOCLASS'} eq 'Bearbeiten') +elsif ($qossettings{'DOCLASS'} eq $Lang::tr{'edit'}) { open( FILE, "< $classfile" ) or die "Unable to read $classfile"; @classes = ; @@ -171,7 +180,7 @@ elsif ($qossettings{'DOCLASS'} eq 'Bearbeiten') &Header::closepage(); exit } -elsif ($qossettings{'DOCLASS'} eq 'Loeschen') +elsif ($qossettings{'DOCLASS'} eq $Lang::tr{'delete'}) { open( FILE, "< $classfile" ) or die "Unable to read $classfile"; @tmp = ; @@ -217,9 +226,9 @@ END ; close FILE; } else { - $qossettings{'ACTION'} = 'Unterklasse hinzufuegen'; + $qossettings{'ACTION'} = $Lang::tr{'qos add subclass'}; } -} elsif ($qossettings{'DOSCLASS'} eq 'Loeschen') +} elsif ($qossettings{'DOSCLASS'} eq $Lang::tr{'delete'}) { open( FILE, "< $subclassfile" ) or die "Unable to read $classfile"; @tmp = ; @@ -243,15 +252,15 @@ END if ($qossettings{'DOLEVEL7'} eq $Lang::tr{'save'}) { if ( $qossettings{'QIP'} ne '' ) { - unless ( &General::validip($qossettings{'QIP'}) ) { + unless ( &General::validip($qossettings{'QIP'}) ) { $qossettings{'VALID'} = 'no'; - $message = "Die Quell-IP-Adresse ist ungueltig."; + $message = $Lang::tr{'The source IP address is invalid.'}; } } if ( $qossettings{'DIP'} ne '' ) { - unless ( &General::validip($qossettings{'DIP'}) ) { + unless ( &General::validip($qossettings{'DIP'}) ) { $qossettings{'VALID'} = 'no'; - $message = "Die Ziel-IP-Adresse ist ungueltig."; + $message = $Lang::tr{'The destination IP address is invalid.'}; } } if ($qossettings{'CLASS'} >= 100 && $qossettings{'CLASS'} < 121) { @@ -271,9 +280,9 @@ END ; close FILE; } else { - $qossettings{'ACTION'} = 'Level7-Regel hinzufuegen'; + $qossettings{'ACTION'} = $Lang::tr{'Add Level7 rule'}; } -} elsif ($qossettings{'DOLEVEL7'} eq 'Loeschen') +} elsif ($qossettings{'DOLEVEL7'} eq $Lang::tr{'delete'}) { open( FILE, "< $level7file" ) or die "Unable to read $level7file"; @l7rules = ; @@ -283,7 +292,7 @@ END { @l7ruleline = split( /\;/, $l7ruleentry ); if ( ($l7ruleline[0] eq $qossettings{'CLASS'}) && ($l7ruleline[2] eq $qossettings{'L7PROT'})) - {$message = "Level7-Regel ($qossettings{'CLASS'} - $qossettings{'L7PROT'}) wurde geloescht.";} + {$message = "$Lang::tr{'Level7 Rule'} ($qossettings{'CLASS'} - $qossettings{'L7PROT'}) $Lang::tr{'was deleted'}.";} else { open( FILE, ">> $level7file" ) or die "Unable to read $level7file"; print FILE $l7ruleentry; @@ -291,7 +300,7 @@ END } } open( FILE, "< $level7file" ) or system("touch $level7file");close FILE; - } elsif ($qossettings{'DOLEVEL7'} eq 'Bearbeiten') + } elsif ($qossettings{'DOLEVEL7'} eq $Lang::tr{'edit'}) { open( FILE, "< $level7file" ) or die "Unable to read $level7file"; @l7rules = ; @@ -318,15 +327,15 @@ END if ($qossettings{'DOPORT'} eq $Lang::tr{'save'}) { if ( $qossettings{'QIP'} ne '' ) { - unless ( &General::validip($qossettings{'QIP'}) ) { + unless ( &General::validip($qossettings{'QIP'}) ) { $qossettings{'VALID'} = 'no'; - $message = "Die Quell-IP-Adresse ist ungueltig."; + $message = "$Lang::tr{'The source IP address is invalid.'}"; } } if ( $qossettings{'DIP'} ne '' ) { - unless ( &General::validip($qossettings{'DIP'}) ) { + unless ( &General::validip($qossettings{'DIP'}) ) { $qossettings{'VALID'} = 'no'; - $message = "Die Ziel-IP-Adresse ist ungueltig."; + $message = "$Lang::tr{'The destination IP address is invalid.'}"; } } if ($qossettings{'CLASS'} >= 100 && $qossettings{'CLASS'} < 121) { @@ -346,9 +355,9 @@ END ; close FILE; } else { - $qossettings{'ACTION'} = 'Port-Regel hinzufuegen'; + $qossettings{'ACTION'} = $Lang::tr{'Add Port Rule'}; } -} elsif ($qossettings{'DOPORT'} eq 'Loeschen') +} elsif ($qossettings{'DOPORT'} eq $Lang::tr{'delete'}) { open( FILE, "< $portfile" ) or die "Unable to read $portfile"; @portrules = ; @@ -364,7 +373,7 @@ END } close FILE; $message = "$Lang::tr{'Port Rule'} ($qossettings{'CLASS'} - $qossettings{'PPROT'}) $Lang::tr{'was deleted'}."; -} elsif ($qossettings{'DOPORT'} eq 'Bearbeiten') +} elsif ($qossettings{'DOPORT'} eq $Lang::tr{'edit'}) { open( FILE, "< $portfile" ) or die "Unable to read $portfile"; @portrules = ; @@ -405,7 +414,7 @@ $qossettings{'CLASS'};$qossettings{'DEVICE'};$qossettings{'TOS'}; END ; close FILE; -} +} elsif ($qossettings{'DOTOS'} eq 'Loeschen') { open( FILE, "< $tosfile" ) or die "Unable to read $tosfile"; @@ -422,7 +431,7 @@ elsif ($qossettings{'DOTOS'} eq 'Loeschen') } close FILE; $message = "$Lang::tr{'TOS Rule'} ($qossettings{'CLASS'} - $qossettings{'TOS'}) $Lang::tr{'was deleted'}."; -} elsif ($qossettings{'DOTOS'} eq 'Bearbeiten') +} elsif ($qossettings{'DOTOS'} eq $Lang::tr{'edit'}) { open( FILE, "< $tosfile" ) or die "Unable to read $tosfile"; @tosrules = ; @@ -450,16 +459,16 @@ elsif ($qossettings{'DOTOS'} eq 'Loeschen') ############################################################################################################################ ############################################################################################################################ -if ($qossettings{'ACTION'} eq 'Start') +if ($qossettings{'ACTION'} eq $Lang::tr{'start'}) { + $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'"); - $qossettings{'ENABLED'} = 'on'; - &General::writehash("${General::swroot}/qos/settings", \%qossettings); } -elsif ($qossettings{'ACTION'} eq 'Stop') +elsif ($qossettings{'ACTION'} eq $Lang::tr{'stop'}) { system("/usr/local/bin/qosctrl stop >/dev/null 2>&1"); unlink "/var/ipfire/qos/bin/qos.sh"; @@ -468,7 +477,7 @@ elsif ($qossettings{'ACTION'} eq 'Stop') $qossettings{'ENABLED'} = 'off'; &General::writehash("${General::swroot}/qos/settings", \%qossettings); } -elsif ($qossettings{'ACTION'} eq 'Neustart') +elsif ($qossettings{'ACTION'} eq $Lang::tr{'restart'}) { if ($qossettings{'ENABLED'} eq 'on'){ system("/usr/local/bin/qosctrl stop >/dev/null 2>&1"); @@ -506,30 +515,29 @@ elsif ($qossettings{'ACTION'} eq $Lang::tr{'template'} ) 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; -imq0;210;6;1;$DOWN[1];;;0;Standardklasse; +imq0;210;6;1;$DOWN[1];;;0;Default; imq0;220;7;1;$DOWN[1];;;1;P2P; -ppp0;101;1;$UP[2];$UP[1];;;8;ACKs oder so; -ppp0;102;2;$UP[3];$UP[1];;;8;VoIP; -ppp0;104;5;$UP[10];$UP[1];;;8;Webtraffic; -ppp0;110;6;1;$UP[1];;;0;Standardklasse; -ppp0;120;7;1;$UP[1];;;1;P2P; -ppp0;103;4;$UP[2];$UP[1];;;2;VPN; +$qossettings{'RED_DEV'};101;1;$UP[2];$UP[1];;;8;ACKs; +$qossettings{'RED_DEV'};102;2;$UP[3];$UP[1];;;8;VoIP; +$qossettings{'RED_DEV'};104;5;$UP[10];$UP[1];;;8;Webtraffic; +$qossettings{'RED_DEV'};110;6;1;$UP[1];;;0;Default; +$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 < $portfile" ) or die "Unable to write $portfile"; print FILE </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 'Statusinformationen') +elsif ($qossettings{'ACTION'} eq $Lang::tr{'status'} ) { &Header::openbox('100%', 'left', 'QoS Status'); if ($qossettings{'ENABLED'} eq 'on'){ @@ -590,30 +604,30 @@ elsif ($qossettings{'ACTION'} eq 'Statusinformationen') &Header::closepage(); exit } -elsif ($qossettings{'ACTION'} eq 'Parentklasse hinzufuegen') +elsif ($qossettings{'ACTION'} eq $Lang::tr{'parentclass add'} ) { &parentclass(); &Header::closebigbox(); &Header::closepage(); exit } -elsif ($qossettings{'ACTION'} eq 'Unterklasse hinzufuegen') +elsif ($qossettings{'ACTION'} eq $Lang::tr{'qos add subclass'}) { &subclass(); &Header::closebigbox(); &Header::closepage(); exit } -elsif ($qossettings{'ACTION'} eq 'Regel hinzufuegen') +elsif ($qossettings{'ACTION'} eq $Lang::tr{'Add Rule'}) { &Header::openbox('100%', 'center', $Lang::tr{'Add Rule'}); print < $Lang::tr{'Choose Rule'} - - - + + + END ; @@ -643,21 +657,21 @@ END &Header::closepage(); exit } -elsif ($qossettings{'ACTION'} eq 'Erweiterte Einstellungen') +elsif ($qossettings{'ACTION'} eq "$Lang::tr{'urlfilter advanced settings'}" ) { &expert(); &Header::closebigbox(); &Header::closepage(); exit } -if ($qossettings{'ACTIONBW'} eq 'Andern') +if ($qossettings{'ACTIONBW'} eq "$Lang::tr{'modify'}" ) { &changebandwidth(); &Header::closebigbox(); &Header::closepage(); exit } -if ($qossettings{'ACTIONDEF'} eq 'Andern') +if ($qossettings{'ACTIONDEF'} eq "$Lang::tr{'modify'}" ) { &changedefclasses(); &Header::closebigbox(); @@ -702,8 +716,8 @@ END Quality of Service: $status - - + + END ; @@ -713,7 +727,7 @@ END
 
$Lang::tr{'downlink speed'}: $qossettings{'INC_SPD'} - +
$Lang::tr{'uplink speed'}: $qossettings{'OUT_SPD'}
END @@ -724,8 +738,8 @@ END
- -END -;} -else -{ -print "\t
-
$Lang::tr{'downlink std class'}: $qossettings{'DEFCLASS_INC'} - +
$Lang::tr{'downlink std class'}: $qossettings{'DEFCLASS_INC'} +
$Lang::tr{'uplink std class'}: $qossettings{'DEFCLASS_OUT'}
ACKs: $qossettings{'ACK'}
@@ -734,9 +748,9 @@ END
-
- - +
+ +
END @@ -758,28 +772,12 @@ if ( ($qossettings{'DEFCLASS_INC'} eq '') || ($qossettings{'DEFCLASS_OUT'} eq '' exit } -&Header::openbox('100%', 'center', $Lang::tr{'info'}); -&Graphs::overviewgraph("3240",$qossettings{'RED_DEV'}); -&Graphs::overviewgraph("3240",$qossettings{'IMQ_DEV'}); -print < -
 $Lang::tr{'add subclass'} |  $Lang::tr{'Add Rule'} |  $Lang::tr{'edit'} |  $Lang::tr{'delete'}   -
$Lang::tr{'TOS Bits'}:  0 - $Lang::tr{'disabled'} | 8 - $Lang::tr{'min delay'} | 4 - $Lang::tr{'max throughput'} | 2 - $Lang::tr{'max reliability'} | 1 - $Lang::tr{'min costs'}   -END -; -if (( -e "/srv/web/ipfire/html/graphs/qos-graph-$qossettings{'RED_DEV'}-3240.png") && ( -e "/srv/web/ipfire/html/graphs/qos-graph-$qossettings{'IMQ_DEV'}-3240.png")) { - print <

".$Lang::tr{'no information available'}; -} -print "\t"; - -&Header::closebox(); + &Header::openbox('100%', 'center', "$qossettings{'RED_DEV'} $Lang::tr{'graph'}"); + &Graphs::makegraphbox("qos.cgi",$qossettings{'RED_DEV'},"hour","325"); + &Header::closebox(); + &Header::openbox('100%', 'center', "$qossettings{'IMQ_DEV'} $Lang::tr{'graph'}"); + &Graphs::makegraphbox("qos.cgi",$qossettings{'IMQ_DEV'},"hour","325"); + &Header::closebox(); &showclasses($qossettings{'RED_DEV'}); &showclasses($qossettings{'IMQ_DEV'}); @@ -787,6 +785,8 @@ print "\t"; &Header::closebigbox(); &Header::closepage(); +} + ############################################################################################################################ ############################################################################################################################ @@ -802,7 +802,7 @@ END for ( $c = 200 ; $c <= 220 ; $c++ ) { if ( $qossettings{'DEFCLASS_INC'} ne $c ) - { print "\n"; } + { print "\n"; } else { print "\n"; } } print <$message"; } - if ( $qossettings{'EDIT'} eq 'yes' ) { + if ( $qossettings{'EDIT'} eq 'yes' ) { print ""; print ""; } @@ -885,7 +885,7 @@ END END ; - if ( $qossettings{'EDIT'} eq 'yes' ) { + if ( $qossettings{'EDIT'} eq 'yes' ) { print ""; @@ -902,7 +902,7 @@ END $Lang::tr{'Class'}: END ; - if ( $qossettings{'EDIT'} eq 'yes' ) { + if ( $qossettings{'EDIT'} eq 'yes' ) { print ""; @@ -1070,7 +1070,7 @@ END next if -d "/etc/l7-protocols/protocols/$direntry"; @proto = split( /\./, $direntry ); if ( $proto[0] eq $qossettings{'L7PROT'} ) { - print "\n"; + print "\n"; } else { print "\n"; } @@ -1084,6 +1084,7 @@ END $Lang::tr{'destination ip'}: + $Lang::tr{'qos warning'} END ; @@ -1108,7 +1109,7 @@ END @tmpline = split( /\ /, $direntry ); next if $tmpline[0] =~ "#"; if ( $tmpline[0] eq $qossettings{'PPROT'} ) { - print "\n"; + print "\n"; } else { print "\n"; } @@ -1116,10 +1117,10 @@ END print <  $Lang::tr{'source port'}: - +   $Lang::tr{'destination port'}: - +   $Lang::tr{'source ip'}: @@ -1152,7 +1153,7 @@ END $Lang::tr{'min delay'} (8) $Lang::tr{'max throughput'} (4) $Lang::tr{'max reliability'} (2) - + $Lang::tr{'min costs'} (1) END @@ -1183,7 +1184,7 @@ sub showclasses { @classline = split( /\;/, $classentry ); if ( $classline[0] eq $qossettings{'DEV'} ) { - &Header::openbox('100%', 'center', "Klasse: $classline[1]"); + &Header::openbox('100%', 'center', "$Lang::tr{'Class'}: $classline[1]"); print < $Lang::tr{'interface'} @@ -1207,22 +1208,22 @@ sub showclasses {
- +
- +
- +
- +
@@ -1247,14 +1248,14 @@ END
- - + +
- - + +
END @@ -1290,14 +1291,14 @@ END ; if ($portruleline[4]) { print <Quell-Port: $portruleline[4] + $Lang::tr{'source port'}: $portruleline[4] END ; } print ""; if ($portruleline[6]) { print <Ziel-Port: $portruleline[6] + $Lang::tr{'destination port'}: $portruleline[6] END ; } @@ -1312,7 +1313,7 @@ END - +
@@ -1322,7 +1323,7 @@ END - +
@@ -1370,14 +1371,14 @@ END - +
- +
@@ -1405,17 +1406,17 @@ END
- +
- +
- +
@@ -1495,7 +1496,7 @@ sub validclass { } elsif ( $qossettings{'DEVICE'} eq $qossettings{'IMQ_DEV'} ) { if ($qossettings{'CLASS'} lt 200 || $qossettings{'CLASS'} ge 221) { $qossettings{'VALID'} = 'no'; - $message = "Die Klassennummer passt nicht zum angegebenen Interface."; + $message = "$Lang::tr{'The class number does not match the specified interface.'}"; } } open( FILE, "< $classfile" ) or die "Unable to read $classfile";