Update layer7 rules

SVN-Revision: 15544

diff --git a/package/iptables/files/l7/aim.pat b/package/iptables/files/l7/aim.pat
index e26a3c4d0bdee059dc642f008299a96fc022eded..5c43930fd3cfd0ecf8f337e53f5005f95c7485e1 100644 (file)
--- a/package/iptables/files/l7/aim.pat
+++ b/package/iptables/files/l7/aim.pat
@@ -2,6 +2,7 @@
 # Pattern attributes: good slow notsofast
 # Protocol groups: chat proprietary
 # Wiki: http://www.protocolinfo.org/wiki/AIM
+# Copyright (C) 2008 Matthew Strait, Ethan Sommer; See ../LICENSE
 #
 # Usually runs on port 5190
 #

diff --git a/package/iptables/files/l7/bittorrent.pat b/package/iptables/files/l7/bittorrent.pat
index e5aa5bc13def14b060627cda628bd3608e0add5f..4a3ba88d583799deaf75fb4f7dcdf82c6148cc1e 100644 (file)
--- a/package/iptables/files/l7/bittorrent.pat
+++ b/package/iptables/files/l7/bittorrent.pat
@@ -1,12 +1,12 @@
 # Bittorrent - P2P filesharing / publishing tool - http://www.bittorrent.com
-# Pattern attributes: good slow notsofast undermatch
+# Pattern attributes: good slow594 notsofast undermatch
 # Protocol groups: p2p open_source
 # Wiki: http://www.protocolinfo.org/wiki/Bittorrent
+# Copyright (C) 2008 Matthew Strait, Ethan Sommer; See ../LICENSE
 #
 # This pattern has been tested and is believed to work well.
 # It will, however, not work on bittorrent streams that are encrypted, since
-# it's impossible to match encrypted data (unless the encryption is extremely 
-# weak, like rot13 or something...).
+# it's impossible to match (well) encrypted data.
 
 bittorrent
 
@@ -16,12 +16,10 @@ bittorrent
 # Next bit matches something Azureus does
 # Ditto on the next bit.  Could also match on "user-agent: azureus", but that's in the next
 # packet and perhaps this will match multiple clients.
-
-# Recently the ^ was removed from before \x13.  I think this was an accident,
-# so I have restored it.
+# bitcomet-specific strings contributed by liangjun.
 
 # This is not a valid GNU basic regular expression (but that's ok).
-^(\x13bittorrent protocol|azver\x01$|get /scrape\?info_hash=)|d1:ad2:id20:|\x08'7P\)[RP]
+^(\x13bittorrent protocol|azver\x01$|get /scrape\?info_hash=get /announce\?info_hash=|get /client/bitcomet/|GET /data\?fid=)|d1:ad2:id20:|\x08'7P\)[RP]
 
 # This pattern is "fast", but won't catch as much
 #^(\x13bittorrent protocol|azver\x01$|get /scrape\?info_hash=)

diff --git a/package/iptables/files/l7/edonkey.pat b/package/iptables/files/l7/edonkey.pat
index 50a072cb28c8bd03e7b83f390f0cc96bdbd3a828..75807f8ebbf2d375176fb5ac62fb61989f18476c 100644 (file)
--- a/package/iptables/files/l7/edonkey.pat
+++ b/package/iptables/files/l7/edonkey.pat
@@ -2,6 +2,7 @@
 # Pattern attributes: good veryfast fast overmatch
 # Protocol groups: p2p
 # Wiki: http://www.protocolinfo.org/wiki/EDonkey
+# Copyright (C) 2008 Matthew Strait, Ethan Sommer; See ../LICENSE
 #
 # Tested recently (April/May 2006) with eMule 0.47a and eDonkey2000 1.4
 # and a long time ago with something else. 

diff --git a/package/iptables/files/l7/fasttrack.pat b/package/iptables/files/l7/fasttrack.pat
index c821ae4d471e6d50d5d10f2eeb1e6e932f022e94..6ed8ff1d134e4b099e91efe168111ab5dde0e30c 100644 (file)
--- a/package/iptables/files/l7/fasttrack.pat
+++ b/package/iptables/files/l7/fasttrack.pat
@@ -2,6 +2,7 @@
 # Pattern attributes: good slow notsofast
 # Protocol groups: p2p
 # Wiki: http://www.protocolinfo.org/wiki/Fasttrack
+# Copyright (C) 2008 Matthew Strait, Ethan Sommer; See ../LICENSE
 #
 # Tested with Kazaa Lite Resurrection 0.0.7.6F
 #

diff --git a/package/iptables/files/l7/ftp.pat b/package/iptables/files/l7/ftp.pat
index a7f9e0eeaabf3cff744ac6212c94fb79a28ddf77..44d97c467bcd67830385e8505b731fa7c338a5fb 100644 (file)
--- a/package/iptables/files/l7/ftp.pat
+++ b/package/iptables/files/l7/ftp.pat
@@ -2,6 +2,7 @@
 # Pattern attributes: great notsofast fast
 # Protocol groups: document_retrieval ietf_internet_standard
 # Wiki: http://protocolinfo.org/wiki/FTP
+# Copyright (C) 2008 Matthew Strait, Ethan Sommer; See ../LICENSE
 #
 # Usually runs on port 21.  Note that the data stream is on a dynamically
 # assigned port, which means that you will need the FTP connection 

diff --git a/package/iptables/files/l7/gnutella.pat b/package/iptables/files/l7/gnutella.pat
index 57a76de02f28351abe84b5243bfe52508c2aa4c8..770ed43b36e2cf7d419c4bd90de3a985e3f28b6f 100644 (file)
--- a/package/iptables/files/l7/gnutella.pat
+++ b/package/iptables/files/l7/gnutella.pat
@@ -2,6 +2,7 @@
 # Pattern attributes: good notsofast notsofast
 # Protocol groups: p2p open_source
 # Wiki: http://www.protocolinfo.org/wiki/Gnutella
+# Copyright (C) 2008 Matthew Strait, Ethan Sommer; See ../LICENSE
 #
 # This should match both Gnutella and "Gnutella2" ("Mike's protocol")
 # 

diff --git a/package/iptables/files/l7/http.pat b/package/iptables/files/l7/http.pat
index 550aa0b71b66e584f69c790bfb7a46ff025909db..5122310d2f688c4409a7b982f26de682a7e7f76a 100644 (file)
--- a/package/iptables/files/l7/http.pat
+++ b/package/iptables/files/l7/http.pat
@@ -2,6 +2,7 @@
 # Pattern attributes: great slow notsofast superset
 # Protocol groups: document_retrieval ietf_draft_standard
 # Wiki: http://protocolinfo.org/wiki/HTTP
+# Copyright (C) 2008 Matthew Strait, Ethan Sommer; See ../LICENSE
 #
 # Usually runs on port 80
 #

diff --git a/package/iptables/files/l7/ident.pat b/package/iptables/files/l7/ident.pat
index d6d89c333f1ee5e2c27ff54b26eacab9cd6ca77f..3205e5e696914c4f1e3146dbbc71f406aa80c7b2 100644 (file)
--- a/package/iptables/files/l7/ident.pat
+++ b/package/iptables/files/l7/ident.pat
@@ -2,6 +2,7 @@
 # Pattern attributes: good fast fast
 # Protocol groups: networking ietf_proposed_standard
 # Wiki: http://www.protocolinfo.org/wiki/Ident
+# Copyright (C) 2008 Matthew Strait, Ethan Sommer; See ../LICENSE
 #
 # Usually runs on port 113
 #

diff --git a/package/iptables/files/l7/irc.pat b/package/iptables/files/l7/irc.pat
index 2767336e8ec4fa23d5762eceac7a9c73e409b831..e25360cafbb08c01b2d64330c9e1ff4ae97f2a62 100644 (file)
--- a/package/iptables/files/l7/irc.pat
+++ b/package/iptables/files/l7/irc.pat
@@ -2,6 +2,7 @@
 # Pattern attributes: great veryfast fast
 # Protocol groups: chat ietf_proposed_standard
 # Wiki: http://www.protocolinfo.org/wiki/IRC
+# Copyright (C) 2008 Matthew Strait, Ethan Sommer; See ../LICENSE
 #
 # Usually runs on port 6666 or 6667
 # Note that chat traffic runs on these ports, but IRC-DCC traffic (which

diff --git a/package/iptables/files/l7/jabber.pat b/package/iptables/files/l7/jabber.pat
index aa51c76605695c5a0378c91b1ce1422bcc7f7d50..7c328905eec36287b9157a193d3df8dc580913ca 100644 (file)
--- a/package/iptables/files/l7/jabber.pat
+++ b/package/iptables/files/l7/jabber.pat
@@ -2,6 +2,7 @@
 # Pattern attributes: good notsofast notsofast
 # Protocol groups: chat ietf_proposed_standard
 # Wiki: http://www.protocolinfo.org/wiki/Jabber
+# Copyright (C) 2008 Matthew Strait, Ethan Sommer; See ../LICENSE
 #
 # This pattern has been tested with Gaim and Gabber.  It is only tested 
 # with non-SSL mode Jabber with no proxies.

diff --git a/package/iptables/files/l7/msnmessenger.pat b/package/iptables/files/l7/msnmessenger.pat
index 41f107555a78c40d6078f3d166159892df914cbf..11dfc10be2550b0b3870cb1b0a0a6faafce58be6 100644 (file)
--- a/package/iptables/files/l7/msnmessenger.pat
+++ b/package/iptables/files/l7/msnmessenger.pat
@@ -2,6 +2,7 @@
 # Pattern attributes: good slow notsofast
 # Protocol groups: chat proprietary
 # Wiki: http://www.protocolinfo.org/wiki/MSN_Messenger
+# Copyright (C) 2008 Matthew Strait, Ethan Sommer; See ../LICENSE
 #
 # Usually uses TCP port 1863
 # http://www.hypothetic.org/docs/msn/index.php

diff --git a/package/iptables/files/l7/ntp.pat b/package/iptables/files/l7/ntp.pat
index a24fb0560e853aa84a2a54cfb59770bcc64d0f52..760cfdbe59e1399e47ea84ba4b992e8b76fc96c1 100644 (file)
--- a/package/iptables/files/l7/ntp.pat
+++ b/package/iptables/files/l7/ntp.pat
@@ -2,6 +2,7 @@
 # Pattern attributes: good fast fast overmatch 
 # Protocol groups: time_synchronization ietf_draft_standard
 # Wiki: http://www.protocolinfo.org/wiki/NTP
+# Copyright (C) 2008 Matthew Strait, Ethan Sommer; See ../LICENSE
 #
 # This pattern is tested and is believed to work.
 

diff --git a/package/iptables/files/l7/pop3.pat b/package/iptables/files/l7/pop3.pat
index b3d76e20d8ad6533379bf3844d0d2209f265c238..3ae4c147bb83c545596ffced11d9c91b5f8d6cc3 100644 (file)
--- a/package/iptables/files/l7/pop3.pat
+++ b/package/iptables/files/l7/pop3.pat
@@ -2,6 +2,7 @@
 # Pattern attributes: great veryfast fast
 # Protocol groups: mail ietf_internet_standard
 # Wiki: http://www.protocolinfo.org/wiki/POP
+# Copyright (C) 2008 Matthew Strait, Ethan Sommer; See ../LICENSE
 #
 # This pattern has been tested somewhat.
 

diff --git a/package/iptables/files/l7/smtp.pat b/package/iptables/files/l7/smtp.pat
index eb98ae72f833591e32d59260323761cbe35ef097..2f5d1957f92aaa0f86e09f4924c9551b6672f1ba 100644 (file)
--- a/package/iptables/files/l7/smtp.pat
+++ b/package/iptables/files/l7/smtp.pat
@@ -2,6 +2,7 @@
 # Pattern attributes: great notsofast fast
 # Protocol groups: mail ietf_internet_standard
 # Wiki: http://www.protocolinfo.org/wiki/SMTP
+# Copyright (C) 2008 Matthew Strait, Ethan Sommer; See ../LICENSE
 #
 # usually runs on port 25
 # 

diff --git a/package/iptables/files/l7/ssl.pat b/package/iptables/files/l7/ssl.pat
index a10589a10323fa471591d99afcde049d37e08fcd..ae30ee4400a7966f2fc0623d8507f5c5dd9a38d2 100644 (file)
--- a/package/iptables/files/l7/ssl.pat
+++ b/package/iptables/files/l7/ssl.pat
@@ -2,6 +2,7 @@
 # Pattern attributes: good notsofast fast superset
 # Protocol groups: secure ietf_proposed_standard
 # Wiki: http://www.protocolinfo.org/wiki/SSL
+# Copyright (C) 2008 Matthew Strait, Ethan Sommer; See ../LICENSE
 #
 # Usually runs on port 443
 #

diff --git a/package/iptables/files/l7/vnc.pat b/package/iptables/files/l7/vnc.pat
index 9f77fdf55e7ad09a515076ea10a008de15e1f437..79d0ae8a28e6ecc907c07b720416b93eff491b25 100644 (file)
--- a/package/iptables/files/l7/vnc.pat
+++ b/package/iptables/files/l7/vnc.pat
@@ -2,6 +2,7 @@
 # Pattern attributes: great veryfast fast
 # Protocol groups: remote_access
 # Wiki: http://www.protocolinfo.org/wiki/VNC
+# Copyright (C) 2008 Matthew Strait, Ethan Sommer; See ../LICENSE
 #
 # http://www.realvnc.com/documentation.html
 #