BSD 4_3_Net_2 release

[unix-history] / usr / src / sys / netinet / if_ether.h

diff --git a/usr/src/sys/netinet/if_ether.h b/usr/src/sys/netinet/if_ether.h
index 4340506..ef86f7c 100644 (file)
--- a/usr/src/sys/netinet/if_ether.h
+++ b/usr/src/sys/netinet/if_ether.h
@@ -1,32 +1,58 @@
-/*     if_ether.h      6.3     84/03/20        */
-

 /*
 /*

- * Ethernet address - 6 octets
+ * Copyright (c) 1982, 1986 Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *     @(#)if_ether.h  7.5 (Berkeley) 6/28/90

  */
  */

-struct ether_addr {
-       u_char  ether_addr_octet[6];
-};

 
 /*
  * Structure of a 10Mb/s Ethernet header.
  */
 struct ether_header {
 
 /*
  * Structure of a 10Mb/s Ethernet header.
  */
 struct ether_header {

-       struct  ether_addr ether_dhost;
-       struct  ether_addr ether_shost;
+       u_char  ether_dhost[6];
+       u_char  ether_shost[6];

        u_short ether_type;
 };
 
        u_short ether_type;
 };
 

-#define        ETHERPUP_PUPTYPE        0x0200          /* PUP protocol */
-#define        ETHERPUP_IPTYPE         0x0800          /* IP protocol */
-#define ETHERPUP_ARPTYPE       0x0806          /* Addr. resolution protocol */
+#define        ETHERTYPE_PUP   0x0200          /* PUP protocol */
+#define        ETHERTYPE_IP    0x0800          /* IP protocol */
+#define ETHERTYPE_ARP  0x0806          /* Addr. resolution protocol */

 
 /*
 
 /*

- * The ETHERPUP_NTRAILER packet types starting at ETHERPUP_TRAIL have
- * (type-ETHERPUP_TRAIL)*512 bytes of data followed
- * by a PUP type (as given above) and then the (variable-length) header.
+ * The ETHERTYPE_NTRAILER packet types starting at ETHERTYPE_TRAIL have
+ * (type-ETHERTYPE_TRAIL)*512 bytes of data followed
+ * by an ETHER type (as given above) and then the (variable-length) header.

  */
  */

-#define        ETHERPUP_TRAIL          0x1000          /* Trailer PUP */
-#define        ETHERPUP_NTRAILER       16
+#define        ETHERTYPE_TRAIL         0x1000          /* Trailer packet */
+#define        ETHERTYPE_NTRAILER      16

 
 #define        ETHERMTU        1500
 #define        ETHERMIN        (60-14)
 
 #define        ETHERMTU        1500
 #define        ETHERMIN        (60-14)


@@ -39,23 +65,18 @@ struct      ether_header {
  * RFC 826.
  */
 struct ether_arp {
  * RFC 826.
  */
 struct ether_arp {

-       u_short arp_hrd;        /* format of hardware address */
-#define ARPHRD_ETHER   1       /* ethernet hardware address */
-       u_short arp_pro;        /* format of proto. address (ETHERPUP_IPTYPE) */
-       u_char  arp_hln;        /* length of hardware address (6) */
-       u_char  arp_pln;        /* length of protocol address (4) */
-       u_short arp_op;
-#define        ARPOP_REQUEST   1       /* request to resolve address */
-#define        ARPOP_REPLY     2       /* response to previous request */
-       u_char  arp_xsha[6];    /* sender hardware address */
-       u_char  arp_xspa[4];    /* sender protocol address */
-       u_char  arp_xtha[6];    /* target hardware address */
-       u_char  arp_xtpa[4];    /* target protocol address */
+       struct  arphdr ea_hdr;  /* fixed-size header */
+       u_char  arp_sha[6];     /* sender hardware address */
+       u_char  arp_spa[4];     /* sender protocol address */
+       u_char  arp_tha[6];     /* target hardware address */
+       u_char  arp_tpa[4];     /* target protocol address */

 };
 };

-#define        arp_sha(ea)     (*(struct ether_addr *)(ea)->arp_xsha)
-#define        arp_spa(ea)     (*(struct in_addr *)(ea)->arp_xspa)
-#define        arp_tha(ea)     (*(struct ether_addr *)(ea)->arp_xtha)
-#define        arp_tpa(ea)     (*(struct in_addr *)(ea)->arp_xtpa)
+#define        arp_hrd ea_hdr.ar_hrd
+#define        arp_pro ea_hdr.ar_pro
+#define        arp_hln ea_hdr.ar_hln
+#define        arp_pln ea_hdr.ar_pln
+#define        arp_op  ea_hdr.ar_op
+

 
 /*
  * Structure shared between the ethernet driver modules and
 
 /*
  * Structure shared between the ethernet driver modules and


@@ -63,8 +84,9 @@ struct        ether_arp {
  * begins with this structure.
  */
 struct arpcom {
  * begins with this structure.
  */
 struct arpcom {

-       struct  ifnet ac_if;    /* network-visible interface */
-       struct ether_addr ac_enaddr;    /* ethernet hardware address */
+       struct  ifnet ac_if;            /* network-visible interface */
+       u_char  ac_enaddr[6];           /* ethernet hardware address */
+       struct in_addr ac_ipaddr;       /* copy of ip address- XXX */

 };
 
 /*
 };
 
 /*


@@ -72,13 +94,15 @@ struct      arpcom {
  */
 struct arptab {
        struct  in_addr at_iaddr;       /* internet address */
  */
 struct arptab {
        struct  in_addr at_iaddr;       /* internet address */

-       struct  ether_addr at_enaddr;   /* ethernet address */
-       struct  mbuf *at_hold;          /* last packet until resolved/timeout */
+       u_char  at_enaddr[6];           /* ethernet address */

        u_char  at_timer;               /* minutes since last reference */
        u_char  at_flags;               /* flags */
        u_char  at_timer;               /* minutes since last reference */
        u_char  at_flags;               /* flags */

+       struct  mbuf *at_hold;          /* last packet until resolved/timeout */

 };
 
 #ifdef KERNEL
 };
 
 #ifdef KERNEL

-struct ether_addr etherbroadcastaddr;
+u_char etherbroadcastaddr[6];

 struct arptab *arptnew();
 struct arptab *arptnew();

+int    ether_output(), ether_input();
+char   *ether_sprintf();

 #endif
 #endif