| Message ID | 20120305100338.3595.19978.stgit@dhcp-8-167.nay.redhat.com |
|---|---|
| State | Superseded |
| Headers | show |
On 03/05/2012 12:03 PM, Amos Kong wrote: > Introduce tcp_client_start() by moving original code in > tcp_start_outgoing_migration(). > > Signed-off-by: Amos Kong <akong@redhat.com> > --- > net.c | 39 +++++++++++++++++++++++++++++++++++++++ > qemu_socket.h | 1 + > 2 files changed, 40 insertions(+), 0 deletions(-) > > diff --git a/net.c b/net.c > index 0260968..5c20e22 100644 > --- a/net.c > +++ b/net.c > @@ -126,6 +126,45 @@ int tcp_server_start(const char *str, int *fd) > return ret; > } > > +int tcp_client_start(const char *str, int *fd) > +{ > + struct sockaddr_in saddr; > + int ret; > + > + if (parse_host_port(&saddr, str) < 0) { > + return -EINVAL; > + } > + > + *fd = qemu_socket(PF_INET, SOCK_STREAM, 0); > + if (fd < 0) { > + perror("socket"); > + return -1; > + } > + socket_set_nonblock(*fd); > + > + for (;;) { > + ret = connect(*fd, (struct sockaddr *)&saddr, sizeof(saddr)); > + if (ret < 0) { > + ret = -socket_error(); > + if (ret == -EINPROGRESS) { > + break; > +#ifdef _WIN32 > + } else if (ret == -WSAEALREADY || ret == -WSAEINVAL) { > + break; > +#endif > + } else if (ret != -EINTR && ret != -EWOULDBLOCK) { > + perror("connect"); > + closesocket(*fd); > + return -1; I think it should be: return ret (otherwise you lose the error code). And you need it. Orit > + } > + } else { > + break; > + } > + } > + > + return ret; > +} > + > int parse_host_port(struct sockaddr_in *saddr, const char *str) > { > char buf[512]; > diff --git a/qemu_socket.h b/qemu_socket.h > index d612793..9246578 100644 > --- a/qemu_socket.h > +++ b/qemu_socket.h > @@ -55,6 +55,7 @@ int unix_connect_opts(QemuOpts *opts); > int unix_connect(const char *path); > > int tcp_server_start(const char *str, int *fd); > +int tcp_client_start(const char *str, int *fd); > > /* Old, ipv4 only bits. Don't use for new code. */ > int parse_host_port(struct sockaddr_in *saddr, const char *str); > >
On 03/05/2012 12:03 PM, Amos Kong wrote: > Introduce tcp_client_start() by moving original code in > tcp_start_outgoing_migration(). > > Signed-off-by: Amos Kong <akong@redhat.com> > --- > net.c | 39 +++++++++++++++++++++++++++++++++++++++ > qemu_socket.h | 1 + > 2 files changed, 40 insertions(+), 0 deletions(-) > > diff --git a/net.c b/net.c > index 0260968..5c20e22 100644 > --- a/net.c > +++ b/net.c > @@ -126,6 +126,45 @@ int tcp_server_start(const char *str, int *fd) > return ret; > } > > +int tcp_client_start(const char *str, int *fd) > +{ > + struct sockaddr_in saddr; > + int ret; > + > + if (parse_host_port(&saddr, str) < 0) { > + return -EINVAL; You use this in order to know when to call migrate_fd_error this is problematic as another error can return this error code. I think that setting *fd = -1 in the beginning of the function would be enough. Orit > + } > + > + *fd = qemu_socket(PF_INET, SOCK_STREAM, 0); > + if (fd < 0) { > + perror("socket"); > + return -1; > + } > + socket_set_nonblock(*fd); > + > + for (;;) { > + ret = connect(*fd, (struct sockaddr *)&saddr, sizeof(saddr)); > + if (ret < 0) { > + ret = -socket_error(); > + if (ret == -EINPROGRESS) { > + break; > +#ifdef _WIN32 > + } else if (ret == -WSAEALREADY || ret == -WSAEINVAL) { > + break; > +#endif > + } else if (ret != -EINTR && ret != -EWOULDBLOCK) { > + perror("connect"); > + closesocket(*fd); > + return -1; should be return ret; > + } > + } else { > + break; > + } > + } > + > + return ret; > +} > + > int parse_host_port(struct sockaddr_in *saddr, const char *str) > { > char buf[512]; > diff --git a/qemu_socket.h b/qemu_socket.h > index d612793..9246578 100644 > --- a/qemu_socket.h > +++ b/qemu_socket.h > @@ -55,6 +55,7 @@ int unix_connect_opts(QemuOpts *opts); > int unix_connect(const char *path); > > int tcp_server_start(const char *str, int *fd); > +int tcp_client_start(const char *str, int *fd); > > /* Old, ipv4 only bits. Don't use for new code. */ > int parse_host_port(struct sockaddr_in *saddr, const char *str); > >
diff --git a/net.c b/net.c index 0260968..5c20e22 100644 --- a/net.c +++ b/net.c @@ -126,6 +126,45 @@ int tcp_server_start(const char *str, int *fd) return ret; } +int tcp_client_start(const char *str, int *fd) +{ + struct sockaddr_in saddr; + int ret; + + if (parse_host_port(&saddr, str) < 0) { + return -EINVAL; + } + + *fd = qemu_socket(PF_INET, SOCK_STREAM, 0); + if (fd < 0) { + perror("socket"); + return -1; + } + socket_set_nonblock(*fd); + + for (;;) { + ret = connect(*fd, (struct sockaddr *)&saddr, sizeof(saddr)); + if (ret < 0) { + ret = -socket_error(); + if (ret == -EINPROGRESS) { + break; +#ifdef _WIN32 + } else if (ret == -WSAEALREADY || ret == -WSAEINVAL) { + break; +#endif + } else if (ret != -EINTR && ret != -EWOULDBLOCK) { + perror("connect"); + closesocket(*fd); + return -1; + } + } else { + break; + } + } + + return ret; +} + int parse_host_port(struct sockaddr_in *saddr, const char *str) { char buf[512]; diff --git a/qemu_socket.h b/qemu_socket.h index d612793..9246578 100644 --- a/qemu_socket.h +++ b/qemu_socket.h @@ -55,6 +55,7 @@ int unix_connect_opts(QemuOpts *opts); int unix_connect(const char *path); int tcp_server_start(const char *str, int *fd); +int tcp_client_start(const char *str, int *fd); /* Old, ipv4 only bits. Don't use for new code. */ int parse_host_port(struct sockaddr_in *saddr, const char *str);
Introduce tcp_client_start() by moving original code in tcp_start_outgoing_migration(). Signed-off-by: Amos Kong <akong@redhat.com> --- net.c | 39 +++++++++++++++++++++++++++++++++++++++ qemu_socket.h | 1 + 2 files changed, 40 insertions(+), 0 deletions(-)