diff options
| -rw-r--r-- | sys/netinet/tcp_debug.c | 4 | ||||
| -rw-r--r-- | usr.sbin/trpt/trpt.c | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/sys/netinet/tcp_debug.c b/sys/netinet/tcp_debug.c index 88f647ffd8d..d5e9b3f0468 100644 --- a/sys/netinet/tcp_debug.c +++ b/sys/netinet/tcp_debug.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tcp_debug.c,v 1.19 2004/07/15 15:27:22 markus Exp $ */ +/* $OpenBSD: tcp_debug.c,v 1.20 2004/09/24 15:02:43 markus Exp $ */ /* $NetBSD: tcp_debug.c,v 1.10 1996/02/13 23:43:36 christos Exp $ */ /* @@ -145,6 +145,7 @@ tcp_trace(short act, short ostate, struct tcpcb *tp, caddr_t headers, if (ti6) { th = &ti6->ti6_t; td->td_ti6 = *ti6; + td->td_ti6.ti6_plen = len; } else bzero(&td->td_ti6, sizeof(struct tcpipv6hdr)); break; @@ -153,6 +154,7 @@ tcp_trace(short act, short ostate, struct tcpcb *tp, caddr_t headers, if (ti) { th = &ti->ti_t; td->td_ti = *ti; + td->td_ti.ti_len = len; } else bzero(&td->td_ti, sizeof(struct tcpiphdr)); break; diff --git a/usr.sbin/trpt/trpt.c b/usr.sbin/trpt/trpt.c index e89cfa69cfb..ba04d962fcf 100644 --- a/usr.sbin/trpt/trpt.c +++ b/usr.sbin/trpt/trpt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: trpt.c,v 1.19 2003/09/19 08:15:56 deraadt Exp $ */ +/* $OpenBSD: trpt.c,v 1.20 2004/09/24 15:02:43 markus Exp $ */ /*- * Copyright (c) 1997 The NetBSD Foundation, Inc. @@ -360,11 +360,8 @@ tcp_trace(short act, short ostate, struct tcpcb *atp, if (act == TA_OUTPUT) { NTOHL(seq); NTOHL(ack); - NTOHS(len); NTOHS(win); } - if (act == TA_OUTPUT) - len -= sizeof(struct tcphdr); if (len) printf("[%x..%x)", seq, seq + len); else |