diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2012-03-22 01:02:51 +0100 |
|---|---|---|
| committer | Jan Kiszka <jan.kiszka@siemens.com> | 2012-03-28 20:33:16 +0200 |
| commit | 2e37cbed7cb15e6287d07ab0ceb60a2738eb2ce1 (patch) | |
| tree | 4a623b6a17b9c36e79b57c7085666b424d94d76b | |
| parent | 36672d4debf5ba5ee5098f026da3e52f2d39c3d9 (diff) | |
| download | slirp-2e37cbed7cb15e6287d07ab0ceb60a2738eb2ce1.zip slirp-2e37cbed7cb15e6287d07ab0ceb60a2738eb2ce1.tar.gz slirp-2e37cbed7cb15e6287d07ab0ceb60a2738eb2ce1.tar.bz2 | |
slirp: clean up conflicts with system headers
Right now, slirp/slirp.h cannot include some system headers and,
indirectly, qemu_socket.h. Clean this up, and remove a duplicate
prototype that was introduced because of that.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
| -rw-r--r-- | slirp.h | 8 | ||||
| -rw-r--r-- | tcp.h | 21 |
2 files changed, 16 insertions, 13 deletions
@@ -88,10 +88,6 @@ void *malloc(size_t arg); void free(void *ptr); #endif -#ifndef HAVE_INET_ATON -int inet_aton(const char *cp, struct in_addr *ia); -#endif - #include <fcntl.h> #ifndef NO_UNIX_SOCKETS #include <sys/un.h> @@ -144,6 +140,7 @@ int inet_aton(const char *cp, struct in_addr *ia); #include "debug.h" #include "qemu-queue.h" +#include "qemu_socket.h" #include "libslirp.h" #include "ip.h" @@ -167,9 +164,6 @@ int inet_aton(const char *cp, struct in_addr *ia); #include "bootp.h" #include "tftp.h" -/* osdep.c */ -int qemu_socket(int domain, int type, int protocol); - #define ETH_ALEN 6 #define ETH_HLEN 14 @@ -45,6 +45,7 @@ typedef uint32_t tcp_seq; * TCP header. * Per RFC 793, September, 1981. */ +#define tcphdr slirp_tcphdr struct tcphdr { uint16_t th_sport; /* source port */ uint16_t th_dport; /* destination port */ @@ -58,12 +59,6 @@ struct tcphdr { th_off : 4; /* data offset */ #endif uint8_t th_flags; -#define TH_FIN 0x01 -#define TH_SYN 0x02 -#define TH_RST 0x04 -#define TH_PUSH 0x08 -#define TH_ACK 0x10 -#define TH_URG 0x20 uint16_t th_win; /* window */ uint16_t th_sum; /* checksum */ uint16_t th_urp; /* urgent pointer */ @@ -71,6 +66,16 @@ struct tcphdr { #include "tcp_var.h" +#ifndef TH_FIN +#define TH_FIN 0x01 +#define TH_SYN 0x02 +#define TH_RST 0x04 +#define TH_PUSH 0x08 +#define TH_ACK 0x10 +#define TH_URG 0x20 +#endif + +#ifndef TCPOPT_EOL #define TCPOPT_EOL 0 #define TCPOPT_NOP 1 #define TCPOPT_MAXSEG 2 @@ -87,6 +92,7 @@ struct tcphdr { #define TCPOPT_TSTAMP_HDR \ (TCPOPT_NOP << 24 | TCPOPT_NOP << 16 | TCPOPT_TIMESTAMP << 8 | \ TCPOLEN_TIMESTAMP) +#endif /* * Default maximum segment size for TCP. @@ -96,10 +102,13 @@ struct tcphdr { * * We make this 1460 because we only care about Ethernet in the qemu context. */ +#undef TCP_MSS #define TCP_MSS 1460 +#undef TCP_MAXWIN #define TCP_MAXWIN 65535 /* largest value for (unscaled) window */ +#undef TCP_MAX_WINSHIFT #define TCP_MAX_WINSHIFT 14 /* maximum window shift */ /* |