From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42478) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aVyFi-0003XD-NL for qemu-devel@nongnu.org; Wed, 17 Feb 2016 04:18:32 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aVyFf-0001YY-Gu for qemu-devel@nongnu.org; Wed, 17 Feb 2016 04:18:30 -0500 Received: from mx1.redhat.com ([209.132.183.28]:33162) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aVyFf-0001YH-9C for qemu-devel@nongnu.org; Wed, 17 Feb 2016 04:18:27 -0500 References: <8013f08a2724d618b8dcb98e35fbe68bd597df42.1455471945.git.samuel.thibault@ens-lyon.org> From: Thomas Huth Message-ID: <56C43ADC.3060406@redhat.com> Date: Wed, 17 Feb 2016 10:18:20 +0100 MIME-Version: 1.0 In-Reply-To: <8013f08a2724d618b8dcb98e35fbe68bd597df42.1455471945.git.samuel.thibault@ens-lyon.org> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCHv7 7/9] slirp: Handle IPv6 in TCP functions List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Samuel Thibault , qemu-devel@nongnu.org Cc: zhanghailiang , Li Zhijian , Stefan Hajnoczi , Jason Wang , Dave Gilbert , Vasiliy Tolstov , Huangpeng , Gonglei , Jan Kiszka , Guillaume Subiron On 14.02.2016 18:47, Samuel Thibault wrote: > From: Guillaume Subiron >=20 > 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(). >=20 > Signed-off-by: Guillaume Subiron > Signed-off-by: Samuel Thibault > --- ... > diff --git a/slirp/tcp_input.c b/slirp/tcp_input.c > index fac2a24..7aad1bc 100644 > --- a/slirp/tcp_input.c > +++ b/slirp/tcp_input.c > @@ -216,7 +216,8 @@ present: > void > tcp_input(struct mbuf *m, int iphlen, struct socket *inso, unsigned sh= ort af) > { > - struct ip save_ip, *ip; > + struct ip save_ip, *ip; > + struct ip6 save_ip6, *ip6; > register struct tcpiphdr *ti; > caddr_t optp =3D NULL; > int optlen =3D 0; > @@ -230,6 +231,7 @@ tcp_input(struct mbuf *m, int iphlen, struct socket= *inso, unsigned short af) > int ret; > struct sockaddr_storage lhost, fhost; > struct sockaddr_in *lhost4, *fhost4; > + struct sockaddr_in6 *lhost6, *fhost6; > struct ex_list *ex_ptr; > Slirp *slirp; > =20 > @@ -256,21 +258,18 @@ tcp_input(struct mbuf *m, int iphlen, struct sock= et *inso, unsigned short af) > } > slirp =3D m->slirp; > =20 > + ip =3D mtod(m, struct ip *); > + ip6 =3D mtod(m, struct ip6 *); > + > switch (af) { > case AF_INET: > + save_ip =3D *ip; > if (iphlen > sizeof(struct ip)) { > ip_stripoptions(m, (struct mbuf *)0); > iphlen =3D sizeof(struct ip); > } > /* XXX Check if too short */ > =20 > - > - /* > - * Save a copy of the IP header in case we want restore it > - * for sending an ICMP error message in response. > - */ > - ip =3D mtod(m, struct ip *); > - save_ip =3D *ip; I think you could also leave the "save_ip =3D *ip" here instead of moving it to the beginning of this case statement. > save_ip.ip_len +=3D iphlen; > =20 > /* > @@ -295,16 +294,36 @@ tcp_input(struct mbuf *m, int iphlen, struct sock= et *inso, unsigned short af) > ti->ti_dst =3D save_ip.ip_dst; > ti->ti_pr =3D save_ip.ip_p; > ti->ti_len =3D htons((uint16_t)tlen); > - len =3D ((sizeof(struct tcpiphdr) - sizeof(struct tcphdr)) + tlen= ); > - if (cksum(m, len)) { > - goto drop; > - } > + break; > + > + case AF_INET6: > + save_ip6 =3D *ip6; > + m->m_data -=3D sizeof(struct tcpiphdr) - (sizeof(struct ip6) > + + sizeof(struct tcphdr)); > + m->m_len +=3D sizeof(struct tcpiphdr) - (sizeof(struct ip6) > + + sizeof(struct tcphdr)); > + ti =3D mtod(m, struct tcpiphdr *); > + > + tlen =3D ip6->ip_pl; > + tcpiphdr2qlink(ti)->next =3D tcpiphdr2qlink(ti)->prev =3D NULL; > + memset(&ti->ih_mbuf, 0 , sizeof(struct mbuf_ptr)); > + memset(&ti->ti, 0, sizeof(ti->ti)); > + ti->ti_x0 =3D 0; > + ti->ti_src6 =3D save_ip6.ip_src; > + ti->ti_dst6 =3D save_ip6.ip_dst; > + ti->ti_nh6 =3D save_ip6.ip_nh; > + ti->ti_len =3D htons((uint16_t)tlen); > break; > =20 > default: > g_assert_not_reached(); > } > =20 > + len =3D ((sizeof(struct tcpiphdr) - sizeof(struct tcphdr)) + tlen); > + if (cksum(m, len)) { > + goto drop; > + } > + ... > diff --git a/slirp/tcp_subr.c b/slirp/tcp_subr.c > index c16b29d..6991b21 100644 > --- a/slirp/tcp_subr.c > +++ b/slirp/tcp_subr.c > @@ -88,6 +88,15 @@ tcp_template(struct tcpcb *tp) > n->ti_dport =3D so->so_lport; > break; > =20 > + case AF_INET6: > + n->ti_nh6 =3D IPPROTO_TCP; > + n->ti_len =3D htons(sizeof(struct tcphdr)); > + n->ti_src6 =3D so->so_faddr6; > + n->ti_dst6 =3D so->so_laddr6; > + n->ti_sport =3D so->so_fport6; > + n->ti_dport =3D 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, > =20 > struct tcpiphdr tcpiph_save =3D *(mtod(m, struct tcpiphdr *)); > struct ip *ip; > + struct ip6 *ip6; > =20 > switch (af) { > case AF_INET: > @@ -204,6 +218,20 @@ tcp_respond(struct tcpcb *tp, struct tcpiphdr *ti,= struct mbuf *m, > (void) ip_output((struct socket *)0, m); > break; > =20 > + case AF_INET6: > + m->m_data +=3D sizeof(struct tcpiphdr) - sizeof(struct tcphdr) > + - sizeof(struct ip6); > + m->m_len -=3D sizeof(struct tcpiphdr) - sizeof(struct tcphdr) > + - sizeof(struct ip6); > + ip6 =3D mtod(m, struct ip6 *); > + ip6->ip_pl =3D tlen; > + ip6->ip_dst =3D tcpiph_save.ti_dst6; > + ip6->ip_src =3D tcpiph_save.ti_src6; > + ip6->ip_nh =3D tcpiph_save.ti_nh6; > + > + (void) ip6_output((struct socket *)0, m, 0); Is that "(void)" really necessary here? Also, I think you could simply use "NULL" instead of "(struct socket *)0". > + break; > + > default: > g_assert_not_reached(); > } ... Just some cosmetic nits, patch generally looks fine to me, so: Reviewed-by: Thomas Huth