[netfilter-cvslog] r4539 - trunk/patch-o-matic-ng/patchlets/ipv4options/linux-2.6/net/ipv4/netfilter

[laforge at netfilter.org]

Author: laforge at netfilter.org
Date: 2005-11-16 11:52:50 +0100 (Wed, 16 Nov 2005)
New Revision: 4539

Modified:
   trunk/patch-o-matic-ng/patchlets/ipv4options/linux-2.6/net/ipv4/netfilter/ipt_ipv4options.c
Log:
fix SRR comparison, we need logical and, not bitwise and. (Daniel Rahn)


Modified: trunk/patch-o-matic-ng/patchlets/ipv4options/linux-2.6/net/ipv4/netfilter/ipt_ipv4options.c
===================================================================
--- trunk/patch-o-matic-ng/patchlets/ipv4options/linux-2.6/net/ipv4/netfilter/ipt_ipv4options.c	2005-11-14 18:13:12 UTC (rev 4538)
+++ trunk/patch-o-matic-ng/patchlets/ipv4options/linux-2.6/net/ipv4/netfilter/ipt_ipv4options.c	2005-11-16 10:52:50 UTC (rev 4539)
@@ -60,11 +60,11 @@
 
 	/* source routing */
 	if ((info->options & IPT_IPV4OPTION_MATCH_SSRR) == IPT_IPV4OPTION_MATCH_SSRR) {
-		if (!((opt->srr) & (opt->is_strictroute)))
+		if (!((opt->srr) && (opt->is_strictroute)))
 			return 0;
 	}
 	else if ((info->options & IPT_IPV4OPTION_MATCH_LSRR) == IPT_IPV4OPTION_MATCH_LSRR) {
-		if (!((opt->srr) & (!opt->is_strictroute)))
+		if (!((opt->srr) && (!opt->is_strictroute)))
 			return 0;
 	}
 	else if ((info->options & IPT_IPV4OPTION_DONT_MATCH_SRR) == IPT_IPV4OPTION_DONT_MATCH_SRR) {