ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'kiszka/queues/slirp' into staging 

* kiszka/queues/slirp:
  slirp: Avoid redefining MAX_TCPOPTLEN
  slirp: Avoid statements without effect on Big Endian host
  slirp: Untangle TCPOLEN_* from TCPOPT_*
This commit is contained in:
Anthony Liguori 2012-05-29 04:30:00 -05:00
parent d501f8478a 917cfc1f26
commit 7943df571a
3 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
slirp/ip.h
View File

@ -34,18 +34,14 @@
#define _IP_H_ #define _IP_H_
#ifdef HOST_WORDS_BIGENDIAN #ifdef HOST_WORDS_BIGENDIAN
# ifndef NTOHL # undef NTOHL
# define NTOHL(d) # undef NTOHS
# endif # undef HTONL
# ifndef NTOHS # undef HTONS
# define NTOHS(d) # define NTOHL(d)
# endif # define NTOHS(d)
# ifndef HTONL # define HTONL(d)
# define HTONL(d) # define HTONS(d)
# endif
# ifndef HTONS
# define HTONS(d)
# endif
#else #else
# ifndef NTOHL # ifndef NTOHL
# define NTOHL(d) ((d) = ntohl((d))) # define NTOHL(d) ((d) = ntohl((d)))

13
slirp/tcp.h
View File

@ -79,20 +79,23 @@ struct tcphdr {
#define TCPOPT_EOL 0 #define TCPOPT_EOL 0
#define TCPOPT_NOP 1 #define TCPOPT_NOP 1
#define TCPOPT_MAXSEG 2 #define TCPOPT_MAXSEG 2
#define TCPOLEN_MAXSEG 4
#define TCPOPT_WINDOW 3 #define TCPOPT_WINDOW 3
#define TCPOLEN_WINDOW 3
#define TCPOPT_SACK_PERMITTED 4 /* Experimental */ #define TCPOPT_SACK_PERMITTED 4 /* Experimental */
#define TCPOLEN_SACK_PERMITTED 2
#define TCPOPT_SACK 5 /* Experimental */ #define TCPOPT_SACK 5 /* Experimental */
#define TCPOPT_TIMESTAMP 8 #define TCPOPT_TIMESTAMP 8
#define TCPOLEN_TIMESTAMP 10
#define TCPOLEN_TSTAMP_APPA (TCPOLEN_TIMESTAMP+2) /* appendix A */
#define TCPOPT_TSTAMP_HDR \ #define TCPOPT_TSTAMP_HDR \
(TCPOPT_NOP<<24|TCPOPT_NOP<<16|TCPOPT_TIMESTAMP<<8|TCPOLEN_TIMESTAMP) (TCPOPT_NOP<<24|TCPOPT_NOP<<16|TCPOPT_TIMESTAMP<<8|TCPOLEN_TIMESTAMP)
#endif #endif
#ifndef TCPOLEN_MAXSEG
#define TCPOLEN_MAXSEG 4
#define TCPOLEN_WINDOW 3
#define TCPOLEN_SACK_PERMITTED 2
#define TCPOLEN_TIMESTAMP 10
#define TCPOLEN_TSTAMP_APPA (TCPOLEN_TIMESTAMP+2) /* appendix A */
#endif
/* /*
* Default maximum segment size for TCP. * Default maximum segment size for TCP.
* With an IP MSS of 576, this is 536, * With an IP MSS of 576, this is 536,

1
slirp/tcp_output.c
View File

@ -47,6 +47,7 @@ static const u_char tcp_outflags[TCP_NSTATES] = {
}; };
#undef MAX_TCPOPTLEN
#define MAX_TCPOPTLEN 32 /* max # bytes that go in options */ #define MAX_TCPOPTLEN 32 /* max # bytes that go in options */
/* /*