dany/luasocket
1
0
Fork 0
mirror of https://github.com/lunarmodules/luasocket.git synced 2024-07-05 20:59:46 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix socket.connect

Browse Source 
Previous implementation was not making sure the socket
had the same family as the addr returned by getaddrinfo.
So instead of "connection refused", we could get "invalid
argument", which was our fault.
This commit is contained in:
Diego Nehab 2013-05-26 15:18:13 +08:00
parent 22107bb9fc
commit 6d93fd7c8f
2 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
macosx.cmd
View File

@ -1 +1 @@
make DEBUG=DEBUG PLAT=macosx LUAINC_macosx_base=/Users/diego/build/macosx LUAPREFIX_macosx=/Users/diego/build/macosx install-both make DEBUG=DEBUG PLAT=macosx LUAINC_macosx_base=/Users/diego/build/macosx/include LUAPREFIX_macosx=/Users/diego/build/macosx install-both

20
src/tcp.c
View File

@ -388,10 +388,20 @@ static int global_create6(lua_State *L) {
return tcp_create(L, AF_INET6); return tcp_create(L, AF_INET6);
} }
const char *strfamily(int family) {
switch (family) {
case PF_UNSPEC: return "unspec";
case PF_INET: return "inet";
case PF_INET6: return "inet6";
default: return "invalid";
}
}
static const char *tryconnect6(const char *remoteaddr, const char *remoteserv, static const char *tryconnect6(const char *remoteaddr, const char *remoteserv,
struct addrinfo *connecthints, p_tcp tcp) { struct addrinfo *connecthints, p_tcp tcp) {
struct addrinfo *iterator = NULL, *resolved = NULL; struct addrinfo *iterator = NULL, *resolved = NULL;
const char *err = NULL; const char *err = NULL;
int i = 0;
/* try resolving */ /* try resolving */
err = socket_gaistrerror(getaddrinfo(remoteaddr, remoteserv, err = socket_gaistrerror(getaddrinfo(remoteaddr, remoteserv,
connecthints, &resolved)); connecthints, &resolved));
@ -402,8 +412,13 @@ static const char *tryconnect6(const char *remoteaddr, const char *remoteserv,
/* iterate over all returned addresses trying to connect */ /* iterate over all returned addresses trying to connect */
for (iterator = resolved; iterator; iterator = iterator->ai_next) { for (iterator = resolved; iterator; iterator = iterator->ai_next) {
p_timeout tm = timeout_markstart(&tcp->tm); p_timeout tm = timeout_markstart(&tcp->tm);
/* create new socket if one wasn't created by the bind stage */ /* create new socket if necessary. if there was no
if (tcp->sock == SOCKET_INVALID) { * bind, we need to create one for every new family
* that shows up while iterating. if there was a
* bind, all families will be the same and we will
* not enter this branch. */
if (tcp->family != iterator->ai_family) {
socket_destroy(&tcp->sock);
err = socket_strerror(socket_create(&tcp->sock, err = socket_strerror(socket_create(&tcp->sock,
iterator->ai_family, iterator->ai_socktype, iterator->ai_family, iterator->ai_socktype,
iterator->ai_protocol)); iterator->ai_protocol));
@ -444,6 +459,7 @@ static int global_connect(lua_State *L) {
timeout_init(&tcp->tm, -1, -1); timeout_init(&tcp->tm, -1, -1);
buffer_init(&tcp->buf, &tcp->io, &tcp->tm); buffer_init(&tcp->buf, &tcp->io, &tcp->tm);
tcp->sock = SOCKET_INVALID; tcp->sock = SOCKET_INVALID;
tcp->family = PF_UNSPEC;
/* allow user to pick local address and port */ /* allow user to pick local address and port */
memset(&bindhints, 0, sizeof(bindhints)); memset(&bindhints, 0, sizeof(bindhints));
bindhints.ai_socktype = SOCK_STREAM; bindhints.ai_socktype = SOCK_STREAM;