webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-27 11:13:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

QOS: IP-Addresses can now be simple IP-Address or IP-Address and subnet

Browse Source
This commit is contained in:
Alexander Marx
2014-02-26 16:07:02 +01:00
committed by Michael Tremer
parent b18dba57de
commit 5eee5a607e
1 changed files with 24 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
html/cgi-bin/qos.cgi
View File

@@ -251,15 +251,29 @@ END
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) {
@@ -1079,10 +1093,10 @@ END
print <<END
</select><td width='33%' align='center'>&nbsp;
<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'>&nbsp;
<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>
@@ -1123,10 +1137,10 @@ END
<td width='33%' align='left'><input type='text' name='DPORT' maxlength='11' value='$qossettings{'DPORT'}' />
<td width='33%' align='center'>&nbsp;
<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'>&nbsp;
<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