xnu-1699.26.8.tar.gz

[apple/xnu.git] / bsd / net / if_arp.h

diff --git a/bsd/net/if_arp.h b/bsd/net/if_arp.h
index 9718e6291206450ca22a11c3d0417368f4613a56..0a6c2e874f4253cea058a01147d5dd55a3639da5 100644 (file)
--- a/bsd/net/if_arp.h
+++ b/bsd/net/if_arp.h
@@ -1,16 +1,19 @@
 /*
  * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
  *
 /*
  * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
  *

- * @APPLE_LICENSE_HEADER_START@
- * 
- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@

  * 
  * 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
  * 
  * 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. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
+ * 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
  * 
  * The Original Code and all software distributed under the License are
  * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER


@@ -20,7 +23,7 @@
  * Please see the License for the specific language governing rights and
  * limitations under the License.
  * 
  * 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) 1986, 1993
  */
 /*
  * Copyright (c) 1986, 1993


@@ -78,6 +81,8 @@ struct        arphdr {
 #define ARPHRD_ETHER   1       /* ethernet hardware format */
 #define ARPHRD_IEEE802 6       /* token-ring hardware format */
 #define ARPHRD_FRELAY  15      /* frame relay hardware format */
 #define ARPHRD_ETHER   1       /* ethernet hardware format */
 #define ARPHRD_IEEE802 6       /* token-ring hardware format */
 #define ARPHRD_FRELAY  15      /* frame relay hardware format */

+#define ARPHRD_IEEE1394        24      /* IEEE1394 hardware address */
+#define ARPHRD_IEEE1394_EUI64 27 /* IEEE1394 EUI-64 */

        u_short ar_pro;         /* format of protocol address */
        u_char  ar_hln;         /* length of hardware address */
        u_char  ar_pln;         /* length of protocol address */
        u_short ar_pro;         /* format of protocol address */
        u_char  ar_hln;         /* length of hardware address */
        u_char  ar_pln;         /* length of protocol address */


@@ -115,58 +120,4 @@ struct arpreq {
 #define        ATF_PUBL        0x08    /* publish entry (respond for other host) */
 #define        ATF_USETRAILERS 0x10    /* has requested trailers */
 
 #define        ATF_PUBL        0x08    /* publish entry (respond for other host) */
 #define        ATF_USETRAILERS 0x10    /* has requested trailers */
 

-#ifdef __APPLE_API_UNSTABLE
-
-#ifdef __APPLE__
-/*
- * Ethernet multicast address structure.  There is one of these for each
- * multicast address or range of multicast addresses that we are supposed
- * to listen to on a particular interface.  They are kept in a linked list,
- * rooted in the interface's arpcom structure.  (This really has nothing to
- * do with ARP, or with the Internet address family, but this appears to be
- * the minimally-disrupting place to put it.)
- */
-struct ether_multi {
-       u_char  enm_addrlo[6];          /* low  or only address of range */
-       u_char  enm_addrhi[6];          /* high or only address of range */
-       struct  arpcom *enm_ac;         /* back pointer to arpcom */
-       u_int   enm_refcount;           /* no. claims to this addr/range */
-       struct  ether_multi *enm_next;  /* ptr to next ether_multi */
-};
-
-/*
- * Structure used by macros below to remember position when stepping through
- * all of the ether_multi records.
- */
-struct ether_multistep {
-       struct ether_multi  *e_enm;
-};
-#endif /* __APPLE__ */
-
-#ifdef KERNEL
-/*
- * Structure shared between the ethernet driver modules and
- * the address resolution code.  For example, each ec_softc or il_softc
- * begins with this structure.
- */
-struct arpcom {
-       /*
-        * The ifnet struct _must_ be at the head of this structure.
-        */
-       struct  ifnet ac_if;            /* network-visible interface */
-       u_char  ac_enaddr[6];           /* ethernet hardware address */
-#ifdef __APPLE__
-       struct  in_addr ac_ipaddr;      /* copy of ip address- XXX */
-       struct  ether_multi *ac_multiaddrs; /* list of ether multicast addrs */
-#endif
-       int     ac_multicnt;            /* length of ac_multiaddrs list */
-#ifndef __APPLE__
-       void    *ac_netgraph;           /* ng_ether(4) netgraph node info */
-#endif
-};
-
-
-#endif
-#endif /* __APPLE_API_UNSTABLE */
-

 #endif /* !_NET_IF_ARP_H_ */
 #endif /* !_NET_IF_ARP_H_ */