date and time created 88/12/14 15:29:27 by sklower

[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 f7a9dde..b36ae59 100644 (file)
--- a/usr/src/sys/netinet/if_ether.h
+++ b/usr/src/sys/netinet/if_ether.h
@@ -1,4 +1,21 @@
-/*     if_ether.h      4.4     83/03/15        */
+/*
+ * Copyright (c) 1982, 1986 Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that the above copyright notice and this paragraph are
+ * duplicated in all such forms and that any documentation,
+ * advertising materials, and other materials related to such
+ * distribution and use acknowledge that the software was developed
+ * by the University of California, Berkeley.  The name of the
+ * University may not be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ *     @(#)if_ether.h  7.3 (Berkeley) %G%
+ */

 
 /*
  * Structure of a 10Mb/s Ethernet header.
 
 /*
  * Structure of a 10Mb/s Ethernet header.


@@ -9,23 +26,21 @@ struct       ether_header {
        u_short ether_type;
 };
 
        u_short ether_type;
 };
 

-#define        ETHERPUP_PUPTYPE        0x0400          /* 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)
 

-u_char etherbroadcastaddr[6];                  /* 6 bytes of 0xFF */
-

 /*
  * Ethernet Address Resolution Protocol.
  *
 /*
  * Ethernet Address Resolution Protocol.
  *


@@ -34,32 +49,43 @@ u_char etherbroadcastaddr[6];                       /* 6 bytes of 0xFF */
  * 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 */
+       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 */
 };
        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_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
+

 
 

-#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 {
 /*
  * 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 {

-       struct  ifnet ac_if;    /* network-visible interface */
-       u_char  ac_enaddr[6];   /* ethernet hardware address */
-       struct  arpcom *ac_ac;  /* link to next ether driver */
+       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 */
+};
+
+/*
+ * Internet to ethernet address resolution table.
+ */
+struct arptab {
+       struct  in_addr at_iaddr;       /* internet address */
+       u_char  at_enaddr[6];           /* ethernet address */
+       u_char  at_timer;               /* minutes since last reference */
+       u_char  at_flags;               /* flags */
+       struct  mbuf *at_hold;          /* last packet until resolved/timeout */

 };
 
 };
 

-struct in_addr arpmyaddr();
+#ifdef KERNEL
+u_char etherbroadcastaddr[6];

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

+char *ether_sprintf();

 #endif
 #endif