Added GRE and ESP protocoll to outgoing fw.

This enables using outgoing fw with ipsec connections.

diff --git a/config/outgoingfw/outgoingfw.pl b/config/outgoingfw/outgoingfw.pl
index ec89e873bde94c476d90b1b33dc7764b82e5e440..4b86a8a2a2fa3e3edb41963c7fb5f0ed55ced8c2 100644 (file)
--- a/config/outgoingfw/outgoingfw.pl
+++ b/config/outgoingfw/outgoingfw.pl
@@ -148,8 +148,14 @@ foreach $configentry (sort @configs)
                        @proto = ("tcp");
                } elsif ($configline[3] eq 'udp') {
                        @proto = ("udp");
                        @proto = ("tcp");
                } elsif ($configline[3] eq 'udp') {
                        @proto = ("udp");

+               } elsif ($configline[3] eq 'esp') {
+                       @proto = ("esp");
+               } elsif ($configline[3] eq 'gre') {
+                       @proto = ("gre");
+               } elsif ($configline[3] eq 'tcp&udp') {
+                       @proto = ("tcp","udp");

                } else {
                } else {

-                       @proto = ("tcp", "udp");
+                       @proto = ("all");

                }
                
                foreach $PROTO (@proto) {
                }
                
                foreach $PROTO (@proto) {

diff --git a/config/rootfiles/core/35/filelists/files b/config/rootfiles/core/35/filelists/files
index 955ed678f70e28883a8353e958e53358e8b55f2c..0e5c74eaf817aea2a1968a5c17056e3ccb8efb2d 100644 (file)
--- a/config/rootfiles/core/35/filelists/files
+++ b/config/rootfiles/core/35/filelists/files
@@ -1,2 +1,4 @@
 etc/system-release
 srv/web/ipfire/cgi-bin/country.cgi
 etc/system-release
 srv/web/ipfire/cgi-bin/country.cgi

+srv/web/ipfire/cgi-bin/outgoingfw.cgi
+var/ipfire/outgoing/bin/outgoingfw.pl
\ No newline at end of file

diff --git a/html/cgi-bin/outgoingfw.cgi b/html/cgi-bin/outgoingfw.cgi
index 9e621221a73f092443fad3fd01fd5fd1ea56e64d..1632f909207b726f5df7152976425833d9bb0065 100644 (file)
--- a/html/cgi-bin/outgoingfw.cgi
+++ b/html/cgi-bin/outgoingfw.cgi
@@ -2,7 +2,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #

-# Copyright (C) 2009  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2010  Michael Tremer & Christian Schmidt                      #

 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #


@@ -458,7 +458,7 @@ END
 if ($outfwsettings{'POLICY'} eq 'MODE1'){
 print <<END
                                        <tr bgcolor='$color{'color20'}'><form method='post' action='$ENV{'SCRIPT_NAME'}'>
 if ($outfwsettings{'POLICY'} eq 'MODE1'){
 print <<END
                                        <tr bgcolor='$color{'color20'}'><form method='post' action='$ENV{'SCRIPT_NAME'}'>

-                                           <td align='center'>tcp&udp
+                                           <td align='center'>all

                                            <td align='center'>all
                                            <td align='center'>ALL
                                            <td align='center'>drop
                                            <td align='center'>all
                                            <td align='center'>ALL
                                            <td align='center'>drop


@@ -577,7 +577,15 @@ sub addrule
                    <td width='20%' align='right' colspan='2'>$Lang::tr{'active'}:
                    <td width='30%' align='left' colspan='2'><input type='checkbox' name='ENABLED' $selected{'ENABLED'} />
                <tr><td width='20%' align='right'>$Lang::tr{'protocol'}:
                    <td width='20%' align='right' colspan='2'>$Lang::tr{'active'}:
                    <td width='30%' align='left' colspan='2'><input type='checkbox' name='ENABLED' $selected{'ENABLED'} />
                <tr><td width='20%' align='right'>$Lang::tr{'protocol'}:

-                   <td width='30%' align='left'><select name='PROT'><option value='all' $selected{'PROT'}{'all'}>All</option><option value='tcp' $selected{'PROT'}{'tcp'}>TCP</option><option value='tcp&udp' $selected{'PROT'}{'tcp&udp'}>TCP & UDP</option><option value='udp' $selected{'PROT'}{'udp'}>UDP</option></select>
+                   <td width='30%' align='left'>
+                       <select name='PROT'>
+                               <option value='all' $selected{'PROT'}{'all'}>All</option>
+                               <option value='tcp' $selected{'PROT'}{'tcp'}>TCP</option>
+                               <option value='udp' $selected{'PROT'}{'udp'}>UDP</option>
+                               <option value='gre' $selected{'PROT'}{'gre'}>GRE</option>
+                               <option value='esp' $selected{'PROT'}{'esp'}>ESP</option>
+                               <option value='tcp&udp' $selected{'PROT'}{'tcp&udp'}>TCP & UDP</option>
+                       </select>

                    <td width='20%' align='right' colspan='2'>$Lang::tr{'policy'}:
                    <td width='30%' align='left' colspan='2'>
 END
                    <td width='20%' align='right' colspan='2'>$Lang::tr{'policy'}:
                    <td width='30%' align='left' colspan='2'>
 END