From nobody Wed Nov 5 16:40:59 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.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 1497002740574793.0043107065725; Fri, 9 Jun 2017 03:05:40 -0700 (PDT) Received: from localhost ([::1]:53576 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dJGnS-00007m-5j for importer@patchew.org; Fri, 09 Jun 2017 06:05:38 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40852) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dJGlS-0007Kd-Vw for qemu-devel@nongnu.org; Fri, 09 Jun 2017 06:03:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dJGlR-0002aQ-Pd for qemu-devel@nongnu.org; Fri, 09 Jun 2017 06:03:34 -0400 Received: from [59.151.112.132] (port=5270 helo=heian.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dJGlQ-0002XD-Tm for qemu-devel@nongnu.org; Fri, 09 Jun 2017 06:03:33 -0400 Received: from unknown (HELO cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 09 Jun 2017 18:03:17 +0800 Received: from G08CNEXCHPEKD02.g08.fujitsu.local (unknown [10.167.33.83]) by cn.fujitsu.com (Postfix) with ESMTP id 8E23A47C7C61; Fri, 9 Jun 2017 18:03:17 +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; Fri, 9 Jun 2017 18:03:17 +0800 X-IronPort-AV: E=Sophos;i="5.22,518,1449504000"; d="scan'208";a="19854104" From: Mao Zhongyi To: Date: Fri, 9 Jun 2017 18:01:46 +0800 Message-ID: <4f0312501b6cf2ceb93c1d3e1fc040525b34b707.1496924675.git.maozy.fnst@cn.fujitsu.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: References: MIME-Version: 1.0 X-Originating-IP: [10.167.225.76] X-yoursite-MailScanner-ID: 8E23A47C7C61.A1756 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 v3 2/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 | 2 +- net/net.c | 21 ++++++++++++++++----- net/socket.c | 37 ++++++++++++++++++++++--------------- 3 files changed, 39 insertions(+), 21 deletions(-) diff --git a/include/qemu/sockets.h b/include/qemu/sockets.h index 5c326db..7abffc4 100644 --- a/include/qemu/sockets.h +++ b/include/qemu/sockets.h @@ -53,7 +53,7 @@ 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 **er= rp); int socket_init(void); =20 /** diff --git a/net/net.c b/net/net.c index 6235aab..e55869a 100644 --- a/net/net.c +++ b/net/net.c @@ -100,7 +100,7 @@ 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 **er= rp) { char buf[512]; struct hostent *he; @@ -108,24 +108,35 @@ 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, "The address should contain ':', for example: " + "xxxx=3D230.0.0.1:1234"); 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, "Specified hostname is error."); 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, "The port number is illegal"); return -1; + } saddr->sin_port =3D htons(port); return 0; } diff --git a/net/socket.c b/net/socket.c index a503cfe..d711f51 100644 --- a/net/socket.c +++ b/net/socket.c @@ -485,15 +485,17 @@ 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; =20 - if (parse_host_port(&saddr, host_str) < 0) + if (parse_host_port(&saddr, host_str, errp) < 0) { return -1; + } =20 fd =3D qemu_socket(PF_INET, SOCK_STREAM, 0); if (fd < 0) { @@ -531,14 +533,16 @@ 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; =20 - if (parse_host_port(&saddr, host_str) < 0) + if (parse_host_port(&saddr, host_str, errp) < 0) { return -1; + } =20 fd =3D qemu_socket(PF_INET, SOCK_STREAM, 0); if (fd < 0) { @@ -580,14 +584,15 @@ 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; =20 - if (parse_host_port(&saddr, host_str) < 0) + if (parse_host_port(&saddr, host_str, errp) < 0) return -1; =20 if (localaddr_str !=3D NULL) { @@ -619,17 +624,18 @@ 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; =20 - if (parse_host_port(&laddr, lhost) < 0) { + if (parse_host_port(&laddr, lhost, errp) < 0) { return -1; } =20 - if (parse_host_port(&raddr, rhost) < 0) { + if (parse_host_port(&raddr, rhost, errp) < 0) { return -1; } =20 @@ -703,15 +709,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; @@ -721,7 +728,7 @@ int net_init_socket(const Netdev *netdev, const char *n= ame, /* 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) { + sock->localaddr, errp) =3D=3D -1) { return -1; } return 0; @@ -732,8 +739,8 @@ int net_init_socket(const Netdev *netdev, const char *n= ame, error_report("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->localad= dr, + errp) =3D=3D -1) { return -1; } return 0; --=20 2.9.3