update ipp2p to 0.8.1rc1, add it to 2.6 as well

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@3463 3c298f89-4303-0410-b956-a3cf2f4a3e73

1 files changed, 134 insertions, 186 deletions

diff --git a/package/iptables/patches/01-ipp2p-0.7.4.patch b/package/iptables/patches/01-ipp2p-0.8.1rc1.patch
index d39a39d2d6..f7129b4560 100644
--- a/package/iptables/patches/01-ipp2p-0.7.4.patch
+++ b/package/iptables/patches/01-ipp2p-0.8.1rc1.patch
@@ -1,7 +1,21 @@
-diff -urN iptables-1.2.11.old/extensions/libipt_ipp2p.c iptables-1.2.11/extensions/libipt_ipp2p.c
---- iptables-1.2.11.old/extensions/libipt_ipp2p.c	1970-01-01 01:00:00.000000000 +0100
-+++ iptables-1.2.11/extensions/libipt_ipp2p.c	2005-03-12 00:50:27.000000000 +0100
-@@ -0,0 +1,455 @@
+diff -urN iptables.old/extensions/Makefile iptables.dev/extensions/Makefile
+--- iptables.old/extensions/Makefile	2005-07-20 04:22:56.000000000 +0200
++++ iptables.dev/extensions/Makefile	2006-03-23 14:42:28.000000000 +0100
+@@ -8,6 +8,10 @@
+ PF_EXT_SLIB:=ah addrtype comment connlimit connmark conntrack dscp ecn esp hashlimit helper icmp iprange length limit mac mark multiport owner physdev pkttype realm rpc sctp standard state tcp tcpmss tos ttl udp unclean CLASSIFY CONNMARK DNAT DSCP ECN LOG MARK MASQUERADE MIRROR NETMAP NFQUEUE NOTRACK REDIRECT REJECT SAME SNAT TARPIT TCPMSS TOS TRACE TTL ULOG
+ PF6_EXT_SLIB:=eui64 hl icmpv6 length limit mac mark multiport owner physdev standard tcp udp HL LOG NFQUEUE MARK TRACE
+ 
++
++# ipp2p
++PF_EXT_SLIB += ipp2p
++
+ # Optionals
+ PF_EXT_SLIB_OPTS:=$(foreach T,$(wildcard extensions/.*-test),$(shell KERNEL_DIR=$(KERNEL_DIR) $(T)))
+ PF6_EXT_SLIB_OPTS:=$(foreach T,$(wildcard extensions/.*-test6),$(shell KERNEL_DIR=$(KERNEL_DIR) $(T)))
+diff -urN iptables.old/extensions/libipt_ipp2p.c iptables.dev/extensions/libipt_ipp2p.c
+--- iptables.old/extensions/libipt_ipp2p.c	1970-01-01 01:00:00.000000000 +0100
++++ iptables.dev/extensions/libipt_ipp2p.c	2006-03-23 14:43:26.000000000 +0100
+@@ -0,0 +1,401 @@
 +
 +#include <stdio.h>
 +#include <netdb.h>
@@ -14,32 +28,29 @@ diff -urN iptables-1.2.11.old/extensions/libipt_ipp2p.c iptables-1.2.11/extensio
 +
 +#include <linux/netfilter_ipv4/ipt_ipp2p.h>
 +
-+
-+
-+
 +static void
 +help(void)
 +{
 +    printf(
 +    "IPP2P v%s options:\n"
 +    " --ipp2p	Grab all known p2p packets\n"
-+    " --ipp2p-data	Identify all known p2p download commands (obsolete)\n\n"
 +    " --edk		[TCP&UDP]	All known eDonkey/eMule/Overnet packets\n"
 +    " --dc		[TCP] 		All known Direct Connect packets\n"
 +    " --kazaa	[TCP&UDP] 	All known KaZaA packets\n"
 +    " --gnu		[TCP&UDP]	All known Gnutella packets\n"
 +    " --bit		[TCP&UDP]	All known BitTorrent packets\n"
-+    " --apple	[TCP] 		All known AppleJuice packets (beta - just a few tests until now)\n"
-+    " --winmx	[TCP] 		All known WinMX (beta - need feedback)\n"
-+    " --soul		[TCP] 		All known SoulSeek (beta - need feedback!)\n"
-+    " --ares		[TCP] 		All known Ares - use with DROP only (beta - need feedback!)\n\n"
-+    " --edk-data	[TCP] 		eDonkey/eMule/Overnet download commands (obsolete)\n"
-+    " --dc-data	[TCP] 		Direct Connect download command (obsolete)\n"
-+    " --kazaa-data	[TCP] 		KaZaA download command (obsolete)\n"
-+    " --gnu-data	[TCP] 		Gnutella download command (obsolete)\n"
++    " --apple	[TCP] 		All known AppleJuice packets\n"
++    " --winmx	[TCP] 		All known WinMX\n"
++    " --soul		[TCP] 		All known SoulSeek\n"
++    " --ares		[TCP] 		All known Ares\n\n"
++    " EXPERIMENTAL protocols (please send feedback to: ipp2p@ipp2p.org) :\n"
++    " --mute		[TCP]		All known Mute packets\n"
++    " --waste	[TCP]		All known Waste packets\n"
++    " --xdcc		[TCP]		All known XDCC packets (only xdcc login)\n\n"
++    " DEBUG SUPPPORT, use only if you know why\n"
++    " --debug		Generate kernel debug output, THIS WILL SLOW DOWN THE FILTER\n"
 +    "\nNote that the follwing options will have the same meaning:\n"
-+    " '--ipp2p' is equal to '--edk --dc --kazaa --gnu'\n"
-+    " '--ipp2p-data' is equal to '--edk-data --dc-data --kazaa-data --gnu-data'\n"
++    " '--ipp2p' is equal to '--edk --dc --kazaa --gnu --bit --apple --winmx --soul --ares'\n"
 +    "\nIPP2P was intended for TCP only. Due to increasing usage of UDP we needed to change this.\n"
 +    "You can now use -p udp to search UDP packets only or without -p switch to search UDP and TCP packets.\n"
 +    "\nSee README included with this package for more details or visit http://www.ipp2p.org\n"
@@ -50,17 +61,10 @@ diff -urN iptables-1.2.11.old/extensions/libipt_ipp2p.c iptables-1.2.11/extensio
 +    , IPP2P_VERSION);
 +}
 +
-+							    
-+
 +static struct option opts[] = {
 +        { "ipp2p", 0, 0, '1' },
 +        { "edk", 0, 0, '2' },	
-+        { "ipp2p-data", 0, 0, '3' },		
-+        { "kazaa-data", 0, 0, '4' },
-+        { "edk-data", 0, 0, '5' },	
-+        { "dc-data", 0, 0, '6' },
 +	{ "dc", 0, 0, '7' },
-+	{ "gnu-data", 0, 0, '8' },	
 +	{ "gnu", 0, 0, '9' },
 +	{ "kazaa", 0, 0, 'a' },
 +	{ "bit", 0, 0, 'b' },
@@ -68,7 +72,10 @@ diff -urN iptables-1.2.11.old/extensions/libipt_ipp2p.c iptables-1.2.11/extensio
 +	{ "soul", 0, 0, 'd' },	
 +	{ "winmx", 0, 0, 'e' },	
 +	{ "ares", 0, 0, 'f' },
-+	{ "debug", 0, 0, 'g' },
++	{ "mute", 0, 0, 'g' },
++	{ "waste", 0, 0, 'h' },
++	{ "xdcc", 0, 0, 'i' },
++	{ "debug", 0, 0, 'j' },
 +        {0}
 +};
 +
@@ -102,10 +109,10 @@ diff -urN iptables-1.2.11.old/extensions/libipt_ipp2p.c iptables-1.2.11/extensio
 +		    exit_error(PARAMETER_PROBLEM,
 +				"ipp2p: `--ipp2p' may only be "
 +				"specified once!");
-+	    if ((*flags & SHORT_HAND_DATA) == SHORT_HAND_DATA)
++/*	    if ((*flags & SHORT_HAND_DATA) == SHORT_HAND_DATA)
 +		    exit_error(PARAMETER_PROBLEM,
 +				"ipp2p: `--ipp2p-data' may only be "
-+				"specified alone!");
++				"specified alone!");*/
 +	    if ((*flags) != 0)
 +		    exit_error(PARAMETER_PROBLEM,
 +				"ipp2p: `--ipp2p' may only be "
@@ -124,10 +131,10 @@ diff -urN iptables-1.2.11.old/extensions/libipt_ipp2p.c iptables-1.2.11/extensio
 +		    exit_error(PARAMETER_PROBLEM,
 +				"ipp2p: `--ipp2p' may only be "
 +				"specified alone!");
-+	    if ((*flags & SHORT_HAND_DATA) == SHORT_HAND_DATA)
++/*	    if ((*flags & SHORT_HAND_DATA) == SHORT_HAND_DATA)
 +		    exit_error(PARAMETER_PROBLEM,
 +				"ipp2p: `--ipp2p-data' may only be "
-+				"specified alone!");
++				"specified alone!");*/
 +            if ((*flags & IPP2P_DATA_EDK) == IPP2P_DATA_EDK)
 +            exit_error(PARAMETER_PROBLEM,
 +                                "ipp2p: use `--edk' OR `--edk-data' but not both of them!");
@@ -136,86 +143,6 @@ diff -urN iptables-1.2.11.old/extensions/libipt_ipp2p.c iptables-1.2.11/extensio
 +	    info->cmd = *flags;	    
 +	    break;
 +
-+	case '3':		/*cmd: ipp2p-data*/
-+	    if ((*flags & SHORT_HAND_DATA) == SHORT_HAND_DATA)
-+		    exit_error(PARAMETER_PROBLEM,
-+				"ipp2p: `--ipp2p-data' may only be "
-+				"specified once!");
-+	    if ((*flags & SHORT_HAND_IPP2P) == SHORT_HAND_IPP2P)
-+		    exit_error(PARAMETER_PROBLEM,
-+				"ipp2p: `--ipp2p' may only be "
-+				"specified alone!");
-+	    if ((*flags) != 0)
-+		    exit_error(PARAMETER_PROBLEM,
-+				"ipp2p: `--ipp2p-data' may only be "
-+				"specified alone!");
-+	    if (invert) exit_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");
-+	    *flags += SHORT_HAND_DATA;
-+	    info->cmd = *flags;	    
-+	    break;
-+
-+        case '4':		/*cmd: kazaa-data*/
-+            if ((*flags & IPP2P_DATA_KAZAA) == IPP2P_DATA_KAZAA)
-+            exit_error(PARAMETER_PROBLEM,
-+                                "ipp2p: `--kazaa-data' may only be "
-+                                "specified once!");
-+	    if ((*flags & SHORT_HAND_IPP2P) == SHORT_HAND_IPP2P)
-+		    exit_error(PARAMETER_PROBLEM,
-+				"ipp2p: `--ipp2p' may only be "
-+				"specified alone!");
-+	    if ((*flags & SHORT_HAND_DATA) == SHORT_HAND_DATA)
-+		    exit_error(PARAMETER_PROBLEM,
-+				"ipp2p: `--ipp2p-data' may only be "
-+				"specified alone!");
-+            if ((*flags & IPP2P_KAZAA) == IPP2P_KAZAA)
-+            exit_error(PARAMETER_PROBLEM,
-+                                "ipp2p: use `--kazaa' OR `--kazaa-data' but not both of them!");
-+	    if (invert) exit_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");
-+            *flags += IPP2P_DATA_KAZAA;
-+	    info->cmd = *flags;
-+	    break;
-+
-+	case '5':		/*cmd: edk-data*/
-+            if ((*flags & IPP2P_DATA_EDK) == IPP2P_DATA_EDK)
-+            exit_error(PARAMETER_PROBLEM,
-+                                "ipp2p: `--edk-data' may only be "
-+                                "specified once!");
-+	    if ((*flags & SHORT_HAND_IPP2P) == SHORT_HAND_IPP2P)
-+		    exit_error(PARAMETER_PROBLEM,
-+				"ipp2p: `--ipp2p' may only be "
-+				"specified alone!");
-+	    if ((*flags & SHORT_HAND_DATA) == SHORT_HAND_DATA)
-+		    exit_error(PARAMETER_PROBLEM,
-+				"ipp2p: `--ipp2p-data' may only be "
-+				"specified alone!");
-+            if ((*flags & IPP2P_EDK) == IPP2P_EDK)
-+            exit_error(PARAMETER_PROBLEM,
-+                                "ipp2p: use `--edk' OR `--edk-data' but not both of them!");
-+	    if (invert) exit_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");
-+            *flags += IPP2P_DATA_EDK;
-+	    info->cmd = *flags;
-+	    break;																											
-+
-+	case '6':		/*cmd: dc-data*/
-+            if ((*flags & IPP2P_DATA_DC) == IPP2P_DATA_DC)
-+            exit_error(PARAMETER_PROBLEM,
-+                                "ipp2p: `--dc-data' may only be "
-+                                "specified once!");
-+	    if ((*flags & SHORT_HAND_DATA) == SHORT_HAND_DATA)
-+		    exit_error(PARAMETER_PROBLEM,
-+				"ipp2p: `--ipp2p-data' may only be "
-+				"specified alone!");
-+	    if ((*flags & SHORT_HAND_IPP2P) == SHORT_HAND_IPP2P)
-+		    exit_error(PARAMETER_PROBLEM,
-+				"ipp2p: `--ipp2p' may only be "
-+				"specified alone!");
-+            if ((*flags & IPP2P_DC) == IPP2P_DC)
-+            exit_error(PARAMETER_PROBLEM,
-+                                "ipp2p: use `--dc' OR `--dc-data' but not both of them!");
-+	    if (invert) exit_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");
-+            *flags += IPP2P_DATA_DC;
-+	    info->cmd = *flags;
-+	    break;																											
 +
 +	case '7':		/*cmd: dc*/
 +            if ((*flags & IPP2P_DC) == IPP2P_DC)
@@ -226,49 +153,28 @@ diff -urN iptables-1.2.11.old/extensions/libipt_ipp2p.c iptables-1.2.11/extensio
 +		    exit_error(PARAMETER_PROBLEM,
 +				"ipp2p: `--ipp2p' may only be "
 +				"specified alone!");
-+	    if ((*flags & SHORT_HAND_DATA) == SHORT_HAND_DATA)
++/*	    if ((*flags & SHORT_HAND_DATA) == SHORT_HAND_DATA)
 +		    exit_error(PARAMETER_PROBLEM,
 +				"ipp2p: `--ipp2p-data' may only be "
-+				"specified alone!");
++				"specified alone!");*/
 +            if ((*flags & IPP2P_DATA_DC) == IPP2P_DATA_DC)
 +            exit_error(PARAMETER_PROBLEM,
 +                                "ipp2p: use `--dc' OR `--dc-data' but not both of them!");
 +	    if (invert) exit_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");
 +            *flags += IPP2P_DC;
 +	    info->cmd = *flags;
-+	    break;																											
-+
++	    break;
 +
-+	case '8':		/*cmd: gnu-data*/
-+            if ((*flags & IPP2P_DATA_GNU) == IPP2P_DATA_GNU)
-+            exit_error(PARAMETER_PROBLEM,
-+                                "ipp2p: `--gnu-data' may only be "
-+                                "specified once!");
-+	    if ((*flags & SHORT_HAND_IPP2P) == SHORT_HAND_IPP2P)
-+		    exit_error(PARAMETER_PROBLEM,
-+				"ipp2p: `--ipp2p' may only be "
-+				"specified alone!");
-+	    if ((*flags & SHORT_HAND_DATA) == SHORT_HAND_DATA)
-+		    exit_error(PARAMETER_PROBLEM,
-+				"ipp2p: `--ipp2p-data' may only be "
-+				"specified alone!");
-+            if ((*flags & IPP2P_GNU) == IPP2P_GNU)
-+            exit_error(PARAMETER_PROBLEM,
-+                                "ipp2p: use `--gnu' OR `--gnu-data' but not both of them!");
-+	    if (invert) exit_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");
-+            *flags += IPP2P_DATA_GNU;
-+	    info->cmd = *flags;
-+	    break;																											
 +
 +	case '9':		/*cmd: gnu*/
 +            if ((*flags & IPP2P_GNU) == IPP2P_GNU)
 +            exit_error(PARAMETER_PROBLEM,
 +                                "ipp2p: `--gnu' may only be "
 +                                "specified once!");
-+	    if ((*flags & SHORT_HAND_DATA) == SHORT_HAND_DATA)
++/*	    if ((*flags & SHORT_HAND_DATA) == SHORT_HAND_DATA)
 +		    exit_error(PARAMETER_PROBLEM,
 +				"ipp2p: `--ipp2p-data' may only be "
-+				"specified alone!");
++				"specified alone!");*/
 +	    if ((*flags & SHORT_HAND_IPP2P) == SHORT_HAND_IPP2P)
 +		    exit_error(PARAMETER_PROBLEM,
 +				"ipp2p: `--ipp2p' may only be "
@@ -279,17 +185,17 @@ diff -urN iptables-1.2.11.old/extensions/libipt_ipp2p.c iptables-1.2.11/extensio
 +	    if (invert) exit_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");
 +            *flags += IPP2P_GNU;
 +	    info->cmd = *flags;
-+	    break;																											
++	    break;
 +
 +	case 'a':		/*cmd: kazaa*/
 +            if ((*flags & IPP2P_KAZAA) == IPP2P_KAZAA)
 +            exit_error(PARAMETER_PROBLEM,
 +                                "ipp2p: `--kazaa' may only be "
 +                                "specified once!");
-+	    if ((*flags & SHORT_HAND_DATA) == SHORT_HAND_DATA)
++/*	    if ((*flags & SHORT_HAND_DATA) == SHORT_HAND_DATA)
 +		    exit_error(PARAMETER_PROBLEM,
 +				"ipp2p: `--ipp2p-data' may only be "
-+				"specified alone!");
++				"specified alone!");*/
 +	    if ((*flags & SHORT_HAND_IPP2P) == SHORT_HAND_IPP2P)
 +		    exit_error(PARAMETER_PROBLEM,
 +				"ipp2p: `--ipp2p' may only be "
@@ -307,6 +213,10 @@ diff -urN iptables-1.2.11.old/extensions/libipt_ipp2p.c iptables-1.2.11/extensio
 +            exit_error(PARAMETER_PROBLEM,
 +                                "ipp2p: `--bit' may only be "
 +                                "specified once!");
++	    if ((*flags & SHORT_HAND_IPP2P) == SHORT_HAND_IPP2P)
++		    exit_error(PARAMETER_PROBLEM,
++				"ipp2p: `--ipp2p' may only be "
++				"specified alone!");
 +	    if (invert) exit_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");
 +            *flags += IPP2P_BIT;
 +	    info->cmd = *flags;
@@ -317,6 +227,10 @@ diff -urN iptables-1.2.11.old/extensions/libipt_ipp2p.c iptables-1.2.11/extensio
 +            exit_error(PARAMETER_PROBLEM,
 +                                "ipp2p: `--apple' may only be "
 +                                "specified once!");
++	    if ((*flags & SHORT_HAND_IPP2P) == SHORT_HAND_IPP2P)
++		    exit_error(PARAMETER_PROBLEM,
++				"ipp2p: `--ipp2p' may only be "
++				"specified alone!");
 +	    if (invert) exit_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");
 +            *flags += IPP2P_APPLE;
 +	    info->cmd = *flags;
@@ -328,6 +242,10 @@ diff -urN iptables-1.2.11.old/extensions/libipt_ipp2p.c iptables-1.2.11/extensio
 +            exit_error(PARAMETER_PROBLEM,
 +                                "ipp2p: `--soul' may only be "
 +                                "specified once!");
++	    if ((*flags & SHORT_HAND_IPP2P) == SHORT_HAND_IPP2P)
++		    exit_error(PARAMETER_PROBLEM,
++				"ipp2p: `--ipp2p' may only be "
++				"specified alone!");
 +	    if (invert) exit_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");
 +            *flags += IPP2P_SOUL;
 +	    info->cmd = *flags;
@@ -339,6 +257,10 @@ diff -urN iptables-1.2.11.old/extensions/libipt_ipp2p.c iptables-1.2.11/extensio
 +            exit_error(PARAMETER_PROBLEM,
 +                                "ipp2p: `--winmx' may only be "
 +                                "specified once!");
++	    if ((*flags & SHORT_HAND_IPP2P) == SHORT_HAND_IPP2P)
++		    exit_error(PARAMETER_PROBLEM,
++				"ipp2p: `--ipp2p' may only be "
++				"specified alone!");
 +	    if (invert) exit_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");
 +            *flags += IPP2P_WINMX;
 +	    info->cmd = *flags;
@@ -349,19 +271,51 @@ diff -urN iptables-1.2.11.old/extensions/libipt_ipp2p.c iptables-1.2.11/extensio
 +            exit_error(PARAMETER_PROBLEM,
 +                                "ipp2p: `--ares' may only be "
 +                                "specified once!");
++	    if ((*flags & SHORT_HAND_IPP2P) == SHORT_HAND_IPP2P)
++		    exit_error(PARAMETER_PROBLEM,
++				"ipp2p: `--ipp2p' may only be "
++				"specified alone!");
 +	    if (invert) exit_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");
 +            *flags += IPP2P_ARES;
 +	    info->cmd = *flags;
 +	    break;																											
++	
++	case 'g':		/*cmd: mute*/
++            if ((*flags & IPP2P_MUTE) == IPP2P_MUTE)
++            exit_error(PARAMETER_PROBLEM,
++                                "ipp2p: `--mute' may only be "
++                                "specified once!");
++	    if (invert) exit_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");
++            *flags += IPP2P_MUTE;
++	    info->cmd = *flags;
++	    break;																											
++	case 'h':		/*cmd: waste*/
++            if ((*flags & IPP2P_WASTE) == IPP2P_WASTE)
++            exit_error(PARAMETER_PROBLEM,
++                                "ipp2p: `--waste' may only be "
++                                "specified once!");
++	    if (invert) exit_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");
++            *flags += IPP2P_WASTE;
++	    info->cmd = *flags;
++	    break;																											
++	case 'i':		/*cmd: xdcc*/
++            if ((*flags & IPP2P_XDCC) == IPP2P_XDCC)
++            exit_error(PARAMETER_PROBLEM,
++                                "ipp2p: `--ares' may only be "
++                                "specified once!");
++	    if (invert) exit_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");
++            *flags += IPP2P_XDCC;
++	    info->cmd = *flags;
++	    break;																											
 +
-+	case 'g':		/*cmd: debug*/
++	case 'j':		/*cmd: debug*/
 +	    if (invert) exit_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");
 +	    info->debug = 1;
 +	    break;																											
 +
 +	default:
-+            exit_error(PARAMETER_PROBLEM,
-+	    "\nipp2p-parameter problem: for ipp2p usage type: iptables -m ipp2p --help\n");
++//            exit_error(PARAMETER_PROBLEM,
++//	    "\nipp2p-parameter problem: for ipp2p usage type: iptables -m ipp2p --help\n");
 +	    return 0;
 +    }
 +    return 1;
@@ -387,20 +341,23 @@ diff -urN iptables-1.2.11.old/extensions/libipt_ipp2p.c iptables-1.2.11/extensio
 +    
 +    printf("ipp2p v%s", IPP2P_VERSION);
 +    if ((info->cmd & SHORT_HAND_IPP2P) == SHORT_HAND_IPP2P) printf(" --ipp2p");
-+    if ((info->cmd & SHORT_HAND_DATA) == SHORT_HAND_DATA) printf(" --ipp2p-data");
++//    if ((info->cmd & SHORT_HAND_DATA) == SHORT_HAND_DATA) printf(" --ipp2p-data");
 +    if ((info->cmd & IPP2P_KAZAA) == IPP2P_KAZAA) printf(" --kazaa");
-+    if ((info->cmd & IPP2P_DATA_KAZAA) == IPP2P_DATA_KAZAA) printf(" --kazaa-data");
-+    if ((info->cmd & IPP2P_DATA_GNU) == IPP2P_DATA_GNU) printf(" --gnu-data");
++//    if ((info->cmd & IPP2P_DATA_KAZAA) == IPP2P_DATA_KAZAA) printf(" --kazaa-data");
++//    if ((info->cmd & IPP2P_DATA_GNU) == IPP2P_DATA_GNU) printf(" --gnu-data");
 +    if ((info->cmd & IPP2P_GNU) == IPP2P_GNU) printf(" --gnu");
 +    if ((info->cmd & IPP2P_EDK) == IPP2P_EDK) printf(" --edk");
-+    if ((info->cmd & IPP2P_DATA_EDK) == IPP2P_DATA_EDK) printf(" --edk-data");
-+    if ((info->cmd & IPP2P_DATA_DC) == IPP2P_DATA_DC) printf(" --dc-data");
++//    if ((info->cmd & IPP2P_DATA_EDK) == IPP2P_DATA_EDK) printf(" --edk-data");
++//    if ((info->cmd & IPP2P_DATA_DC) == IPP2P_DATA_DC) printf(" --dc-data");
 +    if ((info->cmd & IPP2P_DC) == IPP2P_DC) printf(" --dc");
 +    if ((info->cmd & IPP2P_BIT) == IPP2P_BIT) printf(" --bit");
 +    if ((info->cmd & IPP2P_APPLE) == IPP2P_APPLE) printf(" --apple");
 +    if ((info->cmd & IPP2P_SOUL) == IPP2P_SOUL) printf(" --soul");
 +    if ((info->cmd & IPP2P_WINMX) == IPP2P_WINMX) printf(" --winmx");
 +    if ((info->cmd & IPP2P_ARES) == IPP2P_ARES) printf(" --ares");
++    if ((info->cmd & IPP2P_MUTE) == IPP2P_MUTE) printf(" --mute");
++    if ((info->cmd & IPP2P_WASTE) == IPP2P_WASTE) printf(" --waste");
++    if ((info->cmd & IPP2P_XDCC) == IPP2P_XDCC) printf(" --xdcc");
 +    if (info->debug != 0) printf(" --debug");
 +    printf(" ");
 +}
@@ -413,20 +370,23 @@ diff -urN iptables-1.2.11.old/extensions/libipt_ipp2p.c iptables-1.2.11/extensio
 +    struct ipt_p2p_info *info = (struct ipt_p2p_info *)match->data;
 +    
 +    if ((info->cmd & SHORT_HAND_IPP2P) == SHORT_HAND_IPP2P) printf("--ipp2p ");
-+    if ((info->cmd & SHORT_HAND_DATA) == SHORT_HAND_DATA) printf("--ipp2p-data ");
++//    if ((info->cmd & SHORT_HAND_DATA) == SHORT_HAND_DATA) printf("--ipp2p-data ");
 +    if ((info->cmd & IPP2P_KAZAA) == IPP2P_KAZAA) printf("--kazaa ");
-+    if ((info->cmd & IPP2P_DATA_KAZAA) == IPP2P_DATA_KAZAA) printf("--kazaa-data ");
-+    if ((info->cmd & IPP2P_DATA_GNU) == IPP2P_DATA_GNU) printf("--gnu-data ");
++//    if ((info->cmd & IPP2P_DATA_KAZAA) == IPP2P_DATA_KAZAA) printf("--kazaa-data ");
++//    if ((info->cmd & IPP2P_DATA_GNU) == IPP2P_DATA_GNU) printf("--gnu-data ");
 +    if ((info->cmd & IPP2P_GNU) == IPP2P_GNU) printf("--gnu ");
 +    if ((info->cmd & IPP2P_EDK) == IPP2P_EDK) printf("--edk ");
-+    if ((info->cmd & IPP2P_DATA_EDK) == IPP2P_DATA_EDK) printf("--edk-data ");
-+    if ((info->cmd & IPP2P_DATA_DC) == IPP2P_DATA_DC) printf("--dc-data ");
++//    if ((info->cmd & IPP2P_DATA_EDK) == IPP2P_DATA_EDK) printf("--edk-data ");
++//    if ((info->cmd & IPP2P_DATA_DC) == IPP2P_DATA_DC) printf("--dc-data ");
 +    if ((info->cmd & IPP2P_DC) == IPP2P_DC) printf("--dc ");
 +    if ((info->cmd & IPP2P_BIT) == IPP2P_BIT) printf("--bit ");
 +    if ((info->cmd & IPP2P_APPLE) == IPP2P_APPLE) printf("--apple ");
 +    if ((info->cmd & IPP2P_SOUL) == IPP2P_SOUL) printf("--soul ");
 +    if ((info->cmd & IPP2P_WINMX) == IPP2P_WINMX) printf("--winmx ");
 +    if ((info->cmd & IPP2P_ARES) == IPP2P_ARES) printf("--ares ");
++    if ((info->cmd & IPP2P_MUTE) == IPP2P_MUTE) printf(" --mute");
++    if ((info->cmd & IPP2P_WASTE) == IPP2P_WASTE) printf(" --waste");
++    if ((info->cmd & IPP2P_XDCC) == IPP2P_XDCC) printf(" --xdcc");
 +    if (info->debug != 0) printf("--debug ");
 +}
 +
@@ -457,27 +417,13 @@ diff -urN iptables-1.2.11.old/extensions/libipt_ipp2p.c iptables-1.2.11/extensio
 +    register_match(&ipp2p);
 +}
 +
-diff -urN iptables-1.2.11.old/extensions/Makefile iptables-1.2.11/extensions/Makefile
---- iptables-1.2.11.old/extensions/Makefile	2004-06-17 12:22:54.000000000 +0200
-+++ iptables-1.2.11/extensions/Makefile	2005-03-12 00:50:12.000000000 +0100
-@@ -8,6 +8,10 @@
- PF_EXT_SLIB:=ah connlimit connmark conntrack dscp ecn esp helper icmp iprange length limit mac mark multiport owner physdev pkttype realm rpc sctp standard state tcp tcpmss tos ttl udp unclean CLASSIFY CONNMARK DNAT DSCP ECN LOG MARK MASQUERADE MIRROR NETMAP NOTRACK REDIRECT REJECT SAME SNAT TARPIT TCPMSS TOS TRACE TTL ULOG
- PF6_EXT_SLIB:=eui64 hl icmpv6 length limit mac mark multiport owner standard tcp udp HL LOG MARK TRACE
- 
-+
-+# ipp2p
-+PF_EXT_SLIB += ipp2p
-+
- # Optionals
- PF_EXT_SLIB_OPTS:=$(foreach T,$(wildcard extensions/.*-test),$(shell KERNEL_DIR=$(KERNEL_DIR) $(T)))
- PF6_EXT_SLIB_OPTS:=$(foreach T,$(wildcard extensions/.*-test6),$(shell KERNEL_DIR=$(KERNEL_DIR) $(T)))
-diff -urN iptables-1.2.11.old/include/linux/netfilter_ipv4/ipt_ipp2p.h iptables-1.2.11/include/linux/netfilter_ipv4/ipt_ipp2p.h
---- iptables-1.2.11.old/include/linux/netfilter_ipv4/ipt_ipp2p.h	1970-01-01 01:00:00.000000000 +0100
-+++ iptables-1.2.11/include/linux/netfilter_ipv4/ipt_ipp2p.h	2005-03-12 00:50:46.000000000 +0100
-@@ -0,0 +1,29 @@
+diff -urN iptables.old/include/linux/netfilter_ipv4/ipt_ipp2p.h iptables.dev/include/linux/netfilter_ipv4/ipt_ipp2p.h
+--- iptables.old/include/linux/netfilter_ipv4/ipt_ipp2p.h	1970-01-01 01:00:00.000000000 +0100
++++ iptables.dev/include/linux/netfilter_ipv4/ipt_ipp2p.h	2006-03-23 14:44:26.000000000 +0100
+@@ -0,0 +1,31 @@
 +#ifndef __IPT_IPP2P_H
 +#define __IPT_IPP2P_H
-+#define IPP2P_VERSION "0.7.4"
++#define IPP2P_VERSION "0.8.1_rc1"
 +
 +struct ipt_p2p_info {
 +    int cmd;
@@ -487,20 +433,22 @@ diff -urN iptables-1.2.11.old/include/linux/netfilter_ipv4/ipt_ipp2p.h iptables-
 +#endif //__IPT_IPP2P_H
 +
 +#define SHORT_HAND_IPP2P	1 /* --ipp2p switch*/
-+#define SHORT_HAND_DATA		4 /* --ipp2p-data switch*/
++//#define SHORT_HAND_DATA		4 /* --ipp2p-data switch*/
 +#define SHORT_HAND_NONE		5 /* no short hand*/
 +
-+#define IPP2P_EDK		2
-+#define IPP2P_DATA_KAZAA	8
-+#define IPP2P_DATA_EDK		16
-+#define IPP2P_DATA_DC		32
-+#define IPP2P_DC		64
-+#define IPP2P_DATA_GNU		128
-+#define IPP2P_GNU		256
-+#define IPP2P_KAZAA		512
-+#define IPP2P_BIT		1024
-+#define IPP2P_APPLE		2048
-+#define IPP2P_SOUL		4096
-+#define IPP2P_WINMX		8192
-+#define IPP2P_ARES		16384
-+
++#define IPP2P_EDK		(1 << 1)
++#define IPP2P_DATA_KAZAA	(1 << 2)
++#define IPP2P_DATA_EDK		(1 << 3)
++#define IPP2P_DATA_DC		(1 << 4)
++#define IPP2P_DC		(1 << 5)
++#define IPP2P_DATA_GNU		(1 << 6)
++#define IPP2P_GNU		(1 << 7)
++#define IPP2P_KAZAA		(1 << 8)
++#define IPP2P_BIT		(1 << 9)
++#define IPP2P_APPLE		(1 << 10)
++#define IPP2P_SOUL		(1 << 11)
++#define IPP2P_WINMX		(1 << 12)
++#define IPP2P_ARES		(1 << 13)
++#define IPP2P_MUTE		(1 << 14)
++#define IPP2P_WASTE		(1 << 15)
++#define IPP2P_XDCC		(1 << 16)