summaryrefslogtreecommitdiff
path: root/eth-multiplexer/util.h
diff options
context:
space:
mode:
authorJustus Winter <justus@gnupg.org>2016-11-05 18:26:39 +0100
committerJustus Winter <justus@gnupg.org>2016-11-05 18:26:39 +0100
commit115695afe34e5253816ff0e828054f8c07e2ddbd (patch)
treee31d01c464d57be8240be49ede0192a924b9242c /eth-multiplexer/util.h
parentfd3b0bc1b318a2cc95ac1f85e308708c4bb8999a (diff)
eth-multiplexer: Avoid local definitions.
* eth-multiplexer/util.h: Include 'net/if_ether.h'. (ETH_ALEN): Drop. (struct ethhdr): Likewise. * eth-multiplexer/vdev.c: Include 'net/if_ether.h'. (ETH_HLEN): Drop.
Diffstat (limited to 'eth-multiplexer/util.h')
-rw-r--r--eth-multiplexer/util.h10
1 files changed, 1 insertions, 9 deletions
diff --git a/eth-multiplexer/util.h b/eth-multiplexer/util.h
index b062638d..1e062c40 100644
--- a/eth-multiplexer/util.h
+++ b/eth-multiplexer/util.h
@@ -27,6 +27,7 @@
#include <sys/types.h>
#include <sys/socket.h>
#include <arpa/inet.h>
+#include <net/if_ether.h>
#include <netinet/ip.h>
#include <mach.h>
@@ -56,15 +57,6 @@
backtrace_symbols_fd(array, size, fileno (stderr)); \
} while (0)
-#define ETH_ALEN 6 /* Octets in one ethernet addr */
-
-struct ethhdr
-{
- unsigned char h_dest[ETH_ALEN]; /* destination eth addr */
- unsigned char h_source[ETH_ALEN]; /* source ether addr */
- unsigned short h_proto; /* packet type ID field */
-};
-
static inline void
print_pack (char *packet, int len)
{