Deleted Added
full compact
uipc_usrreq.c (134310) uipc_usrreq.c (136682)
1/*
2 * Copyright 2004 Robert N. M. Watson
3 * Copyright (c) 1982, 1986, 1989, 1991, 1993
4 * The Regents of the University of California. All rights reserved.
5 *
6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions
8 * are met:

--- 17 unchanged lines hidden (view full) ---

26 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
27 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
28 * SUCH DAMAGE.
29 *
30 * From: @(#)uipc_usrreq.c 8.3 (Berkeley) 1/4/94
31 */
32
33#include <sys/cdefs.h>
1/*
2 * Copyright 2004 Robert N. M. Watson
3 * Copyright (c) 1982, 1986, 1989, 1991, 1993
4 * The Regents of the University of California. All rights reserved.
5 *
6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions
8 * are met:

--- 17 unchanged lines hidden (view full) ---

26 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
27 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
28 * SUCH DAMAGE.
29 *
30 * From: @(#)uipc_usrreq.c 8.3 (Berkeley) 1/4/94
31 */
32
33#include <sys/cdefs.h>
34__FBSDID("$FreeBSD: head/sys/kern/uipc_usrreq.c 134310 2004-08-25 21:24:36Z rwatson $");
34__FBSDID("$FreeBSD: head/sys/kern/uipc_usrreq.c 136682 2004-10-18 22:19:43Z rwatson $");
35
36#include "opt_mac.h"
37
38#include <sys/param.h>
39#include <sys/domain.h>
40#include <sys/fcntl.h>
41#include <sys/malloc.h> /* XXX must be before <sys/file.h> */
42#include <sys/file.h>

--- 92 unchanged lines hidden (view full) ---

135 unp = sotounpcb(so);
136 if (unp == NULL) {
137 UNP_UNLOCK();
138 return (EINVAL);
139 }
140 unp_drop(unp, ECONNABORTED);
141 unp_detach(unp);
142 UNP_UNLOCK_ASSERT();
35
36#include "opt_mac.h"
37
38#include <sys/param.h>
39#include <sys/domain.h>
40#include <sys/fcntl.h>
41#include <sys/malloc.h> /* XXX must be before <sys/file.h> */
42#include <sys/file.h>

--- 92 unchanged lines hidden (view full) ---

135 unp = sotounpcb(so);
136 if (unp == NULL) {
137 UNP_UNLOCK();
138 return (EINVAL);
139 }
140 unp_drop(unp, ECONNABORTED);
141 unp_detach(unp);
142 UNP_UNLOCK_ASSERT();
143 ACCEPT_LOCK();
143 SOCK_LOCK(so);
144 sotryfree(so);
145 return (0);
146}
147
148static int
149uipc_accept(struct socket *so, struct sockaddr **nam)
150{

--- 1654 unchanged lines hidden ---
144 SOCK_LOCK(so);
145 sotryfree(so);
146 return (0);
147}
148
149static int
150uipc_accept(struct socket *so, struct sockaddr **nam)
151{

--- 1654 unchanged lines hidden ---