Fixed OutgoingFW Parser, all option removed

[people/pmueller/ipfire-2.x.git] / config / outgoingfw / outgoingfw.pl

diff --git a/config/outgoingfw/outgoingfw.pl b/config/outgoingfw/outgoingfw.pl
index 4b86a8a2a2fa3e3edb41963c7fb5f0ed55ced8c2..ac27a58fe57b3681a0cb0238bbcec4c7fd32d33d 100644 (file)
--- a/config/outgoingfw/outgoingfw.pl
+++ b/config/outgoingfw/outgoingfw.pl
@@ -152,19 +152,18 @@ foreach $configentry (sort @configs)
                        @proto = ("esp");
                } elsif ($configline[3] eq 'gre') {
                        @proto = ("gre");
-               } elsif ($configline[3] eq 'tcp&udp') {
-                       @proto = ("tcp","udp");
                } else {
-                       @proto = ("all");
+                       @proto = ("tcp","udp");
                }
+                 
                
                foreach $PROTO (@proto) {
                        $CMD = "/sbin/iptables -A OUTGOINGFW -s $SOURCE -d $DESTINATION -p $PROTO";
        
-                       if ($configline[8]) {
+                        if ($configline[8] && $configline[3] ne 'esp' && $configline[3] ne 'gre') {
                                $DPORT = "$configline[8]";
                                $CMD = "$CMD --dport $DPORT";
-                       }
+                        }
                        
                        if ($DEV) {
                                $CMD = "$CMD -i $DEV";