diff options
author | bz <bz@FreeBSD.org> | 2009-06-10 10:39:41 +0000 |
---|---|---|
committer | bz <bz@FreeBSD.org> | 2009-06-10 10:39:41 +0000 |
commit | 5cd78ef442366904d8919e7216022579b7dcee3a (patch) | |
tree | 6ee733d2ff605d1be2e94400583bbe22ae5abeaa | |
parent | b465834b3e0257922205d6113af29a478b89c369 (diff) | |
download | FreeBSD-src-5cd78ef442366904d8919e7216022579b7dcee3a.zip FreeBSD-src-5cd78ef442366904d8919e7216022579b7dcee3a.tar.gz |
Remove the "The option TCPDEBUG requires option INET." requirement.
In case of !INET we will not have a timestamp on the trace for now
but that might only affect spx debugging as long as INET6 requires
INET.
Reviewed by: rwatson (earlier version)
-rw-r--r-- | sys/netinet/tcp_debug.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/sys/netinet/tcp_debug.c b/sys/netinet/tcp_debug.c index a82943d..5afbcde 100644 --- a/sys/netinet/tcp_debug.c +++ b/sys/netinet/tcp_debug.c @@ -37,10 +37,6 @@ __FBSDID("$FreeBSD$"); #include "opt_inet6.h" #include "opt_tcpdebug.h" -#ifndef INET -#error The option TCPDEBUG requires option INET. -#endif - #ifdef TCPDEBUG /* load symbolic names */ #define PRUREQUESTS @@ -121,7 +117,9 @@ tcp_trace(short act, short ostate, struct tcpcb *tp, void *ipgen, (isipv6 != 0) ? AF_INET6 : #endif AF_INET; +#ifdef INET td->td_time = iptime(); +#endif td->td_act = act; td->td_ostate = ostate; td->td_tcb = (caddr_t)tp; @@ -129,9 +127,11 @@ tcp_trace(short act, short ostate, struct tcpcb *tp, void *ipgen, td->td_cb = *tp; if (ipgen != NULL) { switch (td->td_family) { +#ifdef INET case AF_INET: bcopy(ipgen, &td->td_ti.ti_i, sizeof(td->td_ti.ti_i)); break; +#endif #ifdef INET6 case AF_INET6: bcopy(ipgen, td->td_ip6buf, sizeof(td->td_ip6buf)); @@ -141,9 +141,11 @@ tcp_trace(short act, short ostate, struct tcpcb *tp, void *ipgen, } if (th != NULL) { switch (td->td_family) { +#ifdef INET case AF_INET: td->td_ti.ti_t = *th; break; +#endif #ifdef INET6 case AF_INET6: td->td_ti6.th = *th; |