diff options
| author |   dlg <dlg@openbsd.org> | 2018-07-10 00:38:52 +0000 |
|---|---|---|
| committer | dlg <dlg@openbsd.org> | 2018-07-10 00:38:52 +0000 |
| commit | abf7faa81f399e69ebf73d1688a43d00ea423d14 (patch) | |
| tree | bf8a14384190fba07ccfe154210fe881848331cd /usr.sbin/tcpdump/print-udp.c | |
| parent | vmm(4): prohibit setting/clearing invalid bits in %cr0/%cr4. This was (diff) | |
| download | wireguard-openbsd-abf7faa81f399e69ebf73d1688a43d00ea423d14.tar.xz wireguard-openbsd-abf7faa81f399e69ebf73d1688a43d00ea423d14.zip | |
move the verbose checksum info back after the colon.
requested by bluhm@ as it broke some regress tests for no good
reason.
Diffstat (limited to 'usr.sbin/tcpdump/print-udp.c')
| -rw-r--r-- | usr.sbin/tcpdump/print-udp.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/usr.sbin/tcpdump/print-udp.c b/usr.sbin/tcpdump/print-udp.c index a8de5eb68c5..f1d8d47e4d9 100644 --- a/usr.sbin/tcpdump/print-udp.c +++ b/usr.sbin/tcpdump/print-udp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: print-udp.c,v 1.49 2018/07/06 07:13:21 dlg Exp $ */ +/* $OpenBSD: print-udp.c,v 1.50 2018/07/10 00:38:52 dlg Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996 @@ -403,6 +403,8 @@ udp_print(const u_char *bp, u_int length, const void *iph) udpport_string(dport)); } + printf(": "); + cksum += htons(length); ulen = ntohs(up->uh_ulen); @@ -416,9 +418,9 @@ udp_print(const u_char *bp, u_int length, const void *iph) if (usum == 0) { if (ipv == 4) - printf(" [no udp cksum]"); + printf("[no udp cksum] "); else - printf(" [invalid udp cksum 0]"); + printf("[invalid udp cksum 0] "); } else { cksum += htons(IPPROTO_UDP); cksum += up->uh_sport; @@ -428,16 +430,14 @@ udp_print(const u_char *bp, u_int length, const void *iph) sum = in_cksum(cp, length, cksum); if (sum == usum) - printf(" [udp sum ok]"); + printf("[udp sum ok] "); else { - printf(" [bad udp cksum %04x! -> %04x]", + printf("[bad udp cksum %04x! -> %04x] ", usum, sum); } } } - printf(": "); - if (packettype) { struct rpc_msg *rp; enum msg_type direction; |