Forward Firewall: Bugfix: when usinf ESP or AH as target protocol, no rules where...

diff --git a/html/cgi-bin/forwardfw.cgi b/html/cgi-bin/forwardfw.cgi
index 8d70bfb3edb96561ab06ebf75f79be0ea149a591..8e1100b45e8caa8f5e6d2fa2f4e6aaf8865e544e 100755 (executable)
--- a/html/cgi-bin/forwardfw.cgi
+++ b/html/cgi-bin/forwardfw.cgi
@@ -734,7 +734,7 @@ sub checktarget
                        }
                }
                if ($fwdfwsettings{'grp3'} eq 'TGT_PORT'){
-                       if ($fwdfwsettings{'TGT_PROT'} ne 'ICMP' && $fwdfwsettings{'TGT_PROT'} ne 'GRE'){
+                       if ($fwdfwsettings{'TGT_PROT'} eq 'TCP' || $fwdfwsettings{'TGT_PROT'} eq 'UDP'){
                                if ($fwdfwsettings{'TGT_PORT'} ne ''){
                                        #change dashes with :
                                        $fwdfwsettings{'TGT_PORT'}=~ tr/-/:/;
@@ -751,15 +751,19 @@ sub checktarget
                                }
                        }elsif ($fwdfwsettings{'TGT_PROT'} eq 'GRE'){
                                        $fwdfwsettings{$fwdfwsettings{'grp3'}} = '';
+                                       $fwdfwsettings{'TGT_PORT'} = '';
                                        $fwdfwsettings{'ICMP_TGT'} = '';
-                       }elsif($fwdfwsettings{'TGT_PORT'} eq 'ESP'){
+                       }elsif($fwdfwsettings{'TGT_PROT'} eq 'ESP'){
                                        $fwdfwsettings{$fwdfwsettings{'grp3'}} = '';
+                                       $fwdfwsettings{'TGT_PORT'} = '';
                                        $fwdfwsettings{'ICMP_TGT'}='';
-                       }elsif($fwdfwsettings{'TGT_PORT'} eq 'AH'){
+                       }elsif($fwdfwsettings{'TGT_PROT'} eq 'AH'){
                                        $fwdfwsettings{$fwdfwsettings{'grp3'}} = '';
+                                       $fwdfwsettings{'TGT_PORT'} = '';
                                        $fwdfwsettings{'ICMP_TGT'}='';
                        }elsif ($fwdfwsettings{'TGT_PROT'} eq 'ICMP'){
                                $fwdfwsettings{$fwdfwsettings{'grp3'}} = '';
+                               $fwdfwsettings{'TGT_PORT'} = '';
                                &General::readhasharray("${General::swroot}/fwhosts/icmp-types", \%icmptypes);
                                foreach my $key (keys %icmptypes){
                                        
@@ -777,6 +781,7 @@ sub checktarget
                $fwdfwsettings{$fwdfwsettings{'grp3'}}='';
                $fwdfwsettings{'TGT_PROT'}='';
                $fwdfwsettings{'ICMP_TGT'}='';
+
        }
        #check timeframe
        if($fwdfwsettings{'TIME'} eq 'ON'){