[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULLv4 21/32] slirp: replace net/eth.h inclusion with own
From: |
Samuel Thibault |
Subject: |
[Qemu-devel] [PULLv4 21/32] slirp: replace net/eth.h inclusion with own defines |
Date: |
Thu, 7 Feb 2019 16:03:05 +0200 |
From: Marc-André Lureau <address@hidden>
Signed-off-by: Marc-André Lureau <address@hidden>
Signed-off-by: Samuel Thibault <address@hidden>
---
slirp/ip6.h | 1 -
slirp/slirp.h | 1 -
slirp/util.h | 10 ++++++++++
3 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/slirp/ip6.h b/slirp/ip6.h
index 1e3e329ce6..4e7c366505 100644
--- a/slirp/ip6.h
+++ b/slirp/ip6.h
@@ -7,7 +7,6 @@
#define SLIRP_IP6_H
#include <glib.h>
-#include "net/eth.h"
#define ALLNODES_MULTICAST { .s6_addr = \
{ 0xff, 0x02, 0x00, 0x00,\
diff --git a/slirp/slirp.h b/slirp/slirp.h
index 5707805be2..c9f9143801 100644
--- a/slirp/slirp.h
+++ b/slirp/slirp.h
@@ -48,7 +48,6 @@ typedef char *caddr_t;
#include "util.h"
#include "qemu/queue.h"
-#include "net/eth.h"
#include "libslirp.h"
#include "ip.h"
diff --git a/slirp/util.h b/slirp/util.h
index 4664e8159b..ef75804560 100644
--- a/slirp/util.h
+++ b/slirp/util.h
@@ -50,6 +50,16 @@
#define SCALE_MS 1000000
+#define ETH_ALEN 6
+#define ETH_HLEN 14
+#define ETH_P_IP (0x0800) /* Internet Protocol packet */
+#define ETH_P_ARP (0x0806) /* Address Resolution packet */
+#define ETH_P_IPV6 (0x86dd)
+#define ETH_P_VLAN (0x8100)
+#define ETH_P_DVLAN (0x88a8)
+#define ETH_P_NCSI (0x88f8)
+#define ETH_P_UNKNOWN (0xffff)
+
#ifdef _WIN32
int slirp_closesocket(int fd);
int slirp_ioctlsocket(int fd, int req, void *val);
--
2.20.1
- [Qemu-devel] [PULLv4 14/32] slirp: replace qemu_notify_event() with a callback, (continued)
- [Qemu-devel] [PULLv4 14/32] slirp: replace qemu_notify_event() with a callback, Samuel Thibault, 2019/02/07
- [Qemu-devel] [PULLv4 10/32] slirp: replace QEMU_PACKED with SLIRP_PACKED, Samuel Thibault, 2019/02/07
- [Qemu-devel] [PULLv4 01/32] slirp: Avoid unaligned 16bit memory access, Samuel Thibault, 2019/02/07
- [Qemu-devel] [PULLv4 20/32] slirp: remove now useless QEMU headers inclusions, Samuel Thibault, 2019/02/07
- [Qemu-devel] [PULLv4 07/32] net/slirp: fix leaks on forwarding rule registration error, Samuel Thibault, 2019/02/07
- [Qemu-devel] [PULLv4 24/32] slirp: Move g_spawn_async_with_fds_qemu compatibility to slirp/, Samuel Thibault, 2019/02/07
- [Qemu-devel] [PULLv4 05/32] net/slirp: simplify checking for cmd: prefix, Samuel Thibault, 2019/02/07
- [Qemu-devel] [PULLv4 06/32] net/slirp: free forwarding rules on cleanup, Samuel Thibault, 2019/02/07
- [Qemu-devel] [PULLv4 11/32] slirp: replace most qemu socket utilities with slirp own version, Samuel Thibault, 2019/02/07
- [Qemu-devel] [PULLv4 15/32] slirp: move QEMU state saving to a separate unit, Samuel Thibault, 2019/02/07
- [Qemu-devel] [PULLv4 21/32] slirp: replace net/eth.h inclusion with own defines,
Samuel Thibault <=
- [Qemu-devel] [PULLv4 04/32] slirp: generalize guestfwd with a callback based approach, Samuel Thibault, 2019/02/07
- [Qemu-devel] [PULLv4 19/32] slirp: remove qemu timer.h dependency, Samuel Thibault, 2019/02/07
- [Qemu-devel] [PULLv4 16/32] slirp: do not include qemu headers in libslirp.h public API header, Samuel Thibault, 2019/02/07
- [Qemu-devel] [PULLv4 31/32] slirp: pass opaque to all callbacks, Samuel Thibault, 2019/02/07
- [Qemu-devel] [PULLv4 18/32] slirp: add slirp own version of pstrcpy, Samuel Thibault, 2019/02/07
- [Qemu-devel] [PULLv4 25/32] slirp: replace remaining qemu headers dependency, Samuel Thibault, 2019/02/07
- [Qemu-devel] [PULLv4 30/32] slirp: use polling callbacks, drop glib requirement, Samuel Thibault, 2019/02/07
- [Qemu-devel] [PULLv4 22/32] slirp: replace qemu qtailq with slirp own copy, Samuel Thibault, 2019/02/07
- [Qemu-devel] [PULLv4 26/32] slirp: prefer c99 types over BSD kind, Samuel Thibault, 2019/02/07
- [Qemu-devel] [PULLv4 32/32] slirp: API is extern C, Samuel Thibault, 2019/02/07