xnu-792.13.8.tar.gz

[apple/xnu.git] / bsd / netinet / udp_usrreq.c

diff --git a/bsd/netinet/udp_usrreq.c b/bsd/netinet/udp_usrreq.c
index 4eafd6c8ffb4fda8f0c61f5fb2b7cd194a37c4b5..88eff4c73315602ef8e55f54fff9d7d2f3146f8f 100644 (file)
--- a/bsd/netinet/udp_usrreq.c
+++ b/bsd/netinet/udp_usrreq.c
@@ -1,23 +1,31 @@
 /*
  * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
  *
 /*
  * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
  *

- * @APPLE_LICENSE_HEADER_START@
+ * @APPLE_LICENSE_OSREFERENCE_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 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.
- * 
- * @APPLE_LICENSE_HEADER_END@
+ * 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.
+ *
+ * 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, QUIET ENJOYMENT OR NON-INFRINGEMENT. 
+ * Please see the License for the specific language governing rights and 
+ * limitations under the License.
+ *
+ * @APPLE_LICENSE_OSREFERENCE_HEADER_END@

  */
 /*
  * Copyright (c) 1982, 1986, 1988, 1990, 1993, 1995
  */
 /*
  * Copyright (c) 1982, 1986, 1988, 1990, 1993, 1995


@@ -199,12 +207,10 @@ udp_init()
         * allocate lock group attribute and group for udp pcb mutexes
         */
        pcbinfo->mtx_grp_attr = lck_grp_attr_alloc_init();
         * allocate lock group attribute and group for udp pcb mutexes
         */
        pcbinfo->mtx_grp_attr = lck_grp_attr_alloc_init();

-       lck_grp_attr_setdefault(pcbinfo->mtx_grp_attr);

 
        pcbinfo->mtx_grp = lck_grp_alloc_init("udppcb", pcbinfo->mtx_grp_attr);
                
        pcbinfo->mtx_attr = lck_attr_alloc_init();
 
        pcbinfo->mtx_grp = lck_grp_alloc_init("udppcb", pcbinfo->mtx_grp_attr);
                
        pcbinfo->mtx_attr = lck_attr_alloc_init();

-       lck_attr_setdefault(pcbinfo->mtx_attr);

 
        if ((pcbinfo->mtx = lck_rw_alloc_init(pcbinfo->mtx_grp, pcbinfo->mtx_attr)) == NULL)
                return; /* pretty much dead if this fails... */
 
        if ((pcbinfo->mtx = lck_rw_alloc_init(pcbinfo->mtx_grp, pcbinfo->mtx_attr)) == NULL)
                return; /* pretty much dead if this fails... */


@@ -809,6 +815,7 @@ udp_pcblist SYSCTL_HANDLER_ARGS
        gencnt = udbinfo.ipi_gencnt;
        n = udbinfo.ipi_count;
 
        gencnt = udbinfo.ipi_gencnt;
        n = udbinfo.ipi_count;
 

+       bzero(&xig, sizeof(xig));

        xig.xig_len = sizeof xig;
        xig.xig_count = n;
        xig.xig_gen = gencnt;
        xig.xig_len = sizeof xig;
        xig.xig_count = n;
        xig.xig_gen = gencnt;


@@ -844,6 +851,8 @@ udp_pcblist SYSCTL_HANDLER_ARGS
                inp = inp_list[i];
                if (inp->inp_gencnt <= gencnt && inp->inp_state != INPCB_STATE_DEAD) {
                        struct xinpcb xi;
                inp = inp_list[i];
                if (inp->inp_gencnt <= gencnt && inp->inp_state != INPCB_STATE_DEAD) {
                        struct xinpcb xi;

+
+                       bzero(&xi, sizeof(xi));

                        xi.xi_len = sizeof xi;
                        /* XXX should avoid extra copy */
                        inpcb_to_compat(inp, &xi.xi_inp);
                        xi.xi_len = sizeof xi;
                        /* XXX should avoid extra copy */
                        inpcb_to_compat(inp, &xi.xi_inp);


@@ -860,6 +869,8 @@ udp_pcblist SYSCTL_HANDLER_ARGS
                 * while we were processing this request, and it
                 * might be necessary to retry.
                 */
                 * while we were processing this request, and it
                 * might be necessary to retry.
                 */

+               bzero(&xig, sizeof(xig));
+               xig.xig_len = sizeof xig;

                xig.xig_gen = udbinfo.ipi_gencnt;
                xig.xig_sogen = so_gencnt;
                xig.xig_count = udbinfo.ipi_count;
                xig.xig_gen = udbinfo.ipi_gencnt;
                xig.xig_sogen = so_gencnt;
                xig.xig_count = udbinfo.ipi_count;


@@ -1217,27 +1228,22 @@ udp_lock(so, refcount, debug)
        int refcount, debug;
 {
        int lr_saved;
        int refcount, debug;
 {
        int lr_saved;

-#ifdef __ppc__
-       if (debug == 0) {
-               __asm__ volatile("mflr %0" : "=r" (lr_saved));
-       }
+       if (debug == 0) 
+               lr_saved = (unsigned int) __builtin_return_address(0);

        else lr_saved = debug;
        else lr_saved = debug;

-#endif

 
        if (so->so_pcb) {
                lck_mtx_assert(((struct inpcb *)so->so_pcb)->inpcb_mtx, LCK_MTX_ASSERT_NOTOWNED);
                lck_mtx_lock(((struct inpcb *)so->so_pcb)->inpcb_mtx);
        }
 
        if (so->so_pcb) {
                lck_mtx_assert(((struct inpcb *)so->so_pcb)->inpcb_mtx, LCK_MTX_ASSERT_NOTOWNED);
                lck_mtx_lock(((struct inpcb *)so->so_pcb)->inpcb_mtx);
        }

-       else {
+       else 

                panic("udp_lock: so=%x NO PCB! lr=%x\n", so, lr_saved);
                panic("udp_lock: so=%x NO PCB! lr=%x\n", so, lr_saved);

-               lck_mtx_assert(so->so_proto->pr_domain->dom_mtx, LCK_MTX_ASSERT_NOTOWNED);
-               lck_mtx_lock(so->so_proto->pr_domain->dom_mtx);
-       }

 
        if (refcount) 
                so->so_usecount++;
 
 
        if (refcount) 
                so->so_usecount++;
 

-       so->reserved3= lr_saved;
+       so->lock_lr[so->next_lock_lr] = (void *)lr_saved;
+       so->next_lock_lr = (so->next_lock_lr+1) % SO_LCKDBG_MAX;

        return (0);
 }
 
        return (0);
 }
 


@@ -1250,12 +1256,11 @@ udp_unlock(so, refcount, debug)
        int lr_saved;
        struct inpcb *inp = sotoinpcb(so);
        struct inpcbinfo *pcbinfo       = &udbinfo;
        int lr_saved;
        struct inpcb *inp = sotoinpcb(so);
        struct inpcbinfo *pcbinfo       = &udbinfo;

-#ifdef __ppc__
-       if (debug == 0) {
-               __asm__ volatile("mflr %0" : "=r" (lr_saved));
-       }
+
+       if (debug == 0) 
+               lr_saved = (unsigned int) __builtin_return_address(0);

        else lr_saved = debug;
        else lr_saved = debug;

-#endif
+

        if (refcount) {
                so->so_usecount--;
 #if 0
        if (refcount) {
                so->so_usecount--;
 #if 0


@@ -1268,18 +1273,16 @@ udp_unlock(so, refcount, debug)
                }
 #endif
        }
                }
 #endif
        }

-       if (so->so_pcb == NULL) {
+       if (so->so_pcb == NULL) 

                panic("udp_unlock: so=%x NO PCB! lr=%x\n", so, lr_saved);
                panic("udp_unlock: so=%x NO PCB! lr=%x\n", so, lr_saved);

-               lck_mtx_assert(so->so_proto->pr_domain->dom_mtx, LCK_MTX_ASSERT_OWNED);
-               lck_mtx_unlock(so->so_proto->pr_domain->dom_mtx);
-       }

        else {
                lck_mtx_assert(((struct inpcb *)so->so_pcb)->inpcb_mtx, LCK_MTX_ASSERT_OWNED);
        else {
                lck_mtx_assert(((struct inpcb *)so->so_pcb)->inpcb_mtx, LCK_MTX_ASSERT_OWNED);

+               so->unlock_lr[so->next_unlock_lr] = (void *)lr_saved;
+               so->next_unlock_lr = (so->next_unlock_lr+1) % SO_LCKDBG_MAX;

                lck_mtx_unlock(((struct inpcb *)so->so_pcb)->inpcb_mtx);
        }
 
 
                lck_mtx_unlock(((struct inpcb *)so->so_pcb)->inpcb_mtx);
        }
 
 

-       so->reserved4 = lr_saved;

        return (0);
 }
 
        return (0);
 }