From owner-cvs-src-old@FreeBSD.ORG Thu Mar 26 22:58:52 2009 Return-Path: Delivered-To: cvs-src-old@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1E53F106564A for ; Thu, 26 Mar 2009 22:58:52 +0000 (UTC) (envelope-from rwatson@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id BDB1A8FC08 for ; Thu, 26 Mar 2009 22:58:51 +0000 (UTC) (envelope-from rwatson@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n2QMwpFJ004377 for ; Thu, 26 Mar 2009 22:58:51 GMT (envelope-from rwatson@repoman.freebsd.org) Received: (from svn2cvs@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n2QMwpRf004376 for cvs-src-old@freebsd.org; Thu, 26 Mar 2009 22:58:51 GMT (envelope-from rwatson@repoman.freebsd.org) Message-Id: <200903262258.n2QMwpRf004376@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: svn2cvs set sender to rwatson@repoman.freebsd.org using -f From: Robert Watson Date: Thu, 26 Mar 2009 22:54:19 +0000 (UTC) To: cvs-src-old@freebsd.org X-FreeBSD-CVS-Branch: RELENG_7 Subject: cvs commit: src UPDATING src/sys/netinet in_pcb.c in_pcb.h tcp_input.c tcp_subr.c tcp_timer.c tcp_timewait.c tcp_usrreq.c src/sys/netinet6 in6_pcb.c src/usr.bin/netstat inet.c src/usr.bin/sockstat sockstat.c src/usr.bin/systat netstat.c X-BeenThere: cvs-src-old@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: **OBSOLETE** CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 26 Mar 2009 22:58:52 -0000 rwatson 2009-03-26 22:54:19 UTC FreeBSD src repository Modified files: (Branch: RELENG_7) . UPDATING sys/netinet in_pcb.c in_pcb.h tcp_input.c tcp_subr.c tcp_timer.c tcp_timewait.c tcp_usrreq.c sys/netinet6 in6_pcb.c usr.bin/netstat inet.c usr.bin/sockstat sockstat.c usr.bin/systat netstat.c Log: SVN rev 190457 on 2009-03-26 22:54:19Z by rwatson r189615: Remove now-unused INP_UNMAPPABLEOPTS. Discussd with: bz r189637: Avoid use of IPv6 macro aliases to inpcb fields and inp_flags; we don't remove their defintions as some third-party tools may use them (such as net-snmp), unlike in the 8.x change. References to in6p_lport and in6_fport in sockstat are also replaced with normal inp_lport and inp_fport references. Reviewed by: bz r189848: Correct a number of evolved problems with inp_vflag and inp_flags: certain flags that should have been in inp_flags ended up in inp_vflag, meaning that they were inconsistently locked, and in one case, interpreted. Move the following flags from inp_vflag to gaps in the inp_flags space (and clean up the inp_flags constants to make gaps more obvious to future takers): INP_TIMEWAIT INP_SOCKREF INP_ONESBCAST INP_DROPPED Some aspects of this change have no effect on kernel ABI at all, as these are UDP/TCP/IP-internal uses; however, netstat and sockstat detect INP_TIMEWAIT when listing TCP sockets, so any MFC will need to take this into account. MFC after: 1 week (or after dependencies are MFC'd) Reviewed by: bz Note that this change requires netstat, systat, and sockstat to be recompiled in order to properly print TIMEWAIT connection state; this minor API change (documented in UPDATING) is considered worth it in order to fix the above bugs. This change fixes the INP_ONESBCAST bug describted in kern/124282 by disambiguating flag use. Approved by: re (kib) PR: kern/124282 r189637 discussed with: pav Revision Changes Path 1.507.2.23 +5 -0 src/UPDATING 1.196.2.26 +19 -19 src/sys/netinet/in_pcb.c 1.100.2.17 +28 -30 src/sys/netinet/in_pcb.h 1.370.2.12 +1 -1 src/sys/netinet/tcp_input.c 1.300.2.14 +15 -15 src/sys/netinet/tcp_subr.c 1.99.2.3 +5 -5 src/sys/netinet/tcp_timer.c 1.287.2.4 +6 -6 src/sys/netinet/tcp_timewait.c 1.163.2.15 +29 -29 src/sys/netinet/tcp_usrreq.c 1.84.2.19 +4 -4 src/sys/netinet6/in6_pcb.c 1.78.2.5 +1 -1 src/usr.bin/netstat/inet.c 1.17.2.1 +4 -4 src/usr.bin/sockstat/sockstat.c 1.28.2.1 +1 -1 src/usr.bin/systat/netstat.c