disable the use of the has in the pf state key lookup (for now).
authordlg <dlg@openbsd.org>
Fri, 23 Dec 2022 07:14:55 +0000 (07:14 +0000)
committerdlg <dlg@openbsd.org>
Fri, 23 Dec 2022 07:14:55 +0000 (07:14 +0000)
anton@ says the previous commit breaks ipv6 related regress tests.
disabling the use of the hash in the state key compare gets it going
again while i can figure out what's going on.

sys/net/pf.c

index 975e7b8..96fbbe2 100644 (file)
@@ -1,4 +1,4 @@
-/*     $OpenBSD: pf.c,v 1.1161 2022/12/22 05:59:27 dlg Exp $ */
+/*     $OpenBSD: pf.c,v 1.1162 2022/12/23 07:14:55 dlg Exp $ */
 
 /*
  * Copyright (c) 2001 Daniel Hartmeier
@@ -694,8 +694,10 @@ pf_state_compare_key(struct pf_state_key *a, struct pf_state_key *b)
 {
        int     diff;
 
+#if 0
        if ((diff = a->hash - b->hash) != 0)
                return (diff);
+#endif
        if ((diff = a->proto - b->proto) != 0)
                return (diff);
        if ((diff = a->af - b->af) != 0)