lua-socket-fix: connection timedout fix.

include/coeio.h

@@ -46,6 +46,8 @@
 #include <sys/socket.h>
 #include <netdb.h>
 
+#define ERESOLVE -1
+
 /**
  * Asynchronous IO Tasks (libeio wrapper)
  *

src/coeio.m

@@ -218,6 +218,7 @@ getaddrinfo_cb(va_list ap)
 	const struct addrinfo *hints = va_arg(ap, const struct addrinfo *);
 	struct addrinfo **res = va_arg(ap, struct addrinfo **);
 	if (getaddrinfo(host, port, hints, res)) {
+		errno = ERESOLVE;
 		return -1;
 	}
 	return 0;

src/lua/lua_socket.m

@@ -56,9 +56,6 @@ static const char socketlib_name[] = "box.socket";
  * Here we map all failures of name resolution to a single
  * socket error number.
  */
-enum bio_error {
-	ERESOLVE = -1
-};
 
 /** last operation status */
 enum bio_status {
@@ -307,7 +304,7 @@ lbox_socket_connect(struct lua_State *L)
 	evio_timeout_init(&start, &delay, timeout);
 	struct addrinfo *ai = coeio_resolve(s->socktype, host, port, delay);
 	if (ai == NULL)
-		return bio_pushsockerror(L, s, ERESOLVE);
+		return bio_pushsockerror(L, s, errno);
 
 	evio_timeout_update(start, &delay);
 	@try {
@@ -660,7 +657,7 @@ lbox_socket_bind(struct lua_State *L)
 	/* try to resolve a hostname */
 	struct addrinfo *ai = coeio_resolve(s->socktype, host, port, timeout);
 	if (ai == NULL)
-		return bio_pusherror(L, s, ERESOLVE);
+		return bio_pusherror(L, s, errno);
 	@try {
 		evio_bind_addrinfo(&s->coio, ai);
 	} @catch (SocketError *e) {
@@ -777,7 +774,7 @@ lbox_socket_sendto(struct lua_State *L)
 		/* try to resolve a hostname */
 		struct addrinfo *a = coeio_resolve(s->socktype, host, port, delay);
 		if (a == NULL)
-			return bio_pushsenderror(L, s, 0, ERESOLVE);
+			return bio_pushsenderror(L, s, 0, errno);
 		evio_timeout_update(start, &delay);
 		addr = (struct sockaddr_in *) a->ai_addr;
 		addrlen = a->ai_addrlen;

test/box/socket.result

@@ -95,14 +95,14 @@ lua s:close()
 lua s:connect('somewhereelse', '30303', 0.01)
 ---
  - nil
- - error
- - -1
- - Host name resolution failed
+ - timeout
+ - 110
+ - Connection timed out
 ...
 lua s:error()
 ---
- - -1
- - Host name resolution failed
+ - 110
+ - Connection timed out
 ...
 lua s:close()
 ---
@@ -117,8 +117,8 @@ error: 'box.socket: socket is not initialized'
 ...
 lua s:error()
 ---
- - -1
- - Host name resolution failed
+ - 110
+ - Connection timed out
 ...
 lua s = box.socket.tcp()
 ---