ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

net: introduce convert_host_port() 

Signed-off-by: Laurent Vivier <lvivier@redhat.com>
Reviewed-by: Stefano Brivio <sbrivio@redhat.com>
Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
This commit is contained in:
Laurent Vivier 2022-10-21 11:09:06 +02:00 committed by Jason Wang
parent 396d512669
commit 30e4226b78
2 changed files with 40 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/qemu/sockets.h
View File

@ -65,6 +65,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 convert_host_port(struct sockaddr_in *saddr, const char *host,
const char *port, Error **errp);
int parse_host_port(struct sockaddr_in *saddr, const char *str, int parse_host_port(struct sockaddr_in *saddr, const char *str,
Error **errp); Error **errp);
int socket_init(void); int socket_init(void);

74
net/net.c
View File

@ -66,15 +66,47 @@ static QTAILQ_HEAD(, NetClientState) net_clients;
/***********************************************************/ /***********************************************************/
/* network device redirectors */ /* network device redirectors */
int convert_host_port(struct sockaddr_in *saddr, const char *host,
const char *port, Error **errp)
{
struct hostent *he;
const char *r;
long p;
memset(saddr, 0, sizeof(*saddr));
saddr->sin_family = AF_INET;
if (host[0] == '\0') {
saddr->sin_addr.s_addr = 0;
} else {
if (qemu_isdigit(host[0])) {
if (!inet_aton(host, &saddr->sin_addr)) {
error_setg(errp, "host address '%s' is not a valid "
"IPv4 address", host);
return -1;
}
} else {
he = gethostbyname(host);
if (he == NULL) {
error_setg(errp, "can't resolve host address '%s'", host);
return -1;
}
saddr->sin_addr = *(struct in_addr *)he->h_addr;
}
}
if (qemu_strtol(port, &r, 0, &p) != 0) {
error_setg(errp, "port number '%s' is invalid", port);
return -1;
}
saddr->sin_port = htons(p);
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) Error **errp)
{ {
gchar **substrings; gchar **substrings;
struct hostent *he; int ret;
const char *addr, *p, *r;
int port, ret = 0;
memset(saddr, 0, sizeof(*saddr));
substrings = g_strsplit(str, ":", 2); substrings = g_strsplit(str, ":", 2);
if (!substrings || !substrings[0] || !substrings[1]) { if (!substrings || !substrings[0] || !substrings[1]) {
@ -84,37 +116,7 @@ int parse_host_port(struct sockaddr_in *saddr, const char *str,
goto out; goto out;
} }
addr = substrings[0]; ret = convert_host_port(saddr, substrings[0], substrings[1], errp);
p = substrings[1];
saddr->sin_family = AF_INET;
if (addr[0] == '\0') {
saddr->sin_addr.s_addr = 0;
} else {
if (qemu_isdigit(addr[0])) {
if (!inet_aton(addr, &saddr->sin_addr)) {
error_setg(errp, "host address '%s' is not a valid "
"IPv4 address", addr);
ret = -1;
goto out;
}
} else {
he = gethostbyname(addr);
if (he == NULL) {
error_setg(errp, "can't resolve host address '%s'", addr);
ret = -1;
goto out;
}
saddr->sin_addr = *(struct in_addr *)he->h_addr;
}
}
port = strtol(p, (char **)&r, 0);
if (r == p) {
error_setg(errp, "port number '%s' is invalid", p);
ret = -1;
goto out;
}
saddr->sin_port = htons(port);
out: out:
g_strfreev(substrings); g_strfreev(substrings);