From patchwork Tue Mar 15 09:42:55 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Thibault X-Patchwork-Id: 8586661 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 03FA09F44D for ; Tue, 15 Mar 2016 09:48:22 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 054DE20254 for ; Tue, 15 Mar 2016 09:48:21 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B2CED2024C for ; Tue, 15 Mar 2016 09:48:19 +0000 (UTC) Received: from localhost ([::1]:46798 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aflaN-0000Ob-5H for patchwork-qemu-devel@patchwork.kernel.org; Tue, 15 Mar 2016 05:48:19 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47007) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aflVP-00089W-DG for qemu-devel@nongnu.org; Tue, 15 Mar 2016 05:43:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aflVK-0002g8-Q0 for qemu-devel@nongnu.org; Tue, 15 Mar 2016 05:43:11 -0400 Received: from mail3-relais-sop.national.inria.fr ([192.134.164.104]:59157) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aflVK-0002eD-F8 for qemu-devel@nongnu.org; Tue, 15 Mar 2016 05:43:06 -0400 X-IronPort-AV: E=Sophos;i="5.24,338,1454972400"; d="scan'208";a="168702202" Received: from unknown (HELO var.youpi.perso.aquilenet.fr) ([193.50.110.81]) by mail3-relais-sop.national.inria.fr with ESMTP/TLS/AES128-GCM-SHA256; 15 Mar 2016 10:43:02 +0100 Received: from samy by var.youpi.perso.aquilenet.fr with local (Exim 4.86_2) (envelope-from ) id 1aflVE-0007ji-CZ; Tue, 15 Mar 2016 10:43:00 +0100 From: Samuel Thibault To: qemu-devel@nongnu.org, Peter Maydell Date: Tue, 15 Mar 2016 10:42:55 +0100 Message-Id: <3feea4447f1b9b04816ee6977b5ecc0eb704e07a.1458034810.git.samuel.thibault@ens-lyon.org> X-Mailer: git-send-email 2.7.0 In-Reply-To: References: In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 192.134.164.104 Cc: Thomas Huth , zhanghailiang , Li Zhijian , Stefan Hajnoczi , Jason Wang , Dave Gilbert , Vasiliy Tolstov , Huangpeng , Gonglei , Jan Kiszka , Samuel Thibault , Guillaume Subiron Subject: [Qemu-devel] [PULL 08/11] slirp: Handle IPv6 in TCP functions X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Guillaume Subiron 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 Signed-off-by: Samuel Thibault Reviewed-by: Thomas Huth --- slirp/ip6_input.c | 3 ++- slirp/tcp.h | 2 ++ slirp/tcp_input.c | 72 +++++++++++++++++++++++++++++++++++++++++++++++++----- slirp/tcp_output.c | 16 ++++++++++++ slirp/tcp_subr.c | 32 ++++++++++++++++++++++-- slirp/tcpip.h | 9 +++++++ 6 files changed, 125 insertions(+), 9 deletions(-) diff --git a/slirp/ip6_input.c b/slirp/ip6_input.c index 9ca6d32..c0b11e7 100644 --- a/slirp/ip6_input.c +++ b/slirp/ip6_input.c @@ -55,7 +55,8 @@ void ip6_input(struct mbuf *m) */ switch (ip6->ip_nh) { case IPPROTO_TCP: - icmp6_send_error(m, ICMP6_UNREACH, ICMP6_UNREACH_NO_ROUTE); + NTOHS(ip6->ip_pl); + tcp_input(m, sizeof(struct ip6), (struct socket *)NULL, AF_INET6); break; case IPPROTO_UDP: udp6_input(m); diff --git a/slirp/tcp.h b/slirp/tcp.h index 2e2b403..61befcd 100644 --- a/slirp/tcp.h +++ b/slirp/tcp.h @@ -106,6 +106,8 @@ struct tcphdr { */ #undef TCP_MSS #define TCP_MSS 1460 +#undef TCP6_MSS +#define TCP6_MSS 1440 #undef TCP_MAXWIN #define TCP_MAXWIN 65535 /* largest value for (unscaled) window */ diff --git a/slirp/tcp_input.c b/slirp/tcp_input.c index bce03a3..1fcca30 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 short af) { - struct ip save_ip, *ip; + struct ip save_ip, *ip; + struct ip6 save_ip6, *ip6; register struct tcpiphdr *ti; caddr_t optp = NULL; int optlen = 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; @@ -256,6 +258,9 @@ tcp_input(struct mbuf *m, int iphlen, struct socket *inso, unsigned short af) } slirp = m->slirp; + ip = mtod(m, struct ip *); + ip6 = mtod(m, struct ip6 *); + switch (af) { case AF_INET: if (iphlen > sizeof(struct ip)) { @@ -269,7 +274,6 @@ tcp_input(struct mbuf *m, int iphlen, struct socket *inso, unsigned short af) * Save a copy of the IP header in case we want restore it * for sending an ICMP error message in response. */ - ip = mtod(m, struct ip *); save_ip = *ip; save_ip.ip_len += iphlen; @@ -295,16 +299,44 @@ tcp_input(struct mbuf *m, int iphlen, struct socket *inso, unsigned short af) ti->ti_dst = save_ip.ip_dst; ti->ti_pr = save_ip.ip_p; ti->ti_len = htons((uint16_t)tlen); - len = ((sizeof(struct tcpiphdr) - sizeof(struct tcphdr)) + tlen); - if (cksum(m, len)) { - goto drop; - } + break; + + case AF_INET6: + /* + * Save a copy of the IP header in case we want restore it + * for sending an ICMP error message in response. + */ + save_ip6 = *ip6; + /* + * Get IP and TCP header together in first mbuf. + * Note: IP leaves IP header in first mbuf. + */ + m->m_data -= sizeof(struct tcpiphdr) - (sizeof(struct ip6) + + sizeof(struct tcphdr)); + m->m_len += sizeof(struct tcpiphdr) - (sizeof(struct ip6) + + sizeof(struct tcphdr)); + ti = mtod(m, struct tcpiphdr *); + + tlen = ip6->ip_pl; + tcpiphdr2qlink(ti)->next = tcpiphdr2qlink(ti)->prev = NULL; + memset(&ti->ih_mbuf, 0 , sizeof(struct mbuf_ptr)); + memset(&ti->ti, 0, sizeof(ti->ti)); + ti->ti_x0 = 0; + ti->ti_src6 = save_ip6.ip_src; + ti->ti_dst6 = save_ip6.ip_dst; + ti->ti_nh6 = save_ip6.ip_nh; + ti->ti_len = htons((uint16_t)tlen); break; default: g_assert_not_reached(); } + len = ((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 +382,14 @@ findso: fhost4->sin_addr = ti->ti_dst; fhost4->sin_port = ti->ti_dport; break; + case AF_INET6: + lhost6 = (struct sockaddr_in6 *) &lhost; + lhost6->sin6_addr = ti->ti_src6; + lhost6->sin6_port = ti->ti_sport; + fhost6 = (struct sockaddr_in6 *) &fhost; + fhost6->sin6_addr = ti->ti_dst6; + fhost6->sin6_port = ti->ti_dport; + break; default: g_assert_not_reached(); } @@ -408,6 +448,8 @@ findso: case AF_INET: so->so_iptos = ((struct ip *)ti)->ip_tos; break; + case AF_INET6: + break; default: g_assert_not_reached(); } @@ -634,6 +676,12 @@ findso: code = ICMP_UNREACH_HOST; } break; + case AF_INET6: + code = ICMP6_UNREACH_NO_ROUTE; + if (errno == EHOSTUNREACH) { + code = ICMP6_UNREACH_ADDRESS; + } + break; default: g_assert_not_reached(); } @@ -652,6 +700,14 @@ findso: *ip = save_ip; icmp_send_error(m, ICMP_UNREACH, code, 0, strerror(errno)); break; + case AF_INET6: + m->m_data += sizeof(struct tcpiphdr) - (sizeof(struct ip6) + + sizeof(struct tcphdr)); + m->m_len -= sizeof(struct tcpiphdr) - (sizeof(struct ip6) + + sizeof(struct tcphdr)); + *ip6 = save_ip6; + icmp6_send_error(m, ICMP6_UNREACH, code); + break; default: g_assert_not_reached(); } @@ -1526,6 +1582,10 @@ tcp_mss(struct tcpcb *tp, u_int offer) mss = min(IF_MTU, IF_MRU) - sizeof(struct tcphdr) + sizeof(struct ip); break; + case AF_INET6: + mss = min(IF_MTU, IF_MRU) - sizeof(struct tcphdr) + + sizeof(struct ip6); + break; default: g_assert_not_reached(); } diff --git a/slirp/tcp_output.c b/slirp/tcp_output.c index eec8902..99b0a9b 100644 --- a/slirp/tcp_output.c +++ b/slirp/tcp_output.c @@ -63,6 +63,7 @@ tcp_output(struct tcpcb *tp) register struct mbuf *m; register struct tcpiphdr *ti, tcpiph_save; struct ip *ip; + struct ip6 *ip6; u_char opt[MAX_TCPOPTLEN]; unsigned optlen, hdrlen; int idle, sendalot; @@ -468,6 +469,21 @@ send: error = ip_output(so, 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 = 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; + + error = ip6_output(so, m, 0); + break; + default: g_assert_not_reached(); } diff --git a/slirp/tcp_subr.c b/slirp/tcp_subr.c index c16b29d..dbfd2c6 100644 --- a/slirp/tcp_subr.c +++ b/slirp/tcp_subr.c @@ -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; diff --git a/slirp/tcpip.h b/slirp/tcpip.h index 3c5d127..124b4a9 100644 --- a/slirp/tcpip.h +++ b/slirp/tcpip.h @@ -45,6 +45,12 @@ struct tcpiphdr { uint8_t ih_x1; /* (unused) */ uint8_t ih_pr; /* protocol */ } ti_i4; + struct { + struct in6_addr ih_src; + struct in6_addr ih_dst; + uint8_t ih_x1; + uint8_t ih_nh; + } ti_i6; } ti; uint16_t ti_x0; uint16_t ti_len; /* protocol length */ @@ -54,6 +60,9 @@ struct tcpiphdr { #define ti_pr ti.ti_i4.ih_pr #define ti_src ti.ti_i4.ih_src #define ti_dst ti.ti_i4.ih_dst +#define ti_src6 ti.ti_i6.ih_src +#define ti_dst6 ti.ti_i6.ih_dst +#define ti_nh6 ti.ti_i6.ih_nh #define ti_sport ti_t.th_sport #define ti_dport ti_t.th_dport #define ti_seq ti_t.th_seq