{"id":809712,"url":"http://patchwork.ozlabs.org/api/1.0/patches/809712/?format=json","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/1.0/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<25327636c5f32bbe0ed4017a4017c03c584242f5.1504533674.git.maozy.fnst@cn.fujitsu.com>","date":"2017-09-04T14:35:39","name":"[v9,3/4] net/net: Convert parse_host_port() to Error","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"2b8b90e1725554a04d2f58140d28ff074ac7dae4","submitter":{"id":71231,"url":"http://patchwork.ozlabs.org/api/1.0/people/71231/?format=json","name":"Mao Zhongyi","email":"maozy.fnst@cn.fujitsu.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/25327636c5f32bbe0ed4017a4017c03c584242f5.1504533674.git.maozy.fnst@cn.fujitsu.com/mbox/","series":[{"id":1398,"url":"http://patchwork.ozlabs.org/api/1.0/series/1398/?format=json","date":"2017-09-04T14:35:37","name":"Improve error reporting","version":9,"mbox":"http://patchwork.ozlabs.org/series/1398/mbox/"}],"check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/809712/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":"ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=)","Received":["from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xmCJ71x8Pz9sNc\n\tfor ;\n\tTue, 5 Sep 2017 00:43:03 +1000 (AEST)","from localhost ([::1]:48111 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dosab-0000zu-BA\n\tfor incoming@patchwork.ozlabs.org; Mon, 04 Sep 2017 10:43:01 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:33647)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dosVe-0005oH-HA\n\tfor qemu-devel@nongnu.org; Mon, 04 Sep 2017 10:38:02 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dosVZ-000413-K4\n\tfor qemu-devel@nongnu.org; Mon, 04 Sep 2017 10:37:54 -0400","from mail.cn.fujitsu.com ([183.91.158.132]:47063\n\thelo=heian.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dosVZ-0003yi-8Y\n\tfor qemu-devel@nongnu.org; Mon, 04 Sep 2017 10:37:49 -0400","from localhost (HELO cn.fujitsu.com) ([10.167.33.5])\n\tby heian.cn.fujitsu.com with ESMTP; 04 Sep 2017 22:37:40 +0800","from G08CNEXCHPEKD03.g08.fujitsu.local (unknown [10.167.33.85])\n\tby cn.fujitsu.com (Postfix) with ESMTP id 342D04725543;\n\tMon, 4 Sep 2017 22:37:41 +0800 (CST)","from maozy.g08.fujitsu.local (10.167.225.76) by\n\tG08CNEXCHPEKD03.g08.fujitsu.local (10.167.33.89) with Microsoft SMTP\n\tServer (TLS) id 14.3.361.1; Mon, 4 Sep 2017 22:37:46 +0800"],"X-IronPort-AV":"E=Sophos;i=\"5.41,475,1498492800\"; d=\"scan'208\";a=\"25197760\"","From":"Mao Zhongyi ","To":"","Date":"Mon, 4 Sep 2017 22:35:39 +0800","Message-ID":"<25327636c5f32bbe0ed4017a4017c03c584242f5.1504533674.git.maozy.fnst@cn.fujitsu.com>","X-Mailer":"git-send-email 2.9.4","In-Reply-To":"","References":"","MIME-Version":"1.0","Content-Type":"text/plain","X-Originating-IP":"[10.167.225.76]","X-yoursite-MailScanner-ID":"342D04725543.ABED8","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\n\trecognized.","X-Received-From":"183.91.158.132","Subject":"[Qemu-devel] [PATCH v9 3/4] net/net: Convert parse_host_port() to\n\tError","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"jasowang@redhat.com, armbru@redhat.com, kraxel@redhat.com,\n\tpbonzini@redhat.com","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"Cc: berrange@redhat.com\nCc: kraxel@redhat.com\nCc: pbonzini@redhat.com\nCc: jasowang@redhat.com\nCc: armbru@redhat.com\nCc: eblake@redhat.com\nSigned-off-by: Mao Zhongyi \nReviewed-by: Markus Armbruster \n---\n include/qemu/sockets.h | 3 ++-\n net/net.c | 22 +++++++++++++++++-----\n net/socket.c | 22 +++++++++++++++-------\n 3 files changed, 34 insertions(+), 13 deletions(-)","diff":"diff --git a/include/qemu/sockets.h b/include/qemu/sockets.h\nindex ef6b559..41385ab 100644\n--- a/include/qemu/sockets.h\n+++ b/include/qemu/sockets.h\n@@ -53,7 +53,8 @@ void socket_listen_cleanup(int fd, Error **errp);\n int socket_dgram(SocketAddress *remote, SocketAddress *local, Error **errp);\n \n /* Old, ipv4 only bits. Don't use for new code. */\n-int parse_host_port(struct sockaddr_in *saddr, const char *str);\n+int parse_host_port(struct sockaddr_in *saddr, const char *str,\n+ Error **errp);\n int socket_init(void);\n \n /**\ndiff --git a/net/net.c b/net/net.c\nindex 0e28099..1cf9f60 100644\n--- a/net/net.c\n+++ b/net/net.c\n@@ -100,7 +100,8 @@ static int get_str_sep(char *buf, int buf_size, const char **pp, int sep)\n return 0;\n }\n \n-int parse_host_port(struct sockaddr_in *saddr, const char *str)\n+int parse_host_port(struct sockaddr_in *saddr, const char *str,\n+ Error **errp)\n {\n char buf[512];\n struct hostent *he;\n@@ -108,24 +109,35 @@ int parse_host_port(struct sockaddr_in *saddr, const char *str)\n int port;\n \n p = str;\n- if (get_str_sep(buf, sizeof(buf), &p, ':') < 0)\n+ if (get_str_sep(buf, sizeof(buf), &p, ':') < 0) {\n+ error_setg(errp, \"host address '%s' doesn't contain ':' \"\n+ \"separating host from port\", str);\n return -1;\n+ }\n saddr->sin_family = AF_INET;\n if (buf[0] == '\\0') {\n saddr->sin_addr.s_addr = 0;\n } else {\n if (qemu_isdigit(buf[0])) {\n- if (!inet_aton(buf, &saddr->sin_addr))\n+ if (!inet_aton(buf, &saddr->sin_addr)) {\n+ error_setg(errp, \"host address '%s' is not a valid \"\n+ \"IPv4 address\", buf);\n return -1;\n+ }\n } else {\n- if ((he = gethostbyname(buf)) == NULL)\n+ he = gethostbyname(buf);\n+ if (he == NULL) {\n+ error_setg(errp, \"can't resolve host address '%s'\", buf);\n return - 1;\n+ }\n saddr->sin_addr = *(struct in_addr *)he->h_addr;\n }\n }\n port = strtol(p, (char **)&r, 0);\n- if (r == p)\n+ if (r == p) {\n+ error_setg(errp, \"port number '%s' is invalid\", p);\n return -1;\n+ }\n saddr->sin_port = htons(port);\n return 0;\n }\ndiff --git a/net/socket.c b/net/socket.c\nindex 00f9796..12495d1 100644\n--- a/net/socket.c\n+++ b/net/socket.c\n@@ -343,8 +343,7 @@ static NetSocketState *net_socket_fd_init_dgram(NetClientState *peer,\n */\n \n if (is_connected && mcast != NULL) {\n- if (parse_host_port(&saddr, mcast) < 0) {\n- error_setg(errp, \"fd=%d failed parse_host_port()\", fd);\n+ if (parse_host_port(&saddr, mcast, errp) < 0) {\n goto err;\n }\n /* must be bound */\n@@ -496,9 +495,12 @@ static int net_socket_listen_init(NetClientState *peer,\n NetSocketState *s;\n struct sockaddr_in saddr;\n int fd, ret;\n+ Error *err = NULL;\n \n- if (parse_host_port(&saddr, host_str) < 0)\n+ if (parse_host_port(&saddr, host_str, &err) < 0) {\n+ error_report_err(err);\n return -1;\n+ }\n \n fd = qemu_socket(PF_INET, SOCK_STREAM, 0);\n if (fd < 0) {\n@@ -543,8 +545,10 @@ static int net_socket_connect_init(NetClientState *peer,\n struct sockaddr_in saddr;\n Error *err = NULL;\n \n- if (parse_host_port(&saddr, host_str) < 0)\n+ if (parse_host_port(&saddr, host_str, &err) < 0) {\n+ error_report_err(err);\n return -1;\n+ }\n \n fd = qemu_socket(PF_INET, SOCK_STREAM, 0);\n if (fd < 0) {\n@@ -597,8 +601,10 @@ static int net_socket_mcast_init(NetClientState *peer,\n struct in_addr localaddr, *param_localaddr;\n Error *err = NULL;\n \n- if (parse_host_port(&saddr, host_str) < 0)\n+ if (parse_host_port(&saddr, host_str, &err) < 0) {\n+ error_report_err(err);\n return -1;\n+ }\n \n if (localaddr_str != NULL) {\n if (inet_aton(localaddr_str, &localaddr) == 0)\n@@ -640,11 +646,13 @@ static int net_socket_udp_init(NetClientState *peer,\n struct sockaddr_in laddr, raddr;\n Error *err = NULL;\n \n- if (parse_host_port(&laddr, lhost) < 0) {\n+ if (parse_host_port(&laddr, lhost, &err) < 0) {\n+ error_report_err(err);\n return -1;\n }\n \n- if (parse_host_port(&raddr, rhost) < 0) {\n+ if (parse_host_port(&raddr, rhost, &err) < 0) {\n+ error_report_err(err);\n return -1;\n }\n \n","prefixes":["v9","3/4"]}