From owner-cvs-all@FreeBSD.ORG Thu Jun 8 23:33:25 2006 Return-Path: X-Original-To: cvs-all@FreeBSD.org Delivered-To: cvs-all@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CB35416A41A; Thu, 8 Jun 2006 23:33:25 +0000 (UTC) (envelope-from rwatson@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 505C643D88; Thu, 8 Jun 2006 23:33:15 +0000 (GMT) (envelope-from rwatson@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k58NVHjb086714; Thu, 8 Jun 2006 23:31:17 GMT (envelope-from rwatson@repoman.freebsd.org) Received: (from rwatson@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k58NVH8M086713; Thu, 8 Jun 2006 23:31:17 GMT (envelope-from rwatson) Message-Id: <200606082331.k58NVH8M086713@repoman.freebsd.org> From: Robert Watson Date: Thu, 8 Jun 2006 23:31:17 +0000 (UTC) To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: RELENG_6 Cc: Subject: cvs commit: src/sys/netipx ipx_pcb.c ipx_pcb.h ipx_usrreq.c spx_usrreq.c X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the entire tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 08 Jun 2006 23:33:25 -0000 rwatson 2006-06-08 23:31:17 UTC FreeBSD src repository Modified files: (Branch: RELENG_6) sys/netipx ipx_pcb.c ipx_pcb.h ipx_usrreq.c spx_usrreq.c Log: Merge ipx_pcb.c:1.45, ipx_pcb.h:1.25, ipx_usrreq.c:1.53, spx_usrreq.c:1.76 from HEAD to RELENG_6: Rework IPX/SPX socket and pcb reference model: - Introduce invariant that all IPX/SPX sockets will have valid so_pcb pointers to ipxpcb structures, and that for SPX, the control block pointer will always be valid. Don't attempt to free the socket or pcb at various odd points, such as disconnect. - Add a new ipxpcb flag, IPXP_DROPPED, which will be set in place of freeing PCB's so that this invariant can be maintained. This flag is now checked instead of a NULL check in various socket protocol calls. - Introduce many assertions that this invariant holds. - Various pieces of code, such as the SPX timer code, no longer needs to jump through hoops in case it frees a PCB while running. - Break out ipx_pcbfree() from ipx_pcbdetach(). Likewise spx_pcbdetach(). - Comment on some SMP-related limitations to the SPX code. - Update copyrights. Revision Changes Path 1.43.2.2 +13 -5 src/sys/netipx/ipx_pcb.c 1.23.2.2 +11 -8 src/sys/netipx/ipx_pcb.h 1.52.2.1 +22 -11 src/sys/netipx/ipx_usrreq.c 1.62.2.12 +100 -68 src/sys/netipx/spx_usrreq.c