[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v5 4/4] use inet_listen()/inet_connect() to support
From: |
Amos Kong |
Subject: |
[Qemu-devel] [PATCH v5 4/4] use inet_listen()/inet_connect() to support ipv6 migration |
Date: |
Thu, 22 Mar 2012 11:53:03 +0800 |
User-agent: |
StGit/0.15 |
Use help functions in qemu-socket.c for tcp migration,
which already support ipv6 addresses.
For IPv6 brackets must be mandatory if you require a port.
Referencing to RFC5952, the recommended format is:
[2312::8274]:5200
test status: Successed
listen side: qemu-kvm .... -incoming tcp:[2312::8274]:5200
client side: qemu-kvm ...
(qemu) migrate -d tcp:[2312::8274]:5200
Signed-off-by: Amos Kong <address@hidden>
---
migration-tcp.c | 74 +++++++++++++++----------------------------------------
1 files changed, 20 insertions(+), 54 deletions(-)
diff --git a/migration-tcp.c b/migration-tcp.c
index 35a5781..251d955 100644
--- a/migration-tcp.c
+++ b/migration-tcp.c
@@ -81,43 +81,32 @@ static void tcp_wait_for_connect(void *opaque)
int tcp_start_outgoing_migration(MigrationState *s, const char *host_port)
{
- struct sockaddr_in addr;
- int ret;
-
- ret = parse_host_port(&addr, host_port);
- if (ret < 0) {
- return ret;
- }
+ int err;
s->get_error = socket_errno;
s->write = socket_write;
s->close = tcp_close;
- s->fd = qemu_socket(PF_INET, SOCK_STREAM, 0);
- if (s->fd == -1) {
- DPRINTF("Unable to open socket");
- return -socket_error();
- }
-
- socket_set_nonblock(s->fd);
+ s->fd = inet_connect(host_port, false);
+ err = -socket_error();
- do {
- ret = connect(s->fd, (struct sockaddr *)&addr, sizeof(addr));
- if (ret == -1) {
- ret = -socket_error();
- }
- if (ret == -EINPROGRESS || ret == -EWOULDBLOCK) {
- qemu_set_fd_handler2(s->fd, NULL, NULL, tcp_wait_for_connect, s);
- return 0;
+ if (err == -EINPROGRESS) {
+ DPRINTF("connect in progress");
+ qemu_set_fd_handler2(s->fd, NULL, NULL, tcp_wait_for_connect, s);
+#ifdef _WIN32
+ } else if (err == -WSAEALREADY || err == -WSAEINVAL) {
+ DPRINTF("connect in progress");
+ qemu_set_fd_handler2(s->fd, NULL, NULL, tcp_wait_for_connect, s);
+#endif
+ } else if (err < 0) {
+ DPRINTF("connect failed: %s\n", strerror(-err));
+ if (s->fd != -1) {
+ migrate_fd_error(s);
}
- } while (ret == -EINTR);
-
- if (ret < 0) {
- DPRINTF("connect failed\n");
- migrate_fd_error(s);
- return ret;
+ return err;
+ } else {
+ migrate_fd_connect(s);
}
- migrate_fd_connect(s);
return 0;
}
@@ -157,38 +146,15 @@ out2:
int tcp_start_incoming_migration(const char *host_port)
{
- struct sockaddr_in addr;
- int val;
int s;
- DPRINTF("Attempting to start an incoming migration\n");
-
- if (parse_host_port(&addr, host_port) < 0) {
- fprintf(stderr, "invalid host/port combination: %s\n", host_port);
- return -EINVAL;
- }
-
- s = qemu_socket(PF_INET, SOCK_STREAM, 0);
- if (s == -1) {
+ s = inet_listen(host_port, NULL, 256, SOCK_STREAM, 0);
+ if (s < 0) {
return -socket_error();
}
- val = 1;
- setsockopt(s, SOL_SOCKET, SO_REUSEADDR, (const char *)&val, sizeof(val));
-
- if (bind(s, (struct sockaddr *)&addr, sizeof(addr)) == -1) {
- goto err;
- }
- if (listen(s, 1) == -1) {
- goto err;
- }
-
qemu_set_fd_handler2(s, NULL, tcp_accept_incoming_migration, NULL,
(void *)(intptr_t)s);
return 0;
-
-err:
- close(s);
- return -socket_error();
}
- 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, 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
- [Qemu-devel] [PATCH v5 3/4] sockets: pass back errors in inet_listen(), Amos Kong, 2012/03/21
- 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 <=