Add changes in 4.2.1.

[tcpdump] / ether.h

diff --git a/ether.h b/ether.h
index c68f25c089ce0c63a9874481c5bad8923c7355e5..e8b3a7138dd586715f3081f57ef5f466cd2f5422 100644 (file)
--- a/ether.h
+++ b/ether.h
@@ -1,4 +1,4 @@
-/* @(#) $Header: /tcpdump/master/tcpdump/ether.h,v 1.4 2000-10-03 02:54:55 itojun Exp $ (LBL) */
+/* @(#) $Header: /tcpdump/master/tcpdump/ether.h,v 1.8 2002-12-11 07:13:51 guy Exp $ (LBL) */

 /*
  * Copyright (c) 1982, 1986, 1993
  *     The Regents of the University of California.  All rights reserved.
 /*
  * Copyright (c) 1982, 1986, 1993
  *     The Regents of the University of California.  All rights reserved.


@@ -42,17 +42,18 @@
 #define        ETHER_ADDR_LEN          6
 
 /*
 #define        ETHER_ADDR_LEN          6
 
 /*

- * Ethernet address - 6 octets
- */
-struct ether_addr {
-       u_int8_t        ether_addr_octet[ETHER_ADDR_LEN];
-};
-
-/*
- * Structure of a 10Mb/s Ethernet header.
+ * Structure of a DEC/Intel/Xerox or 802.3 Ethernet header.

  */
 struct ether_header {
        u_int8_t        ether_dhost[ETHER_ADDR_LEN];
        u_int8_t        ether_shost[ETHER_ADDR_LEN];
        u_int16_t       ether_type;
 };
  */
 struct ether_header {
        u_int8_t        ether_dhost[ETHER_ADDR_LEN];
        u_int8_t        ether_shost[ETHER_ADDR_LEN];
        u_int16_t       ether_type;
 };

+
+/*
+ * Length of a DEC/Intel/Xerox or 802.3 Ethernet header; note that some
+ * compilers may pad "struct ether_header" to a multiple of 4 bytes,
+ * for example, so "sizeof (struct ether_header)" may not give the right
+ * answer.
+ */
+#define ETHER_HDRLEN           14