[Iptables-p2p-commits] iptables-p2p/kernel main.c,1.7,1.8 match_http.c,1.11,1.12

[<li...@us...>]

Update of /cvsroot/iptables-p2p/iptables-p2p/kernel
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14742/kernel

Modified Files:
	main.c match_http.c 
Log Message:
OpenFT match tested and working


Index: main.c
===================================================================
RCS file: /cvsroot/iptables-p2p/iptables-p2p/kernel/main.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- main.c	15 Dec 2003 11:04:09 -0000	1.7
+++ main.c	6 Feb 2004 19:00:33 -0000	1.8
@@ -46,7 +46,8 @@
                const unsigned char *end)
 {
 	if (pinfo->proto & IPT_P2P_PROTO_KAZAA ||
-		pinfo->proto & IPT_P2P_PROTO_GNUTELLA)
+		pinfo->proto & IPT_P2P_PROTO_GNUTELLA ||
+		pinfo->proto & IPT_P2P_PROTO_OPENFT)
 	{
 		int proto;
 

Index: match_http.c
===================================================================
RCS file: /cvsroot/iptables-p2p/iptables-p2p/kernel/match_http.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- match_http.c	6 Feb 2004 18:19:52 -0000	1.11
+++ match_http.c	6 Feb 2004 19:00:33 -0000	1.12
@@ -179,6 +179,8 @@
 		HM(HM_X_P2P_MESSAGE))
 		return IPT_P2P_PROTO_KAZAA;
 
+	/* TODO: Add support for PUSH command */
+
 /*
  * Gnutella
  */
@@ -198,14 +200,13 @@
 	 * These are not supported or undrestood by the common ipt_p2p.h, and
 	 * so not used yet.
 	 */
-#if 0
+
 	/* OpenFT */
 	if ((MM(MM_GET) || MM(MM_HTTP11)) && (HM(HM_X_OPENFTALIAS)))
-		return 1;
+		return IPT_P2P_PROTO_OPENFT;
 
 	if (MM(MM_GET_POISONED))
-		return 1;
-#endif
+		return IPT_P2P_PROTO_OPENFT;
 
 	return 0;
 }