{"id":811287,"url":"http://patchwork.ozlabs.org/api/1.2/patches/811287/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/1504836324-4871-11-git-send-email-jasowang@redhat.com/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/1.2/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":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<1504836324-4871-11-git-send-email-jasowang@redhat.com>","list_archive_url":null,"date":"2017-09-08T02:05:16","name":"[PULL,10/18] net/net: Convert parse_host_port() to Error","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"2b8b90e1725554a04d2f58140d28ff074ac7dae4","submitter":{"id":5225,"url":"http://patchwork.ozlabs.org/api/1.2/people/5225/?format=json","name":"Jason Wang","email":"jasowang@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/1504836324-4871-11-git-send-email-jasowang@redhat.com/mbox/","series":[{"id":2087,"url":"http://patchwork.ozlabs.org/api/1.2/series/2087/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=2087","date":"2017-09-08T02:05:06","name":"[PULL,01/18] net/filter-rewriter.c: Fix rewirter checksum bug when use virtio-net","version":1,"mbox":"http://patchwork.ozlabs.org/series/2087/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/811287/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/811287/checks/","tags":{},"related":[],"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=)","ext-mx09.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx09.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=jasowang@redhat.com"],"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 3xpLNp0c0Gz9sDB\n\tfor ;\n\tFri, 8 Sep 2017 12:09:30 +1000 (AEST)","from localhost ([::1]:42954 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dq8jY-0005bP-3G\n\tfor incoming@patchwork.ozlabs.org; Thu, 07 Sep 2017 22:09:28 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:60951)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dq8gZ-0003Um-Cs\n\tfor qemu-devel@nongnu.org; Thu, 07 Sep 2017 22:06:28 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dq8gU-0002Nr-7w\n\tfor qemu-devel@nongnu.org; Thu, 07 Sep 2017 22:06:23 -0400","from mx1.redhat.com ([209.132.183.28]:41104)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from ) id 1dq8gT-0002NR-Vo\n\tfor qemu-devel@nongnu.org; Thu, 07 Sep 2017 22:06:18 -0400","from smtp.corp.redhat.com\n\t(int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby mx1.redhat.com (Postfix) with ESMTPS id 112C84E4CA;\n\tFri, 8 Sep 2017 02:06:17 +0000 (UTC)","from jason-ThinkPad-T450s.redhat.com (ovpn-12-98.pek2.redhat.com\n\t[10.72.12.98])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id 549A2600C2;\n\tFri, 8 Sep 2017 02:06:08 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 112C84E4CA","From":"Jason Wang ","To":"peter.maydell@linaro.org,\n\tqemu-devel@nongnu.org","Date":"Fri, 8 Sep 2017 10:05:16 +0800","Message-Id":"<1504836324-4871-11-git-send-email-jasowang@redhat.com>","In-Reply-To":"<1504836324-4871-1-git-send-email-jasowang@redhat.com>","References":"<1504836324-4871-1-git-send-email-jasowang@redhat.com>","X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.11","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.38]);\n\tFri, 08 Sep 2017 02:06:17 +0000 (UTC)","X-detected-operating-system":"by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]\n\t[fuzzy]","X-Received-From":"209.132.183.28","Subject":"[Qemu-devel] [PULL 10/18] 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":"Mao Zhongyi , jasowang@redhat.com,\n\tarmbru@redhat.com, kraxel@redhat.com, pbonzini@redhat.com","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"From: Mao Zhongyi \n\nCc: 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 \nSigned-off-by: Jason Wang \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 639cc07..4f7311b 100644\n--- a/include/qemu/sockets.h\n+++ b/include/qemu/sockets.h\n@@ -45,7 +45,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 2fa99c0..bebb042 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":["PULL","10/18"]}