From fb96762b20276c851c4016f10b8e26ee467a8cff Mon Sep 17 00:00:00 2001 From: shin Date: Mon, 13 Dec 1999 00:39:20 +0000 Subject: [PATCH] Always set INP_IPV4 flag for IPv4 pcb entries, because netstat needs it to print out protocol specific pcb info. A patch submitted by guido@gvr.org, and asmodai@wxs.nl also reported the problem. Thanks and sorry for your troubles. Submitted by: guido@gvr.org Reviewed by: shin --- sys/netinet/tcp_usrreq.c | 3 --- sys/netinet/udp_usrreq.c | 2 -- 2 files changed, 5 deletions(-) diff --git a/sys/netinet/tcp_usrreq.c b/sys/netinet/tcp_usrreq.c index af43fc346e4c..7d7f71f536b6 100644 --- a/sys/netinet/tcp_usrreq.c +++ b/sys/netinet/tcp_usrreq.c @@ -34,7 +34,6 @@ * $FreeBSD$ */ -#include "opt_inet6.h" #include "opt_tcpdebug.h" #include @@ -732,9 +731,7 @@ tcp_attach(so, p) if (error) return (error); inp = sotoinpcb(so); -#ifdef INET6 inp->inp_vflag |= INP_IPV4; -#endif tp = tcp_newtcpcb(inp); if (tp == 0) { int nofd = so->so_state & SS_NOFDREF; /* XXX */ diff --git a/sys/netinet/udp_usrreq.c b/sys/netinet/udp_usrreq.c index f49a12844833..4b998c7220d6 100644 --- a/sys/netinet/udp_usrreq.c +++ b/sys/netinet/udp_usrreq.c @@ -771,9 +771,7 @@ udp_attach(struct socket *so, int proto, struct proc *p) return error; inp = (struct inpcb *)so->so_pcb; -#ifdef INET6 inp->inp_vflag |= INP_IPV4; -#endif inp->inp_ip_ttl = ip_defttl; #ifdef IPSEC error = ipsec_init_policy(so, &inp->inp_sp);