[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 06/17] net: use g_strsplit() for parsing host address
From: |
Jason Wang |
Subject: |
[Qemu-devel] [PULL 06/17] net: use g_strsplit() for parsing host address and port |
Date: |
Tue, 2 Jul 2019 10:31:18 +0800 |
From: Stefano Garzarella <address@hidden>
Use the glib function to split host address and port in
the parse_host_port() function.
Suggested-by: Markus Armbruster <address@hidden>
Signed-off-by: Stefano Garzarella <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Signed-off-by: Jason Wang <address@hidden>
---
net/net.c | 43 +++++++++++++++++++++++++++----------------
1 file changed, 27 insertions(+), 16 deletions(-)
diff --git a/net/net.c b/net/net.c
index 76ba0b7..5ce3996 100644
--- a/net/net.c
+++ b/net/net.c
@@ -87,32 +87,39 @@ static int get_str_sep(char *buf, int buf_size, const char
**pp, int sep)
int parse_host_port(struct sockaddr_in *saddr, const char *str,
Error **errp)
{
- char buf[512];
+ gchar **substrings;
struct hostent *he;
- const char *p, *r;
- int port;
+ const char *addr, *p, *r;
+ int port, ret = 0;
- p = str;
- if (get_str_sep(buf, sizeof(buf), &p, ':') < 0) {
+ substrings = g_strsplit(str, ":", 2);
+ if (!substrings || !substrings[0] || !substrings[1]) {
error_setg(errp, "host address '%s' doesn't contain ':' "
"separating host from port", str);
- return -1;
+ ret = -1;
+ goto out;
}
+
+ addr = substrings[0];
+ p = substrings[1];
+
saddr->sin_family = AF_INET;
- if (buf[0] == '\0') {
+ if (addr[0] == '\0') {
saddr->sin_addr.s_addr = 0;
} else {
- if (qemu_isdigit(buf[0])) {
- if (!inet_aton(buf, &saddr->sin_addr)) {
+ if (qemu_isdigit(addr[0])) {
+ if (!inet_aton(addr, &saddr->sin_addr)) {
error_setg(errp, "host address '%s' is not a valid "
- "IPv4 address", buf);
- return -1;
+ "IPv4 address", addr);
+ ret = -1;
+ goto out;
}
} else {
- he = gethostbyname(buf);
+ he = gethostbyname(addr);
if (he == NULL) {
- error_setg(errp, "can't resolve host address '%s'", buf);
- return - 1;
+ error_setg(errp, "can't resolve host address '%s'", addr);
+ ret = -1;
+ goto out;
}
saddr->sin_addr = *(struct in_addr *)he->h_addr;
}
@@ -120,10 +127,14 @@ int parse_host_port(struct sockaddr_in *saddr, const char
*str,
port = strtol(p, (char **)&r, 0);
if (r == p) {
error_setg(errp, "port number '%s' is invalid", p);
- return -1;
+ ret = -1;
+ goto out;
}
saddr->sin_port = htons(port);
- return 0;
+
+out:
+ g_strfreev(substrings);
+ return ret;
}
char *qemu_mac_strdup_printf(const uint8_t *macaddr)
--
2.5.0
- [Qemu-devel] [PULL 00/17] Net patches, Jason Wang, 2019/07/01
- [Qemu-devel] [PULL 04/17] net: fix assertion failure when ipv6-prefixlen is not a number, Jason Wang, 2019/07/01
- [Qemu-devel] [PULL 06/17] net: use g_strsplit() for parsing host address and port,
Jason Wang <=
- [Qemu-devel] [PULL 07/17] net: remove unused get_str_sep() function, Jason Wang, 2019/07/01
- [Qemu-devel] [PULL 03/17] ftgmac100: do not link to netdev, Jason Wang, 2019/07/01
- [Qemu-devel] [PULL 08/17] net/announce: Allow optional list of interfaces, Jason Wang, 2019/07/01
- [Qemu-devel] [PULL 01/17] MAINTAINERS: Add qemu-bridge-helper.c to "Network device backends", Jason Wang, 2019/07/01
- [Qemu-devel] [PULL 02/17] qemu-bridge-helper: Document known shortcomings, Jason Wang, 2019/07/01
- [Qemu-devel] [PULL 09/17] net/announce: Add HMP optional interface list, Jason Wang, 2019/07/01
- [Qemu-devel] [PULL 05/17] net: avoid using variable length array in net_client_init(), Jason Wang, 2019/07/01
- [Qemu-devel] [PULL 10/17] net/announce: Add optional ID, Jason Wang, 2019/07/01
- [Qemu-devel] [PULL 11/17] net/announce: Add HMP optional ID, Jason Wang, 2019/07/01
- [Qemu-devel] [PULL 12/17] net/announce: Expand test for stopping self announce, Jason Wang, 2019/07/01