Date: Wed, 10 Jun 2009 10:39:41 +0000 (UTC) From: "Bjoern A. Zeeb" <bz@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r193895 - head/sys/netinet Message-ID: <200906101039.n5AAdfFQ010390@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bz Date: Wed Jun 10 10:39:41 2009 New Revision: 193895 URL: http://svn.freebsd.org/changeset/base/193895 Log: 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) Modified: head/sys/netinet/tcp_debug.c Modified: head/sys/netinet/tcp_debug.c ============================================================================== --- head/sys/netinet/tcp_debug.c Wed Jun 10 10:34:59 2009 (r193894) +++ head/sys/netinet/tcp_debug.c Wed Jun 10 10:39:41 2009 (r193895) @@ -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, struc (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, struc 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, struc } 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;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200906101039.n5AAdfFQ010390>