diff options
| author | Sjors Gielen <sjors@sjorsgielen.nl> | 2017-05-24 17:51:12 +0000 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2017-05-27 23:35:00 +0200 |
| commit | 2e30230aa95a2d6cfaadac015bd96c3db19c45e4 (patch) | |
| tree | 0cedced68b51179583808ccdd6cc5e289886c35f /slirp | |
| parent | 7d8246960e03dabf37726c01d231e89dfde9b229 (diff) | |
| download | qemu-2e30230aa95a2d6cfaadac015bd96c3db19c45e4.zip qemu-2e30230aa95a2d6cfaadac015bd96c3db19c45e4.tar.gz qemu-2e30230aa95a2d6cfaadac015bd96c3db19c45e4.tar.bz2 | |
Fix total IP header length in forwarded TCP packets
When forwarding TCP packets, the internal tcpiphdr struct length was wrongly
used inside the IP header. This commit changes the behaviour to what is used
by tcp_output.c, using the correct full IP header + payload length.
Signed-off-by: Sjors Gielen <sjors@sjorsgielen.nl>
Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
Diffstat (limited to 'slirp')
| -rw-r--r-- | slirp/tcp_subr.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/slirp/tcp_subr.c b/slirp/tcp_subr.c index ed16e18..dc8b4bb 100644 --- a/slirp/tcp_subr.c +++ b/slirp/tcp_subr.c @@ -204,7 +204,7 @@ tcp_respond(struct tcpcb *tp, struct tcpiphdr *ti, struct mbuf *m, m->m_len -= sizeof(struct tcpiphdr) - sizeof(struct tcphdr) - sizeof(struct ip); ip = mtod(m, struct ip *); - ip->ip_len = tlen; + ip->ip_len = m->m_len; ip->ip_dst = tcpiph_save.ti_dst; ip->ip_src = tcpiph_save.ti_src; ip->ip_p = tcpiph_save.ti_pr; @@ -224,7 +224,7 @@ tcp_respond(struct tcpcb *tp, struct tcpiphdr *ti, struct mbuf *m, m->m_len -= sizeof(struct tcpiphdr) - sizeof(struct tcphdr) - sizeof(struct ip6); ip6 = mtod(m, struct ip6 *); - ip6->ip_pl = tlen; + ip6->ip_pl = tcpiph_save.ti_len; ip6->ip_dst = tcpiph_save.ti_dst6; ip6->ip_src = tcpiph_save.ti_src6; ip6->ip_nh = tcpiph_save.ti_nh6; |