[git.ipfire.org] IPFire 2.x development tree branch, core84, updated. 2a5b19c56f8593e78906d716afe123a6ff0ee6db

[git.ipfire.org] IPFire 2.x development tree branch, core84, updated. 2a5b19c56f8593e78906d716afe123a6ff0ee6db

[git]

[-- Attachment #1: Type: text/plain, Size: 2984 bytes --]

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, core84 has been updated
       via  2a5b19c56f8593e78906d716afe123a6ff0ee6db (commit)
      from  e43b21264f8b0c28a9b03f8f65d46e47572df719 (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 2a5b19c56f8593e78906d716afe123a6ff0ee6db
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Sat Oct 4 14:18:16 2014 +0200

    p2pblock: ipp2p must run before CONNTRACK.
    
    And can only used for blocking, not for accept conenections bacause connections must already established for detecting protocol types.

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

Summary of changes:
 config/firewall/rules.pl        | 16 +++-------------
 src/initscripts/init.d/dhcrelay |  0
 src/initscripts/init.d/firewall |  6 ++++++
 3 files changed, 9 insertions(+), 13 deletions(-)
 mode change 100755 => 100644 src/initscripts/init.d/dhcrelay

Difference in files:
diff --git a/config/firewall/rules.pl b/config/firewall/rules.pl
index 4d70382..20f97be 100755
--- a/config/firewall/rules.pl
+++ b/config/firewall/rules.pl
@@ -554,29 +554,19 @@ sub time_convert_to_minutes {
 }
 
 sub p2pblock {
-	my $search_action;
-	my $target;
-
-	if ($fwdfwsettings{"POLICY"} eq "MODE1") {
-		$search_action = "on";
-		$target = "ACCEPT";
-	} else {
-		$search_action = "off";
-		$target = "DROP";
-	}
-
 	open(FILE, "<$p2pfile") or die "Unable to read $p2pfile";
 	my @protocols = ();
 	foreach my $p2pentry (<FILE>) {
 		my @p2pline = split(/\;/, $p2pentry);
-		next unless ($p2pline[2] eq $search_action);
+		next unless ($p2pline[2] eq "off");
 
 		push(@protocols, "--$p2pline[1]");
 	}
 	close(FILE);
 
 	if (@protocols) {
-		run("$IPTABLES -A FORWARDFW -m ipp2p @protocols -j $target");
+		run("$IPTABLES -F P2PBLOCK");
+		run("$IPTABLES -A P2PBLOCK -m ipp2p @protocols -j DROP");
 	}
 }
 
diff --git a/src/initscripts/init.d/dhcrelay b/src/initscripts/init.d/dhcrelay
old mode 100755
new mode 100644
diff --git a/src/initscripts/init.d/firewall b/src/initscripts/init.d/firewall
index 66ca432..c383652 100644
--- a/src/initscripts/init.d/firewall
+++ b/src/initscripts/init.d/firewall
@@ -104,6 +104,12 @@ iptables_init() {
 	iptables -t nat -N CUSTOMPOSTROUTING
 	iptables -t nat -A POSTROUTING -j CUSTOMPOSTROUTING
 
+	# P2PBLOCK
+	iptables -N P2PBLOCK
+	iptables -A INPUT -j P2PBLOCK
+	iptables -A FORWARD -j P2PBLOCK
+	iptables -A OUTPUT -j P2PBLOCK
+	
 	# Guardian (IPS) chains
 	iptables -N GUARDIAN
 	iptables -A INPUT -j GUARDIAN


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