xnu-792.12.6.tar.gz

[apple/xnu.git] / bsd / netat / ddp_aarp.c

diff --git a/bsd/netat/ddp_aarp.c b/bsd/netat/ddp_aarp.c
index 08c50531aa348eac0bd31d90a9edd06a591cef9d..1aaa6a4c6b1630637395a5ded413e2371cfb8ea7 100644 (file)
--- a/bsd/netat/ddp_aarp.c
+++ b/bsd/netat/ddp_aarp.c
@@ -1,23 +1,31 @@
 /*
 /*

- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_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.
+ * Copyright (c) 2006 Apple Computer, Inc. All Rights Reserved.

  * 
  * 

- * 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_OSREFERENCE_HEADER_START@

  * 
  * 

- * @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) 1988, 1989, 1997, 1998 Apple Computer, Inc. 
  *
  */
 /*     Copyright (c) 1988, 1989, 1997, 1998 Apple Computer, Inc. 
  *


@@ -93,6 +101,7 @@ StaticProc void aarp_sched_req(void *);
 StaticProc int aarp_get_rand_node();
 StaticProc int aarp_get_next_node();
 StaticProc int aarp_get_rand_net();
 StaticProc int aarp_get_rand_node();
 StaticProc int aarp_get_next_node();
 StaticProc int aarp_get_rand_net();

+atlock_t arpinp_lock;

 
 extern void AARPwakeup(aarp_amt_t *);
 extern int pat_output(at_ifaddr_t *, gbuf_t *, unsigned char *, int);
 
 extern void AARPwakeup(aarp_amt_t *);
 extern int pat_output(at_ifaddr_t *, gbuf_t *, unsigned char *, int);


@@ -180,7 +189,7 @@ int aarp_rcv_pkt(pkt, elapp)
      aarp_pkt_t *pkt;
      at_ifaddr_t *elapp;
 {
      aarp_pkt_t *pkt;
      at_ifaddr_t *elapp;
 {

-       switch (ntohs(pkt->aarp_cmd)) {
+       switch (pkt->aarp_cmd) {

        case AARP_REQ_CMD:
                return (aarp_req_cmd_in (pkt, elapp));
        case AARP_RESP_CMD:
        case AARP_REQ_CMD:
                return (aarp_req_cmd_in (pkt, elapp));
        case AARP_RESP_CMD:


@@ -280,7 +289,7 @@ StaticProc int aarp_resp_cmd_in (pkt, elapp)
                break;
 
        case PROBE_DONE :
                break;
 
        case PROBE_DONE :

-               AMT_LOOK(amt_ptr, pkt->src_at_addr, elapp)
+               AMT_LOOK(amt_ptr, pkt->src_at_addr, elapp);

                if (amt_ptr == NULL)
                        return(-1);
                if (amt_ptr->tmo) {
                if (amt_ptr == NULL)
                        return(-1);
                if (amt_ptr->tmo) {


@@ -421,18 +430,18 @@ int aarp_chk_addr(ddp_hdrp, elapp)
  *     will ALWAYS be removed.  If the message is dropped,
  *     it's not an "error".
  *
  *     will ALWAYS be removed.  If the message is dropped,
  *     it's not an "error".
  *

- *  Parameter dest_at_addr must have the net # in network byte order

  ****************************************************************************/
 
 int    aarp_send_data(m, elapp, dest_at_addr, loop)
      register gbuf_t   *m;
      register at_ifaddr_t  *elapp;
  ****************************************************************************/
 
 int    aarp_send_data(m, elapp, dest_at_addr, loop)
      register gbuf_t   *m;
      register at_ifaddr_t  *elapp;

-     struct  atalk_addr           *dest_at_addr;       /* net# in network byte order */
+     struct  atalk_addr           *dest_at_addr;

      int               loop;                   /* if true, loopback broadcasts */
 {
        register aarp_amt_t     *amt_ptr;
        register at_ddp_t       *ddp_hdrp;
        int                     error;
      int               loop;                   /* if true, loopback broadcasts */
 {
        register aarp_amt_t     *amt_ptr;
        register at_ddp_t       *ddp_hdrp;
        int                     error;

+       int s;

        struct timeval timenow;
        getmicrouptime(&timenow);
 
        struct timeval timenow;
        getmicrouptime(&timenow);
 


@@ -450,19 +459,22 @@ int       aarp_send_data(m, elapp, dest_at_addr, loop)
                ddp_input(m, elapp);
                return(0);
        }
                ddp_input(m, elapp);
                return(0);
        }

+       ATDISABLE(s, arpinp_lock);

        AMT_LOOK(amt_ptr, *dest_at_addr, elapp);
 
 
        if (amt_ptr) {
        AMT_LOOK(amt_ptr, *dest_at_addr, elapp);
 
 
        if (amt_ptr) {

-           if (amt_ptr->m) {
+               if (amt_ptr->m) {

                        /*
                         * there's already a packet awaiting transmission, so
                         * drop this one and let the upper layer retransmit
                         * later.
                         */
                        /*
                         * there's already a packet awaiting transmission, so
                         * drop this one and let the upper layer retransmit
                         * later.
                         */

+                       ATENABLE(s, arpinp_lock);

                        gbuf_freel(m);
                        return (0);
                }
                        gbuf_freel(m);
                        return (0);
                }

+               ATENABLE(s, arpinp_lock);

                return (pat_output(elapp, m,
                                   (unsigned char *)&amt_ptr->dest_addr, 0));
         }
                return (pat_output(elapp, m,
                                   (unsigned char *)&amt_ptr->dest_addr, 0));
         }


@@ -474,6 +486,7 @@ int aarp_send_data(m, elapp, dest_at_addr, loop)
                gbuf_t               *newm = 0;
                struct  etalk_addr   *dest_addr;
 
                gbuf_t               *newm = 0;
                struct  etalk_addr   *dest_addr;
 

+               ATENABLE(s, arpinp_lock);

                dest_addr =  &elapp->cable_multicast_addr;
                if (loop)
                        newm = (gbuf_t *)gbuf_dupm(m);
                dest_addr =  &elapp->cable_multicast_addr;
                if (loop)
                        newm = (gbuf_t *)gbuf_dupm(m);


@@ -496,7 +509,7 @@ int aarp_send_data(m, elapp, dest_at_addr, loop)
                }
                return (error);
        }
                }
                return (error);
        }

-       NEW_AMT(amt_ptr, *dest_at_addr, elapp)
+       NEW_AMT(amt_ptr, *dest_at_addr,elapp);

 
         if (amt_ptr->m) {
                /*
 
         if (amt_ptr->m) {
                /*


@@ -504,6 +517,7 @@ int aarp_send_data(m, elapp, dest_at_addr, loop)
                 * drop this one and let the upper layer retransmit
                 * later.
                 */
                 * drop this one and let the upper layer retransmit
                 * later.
                 */

+               ATENABLE(s, arpinp_lock);

                gbuf_freel(m);
                return (0);
        }
                gbuf_freel(m);
                return (0);
        }


@@ -515,6 +529,7 @@ int aarp_send_data(m, elapp, dest_at_addr, loop)
        amt_ptr->m = m;
        amt_ptr->elapp = elapp;
        amt_ptr->no_of_retries = 0;
        amt_ptr->m = m;
        amt_ptr->elapp = elapp;
        amt_ptr->no_of_retries = 0;

+       ATENABLE(s, arpinp_lock);

 
        if ((error = aarp_send_req(amt_ptr))) {
                aarp_delete_amt_info(amt_ptr);
 
        if ((error = aarp_send_req(amt_ptr))) {
                aarp_delete_amt_info(amt_ptr);


@@ -550,7 +565,7 @@ StaticProc   int    aarp_send_resp(elapp, pkt)
        new_pkt = (aarp_pkt_t *)gbuf_rptr(m);
        aarp_build_pkt(new_pkt, elapp);
 
        new_pkt = (aarp_pkt_t *)gbuf_rptr(m);
        aarp_build_pkt(new_pkt, elapp);
 

-       new_pkt->aarp_cmd = htons(AARP_RESP_CMD);
+       new_pkt->aarp_cmd = AARP_RESP_CMD;

        new_pkt->dest_addr =  pkt->src_addr;
 
        new_pkt->dest_at_addr = pkt->src_at_addr;
        new_pkt->dest_addr =  pkt->src_addr;
 
        new_pkt->dest_at_addr = pkt->src_at_addr;


@@ -592,7 +607,7 @@ register aarp_amt_t         *amt_ptr;
        pkt = (aarp_pkt_t *)gbuf_rptr(m);
        aarp_build_pkt(pkt, amt_ptr->elapp);
 
        pkt = (aarp_pkt_t *)gbuf_rptr(m);
        aarp_build_pkt(pkt, amt_ptr->elapp);
 

-       pkt->aarp_cmd = htons(AARP_REQ_CMD);
+       pkt->aarp_cmd = AARP_REQ_CMD;

        pkt->dest_addr = et_zeroaddr;
        pkt->dest_at_addr = amt_ptr->dest_at_addr;
        pkt->dest_at_addr.atalk_unused = 0;
        pkt->dest_addr = et_zeroaddr;
        pkt->dest_at_addr = amt_ptr->dest_at_addr;
        pkt->dest_at_addr.atalk_unused = 0;


@@ -635,7 +650,7 @@ StaticProc  int     aarp_send_probe()
        pkt = (aarp_pkt_t *)gbuf_rptr(m);
        aarp_build_pkt(pkt, probe_cb.elapp);
 
        pkt = (aarp_pkt_t *)gbuf_rptr(m);
        aarp_build_pkt(pkt, probe_cb.elapp);
 

-       pkt->aarp_cmd = htons(AARP_PROBE_CMD);
+       pkt->aarp_cmd = AARP_PROBE_CMD;

        pkt->dest_addr = et_zeroaddr;
 
        ATALK_ASSIGN(pkt->src_at_addr, probe_cb.elapp->initial_addr.s_net,
        pkt->dest_addr = et_zeroaddr;
 
        ATALK_ASSIGN(pkt->src_at_addr, probe_cb.elapp->initial_addr.s_net,


@@ -693,7 +708,9 @@ register aarp_pkt_t *pkt;
 at_ifaddr_t    *elapp;
 {
     register aarp_amt_t   *amt_ptr;
 at_ifaddr_t    *elapp;
 {
     register aarp_amt_t   *amt_ptr;

+       int s;

 
 

+       ATDISABLE(s, arpinp_lock);

        AMT_LOOK(amt_ptr, pkt->src_at_addr, elapp);
 
        if (amt_ptr == NULL) {
        AMT_LOOK(amt_ptr, pkt->src_at_addr, elapp);
 
        if (amt_ptr == NULL) {


@@ -703,7 +720,10 @@ at_ifaddr_t        *elapp;
                NEW_AMT(amt_ptr, pkt->src_at_addr,elapp); 
 
                if (amt_ptr->m)
                NEW_AMT(amt_ptr, pkt->src_at_addr,elapp); 
 
                if (amt_ptr->m)

-                       return(0);     /* no non-busy slots available in the cache */
+               {
+               ATENABLE(s, arpinp_lock);
+                       return(0);     /* no non-busy slots available in the cache */
+               }

                amt_ptr->dest_at_addr = pkt->src_at_addr;
                amt_ptr->dest_at_addr.atalk_unused = 0;
 
                amt_ptr->dest_at_addr = pkt->src_at_addr;
                amt_ptr->dest_at_addr.atalk_unused = 0;
 


@@ -716,6 +736,7 @@ at_ifaddr_t *elapp;
        amt_ptr->dest_addr = pkt->src_addr;
        if (FDDI_OR_TOKENRING(elapp->aa_ifp->if_type))
                ddp_bit_reverse(&amt_ptr->dest_addr);
        amt_ptr->dest_addr = pkt->src_addr;
        if (FDDI_OR_TOKENRING(elapp->aa_ifp->if_type))
                ddp_bit_reverse(&amt_ptr->dest_addr);

+       ATENABLE(s, arpinp_lock);

        return(1);
 }
 
        return(1);
 }
 


@@ -728,7 +749,9 @@ at_ifaddr_t *elapp;
 StaticProc   int       aarp_delete_amt_info(amt_ptr)
 register aarp_amt_t    *amt_ptr;
 {
 StaticProc   int       aarp_delete_amt_info(amt_ptr)
 register aarp_amt_t    *amt_ptr;
 {

+       register s;

        register gbuf_t         *m;
        register gbuf_t         *m;

+       ATDISABLE(s, arpinp_lock);

        amt_ptr->last_time = 0;
        ATALK_ASSIGN(amt_ptr->dest_at_addr, 0, 0, 0);
        amt_ptr->no_of_retries = 0;
        amt_ptr->last_time = 0;
        ATALK_ASSIGN(amt_ptr->dest_at_addr, 0, 0, 0);
        amt_ptr->no_of_retries = 0;


@@ -736,8 +759,11 @@ register aarp_amt_t        *amt_ptr;
        if (amt_ptr->m) {
            m = amt_ptr->m;
            amt_ptr->m = NULL;    
        if (amt_ptr->m) {
            m = amt_ptr->m;
            amt_ptr->m = NULL;    

+           ATENABLE(s, arpinp_lock);

            gbuf_freel(m);
            gbuf_freel(m);

-    }
+        }
+       else
+               ATENABLE(s, arpinp_lock);

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


@@ -776,8 +802,8 @@ StaticProc void aarp_build_pkt(pkt, elapp)
      register aarp_pkt_t *pkt;
      at_ifaddr_t *elapp;
 {
      register aarp_pkt_t *pkt;
      at_ifaddr_t *elapp;
 {

-       pkt->hardware_type = htons(AARP_ETHER_HW_TYPE);
-       pkt->stack_type = htons(AARP_AT_PROTO);
+       pkt->hardware_type = AARP_ETHER_HW_TYPE;
+       pkt->stack_type = AARP_AT_PROTO;

        pkt->hw_addr_len = ETHERNET_ADDR_LEN;
        pkt->stack_addr_len = AARP_AT_ADDR_LEN;
        bcopy(elapp->xaddr, pkt->src_addr.etalk_addr_octet, sizeof(elapp->xaddr));
        pkt->hw_addr_len = ETHERNET_ADDR_LEN;
        pkt->stack_addr_len = AARP_AT_ADDR_LEN;
        bcopy(elapp->xaddr, pkt->src_addr.etalk_addr_octet, sizeof(elapp->xaddr));


@@ -793,7 +819,7 @@ StaticProc void aarp_build_pkt(pkt, elapp)
 StaticProc void        aarp_sched_req(arg)
      void *arg;
 {
 StaticProc void        aarp_sched_req(arg)
      void *arg;
 {

-       int i;
+       int s, i;

        aarp_amt_t *amt_ptr = (aarp_amt_t *)arg;
 
        atalk_lock();
        aarp_amt_t *amt_ptr = (aarp_amt_t *)arg;
 
        atalk_lock();


@@ -811,16 +837,21 @@ StaticProc void   aarp_sched_req(arg)
            /*
             * found match - pointer is valid
             */
            /*
             * found match - pointer is valid
             */

+           ATDISABLE(s, arpinp_lock);

            if (amt_ptr->tmo == 0) {
            if (amt_ptr->tmo == 0) {

+               ATENABLE(s, arpinp_lock);

                        atalk_unlock();
                return;
            }
            if (amt_ptr->no_of_retries < AARP_MAX_REQ_RETRIES) {
                        atalk_unlock();
                return;
            }
            if (amt_ptr->no_of_retries < AARP_MAX_REQ_RETRIES) {

+               ATENABLE(s, arpinp_lock);

                if (aarp_send_req(amt_ptr) == 0) {
                                atalk_unlock();
                    return;
                }
                if (aarp_send_req(amt_ptr) == 0) {
                                atalk_unlock();
                    return;
                }

+               ATDISABLE(s, arpinp_lock);

            }
            }

+           ATENABLE(s, arpinp_lock);

            aarp_delete_amt_info(amt_ptr);
            break;
        }       
            aarp_delete_amt_info(amt_ptr);
            break;
        }       


@@ -954,8 +985,6 @@ snmpAarpEnt_t *getAarp(elapId)
        aarp_amt_t *amtp;
        static snmpAarpEnt_t  snmp[AMTSIZE];
        snmpAarpEnt_t  *snmpp;
        aarp_amt_t *amtp;
        static snmpAarpEnt_t  snmp[AMTSIZE];
        snmpAarpEnt_t  *snmpp;

-       struct atalk_addr addr;
-       u_short  tmp_net;

 
 
        if (*elapId <0 || *elapId >= IF_TOTAL_MAX)
 
 
        if (*elapId <0 || *elapId >= IF_TOTAL_MAX)


@@ -972,11 +1001,7 @@ snmpAarpEnt_t *getAarp(elapId)
                                 * & etalk_addr positions in the aarp_amt_t struct
                                 * has not changed and copy both at once
                                 */
                                 * & etalk_addr positions in the aarp_amt_t struct
                                 * has not changed and copy both at once
                                 */

-                       addr.atalk_unused = 0;          
-                       tmp_net = UAS_VALUE(amtp->dest_at_addr.atalk_net);
-                       NET_ASSIGN(addr.atalk_net, tmp_net);
-                       addr.atalk_node = amtp->dest_at_addr.atalk_node;
-                       bcopy(&addr, &snmpp->ap_ddpAddr, ENTRY_SIZE);
+                       bcopy(&amtp->dest_at_addr, &snmpp->ap_ddpAddr, ENTRY_SIZE);

                        snmpp++;
                        cnt++;
                        
                        snmpp++;
                        cnt++;