[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 10/18] net/net: Convert parse_host_port() to Error
From: |
Jason Wang |
Subject: |
[Qemu-devel] [PULL 10/18] net/net: Convert parse_host_port() to Error |
Date: |
Fri, 8 Sep 2017 10:05:16 +0800 |
From: Mao Zhongyi <address@hidden>
Cc: address@hidden
Cc: address@hidden
Cc: address@hidden
Cc: address@hidden
Cc: address@hidden
Cc: address@hidden
Signed-off-by: Mao Zhongyi <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Signed-off-by: Jason Wang <address@hidden>
---
include/qemu/sockets.h | 3 ++-
net/net.c | 22 +++++++++++++++++-----
net/socket.c | 22 +++++++++++++++-------
3 files changed, 34 insertions(+), 13 deletions(-)
diff --git a/include/qemu/sockets.h b/include/qemu/sockets.h
index 639cc07..4f7311b 100644
--- a/include/qemu/sockets.h
+++ b/include/qemu/sockets.h
@@ -45,7 +45,8 @@ void socket_listen_cleanup(int fd, Error **errp);
int socket_dgram(SocketAddress *remote, SocketAddress *local, Error **errp);
/* 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);
/**
diff --git a/net/net.c b/net/net.c
index 2fa99c0..bebb042 100644
--- a/net/net.c
+++ b/net/net.c
@@ -100,7 +100,8 @@ static int get_str_sep(char *buf, int buf_size, const char
**pp, int sep)
return 0;
}
-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,35 @@ int parse_host_port(struct sockaddr_in *saddr, const char
*str)
int port;
p = 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 = AF_INET;
if (buf[0] == '\0') {
saddr->sin_addr.s_addr = 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 = gethostbyname(buf)) == NULL)
+ he = gethostbyname(buf);
+ if (he == NULL) {
+ error_setg(errp, "can't resolve host address '%s'", buf);
return - 1;
+ }
saddr->sin_addr = *(struct in_addr *)he->h_addr;
}
}
port = strtol(p, (char **)&r, 0);
- if (r == p)
+ if (r == p) {
+ error_setg(errp, "port number '%s' is invalid", p);
return -1;
+ }
saddr->sin_port = htons(port);
return 0;
}
diff --git a/net/socket.c b/net/socket.c
index 00f9796..12495d1 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -343,8 +343,7 @@ static NetSocketState
*net_socket_fd_init_dgram(NetClientState *peer,
*/
if (is_connected && mcast != NULL) {
- if (parse_host_port(&saddr, mcast) < 0) {
- error_setg(errp, "fd=%d failed parse_host_port()", fd);
+ if (parse_host_port(&saddr, mcast, errp) < 0) {
goto err;
}
/* must be bound */
@@ -496,9 +495,12 @@ static int net_socket_listen_init(NetClientState *peer,
NetSocketState *s;
struct sockaddr_in saddr;
int fd, ret;
+ Error *err = NULL;
- if (parse_host_port(&saddr, host_str) < 0)
+ if (parse_host_port(&saddr, host_str, &err) < 0) {
+ error_report_err(err);
return -1;
+ }
fd = qemu_socket(PF_INET, SOCK_STREAM, 0);
if (fd < 0) {
@@ -543,8 +545,10 @@ static int net_socket_connect_init(NetClientState *peer,
struct sockaddr_in saddr;
Error *err = NULL;
- if (parse_host_port(&saddr, host_str) < 0)
+ if (parse_host_port(&saddr, host_str, &err) < 0) {
+ error_report_err(err);
return -1;
+ }
fd = qemu_socket(PF_INET, SOCK_STREAM, 0);
if (fd < 0) {
@@ -597,8 +601,10 @@ static int net_socket_mcast_init(NetClientState *peer,
struct in_addr localaddr, *param_localaddr;
Error *err = NULL;
- if (parse_host_port(&saddr, host_str) < 0)
+ if (parse_host_port(&saddr, host_str, &err) < 0) {
+ error_report_err(err);
return -1;
+ }
if (localaddr_str != NULL) {
if (inet_aton(localaddr_str, &localaddr) == 0)
@@ -640,11 +646,13 @@ static int net_socket_udp_init(NetClientState *peer,
struct sockaddr_in laddr, raddr;
Error *err = NULL;
- if (parse_host_port(&laddr, lhost) < 0) {
+ if (parse_host_port(&laddr, lhost, &err) < 0) {
+ error_report_err(err);
return -1;
}
- if (parse_host_port(&raddr, rhost) < 0) {
+ if (parse_host_port(&raddr, rhost, &err) < 0) {
+ error_report_err(err);
return -1;
}
--
2.7.4
- [Qemu-devel] [PULL 00/18] Net patches, Jason Wang, 2017/09/07
- [Qemu-devel] [PULL 01/18] net/filter-rewriter.c: Fix rewirter checksum bug when use virtio-net, Jason Wang, 2017/09/07
- [Qemu-devel] [PULL 02/18] net/rocker: Remove the dead error handling, Jason Wang, 2017/09/07
- [Qemu-devel] [PULL 03/18] net/rocker: Plug memory leak in pci_rocker_init(), Jason Wang, 2017/09/07
- [Qemu-devel] [PULL 04/18] net/rocker: Convert to realize(), Jason Wang, 2017/09/07
- [Qemu-devel] [PULL 05/18] net/rocker: Fix the unusual macro name, Jason Wang, 2017/09/07
- [Qemu-devel] [PULL 06/18] net: rtl8139: do not use old_mmio accesses, Jason Wang, 2017/09/07
- [Qemu-devel] [PULL 07/18] MAINTAINERS: Update mail address for COLO Proxy, Jason Wang, 2017/09/07
- [Qemu-devel] [PULL 08/18] net/socket: Don't treat odd socket type as SOCK_STREAM, Jason Wang, 2017/09/07
- [Qemu-devel] [PULL 09/18] net/socket: Convert several helper functions to Error, Jason Wang, 2017/09/07
- [Qemu-devel] [PULL 10/18] net/net: Convert parse_host_port() to Error,
Jason Wang <=
- [Qemu-devel] [PULL 12/18] e1000: Rename the SEC symbol to SEQEC, Jason Wang, 2017/09/07
- [Qemu-devel] [PULL 11/18] net/socket: Improve -net socket error reporting, Jason Wang, 2017/09/07
- [Qemu-devel] [PULL 13/18] net/colo-compare.c: Optimize unpredictable tcp options comparison, Jason Wang, 2017/09/07
- [Qemu-devel] [PULL 14/18] net/colo-compare.c: Adjust net queue pop order for performance, Jason Wang, 2017/09/07
- [Qemu-devel] [PULL 15/18] net/colo-compare.c: Fix comments and scheme, Jason Wang, 2017/09/07
- [Qemu-devel] [PULL 16/18] qemu-iothread: IOThread supports the GMainContext event loop, Jason Wang, 2017/09/07
- [Qemu-devel] [PULL 17/18] colo-compare: Use IOThread to Check old packet regularly and Process pactkets of the primary, Jason Wang, 2017/09/07
- [Qemu-devel] [PULL 18/18] colo-compare: Update the COLO document to add the IOThread configuration, Jason Wang, 2017/09/07
- Re: [Qemu-devel] [PULL 00/18] Net patches, Peter Maydell, 2017/09/08