diff options
| author | rwatson <rwatson@FreeBSD.org> | 2006-04-01 15:42:02 +0000 |
|---|---|---|
| committer | rwatson <rwatson@FreeBSD.org> | 2006-04-01 15:42:02 +0000 |
| commit | 5479e5d69217e0a6876338fc7cde604067b679ca (patch) | |
| tree | 7431f8c0d78c14bc446d524dcda6a00888732015 /sys/netipx | |
| parent | 68ff3be0b395955e8feac72262824b90a155a710 (diff) | |
| download | FreeBSD-src-5479e5d69217e0a6876338fc7cde604067b679ca.zip FreeBSD-src-5479e5d69217e0a6876338fc7cde604067b679ca.tar.gz | |
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
Diffstat (limited to 'sys/netipx')
| -rw-r--r-- | sys/netipx/ipx_usrreq.c | 5 | ||||
| -rw-r--r-- | sys/netipx/spx_usrreq.c | 5 |
2 files changed, 4 insertions, 6 deletions
diff --git a/sys/netipx/ipx_usrreq.c b/sys/netipx/ipx_usrreq.c index b98d5a1..2125d04 100644 --- a/sys/netipx/ipx_usrreq.c +++ b/sys/netipx/ipx_usrreq.c @@ -80,7 +80,7 @@ static int ipx_attach(struct socket *so, int proto, struct thread *td); static int ipx_bind(struct socket *so, struct sockaddr *nam, struct thread *td); static int ipx_connect(struct socket *so, struct sockaddr *nam, struct thread *td); -static int ipx_detach(struct socket *so); +static void ipx_detach(struct socket *so); static int ipx_disconnect(struct socket *so); static int ipx_send(struct socket *so, int flags, struct mbuf *m, struct sockaddr *addr, struct mbuf *control, @@ -505,7 +505,7 @@ out: return (error); } -static int +static void ipx_detach(so) struct socket *so; { @@ -517,7 +517,6 @@ ipx_detach(so) ipx_pcbdetach(ipxp); ipx_pcbfree(ipxp); IPX_LIST_UNLOCK(); - return (0); } static int diff --git a/sys/netipx/spx_usrreq.c b/sys/netipx/spx_usrreq.c index 637ea19..d9a5639 100644 --- a/sys/netipx/spx_usrreq.c +++ b/sys/netipx/spx_usrreq.c @@ -103,7 +103,7 @@ static int spx_attach(struct socket *so, int proto, struct thread *td); static int spx_bind(struct socket *so, struct sockaddr *nam, struct thread *td); static int spx_connect(struct socket *so, struct sockaddr *nam, struct thread *td); -static int spx_detach(struct socket *so); +static void spx_detach(struct socket *so); static void spx_pcbdetach(struct ipxpcb *ipxp); static int spx_usr_disconnect(struct socket *so); static int spx_listen(struct socket *so, int backlog, struct thread *td); @@ -1512,7 +1512,7 @@ spx_connect_end: return (error); } -static int +static void spx_detach(struct socket *so) { struct ipxpcb *ipxp; @@ -1534,7 +1534,6 @@ spx_detach(struct socket *so) ipx_pcbdetach(ipxp); ipx_pcbfree(ipxp); IPX_LIST_UNLOCK(); - return (0); } /* |
