diff options
| author | Henning Brauer <henning@cvs.openbsd.org> | 2009-06-08 01:55:43 +0000 |
|---|---|---|
| committer | Henning Brauer <henning@cvs.openbsd.org> | 2009-06-08 01:55:43 +0000 |
| commit | 45ad2076e8e9aefb4607dd71e1c09c8e469fd1eb (patch) | |
| tree | d3c2552d27df893ba407d921516794c763393833 | |
| parent | bdeb1820922fb83905f115ec96e0e08268a7d7e0 (diff) | |
gah. something is not quite right, sthen sees strange behaviour fixed
by backing out the macro fix. something must rely on the broken behaviour
| -rw-r--r-- | sys/net/pfvar.h | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/sys/net/pfvar.h b/sys/net/pfvar.h index 0ba6edbb1cf..55fe9d5f7c1 100644 --- a/sys/net/pfvar.h +++ b/sys/net/pfvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pfvar.h,v 1.287 2009/06/08 00:50:30 henning Exp $ */ +/* $OpenBSD: pfvar.h,v 1.288 2009/06/08 01:55:42 henning Exp $ */ /* * Copyright (c) 2001 Daniel Hartmeier @@ -220,24 +220,21 @@ struct pfi_dynaddr { #define PF_AEQ(a, b, c) \ ((c == AF_INET && (a)->addr32[0] == (b)->addr32[0]) || \ - (c == AF_INET6 && \ - (a)->addr32[3] == (b)->addr32[3] && \ + ((a)->addr32[3] == (b)->addr32[3] && \ (a)->addr32[2] == (b)->addr32[2] && \ (a)->addr32[1] == (b)->addr32[1] && \ (a)->addr32[0] == (b)->addr32[0])) \ #define PF_ANEQ(a, b, c) \ ((c == AF_INET && (a)->addr32[0] != (b)->addr32[0]) || \ - (c == AF_INET6 && \ ((a)->addr32[3] != (b)->addr32[3] || \ (a)->addr32[2] != (b)->addr32[2] || \ (a)->addr32[1] != (b)->addr32[1] || \ - (a)->addr32[0] != (b)->addr32[0]))) \ + (a)->addr32[0] != (b)->addr32[0])) \ #define PF_AZERO(a, c) \ ((c == AF_INET && !(a)->addr32[0]) || \ - (c == AF_INET6 && \ - !(a)->addr32[0] && !(a)->addr32[1] && \ + (!(a)->addr32[0] && !(a)->addr32[1] && \ !(a)->addr32[2] && !(a)->addr32[3] )) \ #define PF_MATCHA(n, a, m, b, f) \ |