motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-07-29 05:13:54 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

net/net: Convert parse_host_port() to Error

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

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;
}
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;
}