|
1099
|
1 |
--- ether.h.old Wed May 7 17:49:52 2008
|
|
|
2 |
+++ ether.h Wed May 7 17:52:24 2008
|
|
|
3 |
@@ -34,8 +34,15 @@
|
|
|
4 |
* @(#)if_ether.h 8.3 (Berkeley) 5/2/95
|
|
|
5 |
*/
|
|
|
6 |
|
|
|
7 |
+#if 0
|
|
|
8 |
#define ETHERMTU 1500
|
|
|
9 |
+#endif
|
|
|
10 |
|
|
|
11 |
+struct mbuf; /* Squelch compiler warnings on some platforms for */
|
|
|
12 |
+struct rtentry; /* declarations in <net/if.h> */
|
|
|
13 |
+#include <net/if.h> /* for "struct ifnet" in "struct arpcom" on Solaris */
|
|
|
14 |
+#include <netinet/if_ether.h>
|
|
|
15 |
+
|
|
|
16 |
/*
|
|
|
17 |
* The number of bytes in an ethernet (MAC) address.
|
|
|
18 |
*/
|
|
|
19 |
@@ -44,11 +51,13 @@
|
|
|
20 |
/*
|
|
|
21 |
* Structure of a DEC/Intel/Xerox or 802.3 Ethernet header.
|
|
|
22 |
*/
|
|
|
23 |
+#if 0
|
|
|
24 |
struct ether_header {
|
|
|
25 |
u_int8_t ether_dhost[ETHER_ADDR_LEN];
|
|
|
26 |
u_int8_t ether_shost[ETHER_ADDR_LEN];
|
|
|
27 |
u_int16_t ether_type;
|
|
|
28 |
};
|
|
|
29 |
+#endif
|
|
|
30 |
|
|
|
31 |
/*
|
|
|
32 |
* Length of a DEC/Intel/Xerox or 802.3 Ethernet header; note that some
|
|
|
33 |
--- interface.h.old Wed May 7 17:57:16 2008
|
|
|
34 |
+++ interface.h Wed May 7 17:57:25 2008
|
|
|
35 |
@@ -97,8 +97,8 @@
|
|
|
36 |
#define LITTLE_ENDIAN 1234
|
|
|
37 |
#endif
|
|
|
38 |
|
|
|
39 |
-#define ESRC(ep) ((ep)->ether_shost)
|
|
|
40 |
-#define EDST(ep) ((ep)->ether_dhost)
|
|
|
41 |
+#define ESRC(ep) ((u_char *) &(ep)->ether_shost)
|
|
|
42 |
+#define EDST(ep) ((u_char *) &(ep)->ether_dhost)
|
|
|
43 |
|
|
|
44 |
#ifndef NTOHL
|
|
|
45 |
#define NTOHL(x) (x) = ntohl(x)
|
|
|
46 |
--- netdissect.h.old Wed May 7 17:57:37 2008
|
|
|
47 |
+++ netdissect.h Wed May 7 17:57:50 2008
|
|
|
48 |
@@ -180,8 +180,8 @@
|
|
|
49 |
#define LITTLE_ENDIAN 1234
|
|
|
50 |
#endif
|
|
|
51 |
|
|
|
52 |
-#define ESRC(ep) ((ep)->ether_shost)
|
|
|
53 |
-#define EDST(ep) ((ep)->ether_dhost)
|
|
|
54 |
+#define ESRC(ep) ((u_char *) &(ep)->ether_shost)
|
|
|
55 |
+#define EDST(ep) ((u_char *) &(ep)->ether_dhost)
|
|
|
56 |
|
|
|
57 |
#ifndef NTOHL
|
|
|
58 |
#define NTOHL(x) (x) = ntohl(x)
|