openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

net/net: Convert parse_host_port() to Error 

Cc: berrange@redhat.com
Cc: kraxel@redhat.com
Cc: pbonzini@redhat.com
Cc: jasowang@redhat.com
Cc: armbru@redhat.com
Cc: eblake@redhat.com
Signed-off-by: Mao Zhongyi <maozy.fnst@cn.fujitsu.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
This commit is contained in:
Mao Zhongyi 2017-09-04 22:35:39 +08:00 committed by Jason Wang
parent c37f0bb1d0
commit bcd4dfd685
3 changed files with 34 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/qemu/sockets.h
View File

@ -45,7 +45,8 @@ void socket_listen_cleanup(int fd, Error **errp);
int socket_dgram(SocketAddress *remote, SocketAddress *local, Error **errp); int socket_dgram(SocketAddress *remote, SocketAddress *local, Error **errp);
/* Old, ipv4 only bits. Don't use for new code. */ /* 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); int socket_init(void);
/** /**

22
net/net.c
View File

@ -100,7 +100,8 @@ static int get_str_sep(char *buf, int buf_size, const char **pp, int sep)
return 0; 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]; char buf[512];
struct hostent *he; struct hostent *he;
@ -108,24 +109,35 @@ int parse_host_port(struct sockaddr_in *saddr, const char *str)
int port; int port;
p = str; 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; return -1;
}
saddr->sin_family = AF_INET; saddr->sin_family = AF_INET;
if (buf[0] == '\0') { if (buf[0] == '\0') {
saddr->sin_addr.s_addr = 0; saddr->sin_addr.s_addr = 0;
} else { } else {
if (qemu_isdigit(buf[0])) { 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; return -1;
}
} else { } else {
if ((he = gethostbyname(buf)) == NULL) he = gethostbyname(buf);
if (he == NULL) {
error_setg(errp, "can't resolve host address '%s'", buf);
return - 1; return - 1;
}
saddr->sin_addr = *(struct in_addr *)he->h_addr; saddr->sin_addr = *(struct in_addr *)he->h_addr;
} }
} }
port = strtol(p, (char **)&r, 0); port = strtol(p, (char **)&r, 0);
if (r == p) if (r == p) {
error_setg(errp, "port number '%s' is invalid", p);
return -1; return -1;
}
saddr->sin_port = htons(port); saddr->sin_port = htons(port);
return 0; return 0;
} }

22
net/socket.c
View File

@ -343,8 +343,7 @@ static NetSocketState *net_socket_fd_init_dgram(NetClientState *peer,
*/ */
if (is_connected && mcast != NULL) { if (is_connected && mcast != NULL) {
if (parse_host_port(&saddr, mcast) < 0) { if (parse_host_port(&saddr, mcast, errp) < 0) {
error_setg(errp, "fd=%d failed parse_host_port()", fd);
goto err; goto err;
} }
/* must be bound */ /* must be bound */
@ -496,9 +495,12 @@ static int net_socket_listen_init(NetClientState *peer,
NetSocketState *s; NetSocketState *s;
struct sockaddr_in saddr; struct sockaddr_in saddr;
int fd, ret; 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; return -1;
}
fd = qemu_socket(PF_INET, SOCK_STREAM, 0); fd = qemu_socket(PF_INET, SOCK_STREAM, 0);
if (fd < 0) { if (fd < 0) {
@ -543,8 +545,10 @@ static int net_socket_connect_init(NetClientState *peer,
struct sockaddr_in saddr; struct sockaddr_in saddr;
Error *err = NULL; 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; return -1;
}
fd = qemu_socket(PF_INET, SOCK_STREAM, 0); fd = qemu_socket(PF_INET, SOCK_STREAM, 0);
if (fd < 0) { if (fd < 0) {
@ -597,8 +601,10 @@ static int net_socket_mcast_init(NetClientState *peer,
struct in_addr localaddr, *param_localaddr; struct in_addr localaddr, *param_localaddr;
Error *err = NULL; 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; return -1;
}
if (localaddr_str != NULL) { if (localaddr_str != NULL) {
if (inet_aton(localaddr_str, &localaddr) == 0) if (inet_aton(localaddr_str, &localaddr) == 0)
@ -640,11 +646,13 @@ static int net_socket_udp_init(NetClientState *peer,
struct sockaddr_in laddr, raddr; struct sockaddr_in laddr, raddr;
Error *err = NULL; Error *err = NULL;
if (parse_host_port(&laddr, lhost) < 0) { if (parse_host_port(&laddr, lhost, &err) < 0) {
error_report_err(err);
return -1; return -1;
} }
if (parse_host_port(&raddr, rhost) < 0) { if (parse_host_port(&raddr, rhost, &err) < 0) {
error_report_err(err);
return -1; return -1;
} }