From owner-cvs-src@FreeBSD.ORG Sat Apr 1 15:42:03 2006 Return-Path: X-Original-To: cvs-src@FreeBSD.org 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 2976816A41F; Sat, 1 Apr 2006 15:42:03 +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 D849543D48; Sat, 1 Apr 2006 15:42:02 +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 k31Fg2BG020857; Sat, 1 Apr 2006 15:42:02 GMT (envelope-from rwatson@repoman.freebsd.org) Received: (from rwatson@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k31Fg2B3020856; Sat, 1 Apr 2006 15:42:02 GMT (envelope-from rwatson) Message-Id: <200604011542.k31Fg2B3020856@repoman.freebsd.org> From: Robert Watson Date: Sat, 1 Apr 2006 15:42:02 +0000 (UTC) To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: HEAD Cc: Subject: cvs commit: src/sys/kern uipc_socket.c uipc_socket2.c uipc_usrreq.c src/sys/net raw_cb.c raw_usrreq.c rtsock.c src/sys/netatalk ddp_usrreq.c src/sys/netatm atm_aal5.c atm_socket.c atm_usrreq.c atm_var.h src/sys/netgraph ng_socket.c ... X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.5 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: Sat, 01 Apr 2006 15:42:03 -0000 rwatson 2006-04-01 15:42:02 UTC FreeBSD src repository Modified files: sys/kern uipc_socket.c uipc_socket2.c uipc_usrreq.c sys/net raw_cb.c raw_usrreq.c rtsock.c sys/netatalk ddp_usrreq.c sys/netatm atm_aal5.c atm_socket.c atm_usrreq.c atm_var.h sys/netgraph ng_socket.c sys/netgraph/bluetooth/include ng_btsocket_hci_raw.h ng_btsocket_l2cap.h ng_btsocket_rfcomm.h sys/netgraph/bluetooth/socket ng_btsocket_hci_raw.c ng_btsocket_l2cap.c ng_btsocket_l2cap_raw.c ng_btsocket_rfcomm.c sys/netinet ip_divert.c raw_ip.c tcp_usrreq.c udp_usrreq.c sys/netinet6 raw_ip6.c udp6_usrreq.c sys/netipsec keysock.c sys/netipx ipx_usrreq.c spx_usrreq.c sys/netkey keysock.c sys/netnatm natm.c sys/sys protosw.h Log: Chance protocol switch method pru_detach() so that it returns void rather than an error. Detaches do not "fail", they other occur or the protocol flags SS_PROTOREF to take ownership of the socket. soclose() no longer looks at so_pcb to see if it's NULL, relying entirely on the protocol to decide whether it's time to free the socket or not using SS_PROTOREF. so_pcb is now entirely owned and managed by the protocol code. Likewise, no longer test so_pcb in other socket functions, such as soreceive(), which have no business digging into protocol internals. Protocol detach routines no longer try to free the socket on detach, this is performed in the socket code if the protocol permits it. In rts_detach(), no longer test for rp != NULL in detach, and likewise in other protocols that don't permit a NULL so_pcb, reduce the incidence of testing for it during detach. netinet and netinet6 are not fully updated to this change, which will be in an upcoming commit. In their current state they may leak memory or panic. MFC after: 3 months Revision Changes Path 1.263 +19 -19 src/sys/kern/uipc_socket.c 1.155 +2 -2 src/sys/kern/uipc_socket2.c 1.165 +1 -2 src/sys/kern/uipc_usrreq.c 1.33 +3 -4 src/sys/net/raw_cb.c 1.39 +2 -3 src/sys/net/raw_usrreq.c 1.135 +19 -23 src/sys/net/rtsock.c 1.49 +1 -2 src/sys/netatalk/ddp_usrreq.c 1.24 +5 -5 src/sys/netatm/atm_aal5.c 1.26 +2 -15 src/sys/netatm/atm_socket.c 1.26 +1 -1 src/sys/netatm/atm_usrreq.c 1.29 +1 -1 src/sys/netatm/atm_var.h 1.6 +1 -1 src/sys/netgraph/bluetooth/include/ng_btsocket_hci_raw.h 1.7 +2 -2 src/sys/netgraph/bluetooth/include/ng_btsocket_l2cap.h 1.7 +1 -1 src/sys/netgraph/bluetooth/include/ng_btsocket_rfcomm.h 1.20 +4 -9 src/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c 1.19 +4 -9 src/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c 1.18 +3 -9 src/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c 1.20 +2 -8 src/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c 1.72 +4 -8 src/sys/netgraph/ng_socket.c 1.115 +2 -3 src/sys/netinet/ip_divert.c 1.158 +2 -3 src/sys/netinet/raw_ip.c 1.130 +2 -4 src/sys/netinet/tcp_usrreq.c 1.184 +2 -4 src/sys/netinet/udp_usrreq.c 1.59 +1 -2 src/sys/netinet6/raw_ip6.c 1.58 +3 -4 src/sys/netinet6/udp6_usrreq.c 1.14 +9 -13 src/sys/netipsec/keysock.c 1.55 +2 -3 src/sys/netipx/ipx_usrreq.c 1.84 +2 -3 src/sys/netipx/spx_usrreq.c 1.34 +7 -14 src/sys/netkey/keysock.c 1.43 +2 -3 src/sys/netnatm/natm.c 1.52 +2 -2 src/sys/sys/protosw.h