[Iptables-p2p-commits] iptables-p2p/kernel match_http.c,1.6,1.7

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

Update of /cvsroot/iptables-p2p/iptables-p2p/kernel
In directory sc8-pr-cvs1:/tmp/cvs-serv30034

Modified Files:
	match_http.c 
Log Message:
updated to match kazaa 2.6 connections


Index: match_http.c
===================================================================
RCS file: /cvsroot/iptables-p2p/iptables-p2p/kernel/match_http.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- match_http.c	15 Dec 2003 11:03:01 -0000	1.6
+++ match_http.c	1 Jan 2004 20:03:31 -0000	1.7
@@ -51,13 +51,16 @@
 #define NM_GET_HASH     2
 	{ STRING_MATCH("GET /.hash=")             },
 
-#define MM_GET_POISONED 3
+#define NM_GET_FILE     3
+	{ STRING_MATCH("GET /.file")             },
+
+#define MM_GET_POISONED 4
 	{ STRING_MATCH("GET /PoisonedDownloads/") },
 
-#define MM_GET          4
+#define MM_GET          5
 	{ STRING_MATCH("GET /")                   },
 
-#define MM_HTTP11       5
+#define MM_HTTP11       6
 	{ STRING_MATCH("HTTP/1.1")                },
 
 	{ NULL, 0                                 }
@@ -73,16 +76,19 @@
 #define HM_X_GNUTELLA       1
 	{ STRING_MATCH("X-Gnutella-")    },
 
-#define HM_X_OPENFTALIAS    2
+#define HM_X_P2P_MESSAGE    2
+	{ STRING_MATCH("X-P2P-Message:") },
+
+#define HM_X_OPENFTALIAS    3
 	{ STRING_MATCH("X-OpenftAlias:") },
 
-#define HM_CONTENT_URN      3
+#define HM_CONTENT_URN      4
 	{ STRING_MATCH("Content-URN:")   },
 
-#define HM_X_QUEUE          4
+#define HM_X_QUEUE          5
 	{ STRING_MATCH("X-Queue:")       },
 
-#define HM_X_TIGER_THREE    5
+#define HM_X_TIGER_THREE    6
 	{ STRING_MATCH("X-TigerTree")    },
 
 	{ NULL, 0                        }
@@ -159,6 +165,10 @@
 
 	/* Kazaa */
 	if ((MM(NM_GET_HASH) || MM(MM_HTTP11)) && HM(HM_X_KAZAA))
+		return IPT_P2P_PROTO_KAZAA;
+
+	/* Kazaa 2.6 (TODO: needs testing) */
+	if ((MM(NM_GET_FILE) || MM(MM_HTTP11)) && HM(HM_X_P2P_MESSAGE))
 		return IPT_P2P_PROTO_KAZAA;
 
 	/* Gnutella */