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

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

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

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

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

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

223 UNP_LOCK();
224 error = unp_connect2(so1, so2, PRU_CONNECT2);
225 UNP_UNLOCK();
226 return (error);
227}
228
229/* control is EOPNOTSUPP */
230
36
37#include "opt_mac.h"
38
39#include <sys/param.h>
40#include <sys/domain.h>
41#include <sys/fcntl.h>
42#include <sys/malloc.h> /* XXX must be before <sys/file.h> */
43#include <sys/file.h>

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

223 UNP_LOCK();
224 error = unp_connect2(so1, so2, PRU_CONNECT2);
225 UNP_UNLOCK();
226 return (error);
227}
228
229/* control is EOPNOTSUPP */
230
231static int
231static void
232uipc_detach(struct socket *so)
233{
234 struct unpcb *unp;
235
236 unp = sotounpcb(so);
237 KASSERT(unp != NULL, ("uipc_detach: unp == NULL"));
238 UNP_LOCK();
239 unp_detach(unp);
240 UNP_UNLOCK_ASSERT();
232uipc_detach(struct socket *so)
233{
234 struct unpcb *unp;
235
236 unp = sotounpcb(so);
237 KASSERT(unp != NULL, ("uipc_detach: unp == NULL"));
238 UNP_LOCK();
239 unp_detach(unp);
240 UNP_UNLOCK_ASSERT();
241 return (0);
242}
243
244static int
245uipc_disconnect(struct socket *so)
246{
247 struct unpcb *unp;
248
249 unp = sotounpcb(so);

--- 1578 unchanged lines hidden ---
241}
242
243static int
244uipc_disconnect(struct socket *so)
245{
246 struct unpcb *unp;
247
248 unp = sotounpcb(so);

--- 1578 unchanged lines hidden ---