dany/luasocket
1
0
Fork 0
mirror of https://github.com/lunarmodules/luasocket.git synced 2024-12-26 04:28:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

When zero-timeout, only try first address in connect.

Browse Source
This commit is contained in:
Diego Nehab 2015-12-03 12:56:18 -02:00
parent be67f63f4e
commit 83880dbed7
3 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
doc/tcp.html
View File

@ -242,11 +242,14 @@ established.
<p class=note> <p class=note>
Note: Starting with LuaSocket 3.0, the host name resolution Note: Starting with LuaSocket 3.0, the host name resolution
depends on whether the socket was created by <a depends on whether the socket was created by
href=#socket.tcp><tt>socket.tcp</tt></a> or <a <a href=#socket.tcp><tt>socket.tcp</tt></a>,
href=#socket.tcp6><tt>socket.tcp6</tt></a>. Addresses from <a href=#socket.tcp4><tt>socket.tcp4</tt></a> or
the appropriate family are tried in succession until the <a href=#socket.tcp6><tt>socket.tcp6</tt></a>. Addresses from
first success or until the last failure. the appropriate family (or both) are tried in the order
returned by the resolver until the
first success or until the last failure. If the timeout was
set to zero, only the first address is tried.
</p> </p>
<!-- getpeername ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ --> <!-- getpeername ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->

4
src/inet.c
View File

@ -423,8 +423,8 @@ const char *inet_tryconnect(p_socket ps, int *family, const char *address,
/* try connecting to remote address */ /* try connecting to remote address */
err = socket_strerror(socket_connect(ps, (SA *) iterator->ai_addr, err = socket_strerror(socket_connect(ps, (SA *) iterator->ai_addr,
(socklen_t) iterator->ai_addrlen, tm)); (socklen_t) iterator->ai_addrlen, tm));
/* if success, break out of loop */ /* if success or timeout is zero, break out of loop */
if (err == NULL) { if (err == NULL || timeout_iszero(tm)) {
*family = current_family; *family = current_family;
break; break;
} }

4
src/tcp.c
View File

@ -417,7 +417,7 @@ static int global_connect(lua_State *L) {
bindhints.ai_family = family; bindhints.ai_family = family;
bindhints.ai_flags = AI_PASSIVE; bindhints.ai_flags = AI_PASSIVE;
if (localaddr) { if (localaddr) {
err = inet_trybind(&tcp->sock, &tcp->family, localaddr, err = inet_trybind(&tcp->sock, &tcp->family, localaddr,
localserv, &bindhints); localserv, &bindhints);
if (err) { if (err) {
lua_pushnil(L); lua_pushnil(L);
@ -429,7 +429,7 @@ static int global_connect(lua_State *L) {
memset(&connecthints, 0, sizeof(connecthints)); memset(&connecthints, 0, sizeof(connecthints));
connecthints.ai_socktype = SOCK_STREAM; connecthints.ai_socktype = SOCK_STREAM;
/* make sure we try to connect only to the same family */ /* make sure we try to connect only to the same family */
connecthints.ai_family = tcp->family; connecthints.ai_family = tcp->family;
err = inet_tryconnect(&tcp->sock, &tcp->family, remoteaddr, remoteserv, err = inet_tryconnect(&tcp->sock, &tcp->family, remoteaddr, remoteserv,
&tcp->tm, &connecthints); &tcp->tm, &connecthints);
if (err) { if (err) {