From nobody Tue Nov 18 15:26:05 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1611217493; cv=none; d=zohomail.com; s=zohoarc; b=jccpehUCvsOTFa6u8GzSJpJycgSAWjB4GkCCC4ODeX8B/+cK/meApTp++nnf40kABZsc8/BVeewBC7VVzC1Pb0vEBh32B4WuY2jLp3B20uEZlG4x1VdjSzUA0oyAiO1v4hoUusr1ucqpZZRFiYe37L7nAdzLvaIBAYMcMZZKWRc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1611217493; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=4oTjfXGf7ZzsublRMYhk3TahL2gpNHuKT7suWB5XPjg=; b=NRlpJ/JLI0o9zMoQUiCxtv/dF1o5eFgTZppt53BCatimR4b6EVwQ4TYeboMijAcFSnNJ6V89rVk5bazHY4ZenMWejS/HBuAUgz3ViMysbHJonRVi22ev+KmIvHmzuUdalfoX/oFkumyqP+zMKQt4RJNgt92YylsVBobucSjkvlc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1611217493194112.92511202411833; Thu, 21 Jan 2021 00:24:53 -0800 (PST) Received: from localhost ([::1]:40816 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l2VGu-0002Er-2P for importer@patchew.org; Thu, 21 Jan 2021 03:24:52 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:40680) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <3-zkJYAMKCpo7D8AIIAF8.6IGK8GO-78P8FHIHAHO.ILA@flex--dje.bounces.google.com>) id 1l2VFX-0000ja-EO for qemu-devel@nongnu.org; Thu, 21 Jan 2021 03:23:27 -0500 Received: from mail-qk1-x74a.google.com ([2607:f8b0:4864:20::74a]:48192) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from <3-zkJYAMKCpo7D8AIIAF8.6IGK8GO-78P8FHIHAHO.ILA@flex--dje.bounces.google.com>) id 1l2VFV-0007Gc-5D for qemu-devel@nongnu.org; Thu, 21 Jan 2021 03:23:27 -0500 Received: by mail-qk1-x74a.google.com with SMTP id c83so1039683qkg.15 for ; Thu, 21 Jan 2021 00:23:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=sender:date:in-reply-to:message-id:mime-version:references:subject :from:to:cc; bh=4oTjfXGf7ZzsublRMYhk3TahL2gpNHuKT7suWB5XPjg=; b=KxiqdKFeywNpmLLNwpyRlCNgyZqeTEeCTWQh7PLR5zYGDR67jTJqTFlketgqJcQ8O5 nnBtCNRLpozOkw8qdIQA4cxAZW7AtgmR6wI6IACU7jvQhFwifBfi0/6RuFtphfzGgVa8 EbOSCiTZcnl/CBhBkHtDfmIqHIATvMGxEF9Pw0CT20zkymNglIGWfl0Z2BFaPqlNMV5Y +bbtiYMHExXthW55JaG6TYhzoRsZI1Pag/UQyM9u4+0yWE6KZTamAYZhbDoF8MUcMMYu A3T4hpM1DMnYRJiUnjKlZo7mK49XrhVvI/iBuMzjyoWRTQ7aqB5tc++S2beOQUFw10ah hkLg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=4oTjfXGf7ZzsublRMYhk3TahL2gpNHuKT7suWB5XPjg=; b=X7grjbq4BrbNGEqm5SRCA5wq1JuoETJZlmNFMaZa0nfCYVQgL1mkE+ydu0keyZ/V3c qOccnZq3elm38HWpJSt7elQU5LvY2D1WlfBzOlZcUap/37ugOEuQbnwh4FlR+AmZRPyg vMZSTyFDfY6zK1GGfaG4CyHU/kbpQKJti4hsXrlaEN/GurfVnIyFBZ3PaZbcdJvId/W/ PdZAOCPN0fos62IFRnBll9nwGvmwhc8QgCAaN+0p7VeFKC32WYYawoQ40hZlaN4bLx4b 2/PVwXdYRFkkHVQcoA9FsHFL/CsfGBa+dEmKWOoukw3jcqFTD0ky8ubZ/Idp8bz8B9nB Zezg== X-Gm-Message-State: AOAM530JnTvyaAqvs9dMeXVmePzzY4JYxrIbDOwZClIOXYz43zGx6pqG FtiVdu4iqFQCCMPLLY4FJIA7yKAlHKof6MRv9FlRGJs0ZnOJlfXOrjl2H2Wblm+r53iYDYrObKU SgsW0VR4ry45IhvO43EzqYuM1mCJZH97Jdsym++3XS5arcpbOckKa X-Google-Smtp-Source: ABdhPJygzMuDYL+hoQeVz6VBrZyu32TlySLpmS6w4n84K2q/ZpX5PPafVNU47lmhf8tUeAU3cUik0xY= X-Received: from ruffy.mtv.corp.google.com ([2620:0:1000:1412:4a0f:cfff:fe66:e570]) (user=dje job=sendgmr) by 2002:a0c:f005:: with SMTP id z5mr13276644qvk.9.1611217403255; Thu, 21 Jan 2021 00:23:23 -0800 (PST) Date: Thu, 21 Jan 2021 00:23:13 -0800 In-Reply-To: <20210121082314.458600-1-dje@google.com> Message-Id: <20210121082314.458600-2-dje@google.com> Mime-Version: 1.0 References: <20210121082314.458600-1-dje@google.com> X-Mailer: git-send-email 2.30.0.296.g2bfb1c46d8-goog Subject: [PATCH 1/2] slirp: Add ipv6 hostfwd support To: qemu-devel@nongnu.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::74a; envelope-from=3-zkJYAMKCpo7D8AIIAF8.6IGK8GO-78P8FHIHAHO.ILA@flex--dje.bounces.google.com; helo=mail-qk1-x74a.google.com X-Spam_score_int: -95 X-Spam_score: -9.6 X-Spam_bar: --------- X-Spam_report: (-9.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_MED=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, USER_IN_DEF_DKIM_WL=-7.5 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Samuel Thibault , Doug Evans Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Reply-to: Doug Evans From: dje--- via X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Signed-off-by: Doug Evans --- src/libslirp.h | 6 +++ src/slirp.c | 51 +++++++++++++++++++++-- src/socket.c | 109 +++++++++++++++++++++++++++++++++++-------------- src/socket.h | 9 ++++ src/udp.c | 73 ++++++++++++++++++++++++++------- src/udp.h | 2 + 6 files changed, 202 insertions(+), 48 deletions(-) diff --git a/src/libslirp.h b/src/libslirp.h index 27e1f61..280d3d0 100644 --- a/src/libslirp.h +++ b/src/libslirp.h @@ -142,6 +142,12 @@ int slirp_add_hostfwd(Slirp *slirp, int is_udp, struct= in_addr host_addr, int host_port, struct in_addr guest_addr, int guest_= port); int slirp_remove_hostfwd(Slirp *slirp, int is_udp, struct in_addr host_add= r, int host_port); +int slirp_add_ipv6_hostfwd(Slirp *slirp, int is_udp, + struct in6_addr host_addr, int host_port, + struct in6_addr guest_addr, int guest_port); +int slirp_remove_ipv6_hostfwd(Slirp *slirp, int is_udp, + struct in6_addr host_addr, int host_port); + int slirp_add_exec(Slirp *slirp, const char *cmdline, struct in_addr *guest_addr, int guest_port); int slirp_add_unix(Slirp *slirp, const char *unixsock, diff --git a/src/slirp.c b/src/slirp.c index abb6f9a..a07ef83 100644 --- a/src/slirp.c +++ b/src/slirp.c @@ -1091,7 +1091,6 @@ int if_encap(Slirp *slirp, struct mbuf *ifm) } =20 /* Drop host forwarding rule, return 0 if found. */ -/* TODO: IPv6 */ int slirp_remove_hostfwd(Slirp *slirp, int is_udp, struct in_addr host_add= r, int host_port) { @@ -1105,7 +1104,10 @@ int slirp_remove_hostfwd(Slirp *slirp, int is_udp, s= truct in_addr host_addr, addr_len =3D sizeof(addr); if ((so->so_state & SS_HOSTFWD) && getsockname(so->s, (struct sockaddr *)&addr, &addr_len) =3D=3D= 0 && - addr.sin_addr.s_addr =3D=3D host_addr.s_addr && addr.sin_port = =3D=3D port) { + addr_len =3D=3D sizeof(addr) && + addr.sin_family =3D=3D AF_INET && + addr.sin_addr.s_addr =3D=3D host_addr.s_addr && + addr.sin_port =3D=3D port) { so->slirp->cb->unregister_poll_fd(so->s, so->slirp->opaque); closesocket(so->s); sofree(so); @@ -1116,7 +1118,6 @@ int slirp_remove_hostfwd(Slirp *slirp, int is_udp, st= ruct in_addr host_addr, return -1; } =20 -/* TODO: IPv6 */ int slirp_add_hostfwd(Slirp *slirp, int is_udp, struct in_addr host_addr, int host_port, struct in_addr guest_addr, int guest_= port) { @@ -1135,6 +1136,50 @@ int slirp_add_hostfwd(Slirp *slirp, int is_udp, stru= ct in_addr host_addr, return 0; } =20 +int slirp_remove_ipv6_hostfwd(Slirp *slirp, int is_udp, + struct in6_addr host_addr, int host_port) +{ + struct socket *so; + struct socket *head =3D (is_udp ? &slirp->udb : &slirp->tcb); + struct sockaddr_in6 addr; + int port =3D htons(host_port); + socklen_t addr_len; + + for (so =3D head->so_next; so !=3D head; so =3D so->so_next) { + addr_len =3D sizeof(addr); + if ((so->so_state & SS_HOSTFWD) && + getsockname(so->s, (struct sockaddr *)&addr, &addr_len) =3D=3D= 0 && + addr_len =3D=3D sizeof(addr) && + addr.sin6_family =3D=3D AF_INET6 && + !memcmp(&addr.sin6_addr, &host_addr, sizeof(host_addr)) && + addr.sin6_port =3D=3D port) { + so->slirp->cb->unregister_poll_fd(so->s, so->slirp->opaque); + closesocket(so->s); + sofree(so); + return 0; + } + } + + return -1; +} + +int slirp_add_ipv6_hostfwd(Slirp *slirp, int is_udp, + struct in6_addr host_addr, int host_port, + struct in6_addr guest_addr, int guest_port) +{ + if (is_udp) { + if (!udp6_listen(slirp, host_addr, htons(host_port), + guest_addr, htons(guest_port), SS_HOSTFWD)) + return -1; + } else { + if (!tcp6_listen(slirp, host_addr, htons(host_port), + guest_addr, htons(guest_port), SS_HOSTFWD)) + return -1; + } + + return 0; +} + /* TODO: IPv6 */ static bool check_guestfwd(Slirp *slirp, struct in_addr *guest_addr, int guest_port) diff --git a/src/socket.c b/src/socket.c index c0b02ad..46be587 100644 --- a/src/socket.c +++ b/src/socket.c @@ -736,22 +736,18 @@ int sosendto(struct socket *so, struct mbuf *m) /* * Listen for incoming TCP connections */ -struct socket *tcp_listen(Slirp *slirp, uint32_t haddr, unsigned hport, - uint32_t laddr, unsigned lport, int flags) +static struct socket *tcpx_listen(Slirp *slirp, int family, + in4or6_addr haddr, unsigned hport, + in4or6_addr laddr, unsigned lport, + int flags) { - /* TODO: IPv6 */ - struct sockaddr_in addr; + union { + struct sockaddr_in addr4; + struct sockaddr_in6 addr6; + } addr; struct socket *so; int s, opt =3D 1; socklen_t addrlen =3D sizeof(addr); - memset(&addr, 0, addrlen); - - DEBUG_CALL("tcp_listen"); - DEBUG_ARG("haddr =3D %s", inet_ntoa((struct in_addr){ .s_addr =3D hadd= r })); - DEBUG_ARG("hport =3D %d", ntohs(hport)); - DEBUG_ARG("laddr =3D %s", inet_ntoa((struct in_addr){ .s_addr =3D ladd= r })); - DEBUG_ARG("lport =3D %d", ntohs(lport)); - DEBUG_ARG("flags =3D %x", flags); =20 so =3D socreate(slirp); =20 @@ -770,20 +766,35 @@ struct socket *tcp_listen(Slirp *slirp, uint32_t hadd= r, unsigned hport, =20 so->so_state &=3D SS_PERSISTENT_MASK; so->so_state |=3D (SS_FACCEPTCONN | flags); - so->so_lfamily =3D AF_INET; - so->so_lport =3D lport; /* Kept in network format */ - so->so_laddr.s_addr =3D laddr; /* Ditto */ + so->so_lfamily =3D family; + /* Address,port are kept in network format */ + if (family =3D=3D AF_INET) { + so->so_laddr.s_addr =3D laddr.addr4; + so->so_lport =3D lport; + } else { + so->so_laddr6 =3D laddr.addr6; + so->so_lport6 =3D lport; + } =20 - addr.sin_family =3D AF_INET; - addr.sin_addr.s_addr =3D haddr; - addr.sin_port =3D hport; + memset(&addr, 0, addrlen); + if (family =3D=3D AF_INET) { + addr.addr4.sin_family =3D family; + addr.addr4.sin_addr.s_addr =3D haddr.addr4; + addr.addr4.sin_port =3D hport; + addrlen =3D sizeof(addr.addr4); + } else { + addr.addr6.sin6_family =3D family; + addr.addr6.sin6_addr =3D haddr.addr6; + addr.addr6.sin6_port =3D hport; + addrlen =3D sizeof(addr.addr6); + } =20 - if (((s =3D slirp_socket(AF_INET, SOCK_STREAM, 0)) < 0) || + s =3D slirp_socket(family, SOCK_STREAM, 0); + if ((s < 0) || (slirp_socket_set_fast_reuse(s) < 0) || - (bind(s, (struct sockaddr *)&addr, sizeof(addr)) < 0) || + (bind(s, (struct sockaddr *)&addr, addrlen) < 0) || (listen(s, 1) < 0)) { int tmperrno =3D errno; /* Don't clobber the real reason we failed= */ - if (s >=3D 0) { closesocket(s); } @@ -797,22 +808,60 @@ struct socket *tcp_listen(Slirp *slirp, uint32_t hadd= r, unsigned hport, return NULL; } setsockopt(s, SOL_SOCKET, SO_OOBINLINE, &opt, sizeof(int)); - opt =3D 1; - setsockopt(s, IPPROTO_TCP, TCP_NODELAY, &opt, sizeof(int)); + slirp_socket_set_nodelay(s); =20 getsockname(s, (struct sockaddr *)&addr, &addrlen); - so->so_ffamily =3D AF_INET; - so->so_fport =3D addr.sin_port; - if (addr.sin_addr.s_addr =3D=3D 0 || - addr.sin_addr.s_addr =3D=3D loopback_addr.s_addr) - so->so_faddr =3D slirp->vhost_addr; - else - so->so_faddr =3D addr.sin_addr; + if (family =3D=3D AF_INET) { + so->fhost.sin =3D addr.addr4; + } else { + so->fhost.sin6 =3D addr.addr6; + } + sotranslate_accept(so); =20 so->s =3D s; return so; } =20 +struct socket *tcp_listen(Slirp *slirp, uint32_t haddr, unsigned hport, + uint32_t laddr, unsigned lport, int flags) +{ + DEBUG_CALL("tcp_listen"); + DEBUG_ARG("haddr =3D %s", inet_ntoa((struct in_addr){ .s_addr =3D hadd= r })); + DEBUG_ARG("hport =3D %d", ntohs(hport)); + DEBUG_ARG("laddr =3D %s", inet_ntoa((struct in_addr){ .s_addr =3D ladd= r })); + DEBUG_ARG("lport =3D %d", ntohs(lport)); + DEBUG_ARG("flags =3D %x", flags); + + in4or6_addr haddr4, laddr4; + + haddr4.addr4 =3D haddr; + laddr4.addr4 =3D laddr; + return tcpx_listen(slirp, AF_INET, haddr4, hport, laddr4, lport, flags= ); +} + +struct socket * +tcp6_listen(Slirp *slirp, struct in6_addr haddr, u_int hport, + struct in6_addr laddr, u_int lport, int flags) +{ + DEBUG_CALL("tcp6_listen"); + char addrstr[INET6_ADDRSTRLEN]; + const char *str =3D inet_ntop(AF_INET6, &haddr, addrstr, INET6_ADDRSTR= LEN); + g_assert(str !=3D NULL); + DEBUG_ARG("haddr =3D %s", str); + DEBUG_ARG("hport =3D %d", ntohs(hport)); + str =3D inet_ntop(AF_INET6, &laddr, addrstr, INET6_ADDRSTRLEN); + g_assert(str !=3D NULL); + DEBUG_ARG("laddr =3D %s", str); + DEBUG_ARG("lport =3D %d", ntohs(lport)); + DEBUG_ARG("flags =3D %x", flags); + + in4or6_addr haddr6, laddr6; + + haddr6.addr6 =3D haddr; + laddr6.addr6 =3D laddr; + return tcpx_listen(slirp, AF_INET6, haddr6, hport, laddr6, lport, flag= s); +} + /* * Various session state calls * XXX Should be #define's diff --git a/src/socket.h b/src/socket.h index a6a1e5e..425c607 100644 --- a/src/socket.h +++ b/src/socket.h @@ -11,6 +11,13 @@ #define SO_EXPIRE 240000 #define SO_EXPIREFAST 10000 =20 +/* Helps unify some in/in6 routines. */ +union in4or6_addr { + uint32_t addr4; + struct in6_addr addr6; +}; +typedef union in4or6_addr in4or6_addr; + /* * Our socket structure */ @@ -148,6 +155,8 @@ int sowrite(struct socket *); void sorecvfrom(struct socket *); int sosendto(struct socket *, struct mbuf *); struct socket *tcp_listen(Slirp *, uint32_t, unsigned, uint32_t, unsigned,= int); +struct socket *tcp6_listen(Slirp *, struct in6_addr, u_int, + struct in6_addr, u_int, int); void soisfconnecting(register struct socket *); void soisfconnected(register struct socket *); void sofwdrain(struct socket *); diff --git a/src/udp.c b/src/udp.c index 050cee4..52502b9 100644 --- a/src/udp.c +++ b/src/udp.c @@ -353,17 +353,20 @@ static uint8_t udp_tos(struct socket *so) return 0; } =20 -struct socket *udp_listen(Slirp *slirp, uint32_t haddr, unsigned hport, - uint32_t laddr, unsigned lport, int flags) +static struct socket *udpx_listen(Slirp *slirp, int family, + in4or6_addr haddr, unsigned hport, + in4or6_addr laddr, unsigned lport, + int flags) { - /* TODO: IPv6 */ - struct sockaddr_in addr; + union { + struct sockaddr_in addr4; + struct sockaddr_in6 addr6; + } addr; struct socket *so; - socklen_t addrlen =3D sizeof(struct sockaddr_in); + socklen_t addrlen; =20 - memset(&addr, 0, sizeof(addr)); so =3D socreate(slirp); - so->s =3D slirp_socket(AF_INET, SOCK_DGRAM, 0); + so->s =3D slirp_socket(family, SOCK_DGRAM, 0); if (so->s < 0) { sofree(so); return NULL; @@ -371,9 +374,18 @@ struct socket *udp_listen(Slirp *slirp, uint32_t haddr= , unsigned hport, so->so_expire =3D curtime + SO_EXPIRE; insque(so, &slirp->udb); =20 - addr.sin_family =3D AF_INET; - addr.sin_addr.s_addr =3D haddr; - addr.sin_port =3D hport; + memset(&addr, 0, sizeof(addr)); + if (family =3D=3D AF_INET) { + addr.addr4.sin_family =3D family; + addr.addr4.sin_addr.s_addr =3D haddr.addr4; + addr.addr4.sin_port =3D hport; + addrlen =3D sizeof(addr.addr4); + } else { + addr.addr6.sin6_family =3D family; + addr.addr6.sin6_addr =3D haddr.addr6; + addr.addr6.sin6_port =3D hport; + addrlen =3D sizeof(addr.addr6); + } =20 if (bind(so->s, (struct sockaddr *)&addr, addrlen) < 0) { udp_detach(so); @@ -382,16 +394,47 @@ struct socket *udp_listen(Slirp *slirp, uint32_t hadd= r, unsigned hport, slirp_socket_set_fast_reuse(so->s); =20 getsockname(so->s, (struct sockaddr *)&addr, &addrlen); - so->fhost.sin =3D addr; + if (family =3D=3D AF_INET) { + so->fhost.sin =3D addr.addr4; + } else { + so->fhost.sin6 =3D addr.addr6; + } sotranslate_accept(so); - so->so_lfamily =3D AF_INET; - so->so_lport =3D lport; - so->so_laddr.s_addr =3D laddr; + + so->so_lfamily =3D family; + if (family =3D=3D AF_INET) { + so->so_laddr.s_addr =3D laddr.addr4; + so->so_lport =3D lport; + } else { + so->so_laddr6 =3D laddr.addr6; + so->so_lport6 =3D lport; + } + if (flags !=3D SS_FACCEPTONCE) so->so_expire =3D 0; - so->so_state &=3D SS_PERSISTENT_MASK; so->so_state |=3D SS_ISFCONNECTED | flags; =20 return so; } + +struct socket *udp_listen(Slirp *slirp, uint32_t haddr, unsigned hport, + uint32_t laddr, unsigned lport, int flags) +{ + in4or6_addr haddr4, laddr4; + + haddr4.addr4 =3D haddr; + laddr4.addr4 =3D laddr; + return udpx_listen(slirp, AF_INET, haddr4, hport, laddr4, lport, flags= ); +} + +struct socket * +udp6_listen(Slirp *slirp, struct in6_addr haddr, u_int hport, + struct in6_addr laddr, u_int lport, int flags) +{ + in4or6_addr haddr6, laddr6; + + haddr6.addr6 =3D haddr; + laddr6.addr6 =3D laddr; + return udpx_listen(slirp, AF_INET6, haddr6, hport, laddr6, lport, flag= s); +} diff --git a/src/udp.h b/src/udp.h index c3b83fd..b3fbeac 100644 --- a/src/udp.h +++ b/src/udp.h @@ -80,6 +80,8 @@ void udp_input(register struct mbuf *, int); int udp_attach(struct socket *, unsigned short af); void udp_detach(struct socket *); struct socket *udp_listen(Slirp *, uint32_t, unsigned, uint32_t, unsigned,= int); +struct socket *udp6_listen(Slirp *slirp, struct in6_addr, u_int, + struct in6_addr, u_int, int); int udp_output(struct socket *so, struct mbuf *m, struct sockaddr_in *sadd= r, struct sockaddr_in *daddr, int iptos); =20 --=20 2.30.0.296.g2bfb1c46d8-goog From nobody Tue Nov 18 15:26:05 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1611217497; cv=none; d=zohomail.com; s=zohoarc; b=YtC8KKwGJmUnQXCtqCYNZYm46pffbw1mHlzesdu8YoV4GEoX3xd5VJlZ8q+DGMjCkRy2zevr3Aum0YUsvDD+VqweYAgZFJQef6ClaxS43vxQkKy78XHX8uQXrvBAvRo3/b7F3E/Y/oxHIeubTgWeEB6b+dzmlqd/b0u/wF2FQOU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1611217497; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=UzzL4zlrfrisBP/NqczyQZ7bldV9V10X9QOYqAxsJME=; b=Kf4netNY9q3jysBTVRmmoWIKn6PvwkAymHRPtq9Uah05Rvd1boQW2tcuZJL22IDVQ3BFbDYEuNAWTTRUWJHO8FFFA8ySHFtfCk1PiOrLYE1Z0fshFT7e5mHHT1dzKdfdDuAElfHbcmyaxEtKu2A8BJvJzrf/xshMDl6lM96qzms= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1611217497223788.0567298472739; Thu, 21 Jan 2021 00:24:57 -0800 (PST) Received: from localhost ([::1]:40980 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l2VGw-0002Iu-42 for importer@patchew.org; Thu, 21 Jan 2021 03:24:54 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:40694) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <3_zkJYAMKCp4BHCEMMEJC.AMKOCKS-BCTCJLMLELS.MPE@flex--dje.bounces.google.com>) id 1l2VFb-0000p1-4H for qemu-devel@nongnu.org; Thu, 21 Jan 2021 03:23:32 -0500 Received: from mail-vs1-xe4a.google.com ([2607:f8b0:4864:20::e4a]:46854) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from <3_zkJYAMKCp4BHCEMMEJC.AMKOCKS-BCTCJLMLELS.MPE@flex--dje.bounces.google.com>) id 1l2VFY-0007Hs-QH for qemu-devel@nongnu.org; Thu, 21 Jan 2021 03:23:30 -0500 Received: by mail-vs1-xe4a.google.com with SMTP id 188so51753vsl.13 for ; Thu, 21 Jan 2021 00:23:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=sender:date:in-reply-to:message-id:mime-version:references:subject :from:to:cc; bh=UzzL4zlrfrisBP/NqczyQZ7bldV9V10X9QOYqAxsJME=; b=WvkgRcnxDT/8KT3zL86VgeEJPhIupxsxj64vCEDxdbZVNIEFLxvEXDMn89lUMXgJvK pyg+fGHXC6StCEUQRfYI8M+iPvman+BfeNGImOHeD70XZD2xUHrh/28u97d783uCAUsx jvEHa7gN9mrZDeCWqnsfP26zVyx1u4nxG5mNK8vV9gCPRx9cA6vtFwNmdB9elB52AEOi o6NZ6u/GdJZoPsW8/+TEWGUIBY5kOZN0WVbdqJLQLHc1DZN7omxv6xo2XUusZ4G6AoyT 1XD8iM1r6gQMK2O5wz2GII8rHOJm2T0IvG6txrLYFcqqF0AvUOYid0a3Z4kVt8ENp27E ph/A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=UzzL4zlrfrisBP/NqczyQZ7bldV9V10X9QOYqAxsJME=; b=O215h+wY6wyO9uynMNf3VRC/Ja3hUp6KwFQ18F1wH3gZWngeuZBh9AsO4GQlOLg24t AbyD99QAn8yNR0MZebb16pNYwBgxrGNKZmwOVJWr+J1fbKgbT3nTVBr/Zcwclz7gkk8B 7fE/5n0Tx1Ob0AFLIDQnKtCQnDu/lo1kQzMxkDaP77Vcpl3bFLpO7MosARXHehQn3nMS msU8qPMPulqOmEQIyHzWWN8ICGdUEOVu0u1H+9qaANR6KRwOeP9caMCvhmRUEfEnaKZe GgLLLLp/3fhcaLyXSPubABxXgPnZcDz3fWprbWIkHcqKa0bZ0rbSGtiTYKLDH5SP4mpV baJQ== X-Gm-Message-State: AOAM532rKhEDyhkC3/qoAV1LGp9AlOaWYpGRsxGr/uri02RFcO8sMUgK 3cxHjgb1dRHMu2lePQG6D9c92qEpoZTx7wY61M1IvLCGGMmXdb7J8BjSSohE5U9t5NbwgBu2YZs JZDVxeSwm/Ymy4WtAsMEFamTCgALGJNcfuMuozv7y6hs0dZkzLRCF X-Google-Smtp-Source: ABdhPJywg3tq0YgcFy+pPAUAzwr199lV/vk5LVom/U7t4IT7UbNG228ZaEorDir7L9fKJjHvXzyBPoA= X-Received: from ruffy.mtv.corp.google.com ([2620:0:1000:1412:4a0f:cfff:fe66:e570]) (user=dje job=sendgmr) by 2002:a1f:dac7:: with SMTP id r190mr9887555vkg.22.1611217407275; Thu, 21 Jan 2021 00:23:27 -0800 (PST) Date: Thu, 21 Jan 2021 00:23:14 -0800 In-Reply-To: <20210121082314.458600-1-dje@google.com> Message-Id: <20210121082314.458600-3-dje@google.com> Mime-Version: 1.0 References: <20210121082314.458600-1-dje@google.com> X-Mailer: git-send-email 2.30.0.296.g2bfb1c46d8-goog Subject: [PATCH 2/2] net: Add ipv6_hostfwd option To: qemu-devel@nongnu.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::e4a; envelope-from=3_zkJYAMKCp4BHCEMMEJC.AMKOCKS-BCTCJLMLELS.MPE@flex--dje.bounces.google.com; helo=mail-vs1-xe4a.google.com X-Spam_score_int: -95 X-Spam_score: -9.6 X-Spam_bar: --------- X-Spam_report: (-9.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_MED=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, USER_IN_DEF_DKIM_WL=-7.5 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Samuel Thibault , Doug Evans Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Reply-to: Doug Evans From: dje--- via X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Signed-off-by: Doug Evans --- hmp-commands.hx | 29 ++++- include/net/slirp.h | 2 + net/slirp.c | 311 +++++++++++++++++++++++++++++++++++--------- qapi/net.json | 1 + slirp | 2 +- 5 files changed, 279 insertions(+), 66 deletions(-) diff --git a/hmp-commands.hx b/hmp-commands.hx index 73e0832ea1..fa404123b7 100644 --- a/hmp-commands.hx +++ b/hmp-commands.hx @@ -1398,6 +1398,34 @@ SRST Remove host-to-guest TCP or UDP redirection. ERST =20 +#ifdef CONFIG_SLIRP + { + .name =3D "ipv6_hostfwd_add", + .args_type =3D "arg1:s,arg2:s?", + .params =3D "[netdev_id] [tcp|udp]:[hostaddr6]:hostport-[guest= addr6]:guestport", + .help =3D "redirect TCP6 or UDP6 connections from host to gu= est (requires -net user)", + .cmd =3D hmp_ipv6_hostfwd_add, + }, +#endif +SRST +``ipv6_hostfwd_add`` + Redirect TCP6 or UDP6 connections from host to guest (requires -net user= ). +ERST + +#ifdef CONFIG_SLIRP + { + .name =3D "ipv6_hostfwd_remove", + .args_type =3D "arg1:s,arg2:s?", + .params =3D "[netdev_id] [tcp|udp]:[hostaddr6]:hostport", + .help =3D "remove host-to-guest TCP6 or UDP6 redirection", + .cmd =3D hmp_ipv6_hostfwd_remove, + }, +#endif +SRST +``ipv6_hostfwd_remove`` + Remove host-to-guest TCP6 or UDP6 redirection. +ERST + { .name =3D "balloon", .args_type =3D "value:M", @@ -1866,4 +1894,3 @@ ERST .sub_table =3D hmp_info_cmds, .flags =3D "p", }, - diff --git a/include/net/slirp.h b/include/net/slirp.h index bad3e1e241..4796a5cd39 100644 --- a/include/net/slirp.h +++ b/include/net/slirp.h @@ -29,6 +29,8 @@ =20 void hmp_hostfwd_add(Monitor *mon, const QDict *qdict); void hmp_hostfwd_remove(Monitor *mon, const QDict *qdict); +void hmp_ipv6_hostfwd_add(Monitor *mon, const QDict *qdict); +void hmp_ipv6_hostfwd_remove(Monitor *mon, const QDict *qdict); =20 void hmp_info_usernet(Monitor *mon, const QDict *qdict); =20 diff --git a/net/slirp.c b/net/slirp.c index 8350c6d45f..5870a3284a 100644 --- a/net/slirp.c +++ b/net/slirp.c @@ -70,6 +70,7 @@ static int get_str_sep(char *buf, int buf_size, const cha= r **pp, int sep) /* slirp network adapter */ =20 #define SLIRP_CFG_HOSTFWD 1 +#define SLIRP_CFG_IPV6_HOSTFWD 2 =20 struct slirp_config_str { struct slirp_config_str *next; @@ -101,6 +102,8 @@ static QTAILQ_HEAD(, SlirpState) slirp_stacks =3D QTAILQ_HEAD_INITIALIZER(slirp_stacks); =20 static int slirp_hostfwd(SlirpState *s, const char *redir_str, Error **err= p); +static int slirp_ipv6_hostfwd(SlirpState *s, const char *redir_str, + Error **errp); static int slirp_guestfwd(SlirpState *s, const char *config_str, Error **e= rrp); =20 #ifndef _WIN32 @@ -586,6 +589,10 @@ static int net_slirp_init(NetClientState *peer, const = char *model, if (slirp_hostfwd(s, config->str, errp) < 0) { goto error; } + } else if (config->flags & SLIRP_CFG_IPV6_HOSTFWD) { + if (slirp_ipv6_hostfwd(s, config->str, errp) < 0) { + goto error; + } } else { if (slirp_guestfwd(s, config->str, errp) < 0) { goto error; @@ -631,15 +638,136 @@ static SlirpState *slirp_lookup(Monitor *mon, const = char *id) } } =20 -void hmp_hostfwd_remove(Monitor *mon, const QDict *qdict) +/* + * Parse a protocol name of the form "name". + * Valid protocols are "tcp" and "udp". An empty string means "tcp". + * Returns a pointer to the end of the parsed string on success, and stores + * the result in *is_udp. + * Otherwise returns NULL and stores the error message in *errmsg, which m= ust + * be freed by the caller. + */ +static const char *parse_protocol(const char *str, int sep, int *is_udp, + char **errmsg) +{ + char buf[10]; + const char *p =3D str; + + if (get_str_sep(buf, sizeof(buf), &p, sep) < 0) { + *errmsg =3D g_strdup("Missing protcol name separator"); + return NULL; + } + + if (!strcmp(buf, "tcp") || buf[0] =3D=3D '\0') { + *is_udp =3D 0; + } else if (!strcmp(buf, "udp")) { + *is_udp =3D 1; + } else { + *errmsg =3D g_strdup("Bad protcol name"); + return NULL; + } + + return p; +} + +/* + * Parse an ipv4 address/port of the form "addrport". + * "kind" is either "host" or "guest" and is included in error messages. + * An empty address means INADDR_ANY. + * Returns a pointer to the end of the parsed string on success, and stores + * the results in *addr, *port. + * Otherwise returns NULL and stores the error message in *errmsg, which m= ust + * be freed by the caller. + */ +static const char *parse_in4_addr_port(const char *str, const char *kind, + int addr_sep, int port_sep, + struct in_addr *addr, int *port, + char **errmsg) { - struct in_addr host_addr =3D { .s_addr =3D INADDR_ANY }; - int host_port; char buf[256]; - const char *src_str, *p; + const char *p =3D str; + + if (get_str_sep(buf, sizeof(buf), &p, addr_sep) < 0) { + *errmsg =3D g_strdup_printf("Missing %s address separator", kind); + return NULL; + } + if (buf[0] =3D=3D '\0') { + addr->s_addr =3D INADDR_ANY; + } else if (!inet_aton(buf, addr)) { + *errmsg =3D g_strdup_printf("Bad %s address", kind); + return NULL; + } + + if (get_str_sep(buf, sizeof(buf), &p, port_sep) < 0) { + *errmsg =3D g_strdup_printf("Missing %s port separator", kind); + return NULL; + } + if (qemu_strtoi(buf, NULL, 10, port) < 0 || + *port < 0 || *port > 65535) { + *errmsg =3D g_strdup_printf("Bad %s port", kind); + return NULL; + } + + return p; +} + +/* + * Parse an ipv6 address/port of the form "addrport". + * "kind" is either "host" or "guest" and is included in error messages. + * An empty address means in6addr_any. + * Returns a pointer to the end of the parsed string on success, and stores + * the results in *addr, *port. + * Otherwise returns NULL and stores the error message in *errmsg, which m= ust + * be freed by the caller. + */ +static const char *parse_in6_addr_port(const char *str, const char *kind, + int addr_sep, int port_sep, + struct in6_addr *addr, int *port, + char **errmsg) +{ + char buf[256]; + const char *p =3D str; + + if (*(p++) !=3D '[') { + *errmsg =3D g_strdup_printf("IPv6 %s address must be enclosed" + " in square brackets", kind); + return NULL; + } + if (get_str_sep(buf, sizeof(buf), &p, ']') < 0) { + *errmsg =3D g_strdup_printf("IPv6 %s address must be enclosed" + " in square brackets", kind); + return NULL; + } + if (buf[0] =3D=3D '\0') { + *addr =3D in6addr_any; + } else if (!inet_pton(AF_INET6, buf, addr)) { + *errmsg =3D g_strdup_printf("Bad %s address", kind); + return NULL; + } + + /* Ignore the part between the ']' and addr_sep. */ + if (get_str_sep(buf, sizeof(buf), &p, addr_sep) < 0) { + *errmsg =3D g_strdup_printf("Missing %s address separator", kind); + return NULL; + } + + if (get_str_sep(buf, sizeof(buf), &p, port_sep) < 0) { + *errmsg =3D g_strdup_printf("Missing %s port separator", kind); + return NULL; + } + if (qemu_strtoi(buf, NULL, 10, port) < 0 || + *port < 0 || *port > 65535) { + *errmsg =3D g_strdup_printf("Bad %s port", kind); + return NULL; + } + + return p; +} + +static void hmp_hostfwd_remove_worker(Monitor *mon, const QDict *qdict, + int family) +{ + const char *src_str; SlirpState *s; - int is_udp =3D 0; - int err; const char *arg1 =3D qdict_get_str(qdict, "arg1"); const char *arg2 =3D qdict_get_try_str(qdict, "arg2"); =20 @@ -654,38 +782,52 @@ void hmp_hostfwd_remove(Monitor *mon, const QDict *qd= ict) return; } =20 - p =3D src_str; - if (!p || get_str_sep(buf, sizeof(buf), &p, ':') < 0) { - goto fail_syntax; - } + int host_port; + int is_udp; + char *errmsg =3D NULL; + int err; =20 - if (!strcmp(buf, "tcp") || buf[0] =3D=3D '\0') { - is_udp =3D 0; - } else if (!strcmp(buf, "udp")) { - is_udp =3D 1; - } else { - goto fail_syntax; - } + g_assert(src_str !=3D NULL); + const char *p =3D src_str; =20 - if (get_str_sep(buf, sizeof(buf), &p, ':') < 0) { - goto fail_syntax; - } - if (buf[0] !=3D '\0' && !inet_aton(buf, &host_addr)) { + p =3D parse_protocol(p, ':', &is_udp, &errmsg); + if (p =3D=3D NULL) { goto fail_syntax; } =20 - if (qemu_strtoi(p, NULL, 10, &host_port)) { - goto fail_syntax; + if (family =3D=3D AF_INET) { + struct in_addr host_addr; + if (parse_in4_addr_port(p, "host", ':', '\0', &host_addr, &host_po= rt, + &errmsg) =3D=3D NULL) { + goto fail_syntax; + } + err =3D slirp_remove_hostfwd(s->slirp, is_udp, host_addr, host_por= t); + } else { + struct in6_addr host_addr; + if (parse_in6_addr_port(p, "host", ':', '\0', &host_addr, &host_po= rt, + &errmsg) =3D=3D NULL) { + goto fail_syntax; + } + err =3D slirp_remove_ipv6_hostfwd(s->slirp, is_udp, host_addr, hos= t_port); } =20 - err =3D slirp_remove_hostfwd(s->slirp, is_udp, host_addr, host_port); - monitor_printf(mon, "host forwarding rule for %s %s\n", src_str, err ? "not found" : "removed"); return; =20 fail_syntax: - monitor_printf(mon, "invalid format\n"); + monitor_printf(mon, "Invalid format: %s\n", errmsg); + g_free(errmsg); +} + +void hmp_hostfwd_remove(Monitor *mon, const QDict *qdict) +{ + hmp_hostfwd_remove_worker(mon, qdict, AF_INET); +} + +void hmp_ipv6_hostfwd_remove(Monitor *mon, const QDict *qdict) +{ + hmp_hostfwd_remove_worker(mon, qdict, AF_INET6); } =20 static int slirp_hostfwd(SlirpState *s, const char *redir_str, Error **err= p) @@ -694,61 +836,83 @@ static int slirp_hostfwd(SlirpState *s, const char *r= edir_str, Error **errp) struct in_addr guest_addr =3D { .s_addr =3D 0 }; int host_port, guest_port; const char *p; - char buf[256]; int is_udp; - char *end; - const char *fail_reason =3D "Unknown reason"; + char *errmsg =3D NULL; =20 + g_assert(redir_str !=3D NULL); p =3D redir_str; - if (!p || get_str_sep(buf, sizeof(buf), &p, ':') < 0) { - fail_reason =3D "No : separators"; + + p =3D parse_protocol(p, ':', &is_udp, &errmsg); + if (p =3D=3D NULL) { goto fail_syntax; } - if (!strcmp(buf, "tcp") || buf[0] =3D=3D '\0') { - is_udp =3D 0; - } else if (!strcmp(buf, "udp")) { - is_udp =3D 1; - } else { - fail_reason =3D "Bad protocol name"; + + p =3D parse_in4_addr_port(p, "host", ':', '-', &host_addr, &host_port, + &errmsg); + if (p =3D=3D NULL) { goto fail_syntax; } =20 - if (get_str_sep(buf, sizeof(buf), &p, ':') < 0) { - fail_reason =3D "Missing : separator"; + if (parse_in4_addr_port(p, "guest", ':', '\0', &guest_addr, &guest_por= t, + &errmsg) =3D=3D NULL) { goto fail_syntax; } - if (buf[0] !=3D '\0' && !inet_aton(buf, &host_addr)) { - fail_reason =3D "Bad host address"; + if (guest_port =3D=3D 0) { + errmsg =3D g_strdup("Bad guest port"); goto fail_syntax; } =20 - if (get_str_sep(buf, sizeof(buf), &p, '-') < 0) { - fail_reason =3D "Bad host port separator"; - goto fail_syntax; + if (slirp_add_hostfwd(s->slirp, is_udp, host_addr, host_port, guest_ad= dr, + guest_port) < 0) { + error_setg(errp, "Could not set up host forwarding rule '%s'", + redir_str); + return -1; } - host_port =3D strtol(buf, &end, 0); - if (*end !=3D '\0' || host_port < 0 || host_port > 65535) { - fail_reason =3D "Bad host port"; + return 0; + + fail_syntax: + error_setg(errp, "Invalid host forwarding rule '%s' (%s)", redir_str, + errmsg); + g_free(errmsg); + return -1; +} + +static int slirp_ipv6_hostfwd(SlirpState *s, const char *redir_str, + Error **errp) +{ + struct in6_addr host_addr =3D in6addr_any; + struct in6_addr guest_addr; + int host_port, guest_port; + const char *p; + int is_udp; + char *errmsg =3D NULL; + + memset(&guest_addr, 0, sizeof(guest_addr)); + g_assert(redir_str !=3D NULL); + p =3D redir_str; + + p =3D parse_protocol(p, ':', &is_udp, &errmsg); + if (p =3D=3D NULL) { goto fail_syntax; } =20 - if (get_str_sep(buf, sizeof(buf), &p, ':') < 0) { - fail_reason =3D "Missing guest address"; + p =3D parse_in6_addr_port(p, "host", ':', '-', &host_addr, &host_port, + &errmsg); + if (p =3D=3D NULL) { goto fail_syntax; } - if (buf[0] !=3D '\0' && !inet_aton(buf, &guest_addr)) { - fail_reason =3D "Bad guest address"; + + if (parse_in6_addr_port(p, "guest", ':', '\0', &guest_addr, &guest_por= t, + &errmsg) =3D=3D NULL) { goto fail_syntax; } - - guest_port =3D strtol(p, &end, 0); - if (*end !=3D '\0' || guest_port < 1 || guest_port > 65535) { - fail_reason =3D "Bad guest port"; + if (guest_port =3D=3D 0) { + errmsg =3D g_strdup("Bad guest port"); goto fail_syntax; } =20 - if (slirp_add_hostfwd(s->slirp, is_udp, host_addr, host_port, guest_ad= dr, - guest_port) < 0) { + if (slirp_add_ipv6_hostfwd(s->slirp, is_udp, host_addr, host_port, + guest_addr, guest_port) < 0) { error_setg(errp, "Could not set up host forwarding rule '%s'", redir_str); return -1; @@ -757,11 +921,12 @@ static int slirp_hostfwd(SlirpState *s, const char *r= edir_str, Error **errp) =20 fail_syntax: error_setg(errp, "Invalid host forwarding rule '%s' (%s)", redir_str, - fail_reason); + errmsg); + g_free(errmsg); return -1; } =20 -void hmp_hostfwd_add(Monitor *mon, const QDict *qdict) +static void hmp_hostfwd_add_worker(Monitor *mon, const QDict *qdict, int f= amily) { const char *redir_str; SlirpState *s; @@ -775,13 +940,30 @@ void hmp_hostfwd_add(Monitor *mon, const QDict *qdict) s =3D slirp_lookup(mon, NULL); redir_str =3D arg1; } - if (s) { - Error *err =3D NULL; - if (slirp_hostfwd(s, redir_str, &err) < 0) { - error_report_err(err); - } + if (!s) { + return; + } + + Error *err =3D NULL; + int rc; + if (family =3D=3D AF_INET) { + rc =3D slirp_hostfwd(s, redir_str, &err); + } else { + rc =3D slirp_ipv6_hostfwd(s, redir_str, &err); + } + if (rc < 0) { + error_report_err(err); } +} + +void hmp_hostfwd_add(Monitor *mon, const QDict *qdict) +{ + hmp_hostfwd_add_worker(mon, qdict, AF_INET); +} =20 +void hmp_ipv6_hostfwd_add(Monitor *mon, const QDict *qdict) +{ + hmp_hostfwd_add_worker(mon, qdict, AF_INET6); } =20 #ifndef _WIN32 @@ -1090,6 +1272,7 @@ int net_init_slirp(const Netdev *netdev, const char *= name, /* all optional fields are initialized to "all bits zero" */ =20 net_init_slirp_configs(user->hostfwd, SLIRP_CFG_HOSTFWD); + net_init_slirp_configs(user->ipv6_hostfwd, SLIRP_CFG_IPV6_HOSTFWD); net_init_slirp_configs(user->guestfwd, 0); =20 ret =3D net_slirp_init(peer, "user", name, user->q_restrict, diff --git a/qapi/net.json b/qapi/net.json index c31748c87f..34ea92277c 100644 --- a/qapi/net.json +++ b/qapi/net.json @@ -189,6 +189,7 @@ '*smb': 'str', '*smbserver': 'str', '*hostfwd': ['String'], + '*ipv6-hostfwd': ['String'], '*guestfwd': ['String'], '*tftp-server-name': 'str' } } =20 diff --git a/slirp b/slirp index 8f43a99191..6c0db866ef 160000 --- a/slirp +++ b/slirp @@ -1 +1 @@ -Subproject commit 8f43a99191afb47ca3f3c6972f6306209f367ece +Subproject commit 6c0db866ef5e11a3b87640e57769fbf9b0a1e3b8 --=20 2.30.0.296.g2bfb1c46d8-goog