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/socket.c | |
| parent | 15d62af4b6068d1bac1806ca4625b6d4c475eb09 (diff) | |
| download | focaccia-qemu-98c63057d2144fb81681580cd84c13c93794c96e.tar.gz focaccia-qemu-98c63057d2144fb81681580cd84c13c93794c96e.zip | |
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/socket.c')
| -rw-r--r-- | slirp/socket.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/slirp/socket.c b/slirp/socket.c index 55150f5e5e..8df9252544 100644 --- a/slirp/socket.c +++ b/slirp/socket.c @@ -483,7 +483,18 @@ sorecvfrom(struct socket *so) if (!m) { return; } - m->m_data += IF_MAXLINKHDR; + switch (so->so_ffamily) { + case AF_INET: + m->m_data += IF_MAXLINKHDR + sizeof(struct udpiphdr); + break; + case AF_INET6: + m->m_data += IF_MAXLINKHDR + sizeof(struct ip6) + + sizeof(struct udphdr); + break; + default: + g_assert_not_reached(); + break; + } /* * XXX Shouldn't FIONREAD packets destined for port 53, |