diff options
| author |   reyk <reyk@openbsd.org> | 2007-06-03 23:47:28 +0000 |
|---|---|---|
| committer | reyk <reyk@openbsd.org> | 2007-06-03 23:47:28 +0000 |
| commit | 0a05c5bf9708f7ed77f4baf904c6a5a9d90ecc74 (patch) | |
| tree | 70e5d323c9bcb2c82e2f027a53f9963135fbb20c | |
| parent | if the 915gm didn't work on i386, it's worrisome here too. remove it. (diff) | |
| download | wireguard-openbsd-0a05c5bf9708f7ed77f4baf904c6a5a9d90ecc74.tar.xz wireguard-openbsd-0a05c5bf9708f7ed77f4baf904c6a5a9d90ecc74.zip | |
unbreak 802.11 element parsing by using the TCHECK2 macro correctly
ok claudio@
| -rw-r--r-- | usr.sbin/tcpdump/print-802_11.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/usr.sbin/tcpdump/print-802_11.c b/usr.sbin/tcpdump/print-802_11.c index 527ac6bb5db..b85463b736d 100644 --- a/usr.sbin/tcpdump/print-802_11.c +++ b/usr.sbin/tcpdump/print-802_11.c @@ -1,4 +1,4 @@ -/* $OpenBSD: print-802_11.c,v 1.9 2007/03/27 12:39:24 claudio Exp $ */ +/* $OpenBSD: print-802_11.c,v 1.10 2007/06/03 23:47:28 reyk Exp $ */ /* * Copyright (c) 2005 Reyk Floeter <reyk@openbsd.org> @@ -204,21 +204,21 @@ ieee80211_elements(struct ieee80211_frame *wh, u_int flen) buf = (u_int8_t *)wh; frm = (u_int8_t *)&wh[1]; - TCHECK2(frm, 8); + TCHECK2(*frm, 8); bcopy(frm, &tstamp, sizeof(u_int64_t)); frm += 8; if (vflag > 1) printf(", timestamp %llu", letoh64(tstamp)); - TCHECK2(frm, 2); + TCHECK2(*frm, 2); bcopy(frm, &bintval, sizeof(u_int16_t)); frm += 2; if (vflag > 1) printf(", interval %u", letoh16(bintval)); - TCHECK2(frm, 2); + TCHECK2(*frm, 2); bcopy(frm, &capinfo, sizeof(u_int16_t)); frm += 2; |