summaryrefslogtreecommitdiff
path: root/usr.sbin/tcpdump
diff options
context:
space:
mode:
authorAlexander Bluhm <bluhm@cvs.openbsd.org>2015-03-29 14:09:30 +0000
committerAlexander Bluhm <bluhm@cvs.openbsd.org>2015-03-29 14:09:30 +0000
commitbb65e559644bff7131847671edb10f57cd0526b4 (patch)
treeba7ec4ef294d029601732a20d2d23b230c2ad641 /usr.sbin/tcpdump
parent3906e2f582d53e8af8e3842f82c9a0a579e6cde4 (diff)
Most packets generate one line in tcpdump. For AH and RIP there
was an extra line without benefit. Remove the new-line in printf to make parsing easier. OK lteo@ mikeb@
Diffstat (limited to 'usr.sbin/tcpdump')
-rw-r--r--usr.sbin/tcpdump/print-ipsec.c4
-rw-r--r--usr.sbin/tcpdump/print-rip.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/usr.sbin/tcpdump/print-ipsec.c b/usr.sbin/tcpdump/print-ipsec.c
index c04cb2da75d..829b3e21dd1 100644
--- a/usr.sbin/tcpdump/print-ipsec.c
+++ b/usr.sbin/tcpdump/print-ipsec.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: print-ipsec.c,v 1.20 2015/01/16 06:40:21 deraadt Exp $ */
+/* $OpenBSD: print-ipsec.c,v 1.21 2015/03/29 14:09:29 bluhm Exp $ */
/*
* Copyright (c) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999
@@ -279,7 +279,7 @@ ah_print (register const u_char *bp, register u_int len,
ntohl(ah->ah_spi), ntohl(ah->ah_seq), len);
if (vflag) {
- (void)printf("\n\t[ ");
+ (void)printf(" [ ");
pl_len = (ah->ah_pl_len + 2) << 2; /* RFC2402, sec 2.2 */
diff --git a/usr.sbin/tcpdump/print-rip.c b/usr.sbin/tcpdump/print-rip.c
index f4973c14c4b..9cd6631f9b5 100644
--- a/usr.sbin/tcpdump/print-rip.c
+++ b/usr.sbin/tcpdump/print-rip.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: print-rip.c,v 1.14 2015/01/16 06:40:21 deraadt Exp $ */
+/* $OpenBSD: print-rip.c,v 1.15 2015/03/29 14:09:29 bluhm Exp $ */
/*
* Copyright (c) 1989, 1990, 1991, 1993, 1994, 1996
@@ -197,7 +197,7 @@ rip_print(const u_char *dat, u_int length)
case RIPCMD_TRACEON:
printf(" RIPv%d-traceon %d: \"", rp->rip_vers, length);
(void)fn_print((const u_char *)(rp + 1), snapend);
- fputs("\"\n", stdout);
+ fputs("\"", stdout);
break;
case RIPCMD_TRACEOFF:
printf(" RIPv%d-traceoff %d", rp->rip_vers, length);