diff options
| -rw-r--r-- | sbin/pfctl/pf_print_state.c | 6 | ||||
| -rw-r--r-- | sbin/pfctl/pfctl.h | 4 | ||||
| -rw-r--r-- | usr.sbin/tcpdump/pf_print_state.c | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/sbin/pfctl/pf_print_state.c b/sbin/pfctl/pf_print_state.c index bda91a4c282..657044da17a 100644 --- a/sbin/pfctl/pf_print_state.c +++ b/sbin/pfctl/pf_print_state.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pf_print_state.c,v 1.57 2010/09/02 14:01:04 sobrado Exp $ */ +/* $OpenBSD: pf_print_state.c,v 1.58 2010/11/12 13:14:41 claudio Exp $ */ /* * Copyright (c) 2001 Daniel Hartmeier @@ -165,11 +165,11 @@ print_name(struct pf_addr *addr, sa_family_t af) } void -print_host(struct pf_addr *addr, u_int16_t port, sa_family_t af, int rdom, +print_host(struct pf_addr *addr, u_int16_t port, sa_family_t af, u_int16_t rdom, int opts) { if (rdom) - printf("(%d) ", rdom); + printf("(%u) ", ntohs(rdom)); if (opts & PF_OPT_USEDNS) print_name(addr, af); diff --git a/sbin/pfctl/pfctl.h b/sbin/pfctl/pfctl.h index d18226143ce..ad17fbde8b7 100644 --- a/sbin/pfctl/pfctl.h +++ b/sbin/pfctl/pfctl.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pfctl.h,v 1.45 2010/03/23 13:31:29 henning Exp $ */ +/* $OpenBSD: pfctl.h,v 1.46 2010/11/12 13:14:41 claudio Exp $ */ /* * Copyright (c) 2001 Daniel Hartmeier @@ -107,7 +107,7 @@ struct pf_altq *pfaltq_lookup(const char *); char *rate2str(double); void print_addr(struct pf_addr_wrap *, sa_family_t, int); -void print_host(struct pf_addr *, u_int16_t p, sa_family_t, int, int); +void print_host(struct pf_addr *, u_int16_t p, sa_family_t, u_int16_t, int); void print_seq(struct pfsync_state_peer *); void print_state(struct pfsync_state *, int); int unmask(struct pf_addr *, sa_family_t); diff --git a/usr.sbin/tcpdump/pf_print_state.c b/usr.sbin/tcpdump/pf_print_state.c index f25fac362fb..4f18e689ee3 100644 --- a/usr.sbin/tcpdump/pf_print_state.c +++ b/usr.sbin/tcpdump/pf_print_state.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pf_print_state.c,v 1.8 2009/11/03 10:59:04 claudio Exp $ */ +/* $OpenBSD: pf_print_state.c,v 1.9 2010/11/12 13:14:41 claudio Exp $ */ /* * Copyright (c) 2001 Daniel Hartmeier @@ -129,11 +129,11 @@ print_name(struct pf_addr *addr, sa_family_t af) } void -print_host(struct pf_addr *addr, u_int16_t port, sa_family_t af, int rdom, +print_host(struct pf_addr *addr, u_int16_t port, sa_family_t af, u_int16_t rdom, int opts) { if (rdom) - printf("(%d) ", rdom); + printf("(%u) ", ntohs(rdom)); if (opts & PF_OPT_USEDNS) print_name(addr, af); |