From 26704061a4e28eff573f02297e6da045d166afa4 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 27 May 2013 20:30:06 +0800 Subject: Fix Visual Studio 2012 projects --- src/inet.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/inet.c') diff --git a/src/inet.c b/src/inet.c index 5bc6364..51e8cfe 100644 --- a/src/inet.c +++ b/src/inet.c @@ -502,7 +502,7 @@ const char *inet_trybind(p_socket ps, const char *address, const char *serv, * Some systems do not provide this so that we provide our own. It's not * marvelously fast, but it works just fine. \*-------------------------------------------------------------------------*/ -#ifdef INET_ATON +#ifdef LUASOCKET_INET_ATON int inet_aton(const char *cp, struct in_addr *inp) { unsigned int a = 0, b = 0, c = 0, d = 0; @@ -529,7 +529,7 @@ int inet_aton(const char *cp, struct in_addr *inp) * http://mingw-users.1079350.n2.nabble.com/IPv6-getaddrinfo-amp-inet-ntop-td5891996.html \*-------------------------------------------------------------------------*/ -#ifdef INET_PTON +#ifdef LUASOCKET_INET_PTON const char *inet_ntop(int af, const void *src, char *dst, socklen_t cnt) { if (af == AF_INET) { -- cgit v1.2.3-55-g6feb From 834a3cf520637df0af9967e1f8ad9e40837771cb Mon Sep 17 00:00:00 2001 From: Diego Nehab Date: Mon, 27 May 2013 21:05:48 +0800 Subject: Simplifying getaddrinfo treatment. --- src/inet.c | 50 ++++++++++++++++++-------------------------------- 1 file changed, 18 insertions(+), 32 deletions(-) (limited to 'src/inet.c') diff --git a/src/inet.c b/src/inet.c index eab325e..fe9769b 100644 --- a/src/inet.c +++ b/src/inet.c @@ -79,24 +79,22 @@ static int inet_global_tohostname(lua_State *L) { } static int inet_global_getnameinfo(lua_State *L) { + char hbuf[NI_MAXHOST]; + char sbuf[NI_MAXSERV]; int i, ret; - char host[1024]; - char serv[32]; struct addrinfo hints; struct addrinfo *resolved, *iter; - const char *node = luaL_optstring(L, 1, NULL); - const char *service = luaL_optstring(L, 2, NULL); + const char *host = luaL_optstring(L, 1, NULL); + const char *serv = luaL_optstring(L, 2, NULL); - if (!(node || service)) - luaL_error(L, "You have to specify a hostname, a service, or both"); + if (!(host || serv)) + luaL_error(L, "host and serv cannot be both nil"); memset(&hints, 0, sizeof(hints)); hints.ai_socktype = SOCK_STREAM; hints.ai_family = PF_UNSPEC; - /* getaddrinfo must get a node and a service argument */ - ret = getaddrinfo(node ? node : "127.0.0.1", service ? service : "7", - &hints, &resolved); + ret = getaddrinfo(host, serv, &hints, &resolved); if (ret != 0) { lua_pushnil(L); lua_pushstring(L, socket_gaistrerror(ret)); @@ -105,19 +103,19 @@ static int inet_global_getnameinfo(lua_State *L) { lua_newtable(L); for (i = 1, iter = resolved; iter; i++, iter = iter->ai_next) { - getnameinfo(iter->ai_addr, (socklen_t) iter->ai_addrlen, host, - node ? (socklen_t) sizeof(host) : 0, serv, service ? (socklen_t) sizeof(serv) : 0, 0); - - if (node) { + getnameinfo(iter->ai_addr, (socklen_t) iter->ai_addrlen, + hbuf, host? (socklen_t) sizeof(hbuf): 0, + sbuf, serv? (socklen_t) sizeof(sbuf): 0, 0); + if (host) { lua_pushnumber(L, i); - lua_pushstring(L, host); + lua_pushstring(L, hbuf); lua_settable(L, -3); } } freeaddrinfo(resolved); - if (service) { - lua_pushstring(L, serv); + if (serv) { + lua_pushstring(L, sbuf); return 2; } else { return 1; @@ -176,20 +174,10 @@ static int inet_global_getaddrinfo(lua_State *L) } lua_newtable(L); for (iterator = resolved; iterator; iterator = iterator->ai_next) { - char hbuf[NI_MAXHOST] -#ifndef _WINDOWS - ,sbuf[NI_MAXSERV] -#endif - ; - ret = getnameinfo(iterator->ai_addr, (socklen_t) iterator->ai_addrlen, hbuf, - (socklen_t) sizeof(hbuf), -#ifdef _WINDOWS - NULL, 0, -#else - sbuf, 0, -#endif - NI_NUMERICHOST); - if(ret){ + char hbuf[NI_MAXHOST]; + ret = getnameinfo(iterator->ai_addr, (socklen_t) iterator->ai_addrlen, + hbuf, (socklen_t) sizeof(hbuf), NULL, 0, NI_NUMERICHOST); + if (ret){ lua_pushnil(L); lua_pushstring(L, socket_gaistrerror(ret)); return 2; @@ -218,7 +206,6 @@ static int inet_global_getaddrinfo(lua_State *L) return 1; } - /*-------------------------------------------------------------------------*\ * Gets the host name \*-------------------------------------------------------------------------*/ @@ -237,7 +224,6 @@ static int inet_global_gethostname(lua_State *L) } - /*=========================================================================*\ * Lua methods \*=========================================================================*/ -- cgit v1.2.3-55-g6feb From 734cc23e1f03372314ebad07ffd35117c152afcd Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 28 May 2013 00:09:30 +0800 Subject: Fixed inet_pton and a new Winsock UDP bug. inet_pton was copying the entire sockaddr_in struct, rather than just the sin_addr field... I am a bit unsure about the UDP fix, because it may affect TCP as well. On UDP sockets, when a sendto fails, the next receive/receivefrom fails with CONNRESET. I changed sock_recv/sock_recvfrom in wsocket.c to skip the CONNRESET from the recv/recvfrom, hoping that if the socket is TCP, sock_waitfd will get the CONNRESET again. The tests pass, but this should be tested more thoroughly. --- src/inet.c | 17 +++++--- src/io.h | 2 +- src/udp.c | 122 +++++++++++++++++++++++++++++----------------------------- src/wsocket.c | 12 +++++- 4 files changed, 84 insertions(+), 69 deletions(-) (limited to 'src/inet.c') diff --git a/src/inet.c b/src/inet.c index fe9769b..1f55d2a 100644 --- a/src/inet.c +++ b/src/inet.c @@ -558,18 +558,23 @@ const char *inet_ntop(int af, const void *src, char *dst, socklen_t cnt) int inet_pton(int af, const char *src, void *dst) { - struct addrinfo hints, *res, *ressave; + struct addrinfo hints, *res; memset(&hints, 0, sizeof(struct addrinfo)); hints.ai_family = af; + hints.ai_flags = AI_NUMERICHOST; if (getaddrinfo(src, NULL, &hints, &res) != 0) { return -1; } - ressave = res; - while (res) { - memcpy(dst, res->ai_addr, res->ai_addrlen); - res = res->ai_next; + if (af == AF_INET) { + struct sockaddr_in *in = (struct sockaddr_in *) res->ai_addr; + memcpy(dst, &in->sin_addr, sizeof(in->sin_addr)); + } else if (af == AF_INET6) { + struct sockaddr_in6 *in = (struct sockaddr_in6 *) res->ai_addr; + memcpy(dst, &in->sin6_addr, sizeof(in->sin6_addr)); + } else { + return -1; } - freeaddrinfo(ressave); + freeaddrinfo(res); return 0; } diff --git a/src/io.h b/src/io.h index 8cca08a..76a3e58 100644 --- a/src/io.h +++ b/src/io.h @@ -22,7 +22,7 @@ enum { IO_DONE = 0, /* operation completed successfully */ IO_TIMEOUT = -1, /* operation timed out */ IO_CLOSED = -2, /* the connection has been closed */ - IO_UNKNOWN = -3 + IO_UNKNOWN = -3 }; /* interface to error message function */ diff --git a/src/udp.c b/src/udp.c index 6e74702..3051382 100644 --- a/src/udp.c +++ b/src/udp.c @@ -155,31 +155,31 @@ static int meth_sendto(lua_State *L) { p_timeout tm = &udp->tm; int err; switch (udp->family) { - case PF_INET: { - struct sockaddr_in addr; - memset(&addr, 0, sizeof(addr)); - if (inet_pton(AF_INET, ip, &addr.sin_addr) != 1) + case PF_INET: { + struct sockaddr_in addr; + memset(&addr, 0, sizeof(addr)); + if (inet_pton(AF_INET, ip, &addr.sin_addr) != 1) luaL_argerror(L, 3, "invalid ip address"); - addr.sin_family = AF_INET; - addr.sin_port = htons(port); - timeout_markstart(tm); - err = socket_sendto(&udp->sock, data, count, &sent, - (SA *) &addr, sizeof(addr), tm); - break; - } - case PF_INET6: { - struct sockaddr_in6 addr; - memset(&addr, 0, sizeof(addr)); - if (!inet_pton(AF_INET6, ip, &addr.sin6_addr) != 1) + addr.sin_family = AF_INET; + addr.sin_port = htons(port); + timeout_markstart(tm); + err = socket_sendto(&udp->sock, data, count, &sent, + (SA *) &addr, sizeof(addr), tm); + break; + } + case PF_INET6: { + struct sockaddr_in6 addr; + memset(&addr, 0, sizeof(addr)); + if (!inet_pton(AF_INET6, ip, &addr.sin6_addr) != 1) luaL_argerror(L, 3, "invalid ip address"); - addr.sin6_family = AF_INET6; - addr.sin6_port = htons(port); - timeout_markstart(tm); - err = socket_sendto(&udp->sock, data, count, &sent, - (SA *) &addr, sizeof(addr), tm); - break; - } - default: + addr.sin6_family = AF_INET6; + addr.sin6_port = htons(port); + timeout_markstart(tm); + err = socket_sendto(&udp->sock, data, count, &sent, + (SA *) &addr, sizeof(addr), tm); + break; + } + default: lua_pushnil(L); lua_pushfstring(L, "unknown family %d", udp->family); return 2; @@ -229,38 +229,40 @@ static int meth_receivefrom(lua_State *L) { timeout_markstart(tm); count = MIN(count, sizeof(buffer)); switch (udp->family) { - case PF_INET: { - struct sockaddr_in addr; - socklen_t addr_len = sizeof(addr); - err = socket_recvfrom(&udp->sock, buffer, count, &got, - (SA *) &addr, &addr_len, tm); - /* Unlike TCP, recv() of zero is not closed, but a zero-length packet. */ - if (err == IO_CLOSED) - err = IO_DONE; - if (err == IO_DONE) { - char addrstr[INET_ADDRSTRLEN]; - lua_pushlstring(L, buffer, got); - if (!inet_ntop(AF_INET, &addr.sin_addr, - addrstr, sizeof(addrstr))) { - lua_pushnil(L); - lua_pushstring(L, "invalid source address"); - return 2; - } - lua_pushstring(L, addrstr); - lua_pushnumber(L, ntohs(addr.sin_port)); - return 3; - } - break; - } - case PF_INET6: { - struct sockaddr_in6 addr; - socklen_t addr_len = sizeof(addr); - err = socket_recvfrom(&udp->sock, buffer, count, &got, - (SA *) &addr, &addr_len, tm); - /* Unlike TCP, recv() of zero is not closed, but a zero-length packet. */ - if (err == IO_CLOSED) + case PF_INET: { + struct sockaddr_in addr; + socklen_t addr_len = sizeof(addr); + err = socket_recvfrom(&udp->sock, buffer, count, &got, + (SA *) &addr, &addr_len, tm); + /* Unlike TCP, recv() of zero is not closed, + * but a zero-length packet. */ + if (err == IO_CLOSED) + err = IO_DONE; + if (err == IO_DONE) { + char addrstr[INET_ADDRSTRLEN]; + lua_pushlstring(L, buffer, got); + if (!inet_ntop(AF_INET, &addr.sin_addr, + addrstr, sizeof(addrstr))) { + lua_pushnil(L); + lua_pushstring(L, "invalid source address"); + return 2; + } + lua_pushstring(L, addrstr); + lua_pushnumber(L, ntohs(addr.sin_port)); + return 3; + } + break; + } + case PF_INET6: { + struct sockaddr_in6 addr; + socklen_t addr_len = sizeof(addr); + err = socket_recvfrom(&udp->sock, buffer, count, &got, + (SA *) &addr, &addr_len, tm); + /* Unlike TCP, recv() of zero is not closed, + * but a zero-length packet. */ + if (err == IO_CLOSED) err = IO_DONE; - if (err == IO_DONE) { + if (err == IO_DONE) { char addrstr[INET6_ADDRSTRLEN]; lua_pushlstring(L, buffer, got); if (!inet_ntop(AF_INET6, &addr.sin6_addr, @@ -272,9 +274,9 @@ static int meth_receivefrom(lua_State *L) { lua_pushstring(L, addrstr); lua_pushnumber(L, ntohs(addr.sin6_port)); return 3; - } - break; - } + } + break; + } default: lua_pushnil(L); lua_pushfstring(L, "unknown family %d", udp->family); @@ -413,7 +415,7 @@ static int meth_setsockname(lua_State *L) { const char *address = luaL_checkstring(L, 2); const char *port = luaL_checkstring(L, 3); const char *err; - struct addrinfo bindhints; + struct addrinfo bindhints; memset(&bindhints, 0, sizeof(bindhints)); bindhints.ai_socktype = SOCK_DGRAM; bindhints.ai_family = udp->family; @@ -461,9 +463,9 @@ static int udp_create(lua_State *L, int family) { } static int global_create(lua_State *L) { - return udp_create(L, AF_INET); + return udp_create(L, AF_INET); } static int global_create6(lua_State *L) { - return udp_create(L, AF_INET6); + return udp_create(L, AF_INET6); } diff --git a/src/wsocket.c b/src/wsocket.c index 65f76bc..d34724b 100644 --- a/src/wsocket.c +++ b/src/wsocket.c @@ -250,7 +250,11 @@ int socket_recv(p_socket ps, char *data, size_t count, size_t *got, p_timeout tm } if (taken == 0) return IO_CLOSED; err = WSAGetLastError(); - if (err != WSAEWOULDBLOCK) return err; + /* On Windows, and on UDP, a connreset simply means the + * previous send failed. On TCP, it means our socket + * is now useless, so the error must pass. I am + * hoping waitfd will still get the error. */ + if (err != WSAEWOULDBLOCK && err != WSAECONNRESET) return err; if ((err = socket_waitfd(ps, WAITFD_R, tm)) != IO_DONE) return err; } } @@ -271,7 +275,11 @@ int socket_recvfrom(p_socket ps, char *data, size_t count, size_t *got, } if (taken == 0) return IO_CLOSED; err = WSAGetLastError(); - if (err != WSAEWOULDBLOCK) return err; + /* On Windows, and on UDP, a connreset simply means the + * previous send failed. On TCP, it means our socket + * is now useless, so the error must pass. I am + * hoping waitfd will still get the error. */ + if (err != WSAEWOULDBLOCK && err != WSAECONNRESET) return err; if ((err = socket_waitfd(ps, WAITFD_R, tm)) != IO_DONE) return err; } } -- cgit v1.2.3-55-g6feb From 2d51d6168874cdb2b72ee4f56f414d9a9a9d92e5 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 28 May 2013 17:27:06 +0800 Subject: Fix "final" bug in pton and TCP connreset handling --- src/inet.c | 9 ++++----- src/wsocket.c | 37 +++++++++++++++++++++++-------------- 2 files changed, 27 insertions(+), 19 deletions(-) (limited to 'src/inet.c') diff --git a/src/inet.c b/src/inet.c index 1f55d2a..1c44464 100644 --- a/src/inet.c +++ b/src/inet.c @@ -559,12 +559,11 @@ const char *inet_ntop(int af, const void *src, char *dst, socklen_t cnt) int inet_pton(int af, const char *src, void *dst) { struct addrinfo hints, *res; + int ret = 1; memset(&hints, 0, sizeof(struct addrinfo)); hints.ai_family = af; hints.ai_flags = AI_NUMERICHOST; - if (getaddrinfo(src, NULL, &hints, &res) != 0) { - return -1; - } + if (getaddrinfo(src, NULL, &hints, &res) != 0) return -1; if (af == AF_INET) { struct sockaddr_in *in = (struct sockaddr_in *) res->ai_addr; memcpy(dst, &in->sin_addr, sizeof(in->sin_addr)); @@ -572,10 +571,10 @@ int inet_pton(int af, const char *src, void *dst) struct sockaddr_in6 *in = (struct sockaddr_in6 *) res->ai_addr; memcpy(dst, &in->sin6_addr, sizeof(in->sin6_addr)); } else { - return -1; + ret = -1; } freeaddrinfo(res); - return 0; + return ret; } #endif diff --git a/src/wsocket.c b/src/wsocket.c index d34724b..b4a4384 100644 --- a/src/wsocket.c +++ b/src/wsocket.c @@ -238,8 +238,10 @@ int socket_sendto(p_socket ps, const char *data, size_t count, size_t *sent, /*-------------------------------------------------------------------------*\ * Receive with timeout \*-------------------------------------------------------------------------*/ -int socket_recv(p_socket ps, char *data, size_t count, size_t *got, p_timeout tm) { - int err; +int socket_recv(p_socket ps, char *data, size_t count, size_t *got, + p_timeout tm) +{ + int err, prev = IO_DONE; *got = 0; if (*ps == SOCKET_INVALID) return IO_CLOSED; for ( ;; ) { @@ -250,11 +252,14 @@ int socket_recv(p_socket ps, char *data, size_t count, size_t *got, p_timeout tm } if (taken == 0) return IO_CLOSED; err = WSAGetLastError(); - /* On Windows, and on UDP, a connreset simply means the - * previous send failed. On TCP, it means our socket - * is now useless, so the error must pass. I am - * hoping waitfd will still get the error. */ - if (err != WSAEWOULDBLOCK && err != WSAECONNRESET) return err; + /* On UDP, a connreset simply means the previous send failed. + * So we try again. + * On TCP, it means our socket is now useless, so the error passes. + * (We will loop again, exiting because the same error will happen) */ + if (err != WSAEWOULDBLOCK) { + if (err != WSAECONNRESET || prev == WSAECONNRESET) return err; + prev = err; + } if ((err = socket_waitfd(ps, WAITFD_R, tm)) != IO_DONE) return err; } } @@ -263,8 +268,9 @@ int socket_recv(p_socket ps, char *data, size_t count, size_t *got, p_timeout tm * Recvfrom with timeout \*-------------------------------------------------------------------------*/ int socket_recvfrom(p_socket ps, char *data, size_t count, size_t *got, - SA *addr, socklen_t *len, p_timeout tm) { - int err; + SA *addr, socklen_t *len, p_timeout tm) +{ + int err, prev = IO_DONE; *got = 0; if (*ps == SOCKET_INVALID) return IO_CLOSED; for ( ;; ) { @@ -275,11 +281,14 @@ int socket_recvfrom(p_socket ps, char *data, size_t count, size_t *got, } if (taken == 0) return IO_CLOSED; err = WSAGetLastError(); - /* On Windows, and on UDP, a connreset simply means the - * previous send failed. On TCP, it means our socket - * is now useless, so the error must pass. I am - * hoping waitfd will still get the error. */ - if (err != WSAEWOULDBLOCK && err != WSAECONNRESET) return err; + /* On UDP, a connreset simply means the previous send failed. + * So we try again. + * On TCP, it means our socket is now useless, so the error passes. + * (We will loop again, exiting because the same error will happen) */ + if (err != WSAEWOULDBLOCK) { + if (err != WSAECONNRESET || prev == WSAECONNRESET) return err; + prev = err; + } if ((err = socket_waitfd(ps, WAITFD_R, tm)) != IO_DONE) return err; } } -- cgit v1.2.3-55-g6feb