summaryrefslogtreecommitdiffstats
path: root/sys/netinet/tcp_debug.c
diff options
context:
space:
mode:
authorwollman <wollman@FreeBSD.org>1995-02-09 23:13:27 +0000
committerwollman <wollman@FreeBSD.org>1995-02-09 23:13:27 +0000
commit72af2aa44a98381d496043f67a333df345e987a9 (patch)
tree6b8f4500f8844dcde0c5fcc625cf24bb530f5240 /sys/netinet/tcp_debug.c
parent93f26e434abdf6c41008b87288c038fa1ada912f (diff)
downloadFreeBSD-src-72af2aa44a98381d496043f67a333df345e987a9.zip
FreeBSD-src-72af2aa44a98381d496043f67a333df345e987a9.tar.gz
Merge Transaction TCP, courtesy of Andras Olah <olah@cs.utwente.nl> and
Bob Braden <braden@isi.edu>. NB: This has not had David's TCP ACK hack re-integrated. It is not clear what the correct solution to this problem is, if any. If a better solution doesn't pop up in response to this message, I'll put David's code back in (or he's welcome to do so himself).
Diffstat (limited to 'sys/netinet/tcp_debug.c')
-rw-r--r--sys/netinet/tcp_debug.c13
1 files changed, 8 insertions, 5 deletions
diff --git a/sys/netinet/tcp_debug.c b/sys/netinet/tcp_debug.c
index c759626..f2c2e1d 100644
--- a/sys/netinet/tcp_debug.c
+++ b/sys/netinet/tcp_debug.c
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)tcp_debug.c 8.1 (Berkeley) 6/10/93
- * $Id$
+ * $Id: tcp_debug.c,v 1.2 1994/08/02 07:48:54 davidg Exp $
*/
#ifdef TCPDEBUG
@@ -102,7 +102,7 @@ tcp_trace(act, ostate, tp, ti, req)
if (tcpconsdebug == 0)
return;
if (tp)
- printf("%x %s:", tp, tcpstates[ostate]);
+ printf("%p %s:", tp, tcpstates[ostate]);
else
printf("???????? ");
printf("%s ", tanames[act]);
@@ -130,11 +130,14 @@ tcp_trace(act, ostate, tp, ti, req)
printf("@%x, urp=%x", ack, ti->ti_urp);
flags = ti->ti_flags;
if (flags) {
-#ifndef lint
char *cp = "<";
-#define pf(f) { if (ti->ti_flags&TH_/**/f) { printf("%s%s", cp, "f"); cp = ","; } }
+#define pf(f) { \
+ if (ti->ti_flags & TH_##f) { \
+ printf("%s%s", cp, #f); \
+ cp = ","; \
+ } \
+}
pf(SYN); pf(ACK); pf(FIN); pf(RST); pf(PUSH); pf(URG);
-#endif
printf(">");
}
break;
OpenPOWER on IntegriCloud