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 2c8ee63..b36ae59 100644 (file)
--- a/usr/src/sys/netinet/if_ether.h
+++ b/usr/src/sys/netinet/if_ether.h
@@ -1,9 +1,20 @@
 /*
 /*

- * Copyright (c) 1982 Regents of the University of California.
- * All rights reserved.  The Berkeley software License Agreement
- * specifies the terms and conditions for redistribution.
+ * Copyright (c) 1982, 1986 Regents of the University of California.
+ * All rights reserved.

  *
  *

- *     @(#)if_ether.h  6.5 (Berkeley) %G%
+ * 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%

  */
 
 /*
  */
 
 /*


@@ -21,8 +32,8 @@ struct        ether_header {
 
 /*
  * The ETHERTYPE_NTRAILER packet types starting at ETHERTYPE_TRAIL have
 
 /*
  * The ETHERTYPE_NTRAILER packet types starting at ETHERTYPE_TRAIL have

- * (type-ETHERPUP_TRAIL)*512 bytes of data followed
- * by a PUP type (as given above) and then the (variable-length) header.
+ * (type-ETHERTYPE_TRAIL)*512 bytes of data followed
+ * by an ETHER type (as given above) and then the (variable-length) header.

  */
 #define        ETHERTYPE_TRAIL         0x1000          /* Trailer packet */
 #define        ETHERTYPE_NTRAILER      16
  */
 #define        ETHERTYPE_TRAIL         0x1000          /* Trailer packet */
 #define        ETHERTYPE_NTRAILER      16


@@ -38,19 +49,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 */
+       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
+

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


@@ -69,12 +79,13 @@ struct      arpcom {
 struct arptab {
        struct  in_addr at_iaddr;       /* internet address */
        u_char  at_enaddr[6];           /* ethernet address */
 struct arptab {
        struct  in_addr at_iaddr;       /* internet address */
        u_char  at_enaddr[6];           /* ethernet address */

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

        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
 u_char etherbroadcastaddr[6];
 struct arptab *arptnew();
 };
 
 #ifdef KERNEL
 u_char etherbroadcastaddr[6];
 struct arptab *arptnew();

+char *ether_sprintf();

 #endif
 #endif