X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/def1f28f94261a2b04fa824241cb97e05982d5d1..8dc03d7740ec10c80ce91f2dd3cd8a267c69f6b5:/package/iptables/files/l7/msnmessenger.pat?ds=sidebyside

diff --git a/package/iptables/files/l7/msnmessenger.pat b/package/iptables/files/l7/msnmessenger.pat
index e07f71f31..41f107555 100644
--- a/package/iptables/files/l7/msnmessenger.pat
+++ b/package/iptables/files/l7/msnmessenger.pat
@@ -1,15 +1,27 @@
 # MSN Messenger - Microsoft Network chat client
-# Pattern quality: good veryfast
+# Pattern attributes: good slow notsofast
+# Protocol groups: chat proprietary
+# Wiki: http://www.protocolinfo.org/wiki/MSN_Messenger
 #
-# Usually uses port 1863
+# Usually uses TCP port 1863
 # http://www.hypothetic.org/docs/msn/index.php
+# http://msnpiki.msnfanatic.com/
 #
-# This pattern has been tested and is believed to work well.  If it does not
-# work for you, or you believe it could be improved, please post to 
-# l7-filter-developers@lists.sf.net .  This list may be subscribed to at
-# http://lists.sourceforge.net/lists/listinfo/l7-filter-developers
+# This pattern has been tested and is believed to work well.
 
 msnmessenger
-# ver: allow versions up to 99.
-# usr (in case ver didn't work):  
-^(ver [0-9]+ msnp[1-9][0-9]? [\x09-\x0d -~]* cvr|usr md5 i [ -~]*)
+
+# First branch: login
+#   ver: allow versions up to 99.
+#   I've never seen a cvr other than cvr0.  Maybe this will be trouble later?
+#   Can't anchor at the beginning because sometimes this is encapsulated in
+#   HTTP.  But either way, the first packet ends like this.
+# Second/Third branches: accepting/sending a message
+#   I will assume that these can also be encapsulated in HTTP, although I have
+#   not checked.  Example of each direction:
+#   ANS 1 quadong@hotmail.com 1139803431.29427 17522047
+#   USR 1 quadong@hotmail.com 530423708.968145.366138
+
+# Branches are written entirely separately for better performance.
+ver [0-9]+ msnp[1-9][0-9]? [\x09-\x0d -~]*cvr0\x0d\x0a$|usr 1 [!-~]+ [0-9. ]+\x0d\x0a$|ans 1 [!-~]+ [0-9. ]+\x0d\x0a$
+