motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-02 15:23:53 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

slirp: Handle IPv6 in TCP functions

Browse source 
This patch adds IPv6 case in TCP functions refactored by the last
patches.
This also adds IPv6 pseudo-header in tcpiphdr structure.
Finally, tcp_input() is called by ip6_input().

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>
This commit is contained in:
Guillaume Subiron 2016-03-15 10:31:21 +01:00 • committed by Samuel Thibault
parent 1252cf40a8
commit 3feea4447f
6 changed files with 125 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

32
slirp/tcp_subr.c
View file

@ -88,6 +88,15 @@ tcp_template(struct tcpcb *tp)
n->ti_dport = so->so_lport;
break;
case AF_INET6:
n->ti_nh6 = IPPROTO_TCP;
n->ti_len = htons(sizeof(struct tcphdr));
n->ti_src6 = so->so_faddr6;
n->ti_dst6 = so->so_laddr6;
n->ti_sport = so->so_fport6;
n->ti_dport = so->so_lport6;
break;
default:
g_assert_not_reached();
}
@ -156,6 +165,10 @@ tcp_respond(struct tcpcb *tp, struct tcpiphdr *ti, struct mbuf *m,
xchg(ti->ti_dst.s_addr, ti->ti_src.s_addr, uint32_t);
xchg(ti->ti_dport, ti->ti_sport, uint16_t);
break;
case AF_INET6:
xchg(ti->ti_dst6, ti->ti_src6, struct in6_addr);
xchg(ti->ti_dport, ti->ti_sport, uint16_t);
break;
default:
g_assert_not_reached();
}
@ -182,6 +195,7 @@ tcp_respond(struct tcpcb *tp, struct tcpiphdr *ti, struct mbuf *m,
struct tcpiphdr tcpiph_save = *(mtod(m, struct tcpiphdr *));
struct ip *ip;
struct ip6 *ip6;
switch (af) {
case AF_INET:
@ -201,7 +215,21 @@ tcp_respond(struct tcpcb *tp, struct tcpiphdr *ti, struct mbuf *m,
ip->ip_ttl = IPDEFTTL;
}
(void) ip_output((struct socket *)0, m);
ip_output(NULL, m);
break;
case AF_INET6:
m->m_data += sizeof(struct tcpiphdr) - sizeof(struct tcphdr)
- sizeof(struct ip6);
m->m_len -= sizeof(struct tcpiphdr) - sizeof(struct tcphdr)
- sizeof(struct ip6);
ip6 = mtod(m, struct ip6 *);
ip6->ip_pl = tlen;
ip6->ip_dst = tcpiph_save.ti_dst6;
ip6->ip_src = tcpiph_save.ti_src6;
ip6->ip_nh = tcpiph_save.ti_nh6;
ip6_output(NULL, m, 0);
break;
default:
@ -225,7 +253,7 @@ tcp_newtcpcb(struct socket *so)
memset((char *) tp, 0, sizeof(struct tcpcb));
tp->seg_next = tp->seg_prev = (struct tcpiphdr*)tp;
tp->t_maxseg = TCP_MSS;
tp->t_maxseg = (so->so_ffamily == AF_INET) ? TCP_MSS : TCP6_MSS;
tp->t_flags = TCP_DO_RFC1323 ? (TF_REQ_SCALE|TF_REQ_TSTMP) : 0;
tp->t_socket = so;