[NETFILTER]: Add nf_inet_addr_cmp()

kaber · davem330 · commit b8beedd25d39 · 2008-03-25T20:09:33.000-07:00
Signed-off-by: Patrick McHardy &lt;kaber@trash.net&gt;
Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
diff --git a/include/linux/netfilter.h b/include/linux/netfilter.h
@@ -61,6 +61,15 @@ union nf_inet_addr {
 #ifdef __KERNEL__
 #ifdef CONFIG_NETFILTER
 
+static inline int nf_inet_addr_cmp(const union nf_inet_addr *a1,
+				   const union nf_inet_addr *a2)
+{
+	return a1->all[0] == a2->all[0] &&
+	       a1->all[1] == a2->all[1] &&
+	       a1->all[2] == a2->all[2] &&
+	       a1->all[3] == a2->all[3];
+}
+
 extern void netfilter_init(void);
 
 /* Largest hook number + 1 */
diff --git a/include/net/netfilter/nf_conntrack_tuple.h b/include/net/netfilter/nf_conntrack_tuple.h
@@ -163,21 +163,15 @@ struct nf_conntrack_tuple_hash
 static inline int __nf_ct_tuple_src_equal(const struct nf_conntrack_tuple *t1,
 					  const struct nf_conntrack_tuple *t2)
 { 
-	return (t1->src.u3.all[0] == t2->src.u3.all[0] &&
-		t1->src.u3.all[1] == t2->src.u3.all[1] &&
-		t1->src.u3.all[2] == t2->src.u3.all[2] &&
-		t1->src.u3.all[3] == t2->src.u3.all[3] &&
+	return (nf_inet_addr_cmp(&t1->src.u3, &t2->src.u3) &&
 		t1->src.u.all == t2->src.u.all &&
 		t1->src.l3num == t2->src.l3num);
 }
 
 static inline int __nf_ct_tuple_dst_equal(const struct nf_conntrack_tuple *t1,
 					  const struct nf_conntrack_tuple *t2)
 {
-	return (t1->dst.u3.all[0] == t2->dst.u3.all[0] &&
-		t1->dst.u3.all[1] == t2->dst.u3.all[1] &&
-		t1->dst.u3.all[2] == t2->dst.u3.all[2] &&
-		t1->dst.u3.all[3] == t2->dst.u3.all[3] &&
+	return (nf_inet_addr_cmp(&t1->dst.u3, &t2->dst.u3) &&
 		t1->dst.u.all == t2->dst.u.all &&
 		t1->dst.protonum == t2->dst.protonum);
 }
@@ -192,10 +186,7 @@ static inline int nf_ct_tuple_equal(const struct nf_conntrack_tuple *t1,
 static inline int nf_ct_tuple_mask_equal(const struct nf_conntrack_tuple_mask *m1,
 					 const struct nf_conntrack_tuple_mask *m2)
 {
-	return (m1->src.u3.all[0] == m2->src.u3.all[0] &&
-		m1->src.u3.all[1] == m2->src.u3.all[1] &&
-		m1->src.u3.all[2] == m2->src.u3.all[2] &&
-		m1->src.u3.all[3] == m2->src.u3.all[3] &&
+	return (nf_inet_addr_cmp(&m1->src.u3, &m2->src.u3) &&
 		m1->src.u.all == m2->src.u.all);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -163,21 +163,15 @@ struct nf_conntrack_tuple_hash`
`163`	`163`	`static inline int __nf_ct_tuple_src_equal(const struct nf_conntrack_tuple *t1,`
`164`	`164`	`const struct nf_conntrack_tuple *t2)`
`165`	`165`	`{`
`166`		`- return (t1->src.u3.all[0] == t2->src.u3.all[0] &&`
`167`		`- t1->src.u3.all[1] == t2->src.u3.all[1] &&`
`168`		`- t1->src.u3.all[2] == t2->src.u3.all[2] &&`
`169`		`- t1->src.u3.all[3] == t2->src.u3.all[3] &&`
	`166`	`+ return (nf_inet_addr_cmp(&t1->src.u3, &t2->src.u3) &&`
`170`	`167`	`t1->src.u.all == t2->src.u.all &&`
`171`	`168`	`t1->src.l3num == t2->src.l3num);`
`172`	`169`	`}`
`173`	`170`
`174`	`171`	`static inline int __nf_ct_tuple_dst_equal(const struct nf_conntrack_tuple *t1,`
`175`	`172`	`const struct nf_conntrack_tuple *t2)`
`176`	`173`	`{`
`177`		`- return (t1->dst.u3.all[0] == t2->dst.u3.all[0] &&`
`178`		`- t1->dst.u3.all[1] == t2->dst.u3.all[1] &&`
`179`		`- t1->dst.u3.all[2] == t2->dst.u3.all[2] &&`
`180`		`- t1->dst.u3.all[3] == t2->dst.u3.all[3] &&`
	`174`	`+ return (nf_inet_addr_cmp(&t1->dst.u3, &t2->dst.u3) &&`
`181`	`175`	`t1->dst.u.all == t2->dst.u.all &&`
`182`	`176`	`t1->dst.protonum == t2->dst.protonum);`
`183`	`177`	`}`
`@@ -192,10 +186,7 @@ static inline int nf_ct_tuple_equal(const struct nf_conntrack_tuple *t1,`
`192`	`186`	`static inline int nf_ct_tuple_mask_equal(const struct nf_conntrack_tuple_mask *m1,`
`193`	`187`	`const struct nf_conntrack_tuple_mask *m2)`
`194`	`188`	`{`
`195`		`- return (m1->src.u3.all[0] == m2->src.u3.all[0] &&`
`196`		`- m1->src.u3.all[1] == m2->src.u3.all[1] &&`
`197`		`- m1->src.u3.all[2] == m2->src.u3.all[2] &&`
`198`		`- m1->src.u3.all[3] == m2->src.u3.all[3] &&`
	`189`	`+ return (nf_inet_addr_cmp(&m1->src.u3, &m2->src.u3) &&`
`199`	`190`	`m1->src.u.all == m2->src.u.all);`
`200`	`191`	`}`
`201`	`192`