From nobody Thu Nov 6 10:37:34 2025 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.zohomail.com; dkim=fail; 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; dmarc=fail(p=none dis=none) header.from=yandex-team.ru Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1540517211953725.2917026456977; Thu, 25 Oct 2018 18:26:51 -0700 (PDT) Received: from localhost ([::1]:57577 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gFqtd-0004uo-KL for importer@patchew.org; Thu, 25 Oct 2018 21:26:41 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37625) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gFpbn-0002vH-P8 for qemu-devel@nongnu.org; Thu, 25 Oct 2018 20:04:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gFpbk-0007eF-Hz for qemu-devel@nongnu.org; Thu, 25 Oct 2018 20:04:11 -0400 Received: from forwardcorp1g.cmail.yandex.net ([87.250.241.190]:60700) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gFpbk-0007dE-0B for qemu-devel@nongnu.org; Thu, 25 Oct 2018 20:04:08 -0400 Received: from mxbackcorp1g.mail.yandex.net (mxbackcorp1g.mail.yandex.net [IPv6:2a02:6b8:0:1402::301]) by forwardcorp1g.cmail.yandex.net (Yandex) with ESMTP id B6B2D21800 for ; Fri, 26 Oct 2018 03:04:03 +0300 (MSK) Received: from smtpcorp1o.mail.yandex.net (smtpcorp1o.mail.yandex.net [2a02:6b8:0:1a2d::30]) by mxbackcorp1g.mail.yandex.net (nwsmtp/Yandex) with ESMTP id ZnAP0tGMLE-43l4mm8S; Fri, 26 Oct 2018 03:04:03 +0300 Received: from dynamic-iva.dhcp.yndx.net (dynamic-iva.dhcp.yndx.net [2a02:6b8:b010:d002::1:1]) by smtpcorp1o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id bOfpZ9lZrb-43FqJEJh; Fri, 26 Oct 2018 03:04:03 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client certificate not present) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex-team.ru; s=default; t=1540512243; bh=ej+TccYuoLLMbDn/2FkgmYKkd50lcfKi2xuCTPsvRrg=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References; b=tyzuKFbeZZZH23fxuQHlJvwFEF+AcIsvfepDGpKnm715CRv4ZQYJbeJzP8PnoM8/O Hdw5clQ7R/it+b7X97HrIN5li5TWOC8xJD0XRTGpMbsXxnV8k/Xti1W21FBHKSvu5c TCGBwRaPj46qiHl/dYFqPUl7FjU+OSLfHsA7RnkA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex-team.ru; s=default; t=1540512243; bh=ej+TccYuoLLMbDn/2FkgmYKkd50lcfKi2xuCTPsvRrg=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References; b=tyzuKFbeZZZH23fxuQHlJvwFEF+AcIsvfepDGpKnm715CRv4ZQYJbeJzP8PnoM8/O Hdw5clQ7R/it+b7X97HrIN5li5TWOC8xJD0XRTGpMbsXxnV8k/Xti1W21FBHKSvu5c TCGBwRaPj46qiHl/dYFqPUl7FjU+OSLfHsA7RnkA= Authentication-Results: smtpcorp1o.mail.yandex.net; dkim=pass header.i=@yandex-team.ru From: Maxim Samoylov To: qemu-devel@nongnu.org Date: Fri, 26 Oct 2018 03:03:40 +0300 Message-Id: <1540512223-21199-2-git-send-email-max7255@yandex-team.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1540512223-21199-1-git-send-email-max7255@yandex-team.ru> References: <1540512223-21199-1-git-send-email-max7255@yandex-team.ru> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 87.250.241.190 X-Mailman-Approved-At: Thu, 25 Oct 2018 21:24:29 -0400 Subject: [Qemu-devel] [PATCH RFC 1/4] slirp: add helper for tcp6 socket creation 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: max7255@yandex-team.ru Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Maxim Samoylov --- slirp/socket.c | 73 ++++++++++++++++++++++++++++++++++++++++++++++++++++++= ++++ slirp/socket.h | 2 ++ 2 files changed, 75 insertions(+) diff --git a/slirp/socket.c b/slirp/socket.c index 322383a..e16e6c1 100644 --- a/slirp/socket.c +++ b/slirp/socket.c @@ -776,6 +776,79 @@ tcp_listen(Slirp *slirp, uint32_t haddr, u_int hport, = uint32_t laddr, return so; } =20 +struct socket * +tcp6_listen(Slirp *slirp, struct in6_addr haddr, u_int hport, + struct in6_addr laddr, u_int lport, int flags) +{ + struct sockaddr_in6 addr; + struct socket *so; + int s, opt =3D 1; + socklen_t addrlen =3D sizeof(addr); + memset(&addr, 0, addrlen); + + /* The same flow as in tcp_listen above */ + + so =3D socreate(slirp); + if (!so) { + return NULL; + } + + so->so_tcpcb =3D tcp_newtcpcb(so); + if (so->so_tcpcb =3D=3D NULL) { + free(so); + return NULL; + } + + insque(so, &slirp->tcb); + + if (flags & SS_FACCEPTONCE) { + so->so_tcpcb->t_timer[TCPT_KEEP] =3D TCPTV_KEEP_INIT * 2; + } + + so->so_state &=3D SS_PERSISTENT_MASK; + so->so_state |=3D (SS_FACCEPTCONN | flags); + so->so_lfamily =3D AF_INET6; + so->so_lport6 =3D lport; /* Kept in network format */ + so->so_laddr6 =3D laddr; + + addr.sin6_family =3D AF_INET6; + addr.sin6_addr =3D haddr; + addr.sin6_port =3D hport; + + s =3D qemu_socket(AF_INET6, SOCK_STREAM, 0); + if ((s < 0) || + (socket_set_fast_reuse(s) < 0) || + (bind(s, (struct sockaddr *)&addr, sizeof(addr)) < 0) || + (listen(s, 1) < 0)) { + int tmperrno =3D errno; /* Don't clobber the real reason we failed= */ + if (s >=3D 0) { + closesocket(s); + } + sofree(so); + /* Restore the real errno */ +#ifdef _WIN32 + WSASetLastError(tmperrno); +#else + errno =3D tmperrno; +#endif + return NULL; + } + qemu_setsockopt(s, SOL_SOCKET, SO_OOBINLINE, &opt, sizeof(int)); + + getsockname(s, (struct sockaddr *)&addr, &addrlen); + so->fhost.sin6 =3D addr; + + if (!memcmp(&addr.sin6_addr, &in6addr_any, sizeof(in6addr_any)) || + !memcmp(&addr.sin6_addr, &in6addr_loopback, + sizeof(in6addr_loopback))) { + + memcpy(&so->so_faddr6, &slirp->vhost_addr6, sizeof(slirp->vhost_ad= dr6)); + } + + so->s =3D s; + return so; +} + /* * Various session state calls * XXX Should be #define's diff --git a/slirp/socket.h b/slirp/socket.h index 2f224bc..b200bb6 100644 --- a/slirp/socket.h +++ b/slirp/socket.h @@ -144,6 +144,8 @@ void sorecvfrom(struct socket *); int sosendto(struct socket *, struct mbuf *); struct socket * tcp_listen(Slirp *, uint32_t, u_int, uint32_t, u_int, 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 *); --=20 2.7.4