From owner-cvs-src@FreeBSD.ORG Tue Nov 23 23:41:20 2004 Return-Path: Delivered-To: cvs-src@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DCD6116A4CE; Tue, 23 Nov 2004 23:41:20 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B8D7A43D39; Tue, 23 Nov 2004 23:41:20 +0000 (GMT) (envelope-from rwatson@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iANNfKom080488; Tue, 23 Nov 2004 23:41:20 GMT (envelope-from rwatson@repoman.freebsd.org) Received: (from rwatson@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iANNfKuB080487; Tue, 23 Nov 2004 23:41:20 GMT (envelope-from rwatson) Message-Id: <200411232341.iANNfKuB080487@repoman.freebsd.org> From: Robert Watson Date: Tue, 23 Nov 2004 23:41:20 +0000 (UTC) To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: HEAD Subject: cvs commit: src/sys/netinet tcp_input.c X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 23 Nov 2004 23:41:21 -0000 rwatson 2004-11-23 23:41:20 UTC FreeBSD src repository Modified files: sys/netinet tcp_input.c Log: In tcp_reass(), assert the inpcb lock on the passed tcpcb, since the contents of the tcpcb are read and modified in volume. In tcp_input(), replace th comparison with 0 with a comparison with NULL. At the 'findpcb', 'dropafterack', and 'dropwithreset' labels in tcp_input(), assert 'headlocked'. Try to improve consistency between various assertions regarding headlocked to be more informative. MFC after: 2 weeks Revision Changes Path 1.258 +19 -12 src/sys/netinet/tcp_input.c