From nobody Sun Apr 28 21:23:56 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 1498655526649296.71073665393624; Wed, 28 Jun 2017 06:12:06 -0700 (PDT) Received: from localhost ([::1]:33321 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dQClI-0006vh-EU for importer@patchew.org; Wed, 28 Jun 2017 09:12:04 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52946) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dQCiX-000460-LD for qemu-devel@nongnu.org; Wed, 28 Jun 2017 09:09:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dQCiW-0005dL-Gg for qemu-devel@nongnu.org; Wed, 28 Jun 2017 09:09:13 -0400 Received: from [59.151.112.132] (port=16038 helo=heian.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dQCiW-0005cL-3L for qemu-devel@nongnu.org; Wed, 28 Jun 2017 09:09:12 -0400 Received: from unknown (HELO cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 28 Jun 2017 21:09:07 +0800 Received: from G08CNEXCHPEKD02.g08.fujitsu.local (unknown [10.167.33.83]) by cn.fujitsu.com (Postfix) with ESMTP id AE35B47E64D5; Wed, 28 Jun 2017 21:09:02 +0800 (CST) Received: from maozy.g08.fujitsu.local (10.167.225.76) by G08CNEXCHPEKD02.g08.fujitsu.local (10.167.33.89) with Microsoft SMTP Server (TLS) id 14.3.319.2; Wed, 28 Jun 2017 21:09:01 +0800 X-IronPort-AV: E=Sophos;i="5.22,518,1449504000"; d="scan'208";a="20600669" From: Mao Zhongyi To: Date: Wed, 28 Jun 2017 21:08:47 +0800 Message-ID: X-Mailer: git-send-email 2.9.4 In-Reply-To: References: MIME-Version: 1.0 X-Originating-IP: [10.167.225.76] X-yoursite-MailScanner-ID: AE35B47E64D5.A1C4A X-yoursite-MailScanner: Found to be clean X-yoursite-MailScanner-From: maozy.fnst@cn.fujitsu.com X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 59.151.112.132 Subject: [Qemu-devel] [PATCH v6 1/4] net/socket: Don't treat odd socket type as SOCK_STREAM 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: jasowang@redhat.com, armbru@redhat.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 Content-Type: text/plain; charset="utf-8" In net_socket_fd_init(), the 'default' case is odd: it warns, then continues as if the socket type was SOCK_STREAM. The comment explains "this could be a eg. a pty", but that makes no sense. If @fd really was a pty, getsockopt() would fail with ENOTSOCK. If @fd was a socket, but neither SOCK_DGRAM nor SOCK_STREAM. It should not be treated as if it was SOCK_STREAM. Turn this case into an Error. If there is a genuine reason to support something like SOCK_RAW, it should be explicitly handled. Cc: jasowang@redhat.com Cc: armbru@redhat.com Cc: berrange@redhat.com Cc: armbru@redhat.com Suggested-by: Markus Armbruster Suggested-by: Daniel P. Berrange Signed-off-by: Mao Zhongyi Reviewed-by: Markus Armbruster --- net/socket.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/net/socket.c b/net/socket.c index dcae1ae..53765bd 100644 --- a/net/socket.c +++ b/net/socket.c @@ -449,9 +449,9 @@ static NetSocketState *net_socket_fd_init(NetClientStat= e *peer, case SOCK_STREAM: return net_socket_fd_init_stream(peer, model, name, fd, is_connect= ed); default: - /* who knows ... this could be a eg. a pty, do warn and continue a= s stream */ - fprintf(stderr, "qemu: warning: socket type=3D%d for fd=3D%d is no= t SOCK_DGRAM or SOCK_STREAM\n", so_type, fd); - return net_socket_fd_init_stream(peer, model, name, fd, is_connect= ed); + error_report("qemu: error: socket type=3D%d for fd=3D%d is not" + " SOCK_DGRAM or SOCK_STREAM", so_type, fd); + closesocket(fd); } return NULL; } --=20 2.9.4 From nobody Sun Apr 28 21:23:56 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 149865575645389.19818378664161; Wed, 28 Jun 2017 06:15:56 -0700 (PDT) Received: from localhost ([::1]:33344 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dQCoz-0001TY-6t for importer@patchew.org; Wed, 28 Jun 2017 09:15:53 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52960) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dQCiY-00046p-Mg for qemu-devel@nongnu.org; Wed, 28 Jun 2017 09:09:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dQCiX-0005di-4P for qemu-devel@nongnu.org; Wed, 28 Jun 2017 09:09:14 -0400 Received: from [59.151.112.132] (port=30009 helo=heian.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dQCiW-0005aI-DP for qemu-devel@nongnu.org; Wed, 28 Jun 2017 09:09:13 -0400 Received: from unknown (HELO cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 28 Jun 2017 21:09:07 +0800 Received: from G08CNEXCHPEKD02.g08.fujitsu.local (unknown [10.167.33.83]) by cn.fujitsu.com (Postfix) with ESMTP id 4A5AB47E9887; Wed, 28 Jun 2017 21:09:03 +0800 (CST) Received: from maozy.g08.fujitsu.local (10.167.225.76) by G08CNEXCHPEKD02.g08.fujitsu.local (10.167.33.89) with Microsoft SMTP Server (TLS) id 14.3.319.2; Wed, 28 Jun 2017 21:09:02 +0800 X-IronPort-AV: E=Sophos;i="5.22,518,1449504000"; d="scan'208";a="20600666" From: Mao Zhongyi To: Date: Wed, 28 Jun 2017 21:08:48 +0800 Message-ID: <4e5b562c22cfcfe7732857d6470fa56ecdd23146.1498654240.git.maozy.fnst@cn.fujitsu.com> X-Mailer: git-send-email 2.9.4 In-Reply-To: References: MIME-Version: 1.0 X-Originating-IP: [10.167.225.76] X-yoursite-MailScanner-ID: 4A5AB47E9887.A3F1E X-yoursite-MailScanner: Found to be clean X-yoursite-MailScanner-From: maozy.fnst@cn.fujitsu.com X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 59.151.112.132 Subject: [Qemu-devel] [PATCH v6 2/4] net/socket: Convert several helper functions to Error 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: jasowang@redhat.com, armbru@redhat.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 Content-Type: text/plain; charset="utf-8" Currently, net_socket_mcast_create(), net_socket_fd_init_dgram() and net_socket_fd_init() use the function such as fprintf(), perror() to report an error message. Now, convert these functions to Error. Cc: jasowang@redhat.com Cc: armbru@redhat.com Signed-off-by: Mao Zhongyi Reviewed-by: Daniel P. Berrange --- net/socket.c | 75 +++++++++++++++++++++++++++++++++++++-------------------= ---- 1 file changed, 47 insertions(+), 28 deletions(-) diff --git a/net/socket.c b/net/socket.c index 53765bd..b6bacf4 100644 --- a/net/socket.c +++ b/net/socket.c @@ -209,7 +209,9 @@ static void net_socket_send_dgram(void *opaque) } } =20 -static int net_socket_mcast_create(struct sockaddr_in *mcastaddr, struct i= n_addr *localaddr) +static int net_socket_mcast_create(struct sockaddr_in *mcastaddr, + struct in_addr *localaddr, + Error **errp) { struct ip_mreq imr; int fd; @@ -221,8 +223,8 @@ static int net_socket_mcast_create(struct sockaddr_in *= mcastaddr, struct in_addr #endif =20 if (!IN_MULTICAST(ntohl(mcastaddr->sin_addr.s_addr))) { - fprintf(stderr, "qemu: error: specified mcastaddr \"%s\" (0x%08x) " - "does not contain a multicast address\n", + error_setg(errp, "specified mcastaddr %s (0x%08x) " + "does not contain a multicast address", inet_ntoa(mcastaddr->sin_addr), (int)ntohl(mcastaddr->sin_addr.s_addr)); return -1; @@ -230,7 +232,7 @@ static int net_socket_mcast_create(struct sockaddr_in *= mcastaddr, struct in_addr } fd =3D qemu_socket(PF_INET, SOCK_DGRAM, 0); if (fd < 0) { - perror("socket(PF_INET, SOCK_DGRAM)"); + error_setg_errno(errp, errno, "failed to create datagram socket"); return -1; } =20 @@ -242,13 +244,15 @@ static int net_socket_mcast_create(struct sockaddr_in= *mcastaddr, struct in_addr val =3D 1; ret =3D qemu_setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &val, sizeof(val= )); if (ret < 0) { - perror("setsockopt(SOL_SOCKET, SO_REUSEADDR)"); + error_setg_errno(errp, errno, "set the socket 'SO_REUSEADDR'" + " attribute failed"); goto fail; } =20 ret =3D bind(fd, (struct sockaddr *)mcastaddr, sizeof(*mcastaddr)); if (ret < 0) { - perror("bind"); + error_setg_errno(errp, errno, "bind ip=3D%s to socket failed", + inet_ntoa(mcastaddr->sin_addr)); goto fail; } =20 @@ -263,7 +267,8 @@ static int net_socket_mcast_create(struct sockaddr_in *= mcastaddr, struct in_addr ret =3D qemu_setsockopt(fd, IPPROTO_IP, IP_ADD_MEMBERSHIP, &imr, sizeof(struct ip_mreq)); if (ret < 0) { - perror("setsockopt(IP_ADD_MEMBERSHIP)"); + error_setg_errno(errp, errno, "add socket to multicast group %s" + " failed", inet_ntoa(imr.imr_multiaddr)); goto fail; } =20 @@ -272,7 +277,8 @@ static int net_socket_mcast_create(struct sockaddr_in *= mcastaddr, struct in_addr ret =3D qemu_setsockopt(fd, IPPROTO_IP, IP_MULTICAST_LOOP, &loop, sizeof(loop)); if (ret < 0) { - perror("setsockopt(SOL_IP, IP_MULTICAST_LOOP)"); + error_setg_errno(errp, errno, "force multicast message to loopback" + " failed"); goto fail; } =20 @@ -281,7 +287,8 @@ static int net_socket_mcast_create(struct sockaddr_in *= mcastaddr, struct in_addr ret =3D qemu_setsockopt(fd, IPPROTO_IP, IP_MULTICAST_IF, localaddr, sizeof(*localaddr)); if (ret < 0) { - perror("setsockopt(IP_MULTICAST_IF)"); + error_setg_errno(errp, errno, "set the default network send " + "interface failed"); goto fail; } } @@ -320,7 +327,8 @@ static NetClientInfo net_dgram_socket_info =3D { static NetSocketState *net_socket_fd_init_dgram(NetClientState *peer, const char *model, const char *name, - int fd, int is_connected) + int fd, int is_connected, + Error **errp) { struct sockaddr_in saddr; int newfd; @@ -337,14 +345,13 @@ static NetSocketState *net_socket_fd_init_dgram(NetCl= ientState *peer, if (getsockname(fd, (struct sockaddr *) &saddr, &saddr_len) =3D=3D= 0) { /* must be bound */ if (saddr.sin_addr.s_addr =3D=3D 0) { - fprintf(stderr, "qemu: error: init_dgram: fd=3D%d unbound,= " - "cannot setup multicast dst addr\n", fd); + error_setg(errp, "init_dgram: fd=3D%d unbound, " + "cannot setup multicast dst addr", fd); goto err; } /* clone dgram socket */ - newfd =3D net_socket_mcast_create(&saddr, NULL); + newfd =3D net_socket_mcast_create(&saddr, NULL, errp); if (newfd < 0) { - /* error already reported by net_socket_mcast_create() */ goto err; } /* clone newfd to fd, close newfd */ @@ -352,8 +359,8 @@ static NetSocketState *net_socket_fd_init_dgram(NetClie= ntState *peer, close(newfd); =20 } else { - fprintf(stderr, - "qemu: error: init_dgram: fd=3D%d failed getsockname()= : %s\n", + error_setg(errp, + "init_dgram: fd=3D%d failed getsockname(): %s", fd, strerror(errno)); goto err; } @@ -432,24 +439,26 @@ static NetSocketState *net_socket_fd_init_stream(NetC= lientState *peer, =20 static NetSocketState *net_socket_fd_init(NetClientState *peer, const char *model, const char *n= ame, - int fd, int is_connected) + int fd, int is_connected, + Error **errp) { int so_type =3D -1, optlen=3Dsizeof(so_type); =20 if(getsockopt(fd, SOL_SOCKET, SO_TYPE, (char *)&so_type, (socklen_t *)&optlen)< 0) { - fprintf(stderr, "qemu: error: getsockopt(SO_TYPE) for fd=3D%d fail= ed\n", + error_setg(errp, "getsockopt(SO_TYPE) for fd=3D%d failed", fd); closesocket(fd); return NULL; } switch(so_type) { case SOCK_DGRAM: - return net_socket_fd_init_dgram(peer, model, name, fd, is_connecte= d); + return net_socket_fd_init_dgram(peer, model, name, fd, is_connecte= d, + errp); case SOCK_STREAM: return net_socket_fd_init_stream(peer, model, name, fd, is_connect= ed); default: - error_report("qemu: error: socket type=3D%d for fd=3D%d is not" + error_setg(errp, "socket type=3D%d for fd=3D%d is not" " SOCK_DGRAM or SOCK_STREAM", so_type, fd); closesocket(fd); } @@ -536,6 +545,7 @@ static int net_socket_connect_init(NetClientState *peer, NetSocketState *s; int fd, connected, ret; struct sockaddr_in saddr; + Error *err =3D NULL; =20 if (parse_host_port(&saddr, host_str) < 0) return -1; @@ -567,9 +577,11 @@ static int net_socket_connect_init(NetClientState *pee= r, break; } } - s =3D net_socket_fd_init(peer, model, name, fd, connected); - if (!s) + s =3D net_socket_fd_init(peer, model, name, fd, connected, &err); + if (!s) { + error_report_err(err); return -1; + } snprintf(s->nc.info_str, sizeof(s->nc.info_str), "socket: connect to %s:%d", inet_ntoa(saddr.sin_addr), ntohs(saddr.sin_port)); @@ -586,6 +598,7 @@ static int net_socket_mcast_init(NetClientState *peer, int fd; struct sockaddr_in saddr; struct in_addr localaddr, *param_localaddr; + Error *err =3D NULL; =20 if (parse_host_port(&saddr, host_str) < 0) return -1; @@ -598,13 +611,17 @@ static int net_socket_mcast_init(NetClientState *peer, param_localaddr =3D NULL; } =20 - fd =3D net_socket_mcast_create(&saddr, param_localaddr); - if (fd < 0) + fd =3D net_socket_mcast_create(&saddr, param_localaddr, &err); + if (fd < 0) { + error_report_err(err); return -1; + } =20 - s =3D net_socket_fd_init(peer, model, name, fd, 0); - if (!s) + s =3D net_socket_fd_init(peer, model, name, fd, 0, &err); + if (!s) { + error_report_err(err); return -1; + } =20 s->dgram_dst =3D saddr; =20 @@ -624,6 +641,7 @@ static int net_socket_udp_init(NetClientState *peer, NetSocketState *s; int fd, ret; struct sockaddr_in laddr, raddr; + Error *err =3D NULL; =20 if (parse_host_port(&laddr, lhost) < 0) { return -1; @@ -652,8 +670,9 @@ static int net_socket_udp_init(NetClientState *peer, } qemu_set_nonblock(fd); =20 - s =3D net_socket_fd_init(peer, model, name, fd, 0); + s =3D net_socket_fd_init(peer, model, name, fd, 0, &err); if (!s) { + error_report_err(err); return -1; } =20 @@ -696,7 +715,7 @@ int net_init_socket(const Netdev *netdev, const char *n= ame, return -1; } qemu_set_nonblock(fd); - if (!net_socket_fd_init(peer, "socket", name, fd, 1)) { + if (!net_socket_fd_init(peer, "socket", name, fd, 1, errp)) { return -1; } return 0; --=20 2.9.4 From nobody Sun Apr 28 21:23:56 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 149865546258911.664770568540007; Wed, 28 Jun 2017 06:11:02 -0700 (PDT) Received: from localhost ([::1]:33316 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dQCkE-0005w1-1Z for importer@patchew.org; Wed, 28 Jun 2017 09:10:58 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52982) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dQCia-00048I-39 for qemu-devel@nongnu.org; Wed, 28 Jun 2017 09:09:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dQCiY-0005eZ-Mq for qemu-devel@nongnu.org; Wed, 28 Jun 2017 09:09:16 -0400 Received: from [59.151.112.132] (port=42341 helo=heian.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dQCiX-0005d2-82 for qemu-devel@nongnu.org; Wed, 28 Jun 2017 09:09:14 -0400 Received: from unknown (HELO cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 28 Jun 2017 21:09:07 +0800 Received: from G08CNEXCHPEKD02.g08.fujitsu.local (unknown [10.167.33.83]) by cn.fujitsu.com (Postfix) with ESMTP id F240B47EE1F4; Wed, 28 Jun 2017 21:09:03 +0800 (CST) Received: from maozy.g08.fujitsu.local (10.167.225.76) by G08CNEXCHPEKD02.g08.fujitsu.local (10.167.33.89) with Microsoft SMTP Server (TLS) id 14.3.319.2; Wed, 28 Jun 2017 21:09:02 +0800 X-IronPort-AV: E=Sophos;i="5.22,518,1449504000"; d="scan'208";a="20600668" From: Mao Zhongyi To: Date: Wed, 28 Jun 2017 21:08:49 +0800 Message-ID: X-Mailer: git-send-email 2.9.4 In-Reply-To: References: MIME-Version: 1.0 X-Originating-IP: [10.167.225.76] X-yoursite-MailScanner-ID: F240B47EE1F4.A3BF9 X-yoursite-MailScanner: Found to be clean X-yoursite-MailScanner-From: maozy.fnst@cn.fujitsu.com X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 59.151.112.132 Subject: [Qemu-devel] [PATCH v6 3/4] net/net: Convert parse_host_port() to Error 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: pbonzini@redhat.com, jasowang@redhat.com, kraxel@redhat.com, armbru@redhat.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 Content-Type: text/plain; charset="utf-8" Cc: berrange@redhat.com Cc: kraxel@redhat.com Cc: pbonzini@redhat.com Cc: jasowang@redhat.com Cc: armbru@redhat.com Signed-off-by: Mao Zhongyi --- include/qemu/sockets.h | 3 ++- net/net.c | 23 ++++++++++++++++++----- net/socket.c | 19 ++++++++++++++----- 3 files changed, 34 insertions(+), 11 deletions(-) diff --git a/include/qemu/sockets.h b/include/qemu/sockets.h index 5c326db..78e2b30 100644 --- a/include/qemu/sockets.h +++ b/include/qemu/sockets.h @@ -53,7 +53,8 @@ void socket_listen_cleanup(int fd, Error **errp); int socket_dgram(SocketAddress *remote, SocketAddress *local, Error **errp= ); =20 /* Old, ipv4 only bits. Don't use for new code. */ -int parse_host_port(struct sockaddr_in *saddr, const char *str); +int parse_host_port(struct sockaddr_in *saddr, const char *str, + Error **errp); int socket_init(void); =20 /** diff --git a/net/net.c b/net/net.c index 6235aab..29cc7df 100644 --- a/net/net.c +++ b/net/net.c @@ -100,7 +100,8 @@ static int get_str_sep(char *buf, int buf_size, const c= har **pp, int sep) return 0; } =20 -int parse_host_port(struct sockaddr_in *saddr, const char *str) +int parse_host_port(struct sockaddr_in *saddr, const char *str, + Error **errp) { char buf[512]; struct hostent *he; @@ -108,24 +109,36 @@ int parse_host_port(struct sockaddr_in *saddr, const = char *str) int port; =20 p =3D str; - if (get_str_sep(buf, sizeof(buf), &p, ':') < 0) + if (get_str_sep(buf, sizeof(buf), &p, ':') < 0) { + error_setg(errp, "host address '%s' doesn't contain ':' " + "separating host from port", str); return -1; + } saddr->sin_family =3D AF_INET; if (buf[0] =3D=3D '\0') { saddr->sin_addr.s_addr =3D 0; } else { if (qemu_isdigit(buf[0])) { - if (!inet_aton(buf, &saddr->sin_addr)) + if (!inet_aton(buf, &saddr->sin_addr)) { + error_setg(errp, "host address '%s' is not a valid " + "IPv4 address", buf); return -1; + } } else { - if ((he =3D gethostbyname(buf)) =3D=3D NULL) + he =3D gethostbyname(buf); + if (he =3D=3D NULL) { + error_setg(errp, "can't resolve host address '%s': " + "unknown host", buf); return - 1; + } saddr->sin_addr =3D *(struct in_addr *)he->h_addr; } } port =3D strtol(p, (char **)&r, 0); - if (r =3D=3D p) + if (r =3D=3D p) { + error_setg(errp, "port number '%s' is invalid", p); return -1; + } saddr->sin_port =3D htons(port); return 0; } diff --git a/net/socket.c b/net/socket.c index b6bacf4..90dd4c0 100644 --- a/net/socket.c +++ b/net/socket.c @@ -500,9 +500,12 @@ static int net_socket_listen_init(NetClientState *peer, NetSocketState *s; struct sockaddr_in saddr; int fd, ret; + Error *err =3D NULL; =20 - if (parse_host_port(&saddr, host_str) < 0) + if (parse_host_port(&saddr, host_str, &err) < 0) { + error_report_err(err); return -1; + } =20 fd =3D qemu_socket(PF_INET, SOCK_STREAM, 0); if (fd < 0) { @@ -547,8 +550,10 @@ static int net_socket_connect_init(NetClientState *pee= r, struct sockaddr_in saddr; Error *err =3D NULL; =20 - if (parse_host_port(&saddr, host_str) < 0) + if (parse_host_port(&saddr, host_str, &err) < 0) { + error_report_err(err); return -1; + } =20 fd =3D qemu_socket(PF_INET, SOCK_STREAM, 0); if (fd < 0) { @@ -600,8 +605,10 @@ static int net_socket_mcast_init(NetClientState *peer, struct in_addr localaddr, *param_localaddr; Error *err =3D NULL; =20 - if (parse_host_port(&saddr, host_str) < 0) + if (parse_host_port(&saddr, host_str, &err) < 0) { + error_report_err(err); return -1; + } =20 if (localaddr_str !=3D NULL) { if (inet_aton(localaddr_str, &localaddr) =3D=3D 0) @@ -643,11 +650,13 @@ static int net_socket_udp_init(NetClientState *peer, struct sockaddr_in laddr, raddr; Error *err =3D NULL; =20 - if (parse_host_port(&laddr, lhost) < 0) { + if (parse_host_port(&laddr, lhost, &err) < 0) { + error_report_err(err); return -1; } =20 - if (parse_host_port(&raddr, rhost) < 0) { + if (parse_host_port(&raddr, rhost, &err) < 0) { + error_report_err(err); return -1; } =20 --=20 2.9.4 From nobody Sun Apr 28 21:23:56 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 1498655464007203.72124308281184; Wed, 28 Jun 2017 06:11:04 -0700 (PDT) Received: from localhost ([::1]:33315 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dQCkE-0005vi-KM for importer@patchew.org; Wed, 28 Jun 2017 09:10:58 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52965) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dQCiY-000471-Uq for qemu-devel@nongnu.org; Wed, 28 Jun 2017 09:09:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dQCiU-0005bv-DM for qemu-devel@nongnu.org; Wed, 28 Jun 2017 09:09:14 -0400 Received: from [59.151.112.132] (port=30009 helo=heian.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dQCiT-0005aI-Cf for qemu-devel@nongnu.org; Wed, 28 Jun 2017 09:09:10 -0400 Received: from unknown (HELO cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 28 Jun 2017 21:09:07 +0800 Received: from G08CNEXCHPEKD02.g08.fujitsu.local (unknown [10.167.33.83]) by cn.fujitsu.com (Postfix) with ESMTP id A472A47EE218; Wed, 28 Jun 2017 21:09:04 +0800 (CST) Received: from maozy.g08.fujitsu.local (10.167.225.76) by G08CNEXCHPEKD02.g08.fujitsu.local (10.167.33.89) with Microsoft SMTP Server (TLS) id 14.3.319.2; Wed, 28 Jun 2017 21:09:03 +0800 X-IronPort-AV: E=Sophos;i="5.22,518,1449504000"; d="scan'208";a="20600665" From: Mao Zhongyi To: Date: Wed, 28 Jun 2017 21:08:50 +0800 Message-ID: X-Mailer: git-send-email 2.9.4 In-Reply-To: References: MIME-Version: 1.0 X-Originating-IP: [10.167.225.76] X-yoursite-MailScanner-ID: A472A47EE218.A3BA0 X-yoursite-MailScanner: Found to be clean X-yoursite-MailScanner-From: maozy.fnst@cn.fujitsu.com X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 59.151.112.132 Subject: [Qemu-devel] [PATCH v6 4/4] net/socket: Improve -net socket error reporting 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: jasowang@redhat.com, armbru@redhat.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 Content-Type: text/plain; charset="utf-8" When -net socket fails, it first reports a specific error, then a generic one, like this: $ qemu-system-x86_64 -net socket, qemu-system-x86_64: -net socket: exactly one of fd=3D, listen=3D, conne= ct=3D, mcast=3D or udp=3D is required qemu-system-x86_64: -net socket: Device 'socket' could not be initializ= ed Convert net_socket_*_init() to Error to get rid of the superfluous second error message. After the patch, the effect like this: $ qemu-system-x86_64 -net socket, qemu-system-x86_64: -net socket: exactly one of fd=3D, listen=3D, conne= ct=3D, mcast=3D or udp=3D is required At the same time, add many explicit error handling message when it fails. Cc: jasowang@redhat.com Cc: armbru@redhat.com Signed-off-by: Mao Zhongyi --- net/socket.c | 92 +++++++++++++++++++++++++++++---------------------------= ---- 1 file changed, 44 insertions(+), 48 deletions(-) diff --git a/net/socket.c b/net/socket.c index 90dd4c0..47e6706 100644 --- a/net/socket.c +++ b/net/socket.c @@ -494,22 +494,21 @@ static void net_socket_accept(void *opaque) static int net_socket_listen_init(NetClientState *peer, const char *model, const char *name, - const char *host_str) + const char *host_str, + Error **errp) { NetClientState *nc; NetSocketState *s; struct sockaddr_in saddr; int fd, ret; - Error *err =3D NULL; =20 - if (parse_host_port(&saddr, host_str, &err) < 0) { - error_report_err(err); + if (parse_host_port(&saddr, host_str, errp) < 0) { return -1; } =20 fd =3D qemu_socket(PF_INET, SOCK_STREAM, 0); if (fd < 0) { - perror("socket"); + error_setg_errno(errp, errno, "failed to create stream socket"); return -1; } qemu_set_nonblock(fd); @@ -518,13 +517,14 @@ static int net_socket_listen_init(NetClientState *pee= r, =20 ret =3D bind(fd, (struct sockaddr *)&saddr, sizeof(saddr)); if (ret < 0) { - perror("bind"); + error_setg_errno(errp, errno, "bind ip=3D%s to socket failed", + inet_ntoa(saddr.sin_addr)); closesocket(fd); return -1; } ret =3D listen(fd, 0); if (ret < 0) { - perror("listen"); + error_setg_errno(errp, errno, "listen socket failed"); closesocket(fd); return -1; } @@ -543,21 +543,20 @@ static int net_socket_listen_init(NetClientState *pee= r, static int net_socket_connect_init(NetClientState *peer, const char *model, const char *name, - const char *host_str) + const char *host_str, + Error **errp) { NetSocketState *s; int fd, connected, ret; struct sockaddr_in saddr; - Error *err =3D NULL; =20 - if (parse_host_port(&saddr, host_str, &err) < 0) { - error_report_err(err); + if (parse_host_port(&saddr, host_str, errp) < 0) { return -1; } =20 fd =3D qemu_socket(PF_INET, SOCK_STREAM, 0); if (fd < 0) { - perror("socket"); + error_setg_errno(errp, errno, "failed to create stream socket"); return -1; } qemu_set_nonblock(fd); @@ -573,7 +572,7 @@ static int net_socket_connect_init(NetClientState *peer, errno =3D=3D EINVAL) { break; } else { - perror("connect"); + error_setg_errno(errp, errno, "connection failed"); closesocket(fd); return -1; } @@ -582,9 +581,8 @@ static int net_socket_connect_init(NetClientState *peer, break; } } - s =3D net_socket_fd_init(peer, model, name, fd, connected, &err); + s =3D net_socket_fd_init(peer, model, name, fd, connected, errp); if (!s) { - error_report_err(err); return -1; } snprintf(s->nc.info_str, sizeof(s->nc.info_str), @@ -597,36 +595,36 @@ static int net_socket_mcast_init(NetClientState *peer, const char *model, const char *name, const char *host_str, - const char *localaddr_str) + const char *localaddr_str, + Error **errp) { NetSocketState *s; int fd; struct sockaddr_in saddr; struct in_addr localaddr, *param_localaddr; - Error *err =3D NULL; =20 - if (parse_host_port(&saddr, host_str, &err) < 0) { - error_report_err(err); + if (parse_host_port(&saddr, host_str, errp) < 0) { return -1; } =20 if (localaddr_str !=3D NULL) { - if (inet_aton(localaddr_str, &localaddr) =3D=3D 0) + if (inet_aton(localaddr_str, &localaddr) =3D=3D 0) { + error_setg(errp, "localaddr '%s' is not a valid IPv4 address", + localaddr_str); return -1; + } param_localaddr =3D &localaddr; } else { param_localaddr =3D NULL; } =20 - fd =3D net_socket_mcast_create(&saddr, param_localaddr, &err); + fd =3D net_socket_mcast_create(&saddr, param_localaddr, errp); if (fd < 0) { - error_report_err(err); return -1; } =20 - s =3D net_socket_fd_init(peer, model, name, fd, 0, &err); + s =3D net_socket_fd_init(peer, model, name, fd, 0, errp); if (!s) { - error_report_err(err); return -1; } =20 @@ -643,45 +641,45 @@ static int net_socket_udp_init(NetClientState *peer, const char *model, const char *name, const char *rhost, - const char *lhost) + const char *lhost, + Error **errp) { NetSocketState *s; int fd, ret; struct sockaddr_in laddr, raddr; - Error *err =3D NULL; =20 - if (parse_host_port(&laddr, lhost, &err) < 0) { - error_report_err(err); + if (parse_host_port(&laddr, lhost, errp) < 0) { return -1; } =20 - if (parse_host_port(&raddr, rhost, &err) < 0) { - error_report_err(err); + if (parse_host_port(&raddr, rhost, errp) < 0) { return -1; } =20 fd =3D qemu_socket(PF_INET, SOCK_DGRAM, 0); if (fd < 0) { - perror("socket(PF_INET, SOCK_DGRAM)"); + error_setg_errno(errp, errno, "failed to create datagram socket"); return -1; } =20 ret =3D socket_set_fast_reuse(fd); if (ret < 0) { + error_setg_errno(errp, errno, "set the socket 'SO_REUSEADDR'" + " attribute failed"); closesocket(fd); return -1; } ret =3D bind(fd, (struct sockaddr *)&laddr, sizeof(laddr)); if (ret < 0) { - perror("bind"); + error_setg_errno(errp, errno, "bind ip=3D%s to socket failed", + inet_ntoa(laddr.sin_addr)); closesocket(fd); return -1; } qemu_set_nonblock(fd); =20 - s =3D net_socket_fd_init(peer, model, name, fd, 0, &err); + s =3D net_socket_fd_init(peer, model, name, fd, 0, errp); if (!s) { - error_report_err(err); return -1; } =20 @@ -696,8 +694,6 @@ static int net_socket_udp_init(NetClientState *peer, int net_init_socket(const Netdev *netdev, const char *name, NetClientState *peer, Error **errp) { - /* FIXME error_setg(errp, ...) on failure */ - Error *err =3D NULL; const NetdevSocketOptions *sock; =20 assert(netdev->type =3D=3D NET_CLIENT_DRIVER_SOCKET); @@ -705,22 +701,21 @@ int net_init_socket(const Netdev *netdev, const char = *name, =20 if (sock->has_fd + sock->has_listen + sock->has_connect + sock->has_mc= ast + sock->has_udp !=3D 1) { - error_report("exactly one of fd=3D, listen=3D, connect=3D, mcast= =3D or udp=3D" + error_setg(errp, "exactly one of fd=3D, listen=3D, connect=3D, mca= st=3D or udp=3D" " is required"); return -1; } =20 if (sock->has_localaddr && !sock->has_mcast && !sock->has_udp) { - error_report("localaddr=3D is only valid with mcast=3D or udp=3D"); + error_setg(errp, "localaddr=3D is only valid with mcast=3D or udp= =3D"); return -1; } =20 if (sock->has_fd) { int fd; =20 - fd =3D monitor_fd_param(cur_mon, sock->fd, &err); + fd =3D monitor_fd_param(cur_mon, sock->fd, errp); if (fd =3D=3D -1) { - error_report_err(err); return -1; } qemu_set_nonblock(fd); @@ -731,15 +726,16 @@ int net_init_socket(const Netdev *netdev, const char = *name, } =20 if (sock->has_listen) { - if (net_socket_listen_init(peer, "socket", name, sock->listen) =3D= =3D -1) { + if (net_socket_listen_init(peer, "socket", name, + sock->listen, errp) =3D=3D -1) { return -1; } return 0; } =20 if (sock->has_connect) { - if (net_socket_connect_init(peer, "socket", name, sock->connect) = =3D=3D - -1) { + if (net_socket_connect_init(peer, "socket", name, + sock->connect, errp) =3D=3D -1) { return -1; } return 0; @@ -748,8 +744,8 @@ int net_init_socket(const Netdev *netdev, const char *n= ame, if (sock->has_mcast) { /* if sock->localaddr is missing, it has been initialized to "all = bits * zero" */ - if (net_socket_mcast_init(peer, "socket", name, sock->mcast, - sock->localaddr) =3D=3D -1) { + if (net_socket_mcast_init(peer, "socket", name, + sock->mcast, sock->localaddr, errp) =3D=3D -1) { return -1; } return 0; @@ -757,11 +753,11 @@ int net_init_socket(const Netdev *netdev, const char = *name, =20 assert(sock->has_udp); if (!sock->has_localaddr) { - error_report("localaddr=3D is mandatory with udp=3D"); + error_setg(errp, "localaddr=3D is mandatory with udp=3D"); return -1; } - if (net_socket_udp_init(peer, "socket", name, sock->udp, sock->localad= dr) =3D=3D - -1) { + if (net_socket_udp_init(peer, "socket", name, + sock->udp, sock->localaddr, errp) =3D=3D -1) { return -1; } return 0; --=20 2.9.4