From c791bb2a5982940068bcfdfe4845d233be283aa3 Mon Sep 17 00:00:00 2001
From: Christian Schmidt <maniacikarus@ipfire.org>
Date: Tue, 12 Jan 2010 18:02:27 +0100
Subject: [PATCH] Added GRE and ESP protocoll to outgoing fw.

This enables using outgoing fw with ipsec connections.
---
 config/outgoingfw/outgoingfw.pl          |  8 +++++++-
 config/rootfiles/core/35/filelists/files |  2 ++
 html/cgi-bin/outgoingfw.cgi              | 14 +++++++++++---
 3 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/config/outgoingfw/outgoingfw.pl b/config/outgoingfw/outgoingfw.pl
index ec89e873bd..4b86a8a2a2 100644
--- 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");
+		} elsif ($configline[3] eq 'esp') {
+			@proto = ("esp");
+		} elsif ($configline[3] eq 'gre') {
+			@proto = ("gre");
+		} elsif ($configline[3] eq 'tcp&udp') {
+			@proto = ("tcp","udp");
 		} else {
-			@proto = ("tcp", "udp");
+			@proto = ("all");
 		}
 		
 		foreach $PROTO (@proto) {
diff --git a/config/rootfiles/core/35/filelists/files b/config/rootfiles/core/35/filelists/files
index 955ed678f7..0e5c74eaf8 100644
--- 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
+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 9e621221a7..1632f90920 100644
--- a/html/cgi-bin/outgoingfw.cgi
+++ b/html/cgi-bin/outgoingfw.cgi
@@ -2,7 +2,7 @@
 ###############################################################################
 #                                                                             #
 # 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        #
@@ -458,7 +458,7 @@ END
 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
@@ -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='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
-- 
2.39.2