diff options
| author | Guillaume Subiron <maethor@subiron.org> | 2016-03-15 10:31:20 +0100 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2016-03-15 10:35:11 +0100 |
| commit | 98c63057d2144fb81681580cd84c13c93794c96e (patch) | |
| tree | 6f8ae513422d915b55210f4bf350c3a051daf1c4 /slirp/mbuf.c | |
| parent | 15d62af4b6068d1bac1806ca4625b6d4c475eb09 (diff) | |
slirp: Factorizing tcpiphdr structure with an union
This patch factorizes the tcpiphdr structure to put the IPv4 fields in
an union, for addition of version 6 in further patch.
Using some macros, retrocompatibility of the existing code is assured.
This patch also fixes the SLIRP_MSIZE and margin computation in various
functions, and makes them compatible with the new tcpiphdr structure,
whose size will be bigger than sizeof(struct tcphdr) + sizeof(struct ip)
Signed-off-by: Guillaume Subiron <maethor@subiron.org>
Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Diffstat (limited to 'slirp/mbuf.c')
| -rw-r--r-- | slirp/mbuf.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/slirp/mbuf.c b/slirp/mbuf.c index c959758465..d688dd43f7 100644 --- a/slirp/mbuf.c +++ b/slirp/mbuf.c @@ -22,9 +22,9 @@ /* * Find a nice value for msize - * XXX if_maxlinkhdr already in mtu */ -#define SLIRP_MSIZE (IF_MTU + IF_MAXLINKHDR + offsetof(struct mbuf, m_dat) + 6) +#define SLIRP_MSIZE\ + (offsetof(struct mbuf, m_dat) + IF_MAXLINKHDR + TCPIPHDR_DELTA + IF_MTU) void m_init(Slirp *slirp) |