Menu
▾
▴
iptables-p2p-commits — Distribution list for automated CVS commit notifications
You can subscribe to this list here.
| 2003 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(13) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
(8) |
Feb
(43) |
Mar
(18) |
Apr
(2) |
May
|
Jun
(3) |
Jul
|
Aug
|
Sep
(15) |
Oct
|
Nov
|
Dec
|
|
From: <li...@us...> - 2004-02-13 00:59:33
|
Update of /cvsroot/iptables-p2p/iptables-p2p/kernel In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24979 Modified Files: match_http.c Log Message: kazaa 2.6 header packets are mtu size Index: match_http.c =================================================================== RCS file: /cvsroot/iptables-p2p/iptables-p2p/kernel/match_http.c,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- match_http.c 9 Feb 2004 18:26:15 -0000 1.19 +++ match_http.c 13 Feb 2004 00:54:14 -0000 1.20 @@ -23,10 +23,6 @@ #include "ipt_p2p.h" -#define SIZE_MIN 30 -#define SIZE_MAX 1000 /* TODO: I have seen shareaza packets bigger - than this */ - /*****************************************************************************/ /* Ugly short-hand to avoid costly initialization */ @@ -145,9 +141,6 @@ unsigned int method_matched; /* Methods matched */ unsigned int headers_matched[HEADERS_LEN]; /* Headers matched */ - if (end - data < SIZE_MIN || end - data > SIZE_MAX) - return 0; - /* Match method */ method_matched = string_matchlist(data, end, methods); |
|
From: <ja...@us...> - 2004-02-12 04:51:27
|
Update of /cvsroot/iptables-p2p/iptables-p2p/iptables In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26704/iptables Modified Files: libipt_p2p.c Log Message: cleaned up proto_to_arg [untested] Index: libipt_p2p.c =================================================================== RCS file: /cvsroot/iptables-p2p/iptables-p2p/iptables/libipt_p2p.c,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- libipt_p2p.c 8 Feb 2004 17:02:56 -0000 1.13 +++ libipt_p2p.c 12 Feb 2004 04:46:47 -0000 1.14 @@ -98,16 +98,15 @@ printf( "P2P match v%s options:\n" -" --p2p-protocol [!] protocol[,proto2][,proto3...]\n" +" --p2p-protocol [!] protocol[,...]\n" " --p2p ...\n" " match application-layer protocol\n", IPT_P2P_VERSION); printf("Valid p2p protocols:\n"); - for (i = 0; i < PROTOMAP_NELEM; i++) - if(IPT_P2P_PROTO_ALL != protomap[i].proto) - printf(" %s\n", protomap[i].name); + for (i = 1; i < PROTOMAP_NELEM; i++) + printf("\t%s\n", protomap[i].name); } /* Initialize the match. */ @@ -207,31 +206,34 @@ static char *proto_to_arg(int proto) { static char buf[256]; - int firstrun = 1; + size_t buflen; int i; - if(proto == IPT_P2P_PROTO_ALL) - { - strcpy(buf, "all "); - return buf; - } - - buf[0] = '\0'; + buflen = 0; + buf[buflen] = '\0'; for (i = 0; i < PROTOMAP_NELEM; i++) { - if(IPT_P2P_PROTO_ALL != protomap[i].proto && - proto & protomap[i].proto) + if ((proto & protomap[i].proto) == protomap[i].proto) { - if(!firstrun) - strcat(buf,","); - strcat(buf, protomap[i].name); - firstrun = 0; + size_t namelen; + + namelen = strlen(protomap[i].name); + + if (buflen + namelen + 2 > sizeof (buf)) + break; + + strcpy(buf + buflen, protomap[i].name); + buflen += namelen; + + strcpy(buf + buflen, ", "); + buflen += 2; } } - strcat(buf, " "); - + /* rewind the last ", " appended to the buffer */ + if (buflen > 1) + buf[buflen - 2] = '\0'; return buf; } @@ -279,9 +281,7 @@ { const struct ipt_p2p_info *pinfo = IPT_P2P_INFO_const(m); - printf("P2P match "); - - fputs(proto_to_arg(pinfo->proto), stdout); + printf("P2P match %s", proto_to_arg(pinfo->proto)); } static void save(const struct ipt_ip *ip, const struct ipt_entry_match *m) |
|
From: <ja...@us...> - 2004-02-12 04:50:49
|
Update of /cvsroot/iptables-p2p/iptables-p2p In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26641 Modified Files: Makefile Log Message: minor cleanup Index: Makefile =================================================================== RCS file: /cvsroot/iptables-p2p/iptables-p2p/Makefile,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- Makefile 10 Feb 2004 19:32:47 -0000 1.5 +++ Makefile 12 Feb 2004 04:46:05 -0000 1.6 @@ -1,7 +1,7 @@ # $Id$ ############################################################################### -KV = $(shell echo `uname -r` | cut -d. -f1-2) +KV = $(shell uname -r | cut -d. -f1-2) ifeq ($(KV), 2.6) TARGET=linux-2.6 |
|
From: <li...@us...> - 2004-02-10 19:36:23
|
Update of /cvsroot/iptables-p2p/iptables-p2p In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31968 Modified Files: Makefile Log Message: detection of 2.6 kernels in default target Index: Makefile =================================================================== RCS file: /cvsroot/iptables-p2p/iptables-p2p/Makefile,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- Makefile 1 Jan 2004 20:54:24 -0000 1.4 +++ Makefile 10 Feb 2004 19:32:47 -0000 1.5 @@ -1,7 +1,15 @@ # $Id$ ############################################################################### -all: linux-2.4 +KV = $(shell echo `uname -r` | cut -d. -f1-2) + +ifeq ($(KV), 2.6) + TARGET=linux-2.6 +else + TARGET=linux-2.4 +endif + +all: $(TARGET) linux-2.4: $(MAKE) -C iptables @@ -11,6 +19,8 @@ $(MAKE) -C iptables $(MAKE) -C kernel linux-2.6 +.PHONY: clean + clean: $(MAKE) -C iptables $@ $(MAKE) -C kernel $@ |
|
From: <li...@us...> - 2004-02-10 00:59:53
|
Update of /cvsroot/iptables-p2p/iptables-p2p/kernel In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6201 Modified Files: match_http.c Log Message: headers needed for 2.4 compilation Index: match_http.c =================================================================== RCS file: /cvsroot/iptables-p2p/iptables-p2p/kernel/match_http.c,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- match_http.c 8 Feb 2004 17:20:51 -0000 1.18 +++ match_http.c 9 Feb 2004 18:26:15 -0000 1.19 @@ -17,6 +17,9 @@ #include <linux/config.h> #include <linux/module.h> +#include <linux/skbuff.h> +#include <linux/file.h> +#include <net/sock.h> #include "ipt_p2p.h" |
|
From: <li...@us...> - 2004-02-08 17:38:17
|
Update of /cvsroot/iptables-p2p/iptables-p2p In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30342 Modified Files: FAQ Log Message: gift reference in openft Index: FAQ =================================================================== RCS file: /cvsroot/iptables-p2p/iptables-p2p/FAQ,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- FAQ 8 Feb 2004 16:47:12 -0000 1.5 +++ FAQ 8 Feb 2004 17:35:12 -0000 1.6 @@ -53,7 +53,7 @@ * Direct Connect * Gnutella (regular clients and Shareaza's gnutella 2) * BitTorrent - * OpenFT + * OpenFT (giFT) Future plans: |
|
From: <li...@us...> - 2004-02-08 17:32:39
|
Update of /cvsroot/iptables-p2p/iptables-p2p In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29307 Modified Files: TODO Log Message: update Index: TODO =================================================================== RCS file: /cvsroot/iptables-p2p/iptables-p2p/TODO,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- TODO 8 Feb 2004 17:28:25 -0000 1.1 +++ TODO 8 Feb 2004 17:29:26 -0000 1.2 @@ -1,3 +1,4 @@ + * Name change to iptables-p2p ? * Support for WinMX/Napster * Support for Soulseek * Testing framework |
|
From: <li...@us...> - 2004-02-08 17:31:32
|
Update of /cvsroot/iptables-p2p/iptables-p2p In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29088 Added Files: TODO Log Message: initial version --- NEW FILE: TODO --- * Support for WinMX/Napster * Support for Soulseek * Testing framework - Possibly reading several pcap files with traffic and feeding it to the match modules. |
|
From: <li...@us...> - 2004-02-08 17:24:00
|
Update of /cvsroot/iptables-p2p/iptables-p2p/kernel In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27641 Modified Files: main.c match_bittorrent.c match_dc.c match_http.c Log Message: minor code cleanup Index: main.c =================================================================== RCS file: /cvsroot/iptables-p2p/iptables-p2p/kernel/main.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- main.c 8 Feb 2004 16:47:29 -0000 1.10 +++ main.c 8 Feb 2004 17:20:51 -0000 1.11 @@ -134,14 +134,14 @@ static int __init init(void) { - printk(KERN_INFO "ipt_p2p %s initialized.\n", IPT_P2P_VERSION); + printk(KERN_INFO "ipt_p2p %s initialized\n", IPT_P2P_VERSION); return ipt_register_match(&p2p_match); } static void __exit fini(void) { ipt_unregister_match(&p2p_match); - printk(KERN_INFO "ipt_p2p %s removed.\n", IPT_P2P_VERSION); + printk(KERN_INFO "ipt_p2p %s removed\n", IPT_P2P_VERSION); } module_init(init); Index: match_bittorrent.c =================================================================== RCS file: /cvsroot/iptables-p2p/iptables-p2p/kernel/match_bittorrent.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- match_bittorrent.c 7 Dec 2003 03:05:10 -0000 1.2 +++ match_bittorrent.c 8 Feb 2004 17:20:51 -0000 1.3 @@ -15,14 +15,7 @@ #define __NO_VERSION__ #include <linux/config.h> - -#include <linux/smp.h> #include <linux/module.h> -#include <linux/skbuff.h> -#include <linux/file.h> -#include <net/sock.h> - -#include <linux/netfilter_ipv4/ip_tables.h> #define SIZE_MIN (20) Index: match_dc.c =================================================================== RCS file: /cvsroot/iptables-p2p/iptables-p2p/kernel/match_dc.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- match_dc.c 7 Dec 2003 03:05:10 -0000 1.3 +++ match_dc.c 8 Feb 2004 17:20:51 -0000 1.4 @@ -15,12 +15,7 @@ #define __NO_VERSION__ #include <linux/config.h> - -#include <linux/smp.h> #include <linux/module.h> -#include <linux/skbuff.h> -#include <linux/file.h> -#include <net/sock.h> #include <linux/netfilter_ipv4/ip_tables.h> Index: match_http.c =================================================================== RCS file: /cvsroot/iptables-p2p/iptables-p2p/kernel/match_http.c,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- match_http.c 8 Feb 2004 17:13:11 -0000 1.17 +++ match_http.c 8 Feb 2004 17:20:51 -0000 1.18 @@ -16,16 +16,13 @@ #define __NO_VERSION__ #include <linux/config.h> -#include <linux/smp.h> #include <linux/module.h> -#include <linux/skbuff.h> -#include <linux/file.h> -#include <net/sock.h> #include "ipt_p2p.h" #define SIZE_MIN 30 -#define SIZE_MAX 1000 +#define SIZE_MAX 1000 /* TODO: I have seen shareaza packets bigger + than this */ /*****************************************************************************/ |
|
From: <li...@us...> - 2004-02-08 17:16:15
|
Update of /cvsroot/iptables-p2p/iptables-p2p/kernel In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25802 Modified Files: match_http.c Log Message: most protocols tested Index: match_http.c =================================================================== RCS file: /cvsroot/iptables-p2p/iptables-p2p/kernel/match_http.c,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- match_http.c 8 Feb 2004 16:47:29 -0000 1.16 +++ match_http.c 8 Feb 2004 17:13:11 -0000 1.17 @@ -13,8 +13,6 @@ */ -/* TODO: This module needs more testing */ - #define __NO_VERSION__ #include <linux/config.h> |
|
From: <li...@us...> - 2004-02-08 17:06:19
|
Update of /cvsroot/iptables-p2p/iptables-p2p/iptables In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23425 Modified Files: libipt_p2p.c Log Message: Show available protocols in help Index: libipt_p2p.c =================================================================== RCS file: /cvsroot/iptables-p2p/iptables-p2p/iptables/libipt_p2p.c,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- libipt_p2p.c 8 Feb 2004 16:47:29 -0000 1.12 +++ libipt_p2p.c 8 Feb 2004 17:02:56 -0000 1.13 @@ -94,12 +94,20 @@ /* Prints usage. */ static void help(void) { + int i; + printf( "P2P match v%s options:\n" " --p2p-protocol [!] protocol[,proto2][,proto3...]\n" " --p2p ...\n" " match application-layer protocol\n", IPT_P2P_VERSION); + + printf("Valid p2p protocols:\n"); + for (i = 0; i < PROTOMAP_NELEM; i++) + if(IPT_P2P_PROTO_ALL != protomap[i].proto) + printf(" %s\n", protomap[i].name); + } /* Initialize the match. */ |
|
From: <li...@us...> - 2004-02-08 16:50:39
|
Update of /cvsroot/iptables-p2p/iptables-p2p/kernel In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19658/kernel Modified Files: main.c match_http.c Log Message: changed kazaa references to fasttrack Index: main.c =================================================================== RCS file: /cvsroot/iptables-p2p/iptables-p2p/kernel/main.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- main.c 6 Feb 2004 19:37:21 -0000 1.9 +++ main.c 8 Feb 2004 16:47:29 -0000 1.10 @@ -45,7 +45,7 @@ const unsigned char *data, const unsigned char *end) { - if (pinfo->proto & IPT_P2P_PROTO_KAZAA || + if (pinfo->proto & IPT_P2P_PROTO_FASTTRACK || pinfo->proto & IPT_P2P_PROTO_GNUTELLA || pinfo->proto & IPT_P2P_PROTO_OPENFT) { Index: match_http.c =================================================================== RCS file: /cvsroot/iptables-p2p/iptables-p2p/kernel/match_http.c,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- match_http.c 8 Feb 2004 00:51:06 -0000 1.15 +++ match_http.c 8 Feb 2004 16:47:29 -0000 1.16 @@ -171,20 +171,20 @@ /* - * Kazaa + * FastTrack */ - /* Kazaa < 2.6 */ + /* KaZaa < 2.6 */ if ((MM(MM_GET_HASH) || MM(MM_HTTP11)) && HM(HM_X_KAZAA)) - return IPT_P2P_PROTO_KAZAA; + return IPT_P2P_PROTO_FASTTRACK; - /* Kazaa >= 2.6 (TODO: needs testing) */ + /* KaZaa >= 2.6 (TODO: needs testing) */ if ((MM(MM_GET_FILE) || MM(MM_GET_SIG) || MM(MM_HTTP11)) && HM(HM_X_P2P_MESSAGE)) - return IPT_P2P_PROTO_KAZAA; + return IPT_P2P_PROTO_FASTTRACK; - /* Kazaa passive mode (TODO: Check if methos GIVE is used anywhere else) */ + /* KaZaa passive mode (TODO: Check if methos GIVE is used anywhere else) */ if (MM(MM_GIVE)) - return IPT_P2P_PROTO_KAZAA; + return IPT_P2P_PROTO_FASTTRACK; /* * Gnutella |
|
From: <li...@us...> - 2004-02-08 16:50:39
|
Update of /cvsroot/iptables-p2p/iptables-p2p In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19658 Modified Files: FAQ NEWS Log Message: changed kazaa references to fasttrack Index: FAQ =================================================================== RCS file: /cvsroot/iptables-p2p/iptables-p2p/FAQ,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- FAQ 6 Feb 2004 19:44:11 -0000 1.4 +++ FAQ 8 Feb 2004 16:47:12 -0000 1.5 @@ -29,9 +29,9 @@ 4. And how do I block only certain protocols to and from my network? Add a rule like the following one: - iptables -A FORWARD -m p2p --p2p-protocol kazaa,bittorrent -j DROP + iptables -A FORWARD -m p2p --p2p-protocol fasttrack,bittorrent -j DROP - It is also possible to use ! kazaa to match everything but kazaa. + It is also possible to use ! fasttrack to match everything but fasttrack. 5. I am using a 2.6 kernel, how do I compile this? Index: NEWS =================================================================== RCS file: /cvsroot/iptables-p2p/iptables-p2p/NEWS,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- NEWS 6 Feb 2004 19:44:11 -0000 1.6 +++ NEWS 8 Feb 2004 16:47:28 -0000 1.7 @@ -6,7 +6,7 @@ - Moved project to sourceforge.net - Removed iptables patch, only needs headers installed - Added the ability to specify specific protocols to match - - KaZaa match updated for new version of KaZaa + - FastTrack match updated for new version of FastTrack - eDonkey match updated - Added support for OpenFT - Added support for Shareazza/Gnutella2 in the gnutella match |
|
From: <li...@us...> - 2004-02-08 16:50:38
|
Update of /cvsroot/iptables-p2p/iptables-p2p/examples In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19658/examples Modified Files: account-p2p.sh Log Message: changed kazaa references to fasttrack Index: account-p2p.sh =================================================================== RCS file: /cvsroot/iptables-p2p/iptables-p2p/examples/account-p2p.sh,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- account-p2p.sh 8 Feb 2004 01:09:09 -0000 1.1 +++ account-p2p.sh 8 Feb 2004 16:47:29 -0000 1.2 @@ -1,6 +1,6 @@ #!/bin/sh -PROTOCOLS="kazaa gnutella edonkey dc bittorrent openft" +PROTOCOLS="fasttrack gnutella edonkey dc bittorrent openft" for proto in $PROTOCOLS do |
|
From: <li...@us...> - 2004-02-08 16:50:38
|
Update of /cvsroot/iptables-p2p/iptables-p2p/iptables In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19658/iptables Modified Files: libipt_p2p.c Log Message: changed kazaa references to fasttrack Index: libipt_p2p.c =================================================================== RCS file: /cvsroot/iptables-p2p/iptables-p2p/iptables/libipt_p2p.c,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- libipt_p2p.c 8 Feb 2004 00:49:20 -0000 1.11 +++ libipt_p2p.c 8 Feb 2004 16:47:29 -0000 1.12 @@ -37,7 +37,7 @@ protomap[] = { { "all", IPT_P2P_PROTO_ALL }, - { "kazaa", IPT_P2P_PROTO_KAZAA }, + { "fasttrack", IPT_P2P_PROTO_FASTTRACK }, { "gnutella", IPT_P2P_PROTO_GNUTELLA }, { "edonkey", IPT_P2P_PROTO_EDONKEY }, { "dc", IPT_P2P_PROTO_DIRECT_CONNECT }, @@ -151,9 +151,9 @@ /* * Arg may be in the following forms: * - * kazaa,gnutella = IPT_P2P_PROTO_KAZAA | IPT_P2P_PROTO_GNUTELLA - * 0x6 = IPT_P2P_PROTO_GNUTELLA | IPT_P2P_PROTO_EDONKEY - * edonkey,16 = IPT_P2P_PROTO_EDONKEY | IPT_P2P_PROTO_BITTORRENT + * fasttrack,gnutella = IPT_P2P_PROTO_FASTTRACK | IPT_P2P_PROTO_GNUTELLA + * 0x6 = IPT_P2P_PROTO_GNUTELLA | IPT_P2P_PROTO_EDONKEY + * edonkey,16 = IPT_P2P_PROTO_EDONKEY | IPT_P2P_PROTO_BITTORRENT */ static int arglist_to_proto(const char *arg, int invert) { |
|
From: <li...@us...> - 2004-02-08 16:50:38
|
Update of /cvsroot/iptables-p2p/iptables-p2p/common In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19658/common Modified Files: ipt_p2p.h Log Message: changed kazaa references to fasttrack Index: ipt_p2p.h =================================================================== RCS file: /cvsroot/iptables-p2p/iptables-p2p/common/ipt_p2p.h,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- ipt_p2p.h 6 Feb 2004 19:37:20 -0000 1.6 +++ ipt_p2p.h 8 Feb 2004 16:47:29 -0000 1.7 @@ -19,7 +19,7 @@ /*****************************************************************************/ -#define IPT_P2P_PROTO_KAZAA (0x01) /* Minimum value for proto */ +#define IPT_P2P_PROTO_FASTTRACK (0x01) /* Minimum value for proto */ #define IPT_P2P_PROTO_GNUTELLA (0x02) #define IPT_P2P_PROTO_EDONKEY (0x04) #define IPT_P2P_PROTO_DIRECT_CONNECT (0x08) |
|
From: <li...@us...> - 2004-02-08 01:12:06
|
Update of /cvsroot/iptables-p2p/iptables-p2p/examples In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19649 Added Files: account-p2p.sh Log Message: new accounting script --- NEW FILE: account-p2p.sh --- #!/bin/sh PROTOCOLS="kazaa gnutella edonkey dc bittorrent openft" for proto in $PROTOCOLS do iptables -A FORWARD -m p2p --p2p $proto done |
|
From: <li...@us...> - 2004-02-08 01:04:34
|
Update of /cvsroot/iptables-p2p/iptables-p2p/examples In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18383 Modified Files: limit-p2p.sh block-p2p.sh Log Message: scripts updated Index: limit-p2p.sh =================================================================== RCS file: /cvsroot/iptables-p2p/iptables-p2p/examples/limit-p2p.sh,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -d -r1.1.1.1 -r1.2 --- limit-p2p.sh 5 Dec 2003 00:20:35 -0000 1.1.1.1 +++ limit-p2p.sh 8 Feb 2004 01:01:36 -0000 1.2 @@ -19,7 +19,7 @@ NORMAL=2 P2P=3 -$FW -t mangle -A PREROUTING -m p2p -j CONNMARK --set-mark $P2P_MARK +$FW -t mangle -A PREROUTING -m p2p --p2p all -j CONNMARK --set-mark $P2P_MARK $FW -t mangle -A PREROUTING -m connmark --mark $P2P_MARK -j CONNMARK --restore-mark for i in $IFACES Index: block-p2p.sh =================================================================== RCS file: /cvsroot/iptables-p2p/iptables-p2p/examples/block-p2p.sh,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -d -r1.1.1.1 -r1.2 --- block-p2p.sh 5 Dec 2003 00:20:35 -0000 1.1.1.1 +++ block-p2p.sh 8 Feb 2004 01:01:36 -0000 1.2 @@ -1,3 +1,3 @@ #!/bin/sh -iptables -A FORWARD -m p2p -j DROP +iptables -A FORWARD -m p2p --p2p all -j DROP |
|
From: <li...@us...> - 2004-02-08 00:54:03
|
Update of /cvsroot/iptables-p2p/iptables-p2p/kernel In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16698 Modified Files: match_http.c Log Message: OpenFT tested Index: match_http.c =================================================================== RCS file: /cvsroot/iptables-p2p/iptables-p2p/kernel/match_http.c,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- match_http.c 6 Feb 2004 19:36:36 -0000 1.14 +++ match_http.c 8 Feb 2004 00:51:06 -0000 1.15 @@ -201,11 +201,6 @@ if (MM(MM_HTTP11) && HM(HM_X_TIGER_THREE)) return IPT_P2P_PROTO_GNUTELLA; - /* - * These are not supported or undrestood by the common ipt_p2p.h, and - * so not used yet. - */ - /* OpenFT */ if ((MM(MM_GET) || MM(MM_HTTP11)) && (HM(HM_X_OPENFTALIAS))) return IPT_P2P_PROTO_OPENFT; |
|
From: <li...@us...> - 2004-02-08 00:52:25
|
Update of /cvsroot/iptables-p2p/iptables-p2p/iptables In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16426 Modified Files: libipt_p2p.c Log Message: indentation problem Index: libipt_p2p.c =================================================================== RCS file: /cvsroot/iptables-p2p/iptables-p2p/iptables/libipt_p2p.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- libipt_p2p.c 8 Feb 2004 00:35:23 -0000 1.10 +++ libipt_p2p.c 8 Feb 2004 00:49:20 -0000 1.11 @@ -213,16 +213,16 @@ for (i = 0; i < PROTOMAP_NELEM; i++) { if(IPT_P2P_PROTO_ALL != protomap[i].proto && - proto & protomap[i].proto) + proto & protomap[i].proto) { - if(!firstrun) - strcat(buf,","); + if(!firstrun) + strcat(buf,","); strcat(buf, protomap[i].name); - firstrun = 0; + firstrun = 0; } } - strcat(buf, " "); + strcat(buf, " "); return buf; |
|
From: <li...@us...> - 2004-02-08 00:38:22
|
Update of /cvsroot/iptables-p2p/iptables-p2p/iptables In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14402 Modified Files: libipt_p2p.c Log Message: print and save protocol names instead of numbers Index: libipt_p2p.c =================================================================== RCS file: /cvsroot/iptables-p2p/iptables-p2p/iptables/libipt_p2p.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- libipt_p2p.c 6 Feb 2004 19:37:20 -0000 1.9 +++ libipt_p2p.c 8 Feb 2004 00:35:23 -0000 1.10 @@ -198,9 +198,32 @@ static char *proto_to_arg(int proto) { - static char buf[16]; + static char buf[256]; + int firstrun = 1; + int i; + + if(proto == IPT_P2P_PROTO_ALL) + { + strcpy(buf, "all "); + return buf; + } + + buf[0] = '\0'; + + for (i = 0; i < PROTOMAP_NELEM; i++) + { + if(IPT_P2P_PROTO_ALL != protomap[i].proto && + proto & protomap[i].proto) + { + if(!firstrun) + strcat(buf,","); + strcat(buf, protomap[i].name); + firstrun = 0; + } + } + + strcat(buf, " "); - snprintf (buf, sizeof (buf), "%i", proto); return buf; } |
|
From: <li...@us...> - 2004-02-06 19:46:57
|
Update of /cvsroot/iptables-p2p/iptables-p2p In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25395 Modified Files: FAQ NEWS Log Message: updated docs Index: FAQ =================================================================== RCS file: /cvsroot/iptables-p2p/iptables-p2p/FAQ,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- FAQ 15 Dec 2003 09:25:37 -0000 1.3 +++ FAQ 6 Feb 2004 19:44:11 -0000 1.4 @@ -41,7 +41,7 @@ 6. Is it possible to subvert the filter using a p2p client with custom changes? Possibly, altough it may not be that easy because matching is done in both - directions (except for eDonkey). + directions. 7. What protocols are supported? @@ -49,16 +49,17 @@ Currently the supported protocols are: * FastTrack (KaZaa, Grokster, ...) - * eDonkey (and eMule of course) + * eDonkey (eDonkey, eMule, ...) * Direct Connect - * Gnutella + * Gnutella (regular clients and Shareaza's gnutella 2) * BitTorrent + * OpenFT Future plans: * Optionally match control streams in addition to transfer streams. * Napster/WinMX protocol support - * OpenFT protocol support + * Soulseek 8. Where can I find future updates to ipt_p2p? Index: NEWS =================================================================== RCS file: /cvsroot/iptables-p2p/iptables-p2p/NEWS,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- NEWS 1 Jan 2004 21:23:53 -0000 1.5 +++ NEWS 6 Feb 2004 19:44:11 -0000 1.6 @@ -8,6 +8,8 @@ - Added the ability to specify specific protocols to match - KaZaa match updated for new version of KaZaa - eDonkey match updated + - Added support for OpenFT + - Added support for Shareazza/Gnutella2 in the gnutella match - Fixes in kernel 2.6 support * 0.2.3 |
|
From: <li...@us...> - 2004-02-06 19:40:09
|
Update of /cvsroot/iptables-p2p/iptables-p2p/iptables In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24076/iptables Modified Files: libipt_p2p.c Log Message: print version string when loading and unloading module Index: libipt_p2p.c =================================================================== RCS file: /cvsroot/iptables-p2p/iptables-p2p/iptables/libipt_p2p.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- libipt_p2p.c 6 Feb 2004 19:00:32 -0000 1.8 +++ libipt_p2p.c 6 Feb 2004 19:37:20 -0000 1.9 @@ -26,11 +26,6 @@ /*****************************************************************************/ -/* It seems that all the iptables modules are built to refer to their - iptables version, but we do not distrib with iptables. So that would be - silly, wouldn't it? */ -#define IPT_P2P_VERSION "0.2.3" - /* Translates a named protocol option to an integer proto value; See arg_to_proto for usage. */ static struct |
|
From: <li...@us...> - 2004-02-06 19:40:09
|
Update of /cvsroot/iptables-p2p/iptables-p2p/common In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24076/common Modified Files: ipt_p2p.h Log Message: print version string when loading and unloading module Index: ipt_p2p.h =================================================================== RCS file: /cvsroot/iptables-p2p/iptables-p2p/common/ipt_p2p.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- ipt_p2p.h 6 Feb 2004 19:00:32 -0000 1.5 +++ ipt_p2p.h 6 Feb 2004 19:37:20 -0000 1.6 @@ -15,6 +15,8 @@ #ifndef __IPT_P2P_H #define __IPT_P2P_H +#define IPT_P2P_VERSION "0.2.3" + /*****************************************************************************/ #define IPT_P2P_PROTO_KAZAA (0x01) /* Minimum value for proto */ |
|
From: <li...@us...> - 2004-02-06 19:40:09
|
Update of /cvsroot/iptables-p2p/iptables-p2p/kernel In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24076/kernel Modified Files: main.c Log Message: print version string when loading and unloading module Index: main.c =================================================================== RCS file: /cvsroot/iptables-p2p/iptables-p2p/kernel/main.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- main.c 6 Feb 2004 19:00:33 -0000 1.8 +++ main.c 6 Feb 2004 19:37:21 -0000 1.9 @@ -134,13 +134,14 @@ static int __init init(void) { - printk(KERN_INFO "Module ipt_p2p loaded.\n"); + printk(KERN_INFO "ipt_p2p %s initialized.\n", IPT_P2P_VERSION); return ipt_register_match(&p2p_match); } static void __exit fini(void) { ipt_unregister_match(&p2p_match); + printk(KERN_INFO "ipt_p2p %s removed.\n", IPT_P2P_VERSION); } module_init(init); |
