xnu-792.18.15.tar.gz

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

diff --git a/bsd/net/rtsock.c b/bsd/net/rtsock.c
index 54abd75f0de4dbba884d9006128d76cf353ac1bf..1558ee4fee8614895b3f4e77fb07a1738da62190 100644 (file)
--- a/bsd/net/rtsock.c
+++ b/bsd/net/rtsock.c
@@ -1,23 +1,29 @@
 /*
  * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
  *
 /*
  * 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,
  * 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) 1988, 1991, 1993
  */
 /*
  * Copyright (c) 1988, 1991, 1993


@@ -162,7 +168,7 @@ rts_attach(struct socket *so, int proto, __unused struct proc *p)
                so->so_flags |= SOF_PCBCLEARING;
                return error;
        }
                so->so_flags |= SOF_PCBCLEARING;
                return error;
        }

-       socket_lock(so, 1);
+

        switch(rp->rcb_proto.sp_protocol) {
 //####LD route_cb needs looking
        case AF_INET:
        switch(rp->rcb_proto.sp_protocol) {
 //####LD route_cb needs looking
        case AF_INET:


@@ -180,9 +186,9 @@ rts_attach(struct socket *so, int proto, __unused struct proc *p)
        }
        rp->rcb_faddr = &route_src;
        route_cb.any_count++;
        }
        rp->rcb_faddr = &route_src;
        route_cb.any_count++;

+       /* the socket is already locked when we enter rts_attach */ 

        soisconnected(so);
        so->so_options |= SO_USELOOPBACK;
        soisconnected(so);
        so->so_options |= SO_USELOOPBACK;

-       socket_unlock(so, 1);

        return 0;
 }
 
        return 0;
 }
 


@@ -1361,17 +1367,18 @@ sysctl_rtsock SYSCTL_HANDLER_ARGS
        w.w_arg = name[2];
        w.w_req = req;
 
        w.w_arg = name[2];
        w.w_req = req;
 

-       lck_mtx_lock(rt_mtx);

        switch (w.w_op) {
 
        case NET_RT_DUMP:
        case NET_RT_DUMP2:
        case NET_RT_FLAGS:
        switch (w.w_op) {
 
        case NET_RT_DUMP:
        case NET_RT_DUMP2:
        case NET_RT_FLAGS:

+               lck_mtx_lock(rt_mtx);

                for (i = 1; i <= AF_MAX; i++)
                        if ((rnh = rt_tables[i]) && (af == 0 || af == i) &&
                            (error = rnh->rnh_walktree(rnh,
                                                        sysctl_dumpentry, &w)))
                                break;
                for (i = 1; i <= AF_MAX; i++)
                        if ((rnh = rt_tables[i]) && (af == 0 || af == i) &&
                            (error = rnh->rnh_walktree(rnh,
                                                        sysctl_dumpentry, &w)))
                                break;

+               lck_mtx_unlock(rt_mtx);

                break;
        case NET_RT_IFLIST:
                error = sysctl_iflist(af, &w);
                break;
        case NET_RT_IFLIST:
                error = sysctl_iflist(af, &w);


@@ -1386,7 +1393,6 @@ sysctl_rtsock SYSCTL_HANDLER_ARGS
                error = sysctl_rttrash(req);
                break;
        }
                error = sysctl_rttrash(req);
                break;
        }

-       lck_mtx_unlock(rt_mtx);

        if (w.w_tmem)
                FREE(w.w_tmem, M_RTABLE);
        return (error);
        if (w.w_tmem)
                FREE(w.w_tmem, M_RTABLE);
        return (error);