From a6ba35b3be9d3d2874cd00930c954347e6be764c Mon Sep 17 00:00:00 2001 From: Amos Kong Date: Fri, 11 May 2012 00:28:16 +0800 Subject: sockets: change inet_connect() to support nonblock socket Add a bool argument to inet_connect() to assign if set socket to block/nonblock, and delete original argument 'socktype' that is unused. Add a new argument to inet_connect()/inet_connect_opts(), to pass back connect error by error class. Retry to connect when -EINTR is got. Connect's successful for nonblock socket when following errors are got, user should wait for connecting by select(): -EINPROGRESS -EWOULDBLOCK (win32) -WSAEALREADY (win32) Change nbd, vnc to use new interface. Signed-off-by: Amos Kong Reviewed-by: Orit Wasserman Reviewed-by: Michael Roth Signed-off-by: Anthony Liguori --- nbd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'nbd.c') diff --git a/nbd.c b/nbd.c index 153709f628..bebfc49e2a 100644 --- a/nbd.c +++ b/nbd.c @@ -162,7 +162,7 @@ int tcp_socket_outgoing(const char *address, uint16_t port) int tcp_socket_outgoing_spec(const char *address_and_port) { - return inet_connect(address_and_port, SOCK_STREAM); + return inet_connect(address_and_port, true, NULL); } int tcp_socket_incoming(const char *address, uint16_t port) -- cgit v1.2.1