Projet

Général

Profil

Télécharger (1,08 ko) Statistiques
| Branche: | Révision:

univnautes-tools / patches / stable / 10 / pfvar_addr_compare.RELENG_10.diff @ 4ab3b90b

1
diff --git a/sys/net/pfvar.h b/sys/net/pfvar.h
2
index 5ff131c..e77d02e 100644
3
--- a/sys/net/pfvar.h
4
+++ b/sys/net/pfvar.h
5
@@ -192,21 +192,20 @@ extern struct rwlock pf_rules_lock;
6
 
7
 #define PF_AEQ(a, b, c) \
8
 	((c == AF_INET && (a)->addr32[0] == (b)->addr32[0]) || \
9
-	((a)->addr32[3] == (b)->addr32[3] && \
10
+	(c == AF_INET6 && (a)->addr32[3] == (b)->addr32[3] && \
11
 	(a)->addr32[2] == (b)->addr32[2] && \
12
 	(a)->addr32[1] == (b)->addr32[1] && \
13
 	(a)->addr32[0] == (b)->addr32[0])) \
14
 
15
 #define PF_ANEQ(a, b, c) \
16
-	((c == AF_INET && (a)->addr32[0] != (b)->addr32[0]) || \
17
-	((a)->addr32[3] != (b)->addr32[3] || \
18
-	(a)->addr32[2] != (b)->addr32[2] || \
19
+	((a)->addr32[0] != (b)->addr32[0] || \
20
 	(a)->addr32[1] != (b)->addr32[1] || \
21
-	(a)->addr32[0] != (b)->addr32[0])) \
22
+	(a)->addr32[2] != (b)->addr32[2] || \
23
+	(a)->addr32[3] != (b)->addr32[3]) \
24
 
25
 #define PF_AZERO(a, c) \
26
 	((c == AF_INET && !(a)->addr32[0]) || \
27
-	(!(a)->addr32[0] && !(a)->addr32[1] && \
28
+	(c == AF_INET6 && !(a)->addr32[0] && !(a)->addr32[1] && \
29
 	!(a)->addr32[2] && !(a)->addr32[3] )) \
30
 
31
 #define PF_MATCHA(n, a, m, b, f) \
(55-55/67)