From nobody Sun Apr 28 22:16:29 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1490554211970558.2140778597638; Sun, 26 Mar 2017 11:50:11 -0700 (PDT) Received: from localhost ([::1]:41928 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1csDEw-00088p-PJ for importer@patchew.org; Sun, 26 Mar 2017 14:50:10 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41900) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1csDBb-0006dO-09 for qemu-devel@nongnu.org; Sun, 26 Mar 2017 14:46:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1csDBX-0002K5-8R for qemu-devel@nongnu.org; Sun, 26 Mar 2017 14:46:43 -0400 Received: from hera.aquilenet.fr ([141.255.128.1]:46712) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1csDBX-0002JO-1h for qemu-devel@nongnu.org; Sun, 26 Mar 2017 14:46:39 -0400 Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id 71F87BCBC; Sun, 26 Mar 2017 20:46:38 +0200 (CEST) Received: from hera.aquilenet.fr ([127.0.0.1]) by localhost (hera.aquilenet.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 7p5E6LoHuS2u; Sun, 26 Mar 2017 20:46:36 +0200 (CEST) Received: from var.youpi.perso.aquilenet.fr (unknown [IPv6:2a01:cb19:181:c200:3602:86ff:fe2c:6a19]) by hera.aquilenet.fr (Postfix) with ESMTPSA id 60016BC5C; Sun, 26 Mar 2017 20:46:36 +0200 (CEST) Received: from samy by var.youpi.perso.aquilenet.fr with local (Exim 4.88) (envelope-from ) id 1csDBT-0006Wd-J0; Sun, 26 Mar 2017 20:46:35 +0200 X-Virus-Scanned: Debian amavisd-new at aquilenet.fr From: Samuel Thibault To: qemu-devel@nongnu.org Date: Sun, 26 Mar 2017 20:46:33 +0200 Message-Id: <20170326184634.25042-2-samuel.thibault@ens-lyon.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170326184634.25042-1-samuel.thibault@ens-lyon.org> References: <20170326184634.25042-1-samuel.thibault@ens-lyon.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 141.255.128.1 Subject: [Qemu-devel] [PATCH 1/2] slirp: Make RA build more flexible X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Samuel Thibault , thuth@redhat.com, jan.kiszka@siemens.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Do not hardcode the RA size at all, use a pl_size variable which accounts the accumulated size, and fill rip->ip_pl at the end. This will allow to make some blocks optional. Signed-off-by: Samuel Thibault Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- slirp/ip6_icmp.c | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/slirp/ip6_icmp.c b/slirp/ip6_icmp.c index 298a48dd25..d0f5cc1456 100644 --- a/slirp/ip6_icmp.c +++ b/slirp/ip6_icmp.c @@ -143,17 +143,10 @@ void ndp_send_ra(Slirp *slirp) /* Build IPv6 packet */ struct mbuf *t =3D m_get(slirp); struct ip6 *rip =3D mtod(t, struct ip6 *); + size_t pl_size =3D 0; rip->ip_src =3D (struct in6_addr)LINKLOCAL_ADDR; rip->ip_dst =3D (struct in6_addr)ALLNODES_MULTICAST; rip->ip_nh =3D IPPROTO_ICMPV6; - rip->ip_pl =3D htons(ICMP6_NDP_RA_MINLEN - + NDPOPT_LINKLAYER_LEN - + NDPOPT_PREFIXINFO_LEN -#ifndef _WIN32 - + NDPOPT_RDNSS_LEN -#endif - ); - t->m_len =3D sizeof(struct ip6) + ntohs(rip->ip_pl); =20 /* Build ICMPv6 packet */ t->m_data +=3D sizeof(struct ip6); @@ -171,6 +164,7 @@ void ndp_send_ra(Slirp *slirp) ricmp->icmp6_nra.reach_time =3D htonl(NDP_AdvReachableTime); ricmp->icmp6_nra.retrans_time =3D htonl(NDP_AdvRetransTime); t->m_data +=3D ICMP6_NDP_RA_MINLEN; + pl_size +=3D ICMP6_NDP_RA_MINLEN; =20 /* Source link-layer address (NDP option) */ struct ndpopt *opt =3D mtod(t, struct ndpopt *); @@ -178,6 +172,7 @@ void ndp_send_ra(Slirp *slirp) opt->ndpopt_len =3D NDPOPT_LINKLAYER_LEN / 8; in6_compute_ethaddr(rip->ip_src, opt->ndpopt_linklayer); t->m_data +=3D NDPOPT_LINKLAYER_LEN; + pl_size +=3D NDPOPT_LINKLAYER_LEN; =20 /* Prefix information (NDP option) */ struct ndpopt *opt2 =3D mtod(t, struct ndpopt *); @@ -192,6 +187,7 @@ void ndp_send_ra(Slirp *slirp) opt2->ndpopt_prefixinfo.reserved2 =3D 0; opt2->ndpopt_prefixinfo.prefix =3D slirp->vprefix_addr6; t->m_data +=3D NDPOPT_PREFIXINFO_LEN; + pl_size +=3D NDPOPT_PREFIXINFO_LEN; =20 #ifndef _WIN32 /* Prefix information (NDP option) */ @@ -203,16 +199,14 @@ void ndp_send_ra(Slirp *slirp) opt3->ndpopt_rdnss.lifetime =3D htonl(2 * NDP_MaxRtrAdvInterval); opt3->ndpopt_rdnss.addr =3D slirp->vnameserver_addr6; t->m_data +=3D NDPOPT_RDNSS_LEN; + pl_size +=3D NDPOPT_RDNSS_LEN; #endif =20 + rip->ip_pl =3D htons(pl_size); + t->m_data -=3D sizeof(struct ip6) + pl_size; + t->m_len =3D sizeof(struct ip6) + pl_size; + /* ICMPv6 Checksum */ -#ifndef _WIN32 - t->m_data -=3D NDPOPT_RDNSS_LEN; -#endif - t->m_data -=3D NDPOPT_PREFIXINFO_LEN; - t->m_data -=3D NDPOPT_LINKLAYER_LEN; - t->m_data -=3D ICMP6_NDP_RA_MINLEN; - t->m_data -=3D sizeof(struct ip6); ricmp->icmp6_cksum =3D ip6_cksum(t); =20 ip6_output(NULL, t, 0); --=20 2.11.0 From nobody Sun Apr 28 22:16:29 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1490554068424846.1637320242629; Sun, 26 Mar 2017 11:47:48 -0700 (PDT) Received: from localhost ([::1]:41924 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1csDCc-00076s-PE for importer@patchew.org; Sun, 26 Mar 2017 14:47:46 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41861) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1csDBX-0006cm-V3 for qemu-devel@nongnu.org; Sun, 26 Mar 2017 14:46:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1csDBX-0002Jx-6S for qemu-devel@nongnu.org; Sun, 26 Mar 2017 14:46:39 -0400 Received: from hera.aquilenet.fr ([2a01:474::1]:47468) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1csDBW-0002IQ-Vs for qemu-devel@nongnu.org; Sun, 26 Mar 2017 14:46:39 -0400 Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id 19076BC8E; Sun, 26 Mar 2017 20:46:38 +0200 (CEST) Received: from hera.aquilenet.fr ([127.0.0.1]) by localhost (hera.aquilenet.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id FeZWFIlkiHAU; Sun, 26 Mar 2017 20:46:37 +0200 (CEST) Received: from var.youpi.perso.aquilenet.fr (unknown [IPv6:2a01:cb19:181:c200:3602:86ff:fe2c:6a19]) by hera.aquilenet.fr (Postfix) with ESMTPSA id 7128ABCBC; Sun, 26 Mar 2017 20:46:36 +0200 (CEST) Received: from samy by var.youpi.perso.aquilenet.fr with local (Exim 4.88) (envelope-from ) id 1csDBT-0006Wf-Je; Sun, 26 Mar 2017 20:46:35 +0200 X-Virus-Scanned: Debian amavisd-new at aquilenet.fr From: Samuel Thibault To: qemu-devel@nongnu.org Date: Sun, 26 Mar 2017 20:46:34 +0200 Message-Id: <20170326184634.25042-3-samuel.thibault@ens-lyon.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170326184634.25042-1-samuel.thibault@ens-lyon.org> References: <20170326184634.25042-1-samuel.thibault@ens-lyon.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a01:474::1 Subject: [Qemu-devel] [PATCH 2/2] slirp: Send RDNSS in RA only if host has an IPv6 DNS server X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Samuel Thibault , thuth@redhat.com, jan.kiszka@siemens.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Previously we would always send an RDNSS option in the RA, making the guest try to resolve DNS through IPv6, even if the host does not actually have and IPv6 DNS server available. This makes the RDNSS option enabled only when an IPv6 DNS server is available. Signed-off-by: Samuel Thibault --- slirp/ip6_icmp.c | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/slirp/ip6_icmp.c b/slirp/ip6_icmp.c index d0f5cc1456..00183e5945 100644 --- a/slirp/ip6_icmp.c +++ b/slirp/ip6_icmp.c @@ -189,18 +189,22 @@ void ndp_send_ra(Slirp *slirp) t->m_data +=3D NDPOPT_PREFIXINFO_LEN; pl_size +=3D NDPOPT_PREFIXINFO_LEN; =20 -#ifndef _WIN32 /* Prefix information (NDP option) */ - /* disabled for windows for now, until get_dns6_addr is implemented */ - struct ndpopt *opt3 =3D mtod(t, struct ndpopt *); - opt3->ndpopt_type =3D NDPOPT_RDNSS; - opt3->ndpopt_len =3D NDPOPT_RDNSS_LEN / 8; - opt3->ndpopt_rdnss.reserved =3D 0; - opt3->ndpopt_rdnss.lifetime =3D htonl(2 * NDP_MaxRtrAdvInterval); - opt3->ndpopt_rdnss.addr =3D slirp->vnameserver_addr6; - t->m_data +=3D NDPOPT_RDNSS_LEN; - pl_size +=3D NDPOPT_RDNSS_LEN; -#endif + { + struct in6_addr addr; + uint32_t scope_id; + if (get_dns6_addr(&addr, &scope_id) >=3D 0) { + /* Host system does have an IPv6 DNS server, announce our prox= y. */ + struct ndpopt *opt3 =3D mtod(t, struct ndpopt *); + opt3->ndpopt_type =3D NDPOPT_RDNSS; + opt3->ndpopt_len =3D NDPOPT_RDNSS_LEN / 8; + opt3->ndpopt_rdnss.reserved =3D 0; + opt3->ndpopt_rdnss.lifetime =3D htonl(2 * NDP_MaxRtrAdvInterva= l); + opt3->ndpopt_rdnss.addr =3D slirp->vnameserver_addr6; + t->m_data +=3D NDPOPT_RDNSS_LEN; + pl_size +=3D NDPOPT_RDNSS_LEN; + } + } =20 rip->ip_pl =3D htons(pl_size); t->m_data -=3D sizeof(struct ip6) + pl_size; --=20 2.11.0