xnu-792.22.5.tar.gz

[apple/xnu.git] / bsd / net / raw_cb.c

diff --git a/bsd/net/raw_cb.c b/bsd/net/raw_cb.c
index 105ef13c869500c86d7a54072db5936e7c702c53..291990cd7cc0f97513bae24121757b3507ff066c 100644 (file)
--- a/bsd/net/raw_cb.c
+++ b/bsd/net/raw_cb.c
@@ -1,23 +1,29 @@
 /*
  * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_LICENSE_HEADER_START@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
  * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
  * 
- * @APPLE_LICENSE_HEADER_END@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /*
  * Copyright (c) 1980, 1986, 1993
@@ -60,6 +66,7 @@
 #include <sys/socketvar.h>
 #include <sys/domain.h>
 #include <sys/protosw.h>
+#include <kern/locks.h>
 
 #include <net/raw_cb.h>
 
@@ -76,6 +83,7 @@ struct rawcb_list_head rawcb_list;
 
 static u_long  raw_sendspace = RAWSNDQ;
 static u_long  raw_recvspace = RAWRCVQ;
+extern lck_mtx_t       *raw_mtx;       /*### global raw cb mutex for now */
 
 /*
  * Allocate a control block and a nominal amount
@@ -102,7 +110,9 @@ raw_attach(so, proto)
        rp->rcb_socket = so;
        rp->rcb_proto.sp_family = so->so_proto->pr_domain->dom_family;
        rp->rcb_proto.sp_protocol = proto;
+       lck_mtx_lock(raw_mtx);
        LIST_INSERT_HEAD(&rawcb_list, rp, list);
+       lck_mtx_unlock(raw_mtx);
        return (0);
 }
 
@@ -117,13 +127,21 @@ raw_detach(rp)
        struct socket *so = rp->rcb_socket;
 
        so->so_pcb = 0;
+       so->so_flags |= SOF_PCBCLEARING;
        sofree(so);
+       if (!lck_mtx_try_lock(raw_mtx)) {
+               socket_unlock(so, 0);
+               lck_mtx_lock(raw_mtx);
+               socket_lock(so, 0);
+       }
        LIST_REMOVE(rp, list);
+       lck_mtx_unlock(raw_mtx);
 #ifdef notdef
        if (rp->rcb_laddr)
                m_freem(dtom(rp->rcb_laddr));
        rp->rcb_laddr = 0;
 #endif
+       rp->rcb_socket = NULL;
        FREE((caddr_t)(rp), M_PCB);
 }