From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54666) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aTSIk-0006UH-Sf for qemu-devel@nongnu.org; Wed, 10 Feb 2016 05:47:16 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aTSIh-0001t5-Lb for qemu-devel@nongnu.org; Wed, 10 Feb 2016 05:47:14 -0500 Received: from mx1.redhat.com ([209.132.183.28]:56022) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aTSIh-0001sI-EI for qemu-devel@nongnu.org; Wed, 10 Feb 2016 05:47:11 -0500 References: <06d461a76323aec31c62db291e292da1c78107a5.1454927009.git.samuel.thibault@ens-lyon.org> From: Thomas Huth Message-ID: <56BB1529.5080905@redhat.com> Date: Wed, 10 Feb 2016 11:47:05 +0100 MIME-Version: 1.0 In-Reply-To: <06d461a76323aec31c62db291e292da1c78107a5.1454927009.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 , Yang Hongyang , Guillaume Subiron On 08.02.2016 11:28, 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 eb0df81..5840471 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,6 +258,11 @@ tcp_input(struct mbuf *m, int iphlen, struct socke= t *inso, unsigned short af) > } > slirp =3D m->slirp; > =20 > + ip =3D mtod(m, struct ip *); > + ip6 =3D mtod(m, struct ip6 *); > + save_ip =3D *ip; > + save_ip6 =3D *ip6; Could you do the "save_ip =3D *ip" within the "case AF_INET" below, and the "save_ip6 =3D *ip6" within the case AF_INET6 ? That would avoid to copy bytes that are not required. > switch (af) { > case AF_INET: > if (iphlen > sizeof(struct ip)) { > @@ -264,13 +271,6 @@ tcp_input(struct mbuf *m, int iphlen, struct socke= t *inso, unsigned short af) > } > /* 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; > save_ip.ip_len +=3D iphlen; > =20 > /* > @@ -295,16 +295,35 @@ 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: > + 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: > goto drop; > } > =20 > + len =3D ((sizeof(struct tcpiphdr) - sizeof(struct tcphdr)) + tlen); > + if (cksum(m, len)) { > + goto drop; > + } > + > /* > * Check that TCP offset makes sense, > * pull out TCP options and adjust length. XXX > @@ -350,6 +369,14 @@ findso: > fhost4->sin_addr =3D ti->ti_dst; > fhost4->sin_port =3D ti->ti_dport; > break; > + case AF_INET6: > + lhost6 =3D (struct sockaddr_in6 *) &lhost; > + lhost6->sin6_addr =3D ti->ti_src6; > + lhost6->sin6_port =3D ti->ti_sport; > + fhost6 =3D (struct sockaddr_in6 *) &fhost; > + fhost6->sin6_addr =3D ti->ti_dst6; > + fhost6->sin6_port =3D ti->ti_dport; > + break; > default: > goto drop; > } > @@ -409,7 +436,6 @@ findso: > so->so_iptos =3D ((struct ip *)ti)->ip_tos; > break; > default: > - goto drop; > break; > } > } > @@ -643,6 +669,9 @@ findso: > case AF_INET: > *ip =3D save_ip; > break; > + case AF_INET6: > + *ip6 =3D save_ip6; > + break; > default: > goto drop; > } > @@ -1518,7 +1547,12 @@ tcp_mss(struct tcpcb *tp, u_int offer) > mss =3D min(IF_MTU, IF_MRU) - sizeof(struct tcphdr) > + sizeof(struct ip); > break; > + case AF_INET6: > + mss =3D min(IF_MTU, IF_MRU) - sizeof(struct tcphdr) > + + sizeof(struct ip6); > + break; > default: > + g_assert_not_reached(); > break; > } ... Thomas