From nobody Tue Feb 10 21:59:32 2026 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1517253524104401.98724944767775; Mon, 29 Jan 2018 11:18:44 -0800 (PST) Received: from localhost ([::1]:60031 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1egEx1-0000cu-Cf for importer@patchew.org; Mon, 29 Jan 2018 14:18:43 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46394) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1egEt5-0005zV-DK for qemu-devel@nongnu.org; Mon, 29 Jan 2018 14:14:40 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1egEt3-000090-DH for qemu-devel@nongnu.org; Mon, 29 Jan 2018 14:14:39 -0500 Received: from mail-pf0-x242.google.com ([2607:f8b0:400e:c00::242]:40342) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1egEt3-00008c-7c for qemu-devel@nongnu.org; Mon, 29 Jan 2018 14:14:37 -0500 Received: by mail-pf0-x242.google.com with SMTP id i66so6229677pfd.7 for ; Mon, 29 Jan 2018 11:14:37 -0800 (PST) Received: from fma-X550VB.lan ([218.193.183.120]) by smtp.gmail.com with ESMTPSA id d8sm1135316pfh.93.2018.01.29.11.14.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 29 Jan 2018 11:14:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=uQ6XrePX60GcKVmhzruydcCWLfoN6v0hkCGxzST3HFA=; b=jDBmV0JNvUhJxbvioL/JgtU/Upls1U7GSrpTbbTgBCjJiTCXZxjLIZoM0iV/62RZYl iMTC1u7+s2V/MBwE3OdUQBeISRIexSQXl8SxTExjLm8TotgdyOl5EQltEI8E6cNLoEx3 ar8ekHVntCDZfS2qlCFsRZE89tYt/l00uIX7j38N1qWh5VpwGeAcBkiZCo6WGbrEvC2r y23U8SOiFX7Il6hFcIxS3veFSo2OrnuIu9U8yB5sAcDUgZfVTmEoNyc0zBFJFMnluQ9b PRi4CCoK/EK469hLa6OwNaS3KKBTzHMJNDf6Stiz0IhBzR7Qw7ljwKMGBBlbwYKS3/39 cr7A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=uQ6XrePX60GcKVmhzruydcCWLfoN6v0hkCGxzST3HFA=; b=AOR0UwJhBuLESgb0HKQlHGXdjEroQ156K5jr830vBuNy3nDSHX87V8INtDibyT0EyP lvszpxcYzXbOd3PHiOxcbIr+qi+J7FCymDRfE11AbrrMIE+sA7+BeJWaEE9LkClnhPuH 2pvm3xak9tq05bX5yB8J2ZLWOjeH5NIEeIFD+qilZbwWGlnkaOCRYu0778hLvaab08vf GUl0QRTD1Of/OpDo53zSo+7suvJiTCbgYXD4M0D1eOS7zL7AUr+QqEcaSkAaJkaSsTct ALp05y7YUeVRIHZNtYgcHoiQatGMXWsyXOF8B18PWzJvmG1LLiQgNDV+iMzn9vr9Df8l At2g== X-Gm-Message-State: AKwxyte1oApbFm9FA1aLJwZJS5kKIy0N3kK2ZeJRegzrbjiAIciSVxr6 4HqCZgWQvQYnX/bef+YPGm8tJOB8 X-Google-Smtp-Source: AH8x225b6xvR1fcO4ICoaHqvzjNAxfStkG4f9PtVlWRX2kZvqJMMHt3J7DIvU03MwMALeZaWEkNepg== X-Received: by 10.98.220.195 with SMTP id c64mr27499897pfl.47.1517253276189; Mon, 29 Jan 2018 11:14:36 -0800 (PST) From: Zihan Yang To: qemu-devel@nongnu.org Date: Tue, 30 Jan 2018 03:13:43 +0800 Message-Id: <1517253224-14361-4-git-send-email-whois.zihan.yang@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1517253224-14361-1-git-send-email-whois.zihan.yang@gmail.com> References: <1517253224-14361-1-git-send-email-whois.zihan.yang@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c00::242 Subject: [Qemu-devel] [RFC 3/4] net/socket: change net_socket_listen_init to use functions in include/qemu/sockets.h 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: Jason Wang , Zihan Yang Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Some functions in net/socket.c still uses bind/connect/listen directly. Change it to use functions in include/qemu/sockets.h Signed-off-by: Zihan Yang --- net/socket.c | 41 +++++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/net/socket.c b/net/socket.c index 6917fbc..7b07223 100644 --- a/net/socket.c +++ b/net/socket.c @@ -494,35 +494,35 @@ static int net_socket_listen_init(NetClientState *pee= r, { NetClientState *nc; NetSocketState *s; - struct sockaddr_in saddr; - int fd, ret; + SocketAddress *saddr; + QemuSocketConfig *sconf; + Error *local_err =3D NULL; + int fd; =20 - if (parse_host_port(&saddr, host_str, errp) < 0) { + saddr =3D socket_parse(host_str, &local_err); + if(NULL !=3D local_err) { + error_setg_errno(errp, errno, "socket_parse failed"); return -1; } =20 - fd =3D qemu_socket(PF_INET, SOCK_STREAM, 0); - if (fd < 0) { - error_setg_errno(errp, errno, "can't create stream socket"); + /* Manually prepare config because socket_listen ++ * will not set O_NONBLOCKING */ + sconf =3D g_new0(QemuSocketConfig, 1); + if(NULL =3D=3D sconf) { + qapi_free_SocketAddress(saddr); + error_setg_errno(errp, errno, "out of memory"); return -1; } - qemu_set_nonblock(fd); + sconf->nonblocking =3D true; + sconf->options =3D NULL; =20 - socket_set_fast_reuse(fd); - - ret =3D bind(fd, (struct sockaddr *)&saddr, sizeof(saddr)); - if (ret < 0) { - error_setg_errno(errp, errno, "can't bind ip=3D%s to socket", - inet_ntoa(saddr.sin_addr)); - closesocket(fd); - return -1; - } - ret =3D listen(fd, 0); - if (ret < 0) { - error_setg_errno(errp, errno, "can't listen on socket"); - closesocket(fd); + fd =3D socket_listen(saddr, errp, sconf); + if(fd < 0) { + error_setg_errno(errp, errno, "can't listen on address"); + qapi_free_SocketAddress(saddr); return -1; } + g_free(sconf); =20 nc =3D qemu_new_net_client(&net_socket_info, peer, model, name); s =3D DO_UPCAST(NetSocketState, nc, nc); @@ -532,6 +532,7 @@ static int net_socket_listen_init(NetClientState *peer, net_socket_rs_init(&s->rs, net_socket_rs_finalize, false); =20 qemu_set_fd_handler(s->listen_fd, net_socket_accept, NULL, s); + qapi_free_SocketAddress(saddr); return 0; } =20 --=20 2.7.4