mirror of
https://github.com/vincentmli/bpfire.git
synced 2026-04-21 08:22:59 +02:00
Firewall: Reorganized layout of rulecreationpage
Protocol is now an extra area containing protocol, ICMP-Type and source/target ports
This commit is contained in:
Alexander Marx
@@ -115,6 +115,42 @@ print<<END;
|
||||
function checkradio(a){
|
||||
\$(a).attr('checked', true);
|
||||
}
|
||||
function toggle_elements()
|
||||
{
|
||||
var elementNames = toggle_elements.arguments;
|
||||
for (var i=0; i<elementNames.length; i++)
|
||||
{
|
||||
var elementName = elementNames[i];
|
||||
if ( \$('input[name="USE_NAT"]').is(':checked') || \$('input[name="USE_SRC_PORT"]').is(':checked') || \$('input[name="USESRV"]').is(':checked'))
|
||||
{
|
||||
document.getElementById(elementName).style.display='block';
|
||||
}
|
||||
else{
|
||||
document.getElementById(elementName).style.display='none';
|
||||
}
|
||||
}
|
||||
}
|
||||
function hide_elements()
|
||||
{
|
||||
var elementNames = hide_elements.arguments;
|
||||
for (var i=0; i<elementNames.length; i++)
|
||||
{
|
||||
var elementName = elementNames[i];
|
||||
document.getElementById(elementName).style.display='none';
|
||||
}
|
||||
}
|
||||
function getdropdown()
|
||||
{
|
||||
d = document.getElementById("PROT").value;
|
||||
if ( d == 'ICMP' )
|
||||
{
|
||||
document.getElementById('PROTOKOLL').style.display='block';
|
||||
}
|
||||
else
|
||||
{
|
||||
document.getElementById('PROTOKOLL').style.display='none';
|
||||
}
|
||||
}
|
||||
</script>
|
||||
END
|
||||
|
||||
@@ -239,8 +275,8 @@ if ($fwdfwsettings{'ACTION'} eq 'saverule')
|
||||
}
|
||||
#increase counters
|
||||
if (!$errormessage){
|
||||
&checkcounter($fwdfwsettings{'oldgrp1a'},$fwdfwsettings{'oldgrp1b'},$fwdfwsettings{'grp1'},$fwdfwsettings{$fwdfwsettings{'grp1'}});
|
||||
&checkcounter($fwdfwsettings{'oldgrp2a'},$fwdfwsettings{'oldgrp2b'},$fwdfwsettings{'grp2'},$fwdfwsettings{$fwdfwsettings{'grp2'}});
|
||||
&checkcounter($fwdfwsettings{'oldgrp1a'},$fwdfwsettings{'oldgrp1b'},$fwdfwsettings{'grp1'},$fwdfwsettings{$fwdfwsettings{'grp1'}});
|
||||
&checkcounter($fwdfwsettings{'oldgrp2a'},$fwdfwsettings{'oldgrp2b'},$fwdfwsettings{'grp2'},$fwdfwsettings{$fwdfwsettings{'grp2'}});
|
||||
if($fwdfwsettings{'oldusesrv'} eq '' && $fwdfwsettings{'USESRV'} eq 'ON'){
|
||||
&checkcounter(0,0,$fwdfwsettings{'grp3'},$fwdfwsettings{$fwdfwsettings{'grp3'}});
|
||||
}elsif ($fwdfwsettings{'USESRV'} eq '' && $fwdfwsettings{'oldusesrv'} eq 'ON') {
|
||||
@@ -465,31 +501,6 @@ sub checksource
|
||||
|
||||
#check empty fields
|
||||
if ($fwdfwsettings{$fwdfwsettings{'grp1'}} eq ''){ $errormessage.=$Lang::tr{'fwdfw err nosrc'}."<br>";}
|
||||
#check icmp source
|
||||
if ($fwdfwsettings{'USE_SRC_PORT'} eq 'ON' && $fwdfwsettings{'PROT'} eq 'ICMP'){
|
||||
$fwdfwsettings{'SRC_PORT'}='';
|
||||
&General::readhasharray("${General::swroot}/fwhosts/icmp-types", \%icmptypes);
|
||||
foreach my $key (keys %icmptypes){
|
||||
if($fwdfwsettings{'ICMP_TYPES'} eq "$icmptypes{$key}[0] ($icmptypes{$key}[1])"){
|
||||
$fwdfwsettings{'ICMP_TYPES'}="$icmptypes{$key}[0]";
|
||||
}
|
||||
}
|
||||
}elsif($fwdfwsettings{'USE_SRC_PORT'} eq 'ON' && $fwdfwsettings{'PROT'} eq 'GRE'){
|
||||
$fwdfwsettings{'SRC_PORT'}='';
|
||||
$fwdfwsettings{'ICMP_TYPES'}='';
|
||||
}elsif($fwdfwsettings{'USE_SRC_PORT'} eq 'ON' && $fwdfwsettings{'PROT'} eq 'ESP'){
|
||||
$fwdfwsettings{'SRC_PORT'}='';
|
||||
$fwdfwsettings{'ICMP_TYPES'}='';
|
||||
}elsif($fwdfwsettings{'USE_SRC_PORT'} eq 'ON' && $fwdfwsettings{'PROT'} eq 'AH'){
|
||||
$fwdfwsettings{'SRC_PORT'}='';
|
||||
$fwdfwsettings{'ICMP_TYPES'}='';
|
||||
}elsif($fwdfwsettings{'USE_SRC_PORT'} eq 'ON' && $fwdfwsettings{'PROT'} ne 'ICMP'){
|
||||
$fwdfwsettings{'ICMP_TYPES'}='';
|
||||
}else{
|
||||
$fwdfwsettings{'ICMP_TYPES'}='';
|
||||
$fwdfwsettings{'SRC_PORT'}='';
|
||||
}
|
||||
|
||||
if($fwdfwsettings{'USE_SRC_PORT'} eq 'ON' && ($fwdfwsettings{'PROT'} eq 'TCP' || $fwdfwsettings{'PROT'} eq 'UDP') && $fwdfwsettings{'SRC_PORT'} ne ''){
|
||||
my @parts=split(",",$fwdfwsettings{'SRC_PORT'});
|
||||
my @values=();
|
||||
@@ -550,11 +561,11 @@ sub checktarget
|
||||
}
|
||||
#check if Port is a single Port or portrange
|
||||
if ($fwdfwsettings{'nat'} eq 'dnat' && $fwdfwsettings{'grp3'} eq 'TGT_PORT'){
|
||||
if(($fwdfwsettings{'TGT_PROT'} ne 'TCP'|| $fwdfwsettings{'TGT_PROT'} ne 'UDP') && $fwdfwsettings{'TGT_PORT'} eq ''){
|
||||
if(($fwdfwsettings{'PROT'} ne 'TCP'|| $fwdfwsettings{'PROT'} ne 'UDP') && $fwdfwsettings{'TGT_PORT'} eq ''){
|
||||
$errormessage=$Lang::tr{'fwdfw target'}.": ".$Lang::tr{'fwdfw dnat porterr'}."<br>";
|
||||
return $errormessage;
|
||||
}
|
||||
if (($fwdfwsettings{'TGT_PROT'} eq 'TCP'|| $fwdfwsettings{'TGT_PROT'} eq 'UDP') && $fwdfwsettings{'TGT_PORT'} ne '' && !&check_natport($fwdfwsettings{'TGT_PORT'})){
|
||||
if (($fwdfwsettings{'PROT'} eq 'TCP'|| $fwdfwsettings{'PROT'} eq 'UDP') && $fwdfwsettings{'TGT_PORT'} ne '' && !&check_natport($fwdfwsettings{'TGT_PORT'})){
|
||||
$errormessage=$Lang::tr{'fwdfw target'}.": ".$Lang::tr{'fwdfw dnat porterr'}."<br>";
|
||||
return $errormessage;
|
||||
}
|
||||
@@ -599,17 +610,19 @@ sub checktarget
|
||||
if ($fwdfwsettings{'grp3'} eq 'cust_srv'){
|
||||
$fwdfwsettings{'TGT_PROT'}='';
|
||||
$fwdfwsettings{'ICMP_TGT'}='';
|
||||
$fwdfwsettings{'TGT_PORT'}='';
|
||||
}
|
||||
if ($fwdfwsettings{'grp3'} eq 'cust_srvgrp'){
|
||||
$fwdfwsettings{'TGT_PROT'}='';
|
||||
$fwdfwsettings{'ICMP_TGT'}='';
|
||||
$fwdfwsettings{'TGT_PORT'}='';
|
||||
#check target service
|
||||
if($fwdfwsettings{$fwdfwsettings{'grp3'}} eq ''){
|
||||
$errormessage.=$Lang::tr{'fwdfw err tgt_grp'};
|
||||
}
|
||||
}
|
||||
if ($fwdfwsettings{'grp3'} eq 'TGT_PORT'){
|
||||
if ($fwdfwsettings{'TGT_PROT'} eq 'TCP' || $fwdfwsettings{'TGT_PROT'} eq 'UDP'){
|
||||
if ($fwdfwsettings{'PROT'} eq 'TCP' || $fwdfwsettings{'PROT'} eq 'UDP'){
|
||||
if ($fwdfwsettings{'TGT_PORT'} ne ''){
|
||||
if ($fwdfwsettings{'TGT_PORT'} =~ "," && $fwdfwsettings{'USE_NAT'} && $fwdfwsettings{'nat'} eq 'dnat') {
|
||||
$errormessage=$Lang::tr{'fwdfw dnat porterr'}."<br>";
|
||||
@@ -643,34 +656,26 @@ sub checktarget
|
||||
if (&General::validport($_)){
|
||||
push (@values,$_);
|
||||
}else{
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
$fwdfwsettings{'TGT_PORT'}=join("|",@values);
|
||||
}
|
||||
}elsif ($fwdfwsettings{'TGT_PROT'} eq 'GRE'){
|
||||
}elsif ($fwdfwsettings{'PROT'} eq 'GRE'){
|
||||
$fwdfwsettings{$fwdfwsettings{'grp3'}} = '';
|
||||
$fwdfwsettings{'TGT_PORT'} = '';
|
||||
$fwdfwsettings{'ICMP_TGT'} = '';
|
||||
}elsif($fwdfwsettings{'TGT_PROT'} eq 'ESP'){
|
||||
}elsif ($fwdfwsettings{'PROT'} eq 'ESP'){
|
||||
$fwdfwsettings{$fwdfwsettings{'grp3'}} = '';
|
||||
$fwdfwsettings{'TGT_PORT'} = '';
|
||||
$fwdfwsettings{'ICMP_TGT'}='';
|
||||
}elsif($fwdfwsettings{'TGT_PROT'} eq 'AH'){
|
||||
}elsif ($fwdfwsettings{'PROT'} eq 'AH'){
|
||||
$fwdfwsettings{$fwdfwsettings{'grp3'}} = '';
|
||||
$fwdfwsettings{'TGT_PORT'} = '';
|
||||
$fwdfwsettings{'ICMP_TGT'}='';
|
||||
}elsif ($fwdfwsettings{'TGT_PROT'} eq 'ICMP'){
|
||||
}elsif ($fwdfwsettings{'PROT'} eq 'ICMP'){
|
||||
$fwdfwsettings{$fwdfwsettings{'grp3'}} = '';
|
||||
$fwdfwsettings{'TGT_PORT'} = '';
|
||||
&General::readhasharray("${General::swroot}/fwhosts/icmp-types", \%icmptypes);
|
||||
foreach my $key (keys %icmptypes){
|
||||
|
||||
if ("$icmptypes{$key}[0] ($icmptypes{$key}[1])" eq $fwdfwsettings{'ICMP_TGT'}){
|
||||
$fwdfwsettings{'ICMP_TGT'}=$icmptypes{$key}[0];
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -805,29 +810,59 @@ sub checkrule
|
||||
}
|
||||
}
|
||||
}
|
||||
#check source and destination protocol if manual
|
||||
if( $fwdfwsettings{'USE_SRC_PORT'} eq 'ON' && $fwdfwsettings{'USESRV'} eq 'ON'){
|
||||
#if($fwdfwsettings{'PROT'} ne $fwdfwsettings{'TGT_PROT'} && $fwdfwsettings{'grp3'} eq 'TGT_PORT'){
|
||||
# $errormessage.=$Lang::tr{'fwdfw err prot'};
|
||||
#}
|
||||
#check source and destination protocol if source manual and dest servicegrp
|
||||
if ($fwdfwsettings{'grp3'} eq 'cust_srv'){
|
||||
foreach my $key (sort keys %customservice){
|
||||
if($customservice{$key}[0] eq $fwdfwsettings{$fwdfwsettings{'grp3'}}){
|
||||
if ($customservice{$key}[2] ne $fwdfwsettings{'PROT'}){
|
||||
$errormessage.=$Lang::tr{'fwdfw err prot'};
|
||||
last;
|
||||
}
|
||||
#check source and destination protocol if source manual and dest single service
|
||||
if ($fwdfwsettings{'grp3'} eq 'cust_srv'){
|
||||
foreach my $key (sort keys %customservice){
|
||||
if($customservice{$key}[0] eq $fwdfwsettings{$fwdfwsettings{'grp3'}}){
|
||||
if ($customservice{$key}[2] ne $fwdfwsettings{'PROT'}){
|
||||
$fwdfwsettings{'PROT'} = $customservice{$key}[2];
|
||||
last;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
#ATTENTION: $fwdfwsetting{'TGT_PROT'} deprecated since 30.09.2013
|
||||
|
||||
if( $fwdfwsettings{'PROT'} eq $Lang::tr{'all'}){
|
||||
$fwdfwsettings{'PROT'}='';
|
||||
#check source and destination protocol if source manual and dest servicegroup
|
||||
if ($fwdfwsettings{'grp3'} eq 'cust_srvgrp'){
|
||||
$fwdfwsettings{'PROT'} = '';
|
||||
}
|
||||
#ATTENTION: $fwdfwsetting{'TGT_PROT'} deprecated since 30.09.2013
|
||||
$fwdfwsettings{'TGT_PROT'}=''; #Set field empty (deprecated)
|
||||
#Check ICMP Types
|
||||
if ($fwdfwsettings{'PROT'} eq 'ICMP'){
|
||||
$fwdfwsettings{'USE_SRC_PORT'}='';
|
||||
$fwdfwsettings{'SRC_PORT'}='';
|
||||
$fwdfwsettings{'USESRV'}='';
|
||||
$fwdfwsettings{'TGT_PORT'}='';
|
||||
&General::readhasharray("${General::swroot}/fwhosts/icmp-types", \%icmptypes);
|
||||
foreach my $key (keys %icmptypes){
|
||||
if($fwdfwsettings{'ICMP_TYPES'} eq "$icmptypes{$key}[0] ($icmptypes{$key}[1])"){
|
||||
$fwdfwsettings{'ICMP_TYPES'}="$icmptypes{$key}[0]";
|
||||
}
|
||||
}
|
||||
}elsif($fwdfwsettings{'PROT'} eq 'GRE'){
|
||||
$fwdfwsettings{'USE_SRC_PORT'}='';
|
||||
$fwdfwsettings{'SRC_PORT'}='';
|
||||
$fwdfwsettings{'ICMP_TYPES'}='';
|
||||
$fwdfwsettings{'USESRV'}='';
|
||||
$fwdfwsettings{'TGT_PORT'}='';
|
||||
}elsif($fwdfwsettings{'PROT'} eq 'ESP'){
|
||||
$fwdfwsettings{'USE_SRC_PORT'}='';
|
||||
$fwdfwsettings{'SRC_PORT'}='';
|
||||
$fwdfwsettings{'ICMP_TYPES'}='';
|
||||
$fwdfwsettings{'USESRV'}='';
|
||||
$fwdfwsettings{'TGT_PORT'}='';
|
||||
}elsif($fwdfwsettings{'PROT'} eq 'AH'){
|
||||
$fwdfwsettings{'USE_SRC_PORT'}='';
|
||||
$fwdfwsettings{'SRC_PORT'}='';
|
||||
$fwdfwsettings{'ICMP_TYPES'}='';
|
||||
$fwdfwsettings{'USESRV'}='';
|
||||
$fwdfwsettings{'TGT_PORT'}='';
|
||||
}elsif($fwdfwsettings{'PROT'} ne 'TCP' && $fwdfwsettings{'PROT'} ne 'UDP' && $fwdfwsettings{'PROT'} ne 'ICMP'){
|
||||
$fwdfwsettings{'ICMP_TYPES'}='';
|
||||
$fwdfwsettings{'PROT'} = '';
|
||||
}elsif($fwdfwsettings{'PROT'} ne 'ICMP'){
|
||||
$fwdfwsettings{'ICMP_TYPES'}='';
|
||||
}
|
||||
}
|
||||
sub checkcounter
|
||||
{
|
||||
@@ -1158,7 +1193,7 @@ sub getsrcport
|
||||
{
|
||||
my %hash=%{(shift)};
|
||||
my $key=shift;
|
||||
if($hash{$key}[7] eq 'ON' && $hash{$key}[8] ne '' && $hash{$key}[10]){
|
||||
if($hash{$key}[7] eq 'ON' && $hash{$key}[10]){
|
||||
$hash{$key}[10]=~ s/\|/,/g;
|
||||
print": $hash{$key}[10]";
|
||||
}elsif($hash{$key}[7] eq 'ON' && $hash{$key}[8] eq 'ICMP'){
|
||||
@@ -1188,8 +1223,6 @@ sub gettgtport
|
||||
if($service){
|
||||
print": $service";
|
||||
}
|
||||
}elsif($hash{$key}[11] eq 'ON' && $hash{$key}[12] eq 'ICMP'){
|
||||
print":<br>$hash{$key}[13]";
|
||||
}
|
||||
}
|
||||
sub get_serviceports
|
||||
@@ -1551,36 +1584,16 @@ END
|
||||
</select></td></tr>
|
||||
<tr><td colspan='8'><hr style='border:dotted #BFBFBF; border-width:1px 0 0 0 ; ' /></td></tr></table>
|
||||
END
|
||||
&gen_dd_block('src','grp1');
|
||||
print<<END;
|
||||
<table><tr><td colspan='8'><hr style='border:dotted #BFBFBF; border-width:1px 0 0 0 ; ' /></td></tr></table>
|
||||
<table width='100%' border='0'>
|
||||
<tr><td width='1%'><input type='checkbox' name='USE_SRC_PORT' value='ON' $checked{'USE_SRC_PORT'}{'ON'}></td><td width='51%' colspan='3'>$Lang::tr{'fwdfw use srcport'}</td>
|
||||
<td width='15%' nowrap='nowrap'>$Lang::tr{'fwdfw man port'}</td><td>
|
||||
END
|
||||
$fwdfwsettings{'SRC_PORT'}=~ s/\|/,/g;
|
||||
print<<END;
|
||||
</td><td align='right'><input type='text' name='SRC_PORT' value='$fwdfwsettings{'SRC_PORT'}' maxlength='20' size='18' ></td></tr>
|
||||
<tr><td></td><td></td><td></td><td></td><td nowrap='nowrap'>$Lang::tr{'fwhost icmptype'}</td><td colspan='2'><select name='ICMP_TYPES' style='width:230px;'>
|
||||
END
|
||||
&General::readhasharray("${General::swroot}/fwhosts/icmp-types", \%icmptypes);
|
||||
print"<option>All ICMP-Types</option>";
|
||||
foreach my $key (sort { ncmp($icmptypes{$a}[0],$icmptypes{$b}[0]) } keys %icmptypes){
|
||||
if($fwdfwsettings{'ICMP_TYPES'} eq "$icmptypes{$key}[0]"){
|
||||
print"<option selected>$icmptypes{$key}[0] ($icmptypes{$key}[1])</option>";
|
||||
}else{
|
||||
print"<option>$icmptypes{$key}[0] ($icmptypes{$key}[1])</option>";
|
||||
}
|
||||
}
|
||||
print<<END;
|
||||
</select></td></tr></table><br><hr>
|
||||
END
|
||||
&gen_dd_block('src','grp1');
|
||||
print"<hr>";
|
||||
&Header::closebox();
|
||||
#---SNAT / DNAT ------------------------------------------------
|
||||
&Header::openbox('100%', 'left', 'NAT');
|
||||
print<<END;
|
||||
<table width='100%' border='0'>
|
||||
<tr><td width='1%'><input type='checkbox' name='USE_NAT' id='USE_NAT' value='ON' $checked{'USE_NAT'}{'ON'}></td><td width='15%'>$Lang::tr{'fwdfw use nat'}</td><td colspan='5'></td></tr>
|
||||
<tr><td width='1%'><input type='checkbox' name='USE_NAT' id='USE_NAT' value='ON' $checked{'USE_NAT'}{'ON'} onclick="toggle_elements('natpart')" ></td><td width='15%'>$Lang::tr{'fwdfw use nat'}</td><td colspan='5'></td></tr></table>
|
||||
<div id="natpart" class="noscript">
|
||||
<table width=100%' border='0'><tr>
|
||||
<tr><td colspan='2'></td><td width='1%'><input type='radio' name='nat' id='dnat' value='dnat' checked ></td><td width='50%'>$Lang::tr{'fwdfw dnat'}</td>
|
||||
END
|
||||
print"<td width='8%'>Firewall: </td><td width='20%' align='right'><select name='dnat' style='width:140px;'>";
|
||||
@@ -1611,7 +1624,10 @@ END
|
||||
print ">$network</option>";
|
||||
}
|
||||
print"</select></td></tr></table>";
|
||||
print"<hr>";
|
||||
print"</div><br><hr>";
|
||||
if ($fwdfwsettings{'USE_NAT'} ne 'ON'){
|
||||
print"<script language='JavaScript'>hide_elements('natpart');</script>";
|
||||
}
|
||||
&Header::closebox();
|
||||
#---TARGET------------------------------------------------------
|
||||
&Header::openbox('100%', 'left', $Lang::tr{'fwdfw target'});
|
||||
@@ -1636,10 +1652,71 @@ END
|
||||
<tr><td colspan='7'><hr style='border:dotted #BFBFBF; border-width:1px 0 0 0 ; ' /></td></tr></table>
|
||||
END
|
||||
&gen_dd_block('tgt','grp2');
|
||||
print"<hr>";
|
||||
&Header::closebox;
|
||||
#---PROTOCOL------------------------------------------------------
|
||||
&Header::openbox('100%', 'left', $Lang::tr{'fwhost prot'});
|
||||
print<<END;
|
||||
<table width='15%' border='0' style="float:left;">
|
||||
<tr><td><select name='PROT' id='PROT' onchange="getdropdown()">
|
||||
END
|
||||
if ($fwdfwsettings{'PROT'} eq ''){
|
||||
print"<option selected>$Lang::tr{'all'}</option>";
|
||||
}else{
|
||||
print"<option value=''>$Lang::tr{'all'}</option>";
|
||||
}
|
||||
foreach ("TCP","UDP","GRE","ESP","AH","ICMP")
|
||||
{
|
||||
if ($_ eq $fwdfwsettings{'PROT'})
|
||||
{
|
||||
print"<option selected>$_</option>";
|
||||
}else{
|
||||
print"<option>$_</option>";
|
||||
}
|
||||
}
|
||||
print"</select></td></tr></table>";
|
||||
print<<END;
|
||||
<div id="PROTOKOLL" class="noscript"><table width='30%' border='0' style="float:left;"><tr><td>$Lang::tr{'fwhost icmptype'}</td><td colspan='2'><select name='ICMP_TYPES' style='min-width:230px;'>
|
||||
END
|
||||
&General::readhasharray("${General::swroot}/fwhosts/icmp-types", \%icmptypes);
|
||||
print"<option>All ICMP-Types</option>";
|
||||
foreach my $key (sort { ncmp($icmptypes{$a}[0],$icmptypes{$b}[0]) }keys %icmptypes){
|
||||
if($fwdfwsettings{'ICMP_TYPES'} eq "$icmptypes{$key}[0]"){
|
||||
print"<option selected>$icmptypes{$key}[0] ($icmptypes{$key}[1])</option>";
|
||||
}else{
|
||||
print"<option>$icmptypes{$key}[0] ($icmptypes{$key}[1])</option>";
|
||||
}
|
||||
}
|
||||
print<<END;
|
||||
</select></td></tr>
|
||||
</table></div><br><br><br>
|
||||
END
|
||||
if ($fwdfwsettings{'PROT'} ne 'ICMP'){
|
||||
print"<script language='JavaScript'>hide_elements('PROTOKOLL');</script>";
|
||||
}
|
||||
#SOURCEPORT
|
||||
print<<END;
|
||||
<table width='100%'><tr><td colspan='8'><hr style='border:dotted #BFBFBF; border-width:1px 0 0 0 ; ' /></td></table>
|
||||
<table width='100%' border='0'>
|
||||
<tr><td width='1%'><input type='checkbox' name='USE_SRC_PORT' value='ON' $checked{'USE_SRC_PORT'}{'ON'} onclick="toggle_elements('srcport')"></td>
|
||||
<td width='51%' colspan='3'>$Lang::tr{'fwdfw use srcport'}</td></tr></table>
|
||||
<div id="srcport" class="noscript"><table width='100%' border='0'><tr>
|
||||
<td width='70%' nowrap='nowrap' align='right'>$Lang::tr{'fwdfw man port'}</td>
|
||||
END
|
||||
$fwdfwsettings{'SRC_PORT'}=~ s/\|/,/g;
|
||||
print<<END;
|
||||
<td align='right'><input type='text' name='SRC_PORT' value='$fwdfwsettings{'SRC_PORT'}' maxlength='20' size='18' ></td></tr>
|
||||
</table></div><br>
|
||||
END
|
||||
if ($fwdfwsettings{'USE_SRC_PORT'} ne 'ON'){
|
||||
print"<script language='JavaScript'>hide_elements('srcport');</script>";
|
||||
}
|
||||
#TARGETPORT
|
||||
print<<END;
|
||||
<hr style='border:dotted #BFBFBF; border-width:1px 0 0 0 ; '><br>
|
||||
<table width='100%' border='0'>
|
||||
<tr><td width='1%'><input type='checkbox' name='USESRV' value='ON' $checked{'USESRV'}{'ON'} ></td><td width='48%'>$Lang::tr{'fwdfw use srv'}</td><td width='1%'><input type='radio' name='grp3' id='cust_srv' value='cust_srv' checked></td><td nowrap='nowrap'>$Lang::tr{'fwhost cust service'}</td><td width='1%' colspan='2'><select name='cust_srv' style='min-width:230px;' >
|
||||
<tr><td width='1%'><input type='checkbox' name='USESRV' value='ON' $checked{'USESRV'}{'ON'} onclick="toggle_elements('targetport')"></td><td width='48%'>$Lang::tr{'fwdfw use srv'}</td></tr></table>
|
||||
<div id="targetport" class="noscript"><table width='100%' border='0'><tr><td width='80%'></td><td width='1%'><input type='radio' name='grp3' id='cust_srv' value='cust_srv' checked></td><td nowrap='nowrap'>$Lang::tr{'fwhost cust service'}</td><td width='1%' colspan='2'><select name='cust_srv' style='min-width:230px;' >
|
||||
END
|
||||
&General::readhasharray("$configsrv", \%customservice);
|
||||
foreach my $key (sort { ncmp($customservice{$a}[0],$customservice{$b}[0]) } keys %customservice){
|
||||
@@ -1649,7 +1726,7 @@ END
|
||||
}
|
||||
print<<END;
|
||||
</select></td></tr>
|
||||
<tr><td colspan='2'></td><td><input type='radio' name='grp3' id='cust_srvgrp' value='cust_srvgrp' $checked{'grp3'}{'cust_srvgrp'}></td><td nowrap='nowrap'>$Lang::tr{'fwhost cust srvgrp'}</td><td colspan='2'><select name='cust_srvgrp' style='min-width:230px;' >
|
||||
<tr><td></td><td><input type='radio' name='grp3' id='cust_srvgrp' value='cust_srvgrp' $checked{'grp3'}{'cust_srvgrp'}></td><td nowrap='nowrap'>$Lang::tr{'fwhost cust srvgrp'}</td><td colspan='2'><select name='cust_srvgrp' style='min-width:230px;' >
|
||||
END
|
||||
&General::readhasharray("$configsrvgrp", \%customservicegrp);
|
||||
my $helper;
|
||||
@@ -1663,44 +1740,16 @@ END
|
||||
}
|
||||
print<<END;
|
||||
</select></td></tr>
|
||||
<tr><td colspan='2'></td><td><input type='radio' name='grp3' id='TGT_PORT' value='TGT_PORT' $checked{'grp3'}{'TGT_PORT'}></td><td>$Lang::tr{'fwdfw man port'}</td><td>
|
||||
<tr><td></td><td><input type='radio' name='grp3' id='TGT_PORT' value='TGT_PORT' $checked{'grp3'}{'TGT_PORT'}></td><td>$Lang::tr{'fwdfw man port'}</td>
|
||||
END
|
||||
$fwdfwsettings{'TGT_PORT'} =~ s/\|/,/g;
|
||||
print<<END;
|
||||
</td><td align='right'><input type='text' name='TGT_PORT' value='$fwdfwsettings{'TGT_PORT'}' maxlength='20' size='18' onclick='checkradio(\"#TGT_PORT\")'></td></tr>
|
||||
<tr><td colspan='2'></td><td></td><td>$Lang::tr{'fwhost icmptype'}</td><td colspan='2'><select name='ICMP_TGT' style='min-width:230px;'>
|
||||
<td align='right'><input type='text' name='TGT_PORT' value='$fwdfwsettings{'TGT_PORT'}' maxlength='20' size='18' onclick='checkradio(\"#TGT_PORT\")'></td></tr>
|
||||
</table></div><br><hr>
|
||||
END
|
||||
&General::readhasharray("${General::swroot}/fwhosts/icmp-types", \%icmptypes);
|
||||
print"<option>All ICMP-Types</option>";
|
||||
foreach my $key (sort { ncmp($icmptypes{$a}[0],$icmptypes{$b}[0]) }keys %icmptypes){
|
||||
if($fwdfwsettings{'ICMP_TGT'} eq "$icmptypes{$key}[0]"){
|
||||
print"<option selected>$icmptypes{$key}[0] ($icmptypes{$key}[1])</option>";
|
||||
}else{
|
||||
print"<option>$icmptypes{$key}[0] ($icmptypes{$key}[1])</option>";
|
||||
}
|
||||
if ($fwdfwsettings{'USESRV'} ne 'ON'){
|
||||
print"<script language='JavaScript'>hide_elements('targetport');</script>";
|
||||
}
|
||||
print<<END;
|
||||
</select></td></tr>
|
||||
</table><br><hr>
|
||||
|
||||
END
|
||||
&Header::closebox;
|
||||
#---PROTOCOL------------------------------------------------------
|
||||
&Header::openbox('100%', 'left', $Lang::tr{'fwhost prot'});
|
||||
print<<END;
|
||||
<table width='100%' border='0'>
|
||||
<tr><td><select name='PROT'>
|
||||
END
|
||||
foreach ($Lang::tr{'all'},"TCP","UDP","GRE","ESP","AH","ICMP")
|
||||
{
|
||||
if ($_ eq $fwdfwsettings{'PROT'})
|
||||
{
|
||||
print"<option selected>$_</option>";
|
||||
}else{
|
||||
print"<option>$_</option>";
|
||||
}
|
||||
}
|
||||
print"</select></td></tr></table><br><hr>";
|
||||
&Header::closebox;
|
||||
#---Activate/logging/remark-------------------------------------
|
||||
&Header::openbox('100%', 'left', $Lang::tr{'fwdfw additional'});
|
||||
@@ -1712,7 +1761,7 @@ END
|
||||
{
|
||||
if($fwdfwsettings{'updatefwrule'} eq 'on'){
|
||||
print"<option value='$_'";
|
||||
print "selected='selected'" if ($fwdfwsettings{'RULE_ACTION'} eq $_);
|
||||
print " selected='selected'" if ($fwdfwsettings{'RULE_ACTION'} eq $_);
|
||||
print">$Lang::tr{'fwdfw '.$_}</option>";
|
||||
}else{
|
||||
if($fwdfwsettings{'POLICY'} eq 'MODE2'){
|
||||
@@ -2200,7 +2249,17 @@ END
|
||||
push (@protocols,$Lang::tr{'all'});
|
||||
}
|
||||
my $protz=join(",",@protocols);
|
||||
print"<td align='center'>$protz</td>";
|
||||
if($protz eq 'ICMP'){
|
||||
&General::readhasharray("${General::swroot}/fwhosts/icmp-types", \%icmptypes);
|
||||
foreach my $keyicmp (sort { ncmp($icmptypes{$a}[0],$icmptypes{$b}[0]) }keys %icmptypes){
|
||||
if($$hash{$key}[9] eq "$icmptypes{$keyicmp}[0]"){
|
||||
print "<td align='center'><span title='$icmptypes{$keyicmp}[0]'><b>$protz ($icmptypes{$keyicmp}[1])</b></span></td>";
|
||||
last;
|
||||
}
|
||||
}
|
||||
}else{
|
||||
print"<td align='center'>$protz</td>";
|
||||
}
|
||||
@protocols=();
|
||||
#SOURCE
|
||||
my $ipfireiface;
|
||||
|
||||
Reference in New Issue
Block a user