diff options
| author |   deraadt <deraadt@openbsd.org> | 2013-10-24 09:33:20 +0000 |
|---|---|---|
| committer | deraadt <deraadt@openbsd.org> | 2013-10-24 09:33:20 +0000 |
| commit | 20a2dfaa3b93c9293d79f8209a13fc8be50568d4 (patch) | |
| tree | 1446f2b6dadbb098f83946c4653adc59c429e4a9 | |
| parent | in_var.h is not needed. (diff) | |
| download | wireguard-openbsd-20a2dfaa3b93c9293d79f8209a13fc8be50568d4.tar.xz wireguard-openbsd-20a2dfaa3b93c9293d79f8209a13fc8be50568d4.zip | |
These two programs got fooled by the KAME/NRL split and need type repair.
They do not indicate a problem with the reduction of namespace export,
but got suckered into the 1999 plan.
ok benno
| -rw-r--r-- | usr.bin/netstat/inet.c | 4 | ||||
| -rw-r--r-- | usr.sbin/tcpdump/print-icmp6.c | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/usr.bin/netstat/inet.c b/usr.bin/netstat/inet.c index d63a1cedc7e..8b51c7ec77c 100644 --- a/usr.bin/netstat/inet.c +++ b/usr.bin/netstat/inet.c @@ -1,4 +1,4 @@ -/* $OpenBSD: inet.c,v 1.124 2013/08/18 16:32:24 guenther Exp $ */ +/* $OpenBSD: inet.c,v 1.125 2013/10/24 09:33:20 deraadt Exp $ */ /* $NetBSD: inet.c,v 1.14 1995/10/03 21:42:37 thorpej Exp $ */ /* @@ -1344,7 +1344,7 @@ inpcb_dump(u_long off, short protocol, int af) pp("%p", inp_ipo, "\n "); pp("%p", inp_ipsec_remotecred, ", "); pp("%p", inp_ipsec_remoteauth, "\n "); - p("%d", in6p_cksum, "\n "); + p("%d", inp_cksum6, "\n "); pp("%p", inp_icmp6filt, "\n "); pp("%p", inp_pf_sk, "\n "); p("%u", inp_rtableid, "\n "); diff --git a/usr.sbin/tcpdump/print-icmp6.c b/usr.sbin/tcpdump/print-icmp6.c index 582d4242479..229ab4b816e 100644 --- a/usr.sbin/tcpdump/print-icmp6.c +++ b/usr.sbin/tcpdump/print-icmp6.c @@ -1,4 +1,4 @@ -/* $OpenBSD: print-icmp6.c,v 1.10 2011/09/17 19:56:19 bluhm Exp $ */ +/* $OpenBSD: print-icmp6.c,v 1.11 2013/10/24 09:33:22 deraadt Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1991, 1993, 1994 @@ -607,7 +607,7 @@ icmp6_opt_print(register const u_char *bp, int resid) void mld6_print(register const u_char *bp) { - register struct mld6_hdr *mp = (struct mld6_hdr *)bp; + register struct mld_hdr *mp = (struct mld_hdr *)bp; register const u_char *ep; /* 'ep' points to the end of avaible data. */ @@ -616,8 +616,8 @@ mld6_print(register const u_char *bp) if ((u_char *)mp + sizeof(*mp) > ep) return; - printf("max resp delay: %d ", ntohs(mp->mld6_maxdelay)); - printf("addr: %s", ip6addr_string(&mp->mld6_addr)); + printf("max resp delay: %d ", ntohs(mp->mld_maxdelay)); + printf("addr: %s", ip6addr_string(&mp->mld_addr)); return; } |