[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v5 3/4] sockets: pass back errors in inet_listen()
From: |
Amos Kong |
Subject: |
[Qemu-devel] [PATCH v5 3/4] sockets: pass back errors in inet_listen() |
Date: |
Thu, 22 Mar 2012 11:52:54 +0800 |
User-agent: |
StGit/0.15 |
Use set_socket_error() to restore real erron,
set errno to EINVAL for parse error.
Signed-off-by: Amos Kong <address@hidden>
---
qemu-sockets.c | 21 ++++++++++++++++-----
1 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/qemu-sockets.c b/qemu-sockets.c
index 908479e..f1c6524 100644
--- a/qemu-sockets.c
+++ b/qemu-sockets.c
@@ -110,7 +110,7 @@ int inet_listen_opts(QemuOpts *opts, int port_offset)
char port[33];
char uaddr[INET6_ADDRSTRLEN+1];
char uport[33];
- int slisten, rc, to, port_min, port_max, p;
+ int slisten, rc, to, port_min, port_max, p, err;
memset(&ai,0, sizeof(ai));
ai.ai_flags = AI_PASSIVE | AI_ADDRCONFIG;
@@ -120,7 +120,8 @@ int inet_listen_opts(QemuOpts *opts, int port_offset)
if ((qemu_opt_get(opts, "host") == NULL) ||
(qemu_opt_get(opts, "port") == NULL)) {
fprintf(stderr, "%s: host and/or port not specified\n", __FUNCTION__);
- return -1;
+ err = -EINVAL;
+ goto err;
}
pstrcpy(port, sizeof(port), qemu_opt_get(opts, "port"));
addr = qemu_opt_get(opts, "host");
@@ -138,7 +139,8 @@ int inet_listen_opts(QemuOpts *opts, int port_offset)
if (rc != 0) {
fprintf(stderr,"getaddrinfo(%s,%s): %s\n", addr, port,
gai_strerror(rc));
- return -1;
+ err = -EINVAL;
+ goto err;
}
/* create socket + bind */
@@ -150,6 +152,7 @@ int inet_listen_opts(QemuOpts *opts, int port_offset)
if (slisten < 0) {
fprintf(stderr,"%s: socket(%s): %s\n", __FUNCTION__,
inet_strfamily(e->ai_family), strerror(errno));
+ err = -socket_error();
continue;
}
@@ -169,6 +172,7 @@ int inet_listen_opts(QemuOpts *opts, int port_offset)
if (bind(slisten, e->ai_addr, e->ai_addrlen) == 0) {
goto listen;
}
+ err = -socket_error();
if (p == port_max) {
fprintf(stderr,"%s: bind(%s,%s,%d): %s\n", __FUNCTION__,
inet_strfamily(e->ai_family), uaddr, inet_getport(e),
@@ -179,14 +183,15 @@ int inet_listen_opts(QemuOpts *opts, int port_offset)
}
fprintf(stderr, "%s: FAILED\n", __FUNCTION__);
freeaddrinfo(res);
- return -1;
+ goto err;
listen:
if (listen(slisten,1) != 0) {
+ err = -socket_error();
perror("listen");
closesocket(slisten);
freeaddrinfo(res);
- return -1;
+ goto err;
}
snprintf(uport, sizeof(uport), "%d", inet_getport(e) - port_offset);
qemu_opt_set(opts, "host", uaddr);
@@ -195,6 +200,10 @@ listen:
qemu_opt_set(opts, "ipv4", (e->ai_family != PF_INET6) ? "on" : "off");
freeaddrinfo(res);
return slisten;
+
+err:
+ set_socket_error(-err);
+ return -1;
}
int inet_connect_opts(QemuOpts *opts)
@@ -474,6 +483,8 @@ int inet_listen(const char *str, char *ostr, int olen,
optstr ? optstr : "");
}
}
+ } else {
+ set_socket_error(EINVAL);
}
qemu_opts_del(opts);
return sock;
- Re: [Qemu-devel] [PATCH v4 1/2] qemu-socket: change inet_connect() to to support nonblock socket, (continued)
- Re: [Qemu-devel] [PATCH v4 1/2] qemu-socket: change inet_connect() to to support nonblock socket, Michael Roth, 2012/03/21
- Re: [Qemu-devel] [PATCH v4 1/2] qemu-socket: change inet_connect() to to support nonblock socket, Amos Kong, 2012/03/21
- [Qemu-devel] [PATCH v5 0/2] support to migrate with IPv6 address, Amos Kong, 2012/03/21
- [Qemu-devel] [PATCH v5 1/4] sockets: introduce set_socket_error(), Amos Kong, 2012/03/21
- Re: [Qemu-devel] [PATCH v5 1/4] sockets: introduce set_socket_error(), Orit Wasserman, 2012/03/27
- [Qemu-devel] [PATCH v6 1/4] sockets: introduce set_socket_error(), Amos Kong, 2012/03/27
- [Qemu-devel] [PATCH v5 2/4] qemu-socket: change inet_connect() to to support nonblock socket, Amos Kong, 2012/03/21
- Re: [Qemu-devel] [PATCH v5 2/4] qemu-socket: change inet_connect() to to support nonblock socket, Orit Wasserman, 2012/03/27
- Re: [Qemu-devel] [PATCH v5 2/4] qemu-socket: change inet_connect() to to support nonblock socket, Amos Kong, 2012/03/27
- Re: [Qemu-devel] [PATCH v5 2/4] qemu-socket: change inet_connect() to to support nonblock socket, Amos Kong, 2012/03/27
- [Qemu-devel] [PATCH v5 3/4] sockets: pass back errors in inet_listen(),
Amos Kong <=
- Re: [Qemu-devel] [PATCH v5 3/4] sockets: pass back errors in inet_listen(), Michael Roth, 2012/03/27
- [Qemu-devel] [PATCH v5 4/4] use inet_listen()/inet_connect() to support ipv6 migration, Amos Kong, 2012/03/21