$qossettings{'DEFCLASS_INC'} = '';
$qossettings{'DEFCLASS_OUT'} = '';
$qossettings{'ACK'} = '';
-$qossettings{'MTU'} = '1492';
-$qossettings{'QLENGTH'} = '1000';
$qossettings{'RED_DEV'} = 'ppp0';
$qossettings{'IMQ_DEV'} = 'imq0';
$qossettings{'VALID'} = 'yes';
if ($qossettings{'DOLEVEL7'} eq $Lang::tr{'save'})
{
if ( $qossettings{'QIP'} ne '' ) {
- unless ( &General::validip($qossettings{'QIP'}) ) {
- $qossettings{'VALID'} = 'no';
- $message = $Lang::tr{'The source IP address is invalid.'};
+ if ($qossettings{'QIP'} =~ /^(.*?)\/(.*?)$/){
+ if (! &General::validipandmask($qossettings{'QIP'}) ) {
+ $qossettings{'VALID'} = 'no';
+ $message = $Lang::tr{'The source IP address is invalid.'};
+ }
+ }else{
+ if ( &General::validip($qossettings{'QIP'}) ) {
+ $qossettings{'VALID'} = 'no';
+ $message = $Lang::tr{'The source IP address is invalid.'};
+ }
}
}
if ( $qossettings{'DIP'} ne '' ) {
- unless ( &General::validip($qossettings{'DIP'}) ) {
- $qossettings{'VALID'} = 'no';
- $message = $Lang::tr{'The destination IP address is invalid.'};
+ if ($qossettings{'QIP'} =~ /^(.*?)\/(.*?)$/){
+ if ( &General::validipandmask($qossettings{'DIP'}) ) {
+ $qossettings{'VALID'} = 'no';
+ $message = $Lang::tr{'The destination IP address is invalid.'};
+ }
+ }else{
+ if ( &General::validip($qossettings{'DIP'}) ) {
+ $qossettings{'VALID'} = 'no';
+ $message = $Lang::tr{'The destination IP address is invalid.'};
+ }
}
}
if ($qossettings{'CLASS'} >= 100 && $qossettings{'CLASS'} < 121) {
}
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;
$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;;;
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;
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'} )
{
&Header::closepage();
exit
}
-elsif ($qossettings{'ACTION'} eq "$Lang::tr{'urlfilter advanced settings'}" )
-{
- &expert();
- &Header::closebigbox();
- &Header::closepage();
- exit
-}
if ($qossettings{'ACTIONBW'} eq "$Lang::tr{'modify'}" )
{
&changebandwidth();
############################################################################################################################
############################################################################################################################
-&Header::openbox('100%', 'center', 'Quality of Service');
+&Header::openbox('100%', 'center', );
print <<END
<form method='post' action='$ENV{'SCRIPT_NAME'}'>
END
;
if ( $message ne "" ) {
- print "<tr><td colspan='2' align='center'><font color='red'>$message</font>";
+ print "<tr><td colspan='2' align='center'><font color='red'>$message</font></tr>";
}
print <<END
- <tr><td width='50%' align='left'><b>Quality of Service:</b>
- <td width='50%' align='center' bgcolor='$statuscolor'><font color='white'>$status</font>
- <tr><td width='100%' align='center' colspan='2'>
- <input type='submit' name='ACTION' value="$Lang::tr{'start'}" />
- <input type='submit' name='ACTION' value="$Lang::tr{'stop'}" />
- <input type='submit' name='ACTION' value="$Lang::tr{'restart'}" /></table></form>
+ <tr><td width='50%' align='left'><b>Quality of Service:</b></td>
+ <td width='50%' align='center' bgcolor='$statuscolor'><font color='white'>$status</font></td></tr>
+ <tr>
+ <td colspan='2'><br></td>
+ </tr>
+ <tr><td width='100%' align='right' colspan='2'>
+ <input type='submit' name='ACTION' value="$Lang::tr{'start'}">
+ <input type='submit' name='ACTION' value="$Lang::tr{'stop'}">
+ <input type='submit' name='ACTION' value="$Lang::tr{'restart'}" ></td></tr></table></form>
END
;
if (($qossettings{'OUT_SPD'} ne '') && ($qossettings{'INC_SPD'} ne '')) {
</table>
</form>
<form method='post' action='$ENV{'SCRIPT_NAME'}'>
- <table border='0' cellpadding='0' cellspacing='0'>
- <tr><td><input type='submit' name='ACTION' value='$Lang::tr{'parentclass add'}' />
- <td><input type='submit' name='ACTION' value='$Lang::tr{'urlfilter advanced settings'}' />
- <td><input type='submit' name='ACTION' value='$Lang::tr{'status'}' />
- </tr></table>
+ <table width='66%' border='0'>
+ <tr><td width='100%' align='center'>
+ <input type='submit' name='ACTION' value='$Lang::tr{'parentclass add'}' />
+ <input type='submit' name='ACTION' value='$Lang::tr{'status'}' />
+ </td></tr></table>
</form>
END
;
exit
}
- &Header::openbox('100%', 'center', "$qossettings{'RED_DEV'} $Lang::tr{'graph'}");
+ &Header::openbox('100%', 'center', "$qossettings{'RED_DEV'} $Lang::tr{'graph'}, $Lang::tr{'uplink'}");
&Graphs::makegraphbox("qos.cgi",$qossettings{'RED_DEV'},"hour","325");
&Header::closebox();
- &Header::openbox('100%', 'center', "$qossettings{'IMQ_DEV'} $Lang::tr{'graph'}");
+ &Header::openbox('100%', 'center', "$qossettings{'IMQ_DEV'} $Lang::tr{'graph'}, $Lang::tr{'downlink'}");
&Graphs::makegraphbox("qos.cgi",$qossettings{'IMQ_DEV'},"hour","325");
&Header::closebox();
<form method='post' action='$ENV{'SCRIPT_NAME'}'>
<table width='66%'>
<tr><td width='100%' colspan='3'>$Lang::tr{'no filter pass'}
- <tr><td width='33%' align='right'>Download:<td width='33%' align='left'><select name='DEFCLASS_INC'>
+ <tr><td width='33%' align='right'>$Lang::tr{'download'}:<td width='33%' align='left'><select name='DEFCLASS_INC'>
END
;
for ( $c = 200 ; $c <= 220 ; $c++ )
}
print <<END
</select><td width='33%' align='center'>
- <tr><td width='33%' align='right'>Upload:<td width='33%' align='left'><select name='DEFCLASS_OUT'>
+ <tr><td width='33%' align='right'>$Lang::tr{'upload'}:<td width='33%' align='left'><select name='DEFCLASS_OUT'>
END
;
for ( $c = 100 ; $c <= 120 ; $c++ )
print <<END
</select><td width='33%' align='center'>
<tr><td width='33%' align='right'>$Lang::tr{'source ip'}:
- <td width='33%' align='left'><input type='text' name='QIP' maxlength='15' value='$qossettings{'QIP'}' />
+ <td width='33%' align='left'><input type='text' name='QIP' maxlength='31' value='$qossettings{'QIP'}' />
<td width='33%' align='center'>
<tr><td width='33%' align='right'>$Lang::tr{'destination ip'}:
- <td width='33%' align='left'><input type='text' name='DIP' maxlength='15' value='$qossettings{'DIP'}' />
+ <td width='33%' align='left'><input type='text' name='DIP' maxlength='31' value='$qossettings{'DIP'}' />
<td width='33%' align='center'><input type='hidden' name='CLASS' value='$qossettings{'CLASS'}' /><input type='submit' name='DOLEVEL7' value='$Lang::tr{'save'}' />
<tr><td colspan="3" align='center'><font color="red"><em>$Lang::tr{'qos warning'}</em></font>
</table></form>
<td width='33%' align='left'><input type='text' name='DPORT' maxlength='11' value='$qossettings{'DPORT'}' />
<td width='33%' align='center'>
<tr><td width='33%' align='right'>$Lang::tr{'source ip'}:
- <td width='33%' align='left'><input type='text' name='QIP' maxlength='15' value='$qossettings{'QIP'}' />
+ <td width='33%' align='left'><input type='text' name='QIP' maxlength='31' value='$qossettings{'QIP'}' />
<td width='33%' align='center'>
<tr><td width='33%' align='right'>$Lang::tr{'destination ip'}:
- <td width='33%' align='left'><input type='text' name='DIP' maxlength='15' value='$qossettings{'DIP'}' />
+ <td width='33%' align='left'><input type='text' name='DIP' maxlength='31' value='$qossettings{'DIP'}' />
<td width='33%' align='center'><input type='hidden' name='CLASS' value='$qossettings{'CLASS'}' /><input type='submit' name='DOPORT' value='$Lang::tr{'save'}' />
</table></form>
END
@classline = split( /\;/, $classentry );
if ( $classline[0] eq $qossettings{'DEV'} )
{
- &Header::openbox('100%', 'center', "$Lang::tr{'Class'}: $classline[1]");
+ &Header::openbox('100%', 'center', "$Lang::tr{'Class'}: $classline[1] $classline[8]");
print <<END
<table border='0' width='100%' cellspacing='0'>
<tr><td bgcolor='$color{'color20'}' width='10%' align='center'><b>$Lang::tr{'interface'}</b>
<td><form method='post' action='$ENV{'SCRIPT_NAME'}'>
<input type='hidden' name='CLASS' value='$classline[1]' />
<input type='hidden' name='ACTION' value='$Lang::tr{'qos add subclass'}' />
- <input type='image' alt='$Lang::tr{'add subclass'}' src='/images/addblue.gif' />
+ <input type='image' alt='$Lang::tr{'add subclass'}' title='$Lang::tr{'add subclass'}' src='/images/addblue.gif' />
</form>
<td><form method='post' action='$ENV{'SCRIPT_NAME'}'>
<input type='hidden' name='CLASS' value='$classline[1]' />
<input type='hidden' name='ACTION' value='$Lang::tr{'Add Rule'}' />
- <input type='image' alt='$Lang::tr{'Add Rule'}' src='/images/addgreen.gif' />
+ <input type='image' alt='$Lang::tr{'Add Rule'}' title='$Lang::tr{'Add Rule'}' src='/images/addgreen.gif' />
</form>
<td><form method='post' action='$ENV{'SCRIPT_NAME'}'>
<input type='hidden' name='CLASS' value='$classline[1]' />
<input type='hidden' name='DOCLASS' value='$Lang::tr{'edit'}' />
- <input type='image' alt='$Lang::tr{'edit'}' src='/images/edit.gif' />
+ <input type='image' alt='$Lang::tr{'edit'}' title='$Lang::tr{'edit'}' src='/images/edit.gif' />
</form>
<td><form method='post' action='$ENV{'SCRIPT_NAME'}'>
<input type='hidden' name='CLASS' value='$classline[1]' />
<input type='hidden' name='DOCLASS' value='$Lang::tr{'delete'}' />
- <input type='image' alt='$Lang::tr{'delete'}' src='/images/delete.gif' />
+ <input type='image' alt='$Lang::tr{'delete'}' title='$Lang::tr{'delete'}' src='/images/delete.gif' />
</form>
</table>
</td>
<input type='hidden' name='CLASS' value='$l7ruleline[0]' />
<input type='hidden' name='L7PROT' value='$l7ruleline[2]' />
<input type='hidden' name='DOLEVEL7' value='$Lang::tr{'edit'}' />
- <input type='image' alt='$Lang::tr{'edit'}' src='/images/edit.gif' />
+ <input type='image' alt='$Lang::tr{'edit'}' title='$Lang::tr{'edit'}' src='/images/edit.gif' />
</form>
<td><form method='post' action='$ENV{'SCRIPT_NAME'}'>
<input type='hidden' name='CLASS' value='$l7ruleline[0]' />
<input type='hidden' name='L7PROT' value='$l7ruleline[2]' />
<input type='hidden' name='DOLEVEL7' value='$Lang::tr{'delete'}' />
- <input type='image' alt='$Lang::tr{'delete'}' src='/images/delete.gif' />
+ <input type='image' alt='$Lang::tr{'delete'}' title='$Lang::tr{'delete'}' src='/images/delete.gif' />
</form>
</table>
END
<input type='hidden' name='DIP' value='$portruleline[5]' />
<input type='hidden' name='DPORT' value='$portruleline[6]' />
<input type='hidden' name='DOPORT' value='$Lang::tr{'edit'}' />
- <input type='image' alt='$Lang::tr{'edit'}' src='/images/edit.gif' />
+ <input type='image' alt='$Lang::tr{'edit'}' title='$Lang::tr{'edit'}' src='/images/edit.gif' />
</form>
<td><form method='post' action='$ENV{'SCRIPT_NAME'}'>
<input type='hidden' name='CLASS' value='$portruleline[0]' />
<input type='hidden' name='DIP' value='$portruleline[5]' />
<input type='hidden' name='DPORT' value='$portruleline[6]' />
<input type='hidden' name='DOPORT' value='$Lang::tr{'delete'}' />
- <input type='image' alt='$Lang::tr{'delete'}' src='/images/delete.gif' />
+ <input type='image' alt='$Lang::tr{'delete'}' title='$Lang::tr{'delete'}' src='/images/delete.gif' />
</form>
</table>
END
<input type='hidden' name='DEV' value='$tosruleline[1]' />
<input type='hidden' name='TOS' value='$tosruleline[2]' />
<input type='hidden' name='DOTOS' value='$Lang::tr{'edit'}' />
- <input type='image' alt='$Lang::tr{'edit'}' src='/images/edit.gif' />
+ <input type='image' alt='$Lang::tr{'edit'}' title='$Lang::tr{'edit'}' src='/images/edit.gif' />
</form>
<td><form method='post' action='$ENV{'SCRIPT_NAME'}'>
<input type='hidden' name='CLASS' value='$tosruleline[0]' />
<input type='hidden' name='DEV' value='$tosruleline[1]' />
<input type='hidden' name='TOS' value='$tosruleline[2]' />
<input type='hidden' name='DOTOS' value='$Lang::tr{'delete'}' />
- <input type='image' alt='$Lang::tr{'delete'}' src='/images/delete.gif' />
+ <input type='image' alt='$Lang::tr{'delete'}' title='$Lang::tr{'delete'}' src='/images/delete.gif' />
</form>
</table>
END
<td><form method='post' action='$ENV{'SCRIPT_NAME'}'>
<input type='hidden' name='CLASS' value='$subclassline[2]' />
<input type='hidden' name='ACTION' value='$Lang::tr{'Add Rule'}' />
- <input type='image' alt='$Lang::tr{'Add Rule'}' src='/images/addgreen.gif' />
+ <input type='image' alt='$Lang::tr{'Add Rule'}' title='$Lang::tr{'Add Rule'}' src='/images/addgreen.gif' />
</form>
<td><form method='post' action='$ENV{'SCRIPT_NAME'}'>
<input type='hidden' name='CLASS' value='$subclassline[2]' />
<input type='hidden' name='DOSCLASS' value='$Lang::tr{'edit'}' />
- <input type='image' alt='$Lang::tr{'edit'}' src='/images/edit.gif' />
+ <input type='image' alt='$Lang::tr{'edit'}' title='$Lang::tr{'edit'}' src='/images/edit.gif' />
</form>
<td><form method='post' action='$ENV{'SCRIPT_NAME'}'>
<input type='hidden' name='CLASS' value='$subclassline[2]' />
<input type='hidden' name='DOSCLASS' value='$Lang::tr{'delete'}' />
- <input type='image' alt='$Lang::tr{'delete'}' src='/images/delete.gif' />
+ <input type='image' alt='$Lang::tr{'delete'}' title='$Lang::tr{'delete'}' src='/images/delete.gif' />
</form>
</table>
END
}
}
}
-
-sub expert
-{
- &Header::openbox('100%', 'center', $Lang::tr{'expertoptions'});
- print <<END
- <form method='post' action='$ENV{'SCRIPT_NAME'}'>
- <table width='66%'>
- <tr><td width='33%' align='right'>MTU:<td width='33%' align='left'>
- <input type='text' name='MTU' maxlength='8' required='4' value='$qossettings{'MTU'}' />
- <td width='33%' align='center'>$Lang::tr{'mtu QoS'}
- <tr><td width='33%' align='right'>$Lang::tr{'Queuelenght'}:<td width='33%' align='left'>
- <input type='text' name='QLENGTH' maxlength='8' required='2' value='$qossettings{'QLENGTH'}' />
- <td width='33%' align='center'><input type='submit' name='ACTION' value='$Lang::tr{'save'}' />
- </table>
- </form>
-END
-;
- &Header::closebox();
-}
-
sub validminbwdth {
if ( $qossettings{'VALID'} eq 'yes' ) {
if ( $qossettings{'DEVICE'} eq $qossettings{'RED_DEV'} ) {
projects / people / teissler / ipfire-2.x.git / blobdiff