[prev in list] [next in list] [prev in thread] [next in thread] 

List:       ipfire-scm
Subject:    [IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, core35, updated. b743702e98f22009a
From:       git () ipfire ! org (Arne Fitzenreiter)
Date:       2010-01-23 18:30:14
Message-ID: 20100123183015.043FEAEEE005 () mail01 ! tremer ! info
[Download RAW message or body]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, core35 has been updated
       via  b743702e98f22009a46689b107ac6834978f965d (commit)
      from  55ad30d1901b3de6d5704e4cde86f9879ac90565 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit b743702e98f22009a46689b107ac6834978f965d
Author: Christian Schmidt <maniacikarus at ipfire.org>
Date:   Sat Jan 23 17:48:01 2010 +0100

    Fixed OutgoingFW Parser, all option removed
    
    To be compatible with old rules all will be translated to tcp and udp
    like in earlier versions of outgoingfw. So all is not doing what you
    expect, but if we change this all old rules using all and ports need to
    be translated to udp or tcp.
    When using GRE and ESP ports will be ignored.

-----------------------------------------------------------------------

Summary of changes:
 config/outgoingfw/outgoingfw.pl |    9 ++++-----
 html/cgi-bin/outgoingfw.cgi     |    1 -
 2 files changed, 4 insertions(+), 6 deletions(-)

Difference in files:
diff --git a/config/outgoingfw/outgoingfw.pl b/config/outgoingfw/outgoingfw.pl
index 4b86a8a..ac27a58 100644
--- 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";
diff --git a/html/cgi-bin/outgoingfw.cgi b/html/cgi-bin/outgoingfw.cgi
index ed87e0d..f112f6e 100644
--- a/html/cgi-bin/outgoingfw.cgi
+++ b/html/cgi-bin/outgoingfw.cgi
@@ -634,7 +634,6 @@ sub addrule
                                <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'>


hooks/post-receive
--
IPFire 2.x development tree

[prev in list] [next in list] [prev in thread] [next in thread]