diff options
| author | rwatson <rwatson@FreeBSD.org> | 2006-04-01 15:15:05 +0000 |
|---|---|---|
| committer | rwatson <rwatson@FreeBSD.org> | 2006-04-01 15:15:05 +0000 |
| commit | 8622e776f910513e077d822efc579cdb9ba09316 (patch) | |
| tree | 9714c8659826516cd802bd3b0a45d778b7ebb1a6 /sys/netgraph/bluetooth/socket | |
| parent | 6b3805592d02e666e50f1d4473fb18c587d69a75 (diff) | |
| download | FreeBSD-src-8622e776f910513e077d822efc579cdb9ba09316.zip FreeBSD-src-8622e776f910513e077d822efc579cdb9ba09316.tar.gz | |
Change protocol switch pru_abort() API so that it returns void rather
than an int, as an error here is not meaningful. Modify soabort() to
unconditionally free the socket on the return of pru_abort(), and
modify most protocols to no longer conditionally free the socket,
since the caller will do this.
This commit likely leaves parts of netinet and netinet6 in a situation
where they may panic or leak memory, as they have not are not fully
updated by this commit. This will be corrected shortly in followup
commits to these components.
MFC after: 3 months
Diffstat (limited to 'sys/netgraph/bluetooth/socket')
4 files changed, 8 insertions, 8 deletions
diff --git a/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c b/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c index 6afa918..d89bdaf 100644 --- a/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c +++ b/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c @@ -872,10 +872,10 @@ ng_btsocket_hci_raw_init(void) * Abort connection on socket */ -int +void ng_btsocket_hci_raw_abort(struct socket *so) { - return (ng_btsocket_hci_raw_detach(so)); + ng_btsocket_hci_raw_detach(so); } /* ng_btsocket_hci_raw_abort */ /* diff --git a/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c b/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c index 631e6a2..09b5d76 100644 --- a/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c +++ b/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c @@ -1912,12 +1912,12 @@ ng_btsocket_l2cap_init(void) * Abort connection on socket */ -int +void ng_btsocket_l2cap_abort(struct socket *so) { so->so_error = ECONNABORTED; - return (ng_btsocket_l2cap_detach(so)); + ng_btsocket_l2cap_detach(so); } /* ng_btsocket_l2cap_abort */ /* diff --git a/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c b/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c index bd6ce17..0fda1a1 100644 --- a/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c +++ b/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c @@ -572,10 +572,10 @@ ng_btsocket_l2cap_raw_init(void) * Abort connection on socket */ -int +void ng_btsocket_l2cap_raw_abort(struct socket *so) { - return (ng_btsocket_l2cap_raw_detach(so)); + ng_btsocket_l2cap_raw_detach(so); } /* ng_btsocket_l2cap_raw_abort */ /* diff --git a/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c b/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c index 96478df..c921067 100644 --- a/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c +++ b/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c @@ -343,12 +343,12 @@ ng_btsocket_rfcomm_init(void) * Abort connection on socket */ -int +void ng_btsocket_rfcomm_abort(struct socket *so) { so->so_error = ECONNABORTED; - return (ng_btsocket_rfcomm_detach(so)); + ng_btsocket_rfcomm_detach(so); } /* ng_btsocket_rfcomm_abort */ /* |
