[netfilter-cvslog] r6911 - trunk/libnetfilter_conntrack/src/conntrack

[pablo at netfilter.org]

Author: pablo at netfilter.org
Date: 2007-07-18 22:00:40 +0200 (Wed, 18 Jul 2007)
New Revision: 6911

Modified:
   trunk/libnetfilter_conntrack/src/conntrack/compare.c
Log:
add layer 4 protocol comparison to nfct_compare()


Modified: trunk/libnetfilter_conntrack/src/conntrack/compare.c
===================================================================
--- trunk/libnetfilter_conntrack/src/conntrack/compare.c	2007-07-17 17:02:04 UTC (rev 6910)
+++ trunk/libnetfilter_conntrack/src/conntrack/compare.c	2007-07-18 20:00:40 UTC (rev 6911)
@@ -46,6 +46,18 @@
 	    ct2->tuple[__DIR_REPL].l3protonum)
 		return 0;
 
+	if (test_bit(ATTR_ORIG_L4PROTO, ct1->set) &&
+	    test_bit(ATTR_ORIG_L4PROTO, ct2->set) &&
+	    ct1->tuple[__DIR_ORIG].protonum !=
+	    ct2->tuple[__DIR_ORIG].protonum)
+		return 0;
+
+	if (test_bit(ATTR_REPL_L4PROTO, ct1->set) &&
+	    test_bit(ATTR_REPL_L4PROTO, ct2->set) &&
+	    ct1->tuple[__DIR_REPL].protonum !=
+	    ct2->tuple[__DIR_REPL].protonum)
+		return 0;
+
 	if (test_bit(ATTR_ORIG_IPV4_SRC, ct1->set) &&
 	    test_bit(ATTR_ORIG_IPV4_SRC, ct2->set) &&
 	    ct1->tuple[__DIR_ORIG].src.v4 !=