projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Allow "tinc --force join" to accept all variables sent in an invitaiton.
[tinc]
/
src
/
ethernet.h
diff --git
a/src/ethernet.h
b/src/ethernet.h
index
2165c51
..
086f572
100644
(file)
--- a/
src/ethernet.h
+++ b/
src/ethernet.h
@@
-1,3
+1,6
@@
+#ifndef TINC_ETHERNET_H
+#define TINC_ETHERNET_H
+
/*
ethernet.h -- missing Ethernet related definitions
Copyright (C) 2005 Ivo Timmermans
/*
ethernet.h -- missing Ethernet related definitions
Copyright (C) 2005 Ivo Timmermans
@@
-18,13
+21,19
@@
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#ifndef __TINC_ETHERNET_H__
-#define __TINC_ETHERNET_H__
-
#ifndef ETH_ALEN
#define ETH_ALEN 6
#endif
#ifndef ETH_ALEN
#define ETH_ALEN 6
#endif
+#ifndef ETH_HLEN
+#define ETH_HLEN 14
+#endif
+
+#ifndef ETHER_TYPE_LEN
+#define ETHER_TYPE_LEN 2
+#endif
+
+
#ifndef ARPHRD_ETHER
#define ARPHRD_ETHER 1
#endif
#ifndef ARPHRD_ETHER
#define ARPHRD_ETHER 1
#endif
@@
-54,7
+63,7
@@
struct ether_header {
uint8_t ether_dhost[ETH_ALEN];
uint8_t ether_shost[ETH_ALEN];
uint16_t ether_type;
uint8_t ether_dhost[ETH_ALEN];
uint8_t ether_shost[ETH_ALEN];
uint16_t ether_type;
-} __attribute__
((__gcc_struct__,
__packed__));
+} __attribute__
((__gcc_struct__)) __attribute((
__packed__));
#endif
#ifndef HAVE_STRUCT_ARPHDR
#endif
#ifndef HAVE_STRUCT_ARPHDR
@@
-64,7
+73,7
@@
struct arphdr {
uint8_t ar_hln;
uint8_t ar_pln;
uint16_t ar_op;
uint8_t ar_hln;
uint8_t ar_pln;
uint16_t ar_op;
-} __attribute__
((__gcc_struct__,
__packed__));
+} __attribute__
((__gcc_struct__)) __attribute((
__packed__));
#define ARPOP_REQUEST 1
#define ARPOP_REPLY 2
#define ARPOP_REQUEST 1
#define ARPOP_REPLY 2
@@
-82,7
+91,7
@@
struct ether_arp {
uint8_t arp_spa[4];
uint8_t arp_tha[ETH_ALEN];
uint8_t arp_tpa[4];
uint8_t arp_spa[4];
uint8_t arp_tha[ETH_ALEN];
uint8_t arp_tpa[4];
-} __attribute__
((__gcc_struct__,
__packed__));
+} __attribute__
((__gcc_struct__)) __attribute((
__packed__));
#define arp_hrd ea_hdr.ar_hrd
#define arp_pro ea_hdr.ar_pro
#define arp_hln ea_hdr.ar_hln
#define arp_hrd ea_hdr.ar_hrd
#define arp_pro ea_hdr.ar_pro
#define arp_hln ea_hdr.ar_hln
@@
-90,4
+99,4
@@
struct ether_arp {
#define arp_op ea_hdr.ar_op
#endif
#define arp_op ea_hdr.ar_op
#endif
-#endif
/* __TINC_ETHERNET_H__ */
+#endif