Re: CVS commit: src/sys (netinet/tcp_usrreq.c)

[Andrew Brown <atatat%atatdot.net@localhost>]

On Thu, Mar 10, 2005 at 03:39:41AM +0000, Geoff Wing wrote:
>Andrew Brown <atatat%netbsd.org@localhost> typed:
>: Committed By:        atatat
>: Date:                Wed Mar  9 05:07:19 UTC 2005
>: Modified Files:
>:      src/sys/kern: uipc_domain.c
>:      src/sys/netinet: in_var.h raw_ip.c tcp_usrreq.c udp_usrreq.c
>:      src/sys/netinet6: raw_ip6.c udp6_usrreq.c
>:      src/sys/sys: socket.h
>
>: cvs rdiff -r1.96 -r1.97 src/sys/netinet/tcp_usrreq.c
>
>At least this file needs some cleanup (I thought I posted this message but
>can't find it so maybe it's a duplicate).
>
>Regards,
>Geoff
>
>--- sys/netinet/tcp_usrreq.c.org       2005-03-09 18:23:56.000000000 +1100
>+++ sys/netinet/tcp_usrreq.c   2005-03-10 14:31:21.000000000 +1100
>@@ -1232,12 +1232,14 @@
>       pf2 = (oldp == NULL) ? 0 : pf;
> 
>       CIRCLEQ_FOREACH(inph, &pcbtbl->inpt_queue, inph_queue) {
>+#ifdef INET
>               inp = (struct inpcb *)inph;
>-              in6p = (struct in6pcb *)inph;
>-
>               if (inp->inp_af != pf)
>                       continue;
>-
>+#endif
>+#ifdef INET6
>+              in6p = (struct in6pcb *)inph;
>+#endif
>               memset(&pcb, 0, sizeof(pcb));
> 
>               pcb.ki_family = pf;

fixed.  sorry about that.

-- 
|-----< "CODE WARRIOR" >-----|
codewarrior%daemon.org@localhost             * "ah!  i see you have the internet
twofsonet%graffiti.com@localhost (Andrew Brown)                that goes 
*ping*!"
werdna%squooshy.com@localhost       * "information is power -- share the 
wealth."