diff options
| author |   henning <henning@openbsd.org> | 2003-08-07 14:20:50 +0000 |
|---|---|---|
| committer | henning <henning@openbsd.org> | 2003-08-07 14:20:50 +0000 |
| commit | 63f2c28578977942d34d8e606bfd2968739fd1d4 (patch) | |
| tree | f071e7d5ab1ea97a4a9670af8196544e7b782006 | |
| parent | Disable the so-called optimized memcpy functions for small (less than a few (diff) | |
| download | wireguard-openbsd-63f2c28578977942d34d8e606bfd2968739fd1d4.tar.xz wireguard-openbsd-63f2c28578977942d34d8e606bfd2968739fd1d4.zip | |
make pf_match take u_int32_t instead of u_int16_t
it's not only used to ,atch on ports any more but uid/gid as well, and uid_t/gid_t are u_int32_t.
found by aaron@
ok cedric@
| -rw-r--r-- | sys/net/pf.c | 4 | ||||
| -rw-r--r-- | sys/net/pfvar.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/net/pf.c b/sys/net/pf.c index eecc2077e84..9a1554da4a5 100644 --- a/sys/net/pf.c +++ b/sys/net/pf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pf.c,v 1.380 2003/07/29 20:56:55 dhartmei Exp $ */ +/* $OpenBSD: pf.c,v 1.381 2003/08/07 14:20:50 henning Exp $ */ /* * Copyright (c) 2001 Daniel Hartmeier @@ -1322,7 +1322,7 @@ pf_match_addr(u_int8_t n, struct pf_addr *a, struct pf_addr *m, } int -pf_match(u_int8_t op, u_int16_t a1, u_int16_t a2, u_int16_t p) +pf_match(u_int8_t op, u_int32_t a1, u_int32_t a2, u_int32_t p) { switch (op) { case PF_OP_IRG: diff --git a/sys/net/pfvar.h b/sys/net/pfvar.h index 0e15f54f07c..9c4d4a4e3cf 100644 --- a/sys/net/pfvar.h +++ b/sys/net/pfvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pfvar.h,v 1.164 2003/07/31 22:25:55 cedric Exp $ */ +/* $OpenBSD: pfvar.h,v 1.165 2003/08/07 14:20:50 henning Exp $ */ /* * Copyright (c) 2001 Daniel Hartmeier @@ -1062,7 +1062,7 @@ int pflog_packet(struct ifnet *, struct mbuf *, sa_family_t, u_int8_t, u_int8_t, struct pf_rule *, struct pf_rule *, struct pf_ruleset *); int pf_match_addr(u_int8_t, struct pf_addr *, struct pf_addr *, struct pf_addr *, sa_family_t); -int pf_match(u_int8_t, u_int16_t, u_int16_t, u_int16_t); +int pf_match(u_int8_t, u_int32_t, u_int32_t, u_int32_t); int pf_match_port(u_int8_t, u_int16_t, u_int16_t, u_int16_t); int pf_match_uid(u_int8_t, uid_t, uid_t, uid_t); int pf_match_gid(u_int8_t, gid_t, gid_t, gid_t); |