projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Forgot to #include "xalloc.h"
[tinc]
/
lib
/
ethernet.h
diff --git
a/lib/ethernet.h
b/lib/ethernet.h
index
98e7047
..
697aa44
100644
(file)
--- a/
lib/ethernet.h
+++ b/
lib/ethernet.h
@@
-17,7
+17,7
@@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- $Id: ethernet.h,v 1.1.2.
1 2003/07/18 12:16:23
guus Exp $
+ $Id: ethernet.h,v 1.1.2.
4 2003/10/06 14:16:51
guus Exp $
*/
#ifndef __TINC_ETHERNET_H__
*/
#ifndef __TINC_ETHERNET_H__
@@
-31,12
+31,19
@@
#define ARPHRD_ETHER 1
#endif
#define ARPHRD_ETHER 1
#endif
-#ifndef ETH
ERTYPE
_IP
-#define ETH
ERTYPE
_IP 0x0800
+#ifndef ETH
_P
_IP
+#define ETH
_P
_IP 0x0800
#endif
#endif
-#ifndef HAVE_NET_IF_ARP_H
+#ifndef ETH_P_ARP
+#define ETH_P_ARP 0x0806
+#endif
+
+#ifndef ETH_P_IPV6
+#define ETH_P_IPV6 0x86DD
+#endif
+#ifndef HAVE_STRUCT_ARPHDR
struct arphdr {
unsigned short int ar_hrd;
unsigned short int ar_pro;
struct arphdr {
unsigned short int ar_hrd;
unsigned short int ar_pro;
@@
-52,11
+59,9
@@
struct arphdr {
#define ARPOP_InREQUEST 8
#define ARPOP_InREPLY 9
#define ARPOP_NAK 10
#define ARPOP_InREQUEST 8
#define ARPOP_InREPLY 9
#define ARPOP_NAK 10
-
#endif
#endif
-#ifndef HAVE_NETINET_IF_ETHER_H
-
+#ifndef HAVE_STRUCT_ETHER_ARP
struct ether_arp {
struct arphdr ea_hdr;
uint8_t arp_sha[ETH_ALEN];
struct ether_arp {
struct arphdr ea_hdr;
uint8_t arp_sha[ETH_ALEN];
@@
-69,7
+74,6
@@
struct ether_arp {
#define arp_hln ea_hdr.ar_hln
#define arp_pln ea_hdr.ar_pln
#define arp_op ea_hdr.ar_op
#define arp_hln ea_hdr.ar_hln
#define arp_pln ea_hdr.ar_pln
#define arp_op ea_hdr.ar_op
-
#endif
#endif /* __TINC_ETHERNET_H__ */
#endif
#endif /* __TINC_ETHERNET_H__ */