From 833333e1311b531ffbf3f7051da1ec5287a682b5 Mon Sep 17 00:00:00 2001 From: kobra Date: Thu, 12 Sep 2013 00:46:32 +0100 Subject: [PATCH 001/194] Added ability to set the option `reuseport` of a tcp socket. --- src/options.h | 2 +- src/tcp.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/options.h b/src/options.h index 5657a06..f7048b1 100644 --- a/src/options.h +++ b/src/options.h @@ -44,7 +44,7 @@ int opt_get_reuseaddr(lua_State *L, p_socket ps); int opt_get_tcp_nodelay(lua_State *L, p_socket ps); int opt_get_keepalive(lua_State *L, p_socket ps); int opt_get_linger(lua_State *L, p_socket ps); -int opt_get_reuseaddr(lua_State *L, p_socket ps); +int opt_get_reuseport(lua_State *L, p_socket ps); int opt_get_ip_multicast_loop(lua_State *L, p_socket ps); int opt_get_ip_multicast_if(lua_State *L, p_socket ps); int opt_get_error(lua_State *L, p_socket ps); diff --git a/src/tcp.c b/src/tcp.c index 6594bda..d0658a3 100644 --- a/src/tcp.c +++ b/src/tcp.c @@ -71,6 +71,7 @@ static luaL_Reg tcp_methods[] = { static t_opt optget[] = { {"keepalive", opt_get_keepalive}, {"reuseaddr", opt_get_reuseaddr}, + {"reuseport", opt_get_reuseport}, {"tcp-nodelay", opt_get_tcp_nodelay}, {"linger", opt_get_linger}, {"error", opt_get_error}, @@ -80,6 +81,7 @@ static t_opt optget[] = { static t_opt optset[] = { {"keepalive", opt_set_keepalive}, {"reuseaddr", opt_set_reuseaddr}, + {"reuseport", opt_set_reuseport}, {"tcp-nodelay", opt_set_tcp_nodelay}, {"ipv6-v6only", opt_set_ip6_v6only}, {"linger", opt_set_linger}, From 2906d6a5227df25f14305c373fdde057f388d363 Mon Sep 17 00:00:00 2001 From: Victor Seva Date: Fri, 5 Dec 2014 13:17:50 +0100 Subject: [PATCH 002/194] Add "tcp-keepidle", "tcp-keepcnt" and "tcp-keepintvl" options --- doc/tcp.html | 6 ++++++ src/options.c | 36 ++++++++++++++++++++++++++++++++++++ src/options.h | 18 ++++++++++++++++++ src/tcp.c | 18 ++++++++++++++++++ test/tcp-getoptions | 4 +++- 5 files changed, 81 insertions(+), 1 deletion(-) diff --git a/doc/tcp.html b/doc/tcp.html index 4226d78..4307234 100644 --- a/doc/tcp.html +++ b/doc/tcp.html @@ -433,6 +433,12 @@ used in validating addresses supplied in a call to
  • 'tcp-nodelay': Setting this option to true disables the Nagle's algorithm for the connection; +
  • 'tcp-keepidle': value in seconds for TCP_KEEPIDLE Linux only!! + +
  • 'tcp-keepcnt': value for TCP_KEEPCNT Linux only!! + +
  • 'tcp-keepintvl': value for TCP_KEEPINTVL Linux only!! +
  • 'ipv6-v6only': Setting this option to true restricts an inet6 socket to sending and receiving only IPv6 packets. diff --git a/src/options.c b/src/options.c index 8ac2a14..28fc08a 100644 --- a/src/options.c +++ b/src/options.c @@ -90,6 +90,42 @@ int opt_get_tcp_nodelay(lua_State *L, p_socket ps) return opt_getboolean(L, ps, IPPROTO_TCP, TCP_NODELAY); } +#ifdef TCP_KEEPIDLE +int opt_get_tcp_keepidle(lua_State *L, p_socket ps) +{ + return opt_getint(L, ps, IPPROTO_TCP, TCP_KEEPIDLE); +} + +int opt_set_tcp_keepidle(lua_State *L, p_socket ps) +{ + return opt_setint(L, ps, IPPROTO_TCP, TCP_KEEPIDLE); +} +#endif + +#ifdef TCP_KEEPCNT +int opt_get_tcp_keepcnt(lua_State *L, p_socket ps) +{ + return opt_getint(L, ps, IPPROTO_TCP, TCP_KEEPCNT); +} + +int opt_set_tcp_keepcnt(lua_State *L, p_socket ps) +{ + return opt_setint(L, ps, IPPROTO_TCP, TCP_KEEPCNT); +} +#endif + +#ifdef TCP_KEEPINTVL +int opt_get_tcp_keepintvl(lua_State *L, p_socket ps) +{ + return opt_getint(L, ps, IPPROTO_TCP, TCP_KEEPINTVL); +} + +int opt_set_tcp_keepintvl(lua_State *L, p_socket ps) +{ + return opt_setint(L, ps, IPPROTO_TCP, TCP_KEEPINTVL); +} +#endif + int opt_set_keepalive(lua_State *L, p_socket ps) { return opt_setboolean(L, ps, SOL_SOCKET, SO_KEEPALIVE); diff --git a/src/options.h b/src/options.h index 5657a06..2b6697b 100644 --- a/src/options.h +++ b/src/options.h @@ -23,6 +23,15 @@ int opt_set_dontroute(lua_State *L, p_socket ps); int opt_set_broadcast(lua_State *L, p_socket ps); int opt_set_reuseaddr(lua_State *L, p_socket ps); int opt_set_tcp_nodelay(lua_State *L, p_socket ps); +#ifdef TCP_KEEPIDLE +int opt_set_tcp_keepidle(lua_State *L, p_socket ps); +#endif +#ifdef TCP_KEEPCNT +int opt_set_tcp_keepcnt(lua_State *L, p_socket ps); +#endif +#ifdef TCP_KEEPINTVL +int opt_set_tcp_keepintvl(lua_State *L, p_socket ps); +#endif int opt_set_keepalive(lua_State *L, p_socket ps); int opt_set_linger(lua_State *L, p_socket ps); int opt_set_reuseaddr(lua_State *L, p_socket ps); @@ -42,6 +51,15 @@ int opt_set_ip6_v6only(lua_State *L, p_socket ps); /* supported options for getoption */ int opt_get_reuseaddr(lua_State *L, p_socket ps); int opt_get_tcp_nodelay(lua_State *L, p_socket ps); +#ifdef TCP_KEEPIDLE +int opt_get_tcp_keepidle(lua_State *L, p_socket ps); +#endif +#ifdef TCP_KEEPCNT +int opt_get_tcp_keepcnt(lua_State *L, p_socket ps); +#endif +#ifdef TCP_KEEPINTVL +int opt_get_tcp_keepintvl(lua_State *L, p_socket ps); +#endif int opt_get_keepalive(lua_State *L, p_socket ps); int opt_get_linger(lua_State *L, p_socket ps); int opt_get_reuseaddr(lua_State *L, p_socket ps); diff --git a/src/tcp.c b/src/tcp.c index 6594bda..3af9a39 100644 --- a/src/tcp.c +++ b/src/tcp.c @@ -72,6 +72,15 @@ static t_opt optget[] = { {"keepalive", opt_get_keepalive}, {"reuseaddr", opt_get_reuseaddr}, {"tcp-nodelay", opt_get_tcp_nodelay}, +#ifdef TCP_KEEPIDLE + {"tcp-keepidle", opt_get_tcp_keepidle}, +#endif +#ifdef TCP_KEEPCNT + {"tcp-keepcnt", opt_get_tcp_keepcnt}, +#endif +#ifdef TCP_KEEPINTVL + {"tcp-keepintvl", opt_get_tcp_keepintvl}, +#endif {"linger", opt_get_linger}, {"error", opt_get_error}, {NULL, NULL} @@ -81,6 +90,15 @@ static t_opt optset[] = { {"keepalive", opt_set_keepalive}, {"reuseaddr", opt_set_reuseaddr}, {"tcp-nodelay", opt_set_tcp_nodelay}, +#ifdef TCP_KEEPIDLE + {"tcp-keepidle", opt_set_tcp_keepidle}, +#endif +#ifdef TCP_KEEPCNT + {"tcp-keepcnt", opt_set_tcp_keepcnt}, +#endif +#ifdef TCP_KEEPINTVL + {"tcp-keepintvl", opt_set_tcp_keepintvl}, +#endif {"ipv6-v6only", opt_set_ip6_v6only}, {"linger", opt_set_linger}, {NULL, NULL} diff --git a/test/tcp-getoptions b/test/tcp-getoptions index f9b3d1b..777ccc3 100755 --- a/test/tcp-getoptions +++ b/test/tcp-getoptions @@ -7,7 +7,9 @@ port = 8765 function options(o) print("options for", o) - for _, opt in ipairs{"keepalive", "reuseaddr", "tcp-nodelay"} do + for _, opt in ipairs{ + "keepalive", "reuseaddr", + "tcp-nodelay", "tcp-keepidle", "tcp-keepcnt", "tcp-keepintvl"} do print("getoption", opt, o:getoption(opt)) end From fd729b32a8966291f007567f72f3dc0158bdab35 Mon Sep 17 00:00:00 2001 From: Diego Nehab Date: Mon, 5 Oct 2015 11:47:51 +0800 Subject: [PATCH 003/194] Added support for arbitrary datagram sizes. The maximum size is still constant per UDP object, but the size can be speficied at creation time. --- doc/udp.html | 34 ++++++++++++++++++++++++------ src/udp.c | 58 +++++++++++++++++++++++++++++++++------------------- src/udp.h | 5 +++-- 3 files changed, 68 insertions(+), 29 deletions(-) diff --git a/doc/udp.html b/doc/udp.html index a300f2f..22d7c72 100644 --- a/doc/udp.html +++ b/doc/udp.html @@ -42,7 +42,7 @@

    -socket.udp() +socket.udp([buffersize])

    @@ -62,6 +62,13 @@ The setpeername is used to connect the object.

    +

    +The optional buffersize parameter +specifies the size of the largest datagram that will +ever be received by the UDP object. The default value is +8192. +

    +

    In case of success, a new unconnected UDP object returned. In case of error, nil is returned, followed by @@ -85,7 +92,7 @@ href=#setoption>setoption will fail.

    -socket.udp4() +socket.udp4([buffersize])

    @@ -105,6 +112,13 @@ The setpeername is used to connect the object.

    +

    +The optional buffersize parameter +specifies the size of the largest datagram that will +ever be received by the UDP object. The default value is +8192. +

    +

    In case of success, a new unconnected UDP object returned. In case of error, nil is returned, followed by @@ -114,7 +128,7 @@ an error message.

    -socket.udp6() +socket.udp6([buffersize])

    @@ -134,6 +148,13 @@ The setpeername is used to connect the object.

    +

    +The optional buffersize parameter +specifies the size of the largest datagram that will +ever be received by the UDP object. The default value is +8192. +

    +

    In case of success, a new unconnected UDP object returned. In case of error, nil is returned, followed by @@ -238,9 +259,10 @@ specifies the maximum size of the datagram to be retrieved. If there are more than size bytes available in the datagram, the excess bytes are discarded. If there are less then size bytes available in the current datagram, the -available bytes are returned. If size is omitted, the -maximum datagram size is used (which is currently limited by the -implementation to 8192 bytes). +available bytes are returned. +If size is omitted, the +buffersize argument at creation time is used +(which defaults to 8192 bytes).

    diff --git a/src/udp.c b/src/udp.c index 17d932a..9c27b60 100644 --- a/src/udp.c +++ b/src/udp.c @@ -41,6 +41,7 @@ static int meth_setpeername(lua_State *L); static int meth_close(lua_State *L); static int meth_setoption(lua_State *L); static int meth_getoption(lua_State *L); +static int meth_getbufferlength(lua_State *L); static int meth_settimeout(lua_State *L); static int meth_getfd(lua_State *L); static int meth_setfd(lua_State *L); @@ -63,6 +64,7 @@ static luaL_Reg udp_methods[] = { {"setfd", meth_setfd}, {"setoption", meth_setoption}, {"getoption", meth_getoption}, + {"getoption", meth_getbufferlength}, {"setpeername", meth_setpeername}, {"setsockname", meth_setsockname}, {"settimeout", meth_settimeout}, @@ -202,47 +204,55 @@ static int meth_sendto(lua_State *L) { \*-------------------------------------------------------------------------*/ static int meth_receive(lua_State *L) { p_udp udp = (p_udp) auxiliar_checkgroup(L, "udp{any}", 1); - char buffer[UDP_DATAGRAMSIZE]; - size_t got, count = (size_t) luaL_optnumber(L, 2, sizeof(buffer)); + char buf[UDP_DATAGRAMSIZE]; + size_t len = MAX(udp->len, UDP_DATAGRAMSIZE); + char *dgram = len > sizeof(buf)? udp->buf: buf; + size_t got, wanted = (size_t) luaL_optnumber(L, 2, len); int err; p_timeout tm = &udp->tm; - count = MIN(count, sizeof(buffer)); timeout_markstart(tm); - err = socket_recv(&udp->sock, buffer, count, &got, tm); + wanted = MIN(wanted, len); + err = socket_recv(&udp->sock, dgram, wanted, &got, 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 && err != IO_CLOSED ) { lua_pushnil(L); lua_pushstring(L, udp_strerror(err)); return 2; } - lua_pushlstring(L, buffer, got); + lua_pushlstring(L, dgram, got); + return 1; +} + +/*-------------------------------------------------------------------------*\ +* Receives data from a UDP socket +\*-------------------------------------------------------------------------*/ +static int meth_getbufferlength(lua_State *L) { + p_udp udp = (p_udp) auxiliar_checkgroup(L, "udp{any}", 1); + lua_pushinteger(L, MAX(UDP_DATAGRAMSIZE, udp->len)); return 1; } /*-------------------------------------------------------------------------*\ * Receives data and sender from a UDP socket \*-------------------------------------------------------------------------*/ -static int meth_receivefrom(lua_State *L) -{ +static int meth_receivefrom(lua_State *L) { p_udp udp = (p_udp) auxiliar_checkclass(L, "udp{unconnected}", 1); - char buffer[UDP_DATAGRAMSIZE]; - size_t got, count = (size_t) luaL_optnumber(L, 2, sizeof(buffer)); - int err; - p_timeout tm = &udp->tm; + char buf[UDP_DATAGRAMSIZE]; + size_t len = MAX(udp->len, UDP_DATAGRAMSIZE); + char *dgram = len > sizeof(buf)? udp->buf: buf; + size_t got, wanted = (size_t) luaL_optnumber(L, 2, len); struct sockaddr_storage addr; socklen_t addr_len = sizeof(addr); char addrstr[INET6_ADDRSTRLEN]; char portstr[6]; + int err; + p_timeout tm = &udp->tm; timeout_markstart(tm); - count = MIN(count, sizeof(buffer)); - err = socket_recvfrom(&udp->sock, buffer, count, &got, (SA *) &addr, + wanted = MIN(wanted, len); + err = socket_recvfrom(&udp->sock, dgram, wanted, &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 && err != IO_CLOSED) { lua_pushnil(L); lua_pushstring(L, udp_strerror(err)); return 2; @@ -254,7 +264,7 @@ static int meth_receivefrom(lua_State *L) lua_pushstring(L, gai_strerror(err)); return 2; } - lua_pushlstring(L, buffer, got); + lua_pushlstring(L, dgram, got); lua_pushstring(L, addrstr); lua_pushinteger(L, (int) strtol(portstr, (char **) NULL, 10)); return 3; @@ -409,13 +419,19 @@ static int meth_setsockname(lua_State *L) { * Creates a master udp object \*-------------------------------------------------------------------------*/ static int udp_create(lua_State *L, int family) { + p_udp udp = NULL; + /* optional length for private datagram buffer. this is useful when + * you need larger datagrams than UDP_DATAGRAMSIZE */ + size_t len = (size_t) luaL_optinteger(L, 1, 0); + if (len <= UDP_DATAGRAMSIZE) len = 0; /* allocate udp object */ - p_udp udp = (p_udp) lua_newuserdata(L, sizeof(t_udp)); + udp = (p_udp) lua_newuserdata(L, sizeof(t_udp) + len - 1); auxiliar_setclass(L, "udp{unconnected}", -1); /* if family is AF_UNSPEC, we leave the socket invalid and * store AF_UNSPEC into family. This will allow it to later be * replaced with an AF_INET6 or AF_INET socket upon first use. */ udp->sock = SOCKET_INVALID; + udp->len = len; timeout_init(&udp->tm, -1, -1); udp->family = family; if (family != AF_UNSPEC) { diff --git a/src/udp.h b/src/udp.h index 2b831a5..da27a7a 100644 --- a/src/udp.h +++ b/src/udp.h @@ -8,7 +8,7 @@ * (AF_INET, SOCK_DGRAM). * * Two classes are defined: connected and unconnected. UDP objects are -* originally unconnected. They can be "connected" to a given address +* originally unconnected. They can be "connected" to a given address * with a call to the setpeername function. The same function can be used to * break the connection. \*=========================================================================*/ @@ -17,13 +17,14 @@ #include "timeout.h" #include "socket.h" -/* can't be larger than wsocket.c MAXCHUNK!!! */ #define UDP_DATAGRAMSIZE 8192 typedef struct t_udp_ { t_socket sock; t_timeout tm; int family; + size_t len; /* length of datagram buffer below */ + char buf[1]; /* allocate larger structure to hold actual buffer */ } t_udp; typedef t_udp *p_udp; From be67f63f4e11e53690bf1431a236f86b484c9bf0 Mon Sep 17 00:00:00 2001 From: Diego Nehab Date: Tue, 6 Oct 2015 11:33:50 +0800 Subject: [PATCH 004/194] Changed buffer-per-socket to buffer-per-operation. This is a difficult tradeoff to measure. I think large datagrams won't be used very frequently. So it is better to not lock a large buffer to each socket object and instead allocate and deallocate for each operation receiving a datagram larger than UDP_DATAGRAMSIZE. --- doc/reference.html | 2 ++ doc/socket.html | 25 +++++++++++++++++++- doc/udp.html | 33 ++++++-------------------- src/select.c | 5 +++- src/udp.c | 58 +++++++++++++++++++++------------------------- src/udp.h | 2 -- test/testclnt.lua | 1 - 7 files changed, 64 insertions(+), 62 deletions(-) diff --git a/doc/reference.html b/doc/reference.html index 6067ba6..878e7d2 100644 --- a/doc/reference.html +++ b/doc/reference.html @@ -147,6 +147,7 @@ Support, Manual"> connect, connect4, connect6, +_DATAGRAMSIZE, _DEBUG, dns, gettime, @@ -158,6 +159,7 @@ Support, Manual"> skip, sleep, _SETSIZE, +_SOCKETINVALID, source, tcp, tcp4, diff --git a/doc/socket.html b/doc/socket.html index e6a9bf8..8a81414 100644 --- a/doc/socket.html +++ b/doc/socket.html @@ -90,7 +90,7 @@ of connect are defined as simple helper functions that restrict the -

    +

    socket._DEBUG

    @@ -99,6 +99,19 @@ This constant is set to true if the library was compiled with debug support.

    + + +

    +socket._DATAGRAMSIZE +

    + +

    +Default datagram size used by calls to +receive and +receivefrom. +(Unless changed in compile time, the value is 8192.) +

    +

    @@ -393,6 +406,16 @@ The maximum number of sockets that the select function can handle.

    + + +

    +socket._SOCKETINVALID +

    + +

    +The OS value for an invalid socket. +

    +

    diff --git a/doc/udp.html b/doc/udp.html index 22d7c72..9437c51 100644 --- a/doc/udp.html +++ b/doc/udp.html @@ -42,7 +42,7 @@

    -socket.udp([buffersize]) +socket.udp()

    @@ -62,13 +62,6 @@ The setpeername is used to connect the object.

    -

    -The optional buffersize parameter -specifies the size of the largest datagram that will -ever be received by the UDP object. The default value is -8192. -

    -

    In case of success, a new unconnected UDP object returned. In case of error, nil is returned, followed by @@ -92,7 +85,7 @@ href=#setoption>setoption will fail.

    -socket.udp4([buffersize]) +socket.udp4()

    @@ -112,13 +105,6 @@ The setpeername is used to connect the object.

    -

    -The optional buffersize parameter -specifies the size of the largest datagram that will -ever be received by the UDP object. The default value is -8192. -

    -

    In case of success, a new unconnected UDP object returned. In case of error, nil is returned, followed by @@ -128,7 +114,7 @@ an error message.

    -socket.udp6([buffersize]) +socket.udp6()

    @@ -148,13 +134,6 @@ The setpeername is used to connect the object.

    -

    -The optional buffersize parameter -specifies the size of the largest datagram that will -ever be received by the UDP object. The default value is -8192. -

    -

    In case of success, a new unconnected UDP object returned. In case of error, nil is returned, followed by @@ -261,8 +240,10 @@ the excess bytes are discarded. If there are less then size bytes available in the current datagram, the available bytes are returned. If size is omitted, the -buffersize argument at creation time is used -(which defaults to 8192 bytes). +compile-time constant socket._DATAGRAMSIZE is used +(it defaults to 8192 bytes). Larger sizes will cause a +temporary buffer to be allocated for the operation.

    diff --git a/src/select.c b/src/select.c index d14c40a..9d133b7 100644 --- a/src/select.c +++ b/src/select.c @@ -39,7 +39,10 @@ static luaL_Reg func[] = { \*-------------------------------------------------------------------------*/ int select_open(lua_State *L) { lua_pushstring(L, "_SETSIZE"); - lua_pushnumber(L, FD_SETSIZE); + lua_pushinteger(L, FD_SETSIZE); + lua_rawset(L, -3); + lua_pushstring(L, "_SOCKETINVALID"); + lua_pushinteger(L, SOCKET_INVALID); lua_rawset(L, -3); luaL_setfuncs(L, func, 0); return 0; diff --git a/src/udp.c b/src/udp.c index 9c27b60..968dca8 100644 --- a/src/udp.c +++ b/src/udp.c @@ -41,7 +41,6 @@ static int meth_setpeername(lua_State *L); static int meth_close(lua_State *L); static int meth_setoption(lua_State *L); static int meth_getoption(lua_State *L); -static int meth_getbufferlength(lua_State *L); static int meth_settimeout(lua_State *L); static int meth_getfd(lua_State *L); static int meth_setfd(lua_State *L); @@ -64,7 +63,6 @@ static luaL_Reg udp_methods[] = { {"setfd", meth_setfd}, {"setoption", meth_setoption}, {"getoption", meth_getoption}, - {"getoption", meth_getbufferlength}, {"setpeername", meth_setpeername}, {"setsockname", meth_setsockname}, {"settimeout", meth_settimeout}, @@ -118,8 +116,7 @@ static luaL_Reg func[] = { /*-------------------------------------------------------------------------*\ * Initializes module \*-------------------------------------------------------------------------*/ -int udp_open(lua_State *L) -{ +int udp_open(lua_State *L) { /* create classes */ auxiliar_newclass(L, "udp{connected}", udp_methods); auxiliar_newclass(L, "udp{unconnected}", udp_methods); @@ -130,6 +127,10 @@ int udp_open(lua_State *L) auxiliar_add2group(L, "udp{unconnected}", "select{able}"); /* define library functions */ luaL_setfuncs(L, func, 0); + /* export default UDP size */ + lua_pushliteral(L, "_DATAGRAMSIZE"); + lua_pushinteger(L, UDP_DATAGRAMSIZE); + lua_rawset(L, -3); return 0; } @@ -205,30 +206,26 @@ static int meth_sendto(lua_State *L) { static int meth_receive(lua_State *L) { p_udp udp = (p_udp) auxiliar_checkgroup(L, "udp{any}", 1); char buf[UDP_DATAGRAMSIZE]; - size_t len = MAX(udp->len, UDP_DATAGRAMSIZE); - char *dgram = len > sizeof(buf)? udp->buf: buf; - size_t got, wanted = (size_t) luaL_optnumber(L, 2, len); + size_t got, wanted = (size_t) luaL_optnumber(L, 2, sizeof(buf)); + char *dgram = wanted > sizeof(buf)? (char *) malloc(wanted): buf; int err; p_timeout tm = &udp->tm; timeout_markstart(tm); - wanted = MIN(wanted, len); + if (!dgram) { + lua_pushnil(L); + lua_pushliteral(L, "out of memory"); + return 2; + } err = socket_recv(&udp->sock, dgram, wanted, &got, tm); /* Unlike TCP, recv() of zero is not closed, but a zero-length packet. */ - if (err != IO_DONE && err != IO_CLOSED ) { + if (err != IO_DONE && err != IO_CLOSED) { lua_pushnil(L); lua_pushstring(L, udp_strerror(err)); + if (wanted > sizeof(buf)) free(dgram); return 2; } lua_pushlstring(L, dgram, got); - return 1; -} - -/*-------------------------------------------------------------------------*\ -* Receives data from a UDP socket -\*-------------------------------------------------------------------------*/ -static int meth_getbufferlength(lua_State *L) { - p_udp udp = (p_udp) auxiliar_checkgroup(L, "udp{any}", 1); - lua_pushinteger(L, MAX(UDP_DATAGRAMSIZE, udp->len)); + if (wanted > sizeof(buf)) free(dgram); return 1; } @@ -238,9 +235,8 @@ static int meth_getbufferlength(lua_State *L) { static int meth_receivefrom(lua_State *L) { p_udp udp = (p_udp) auxiliar_checkclass(L, "udp{unconnected}", 1); char buf[UDP_DATAGRAMSIZE]; - size_t len = MAX(udp->len, UDP_DATAGRAMSIZE); - char *dgram = len > sizeof(buf)? udp->buf: buf; - size_t got, wanted = (size_t) luaL_optnumber(L, 2, len); + size_t got, wanted = (size_t) luaL_optnumber(L, 2, sizeof(buf)); + char *dgram = wanted > sizeof(buf)? (char *) malloc(wanted): buf; struct sockaddr_storage addr; socklen_t addr_len = sizeof(addr); char addrstr[INET6_ADDRSTRLEN]; @@ -248,13 +244,18 @@ static int meth_receivefrom(lua_State *L) { int err; p_timeout tm = &udp->tm; timeout_markstart(tm); - wanted = MIN(wanted, len); + if (!dgram) { + lua_pushnil(L); + lua_pushliteral(L, "out of memory"); + return 2; + } err = socket_recvfrom(&udp->sock, dgram, wanted, &got, (SA *) &addr, &addr_len, tm); /* Unlike TCP, recv() of zero is not closed, but a zero-length packet. */ if (err != IO_DONE && err != IO_CLOSED) { lua_pushnil(L); lua_pushstring(L, udp_strerror(err)); + if (wanted > sizeof(buf)) free(dgram); return 2; } err = getnameinfo((struct sockaddr *)&addr, addr_len, addrstr, @@ -262,19 +263,20 @@ static int meth_receivefrom(lua_State *L) { if (err) { lua_pushnil(L); lua_pushstring(L, gai_strerror(err)); + if (wanted > sizeof(buf)) free(dgram); return 2; } lua_pushlstring(L, dgram, got); lua_pushstring(L, addrstr); lua_pushinteger(L, (int) strtol(portstr, (char **) NULL, 10)); + if (wanted > sizeof(buf)) free(dgram); return 3; } /*-------------------------------------------------------------------------*\ * Returns family as string \*-------------------------------------------------------------------------*/ -static int meth_getfamily(lua_State *L) -{ +static int meth_getfamily(lua_State *L) { p_udp udp = (p_udp) auxiliar_checkgroup(L, "udp{any}", 1); if (udp->family == AF_INET6) { lua_pushliteral(L, "inet6"); @@ -419,19 +421,13 @@ static int meth_setsockname(lua_State *L) { * Creates a master udp object \*-------------------------------------------------------------------------*/ static int udp_create(lua_State *L, int family) { - p_udp udp = NULL; - /* optional length for private datagram buffer. this is useful when - * you need larger datagrams than UDP_DATAGRAMSIZE */ - size_t len = (size_t) luaL_optinteger(L, 1, 0); - if (len <= UDP_DATAGRAMSIZE) len = 0; /* allocate udp object */ - udp = (p_udp) lua_newuserdata(L, sizeof(t_udp) + len - 1); + p_udp udp = (p_udp) lua_newuserdata(L, sizeof(t_udp)); auxiliar_setclass(L, "udp{unconnected}", -1); /* if family is AF_UNSPEC, we leave the socket invalid and * store AF_UNSPEC into family. This will allow it to later be * replaced with an AF_INET6 or AF_INET socket upon first use. */ udp->sock = SOCKET_INVALID; - udp->len = len; timeout_init(&udp->tm, -1, -1); udp->family = family; if (family != AF_UNSPEC) { diff --git a/src/udp.h b/src/udp.h index da27a7a..be9b6a5 100644 --- a/src/udp.h +++ b/src/udp.h @@ -23,8 +23,6 @@ typedef struct t_udp_ { t_socket sock; t_timeout tm; int family; - size_t len; /* length of datagram buffer below */ - char buf[1]; /* allocate larger structure to hold actual buffer */ } t_udp; typedef t_udp *p_udp; diff --git a/test/testclnt.lua b/test/testclnt.lua index ee1201f..170e187 100644 --- a/test/testclnt.lua +++ b/test/testclnt.lua @@ -669,7 +669,6 @@ local udp_methods = { "settimeout" } - ------------------------------------------------------------------------ test_methods(socket.udp(), udp_methods) do local sock = socket.tcp6() From 83880dbed77f9a0a3627bce2e7bfbe1b862e091d Mon Sep 17 00:00:00 2001 From: Diego Nehab Date: Thu, 3 Dec 2015 12:56:18 -0200 Subject: [PATCH 005/194] When zero-timeout, only try first address in connect. --- doc/tcp.html | 13 ++++++++----- src/inet.c | 4 ++-- src/tcp.c | 4 ++-- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/doc/tcp.html b/doc/tcp.html index fb627a1..c86853d 100644 --- a/doc/tcp.html +++ b/doc/tcp.html @@ -242,11 +242,14 @@ established.

    Note: Starting with LuaSocket 3.0, the host name resolution -depends on whether the socket was created by socket.tcp or socket.tcp6. Addresses from -the appropriate family are tried in succession until the -first success or until the last failure. +depends on whether the socket was created by +socket.tcp, +socket.tcp4 or +socket.tcp6. Addresses from +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.

    diff --git a/src/inet.c b/src/inet.c index 331b800..f4c8404 100644 --- a/src/inet.c +++ b/src/inet.c @@ -423,8 +423,8 @@ const char *inet_tryconnect(p_socket ps, int *family, const char *address, /* try connecting to remote address */ err = socket_strerror(socket_connect(ps, (SA *) iterator->ai_addr, (socklen_t) iterator->ai_addrlen, tm)); - /* if success, break out of loop */ - if (err == NULL) { + /* if success or timeout is zero, break out of loop */ + if (err == NULL || timeout_iszero(tm)) { *family = current_family; break; } diff --git a/src/tcp.c b/src/tcp.c index cef9d16..e4f1a4b 100644 --- a/src/tcp.c +++ b/src/tcp.c @@ -417,7 +417,7 @@ static int global_connect(lua_State *L) { bindhints.ai_family = family; bindhints.ai_flags = AI_PASSIVE; if (localaddr) { - err = inet_trybind(&tcp->sock, &tcp->family, localaddr, + err = inet_trybind(&tcp->sock, &tcp->family, localaddr, localserv, &bindhints); if (err) { lua_pushnil(L); @@ -429,7 +429,7 @@ static int global_connect(lua_State *L) { memset(&connecthints, 0, sizeof(connecthints)); connecthints.ai_socktype = SOCK_STREAM; /* 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, &tcp->tm, &connecthints); if (err) { From 5d52ffedf49ca14af2926eac9ddbf9bfc5e8c56c Mon Sep 17 00:00:00 2001 From: Jonas Kunze Date: Fri, 15 Jan 2016 18:48:57 +0100 Subject: [PATCH 006/194] Added solaris platform To compile on solaris some libs had to be linked. So far I was only able to test it on OmniOS r151006 --- makefile | 2 +- src/makefile | 30 ++++++++++++++++++++++++++++-- 2 files changed, 29 insertions(+), 3 deletions(-) diff --git a/makefile b/makefile index e34f5a9..cc15b4e 100644 --- a/makefile +++ b/makefile @@ -10,7 +10,7 @@ # print print the build settings PLAT?= linux -PLATS= macosx linux win32 mingw freebsd +PLATS= macosx linux win32 mingw freebsd solaris all: $(PLAT) diff --git a/src/makefile b/src/makefile index 3e8c128..adf687f 100644 --- a/src/makefile +++ b/src/makefile @@ -55,7 +55,7 @@ LDIR_linux?=share/lua/$(LUAV) # LUAINC_freebsd: # /usr/local/include/lua$(LUAV) -# where lua headers are found for linux builds +# where lua headers are found for freebsd builds LUAINC_freebsd_base?=/usr/local/include/ LUAINC_freebsd?=$(LUAINC_freebsd_base)/lua$(LUAV) LUAPREFIX_freebsd?=/usr/local/ @@ -86,6 +86,13 @@ LUALIB_win32?=$(LUAPREFIX_win32)/lib/lua/$(LUAV)/$(PLATFORM_win32) LUALIBNAME_win32?=lua$(subst .,,$(LUAV)).lib +# LUAINC_solaris: +LUAINC_solaris_base?=/usr/include +LUAINC_solaris?=$(LUAINC_solaris_base)/lua/$(LUAV) +LUAPREFIX_solaris?=/usr/local +CDIR_solaris?=lib/lua/$(LUAV) +LDIR_solaris?=share/lua/$(LUAV) + # prefix: /usr/local /usr /opt/local /sw # the top of the default install tree prefix?=$(LUAPREFIX_$(PLAT)) @@ -132,7 +139,7 @@ print: #------ # Supported platforms # -PLATS= macosx linux win32 mingw +PLATS= macosx linux win32 mingw solaris #------ # Compiler and linker settings @@ -182,6 +189,22 @@ LDFLAGS_freebsd=-O -shared -fpic -o LD_freebsd=gcc SOCKET_freebsd=usocket.o +#------ +# Compiler and linker settings +# for Solaris +SO_solaris=so +O_solaris=o +CC_solaris=gcc +DEF_solaris=-DLUASOCKET_$(DEBUG) \ + -DLUASOCKET_API='__attribute__((visibility("default")))' \ + -DUNIX_API='__attribute__((visibility("default")))' \ + -DMIME_API='__attribute__((visibility("default")))' +CFLAGS_solaris=-I$(LUAINC) $(DEF) -Wall -Wshadow -Wextra \ + -Wimplicit -O2 -ggdb3 -fpic -fvisibility=hidden +LDFLAGS_solaris=-lnsl -lsocket -lresolv -O -shared -fpic -o +LD_solaris=gcc +SOCKET_solaris=usocket.o + #------ # Compiler and linker settings # for MingW @@ -332,6 +355,9 @@ linux: mingw: $(MAKE) all PLAT=mingw + +solaris: + $(MAKE) all-unix PLAT=solaris none: @echo "Please run" From a7f21e8ec44586fafd5a6a2ffaaf721b69d86f6e Mon Sep 17 00:00:00 2001 From: mpeterv Date: Mon, 25 Jan 2016 13:52:41 +0300 Subject: [PATCH 007/194] Fix error in ltn12 under Lua 5.3 --- src/ltn12.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/src/ltn12.lua b/src/ltn12.lua index 1014de2..f75cd07 100644 --- a/src/ltn12.lua +++ b/src/ltn12.lua @@ -9,6 +9,7 @@ ----------------------------------------------------------------------------- local string = require("string") local table = require("table") +local unpack = unpack or table.unpack local base = _G local _M = {} if module then -- heuristic for exporting a global package table From 3c3a5d001138f7c4630aea595da0e93ed247ec34 Mon Sep 17 00:00:00 2001 From: mpeterv Date: Thu, 11 Feb 2016 15:53:53 +0300 Subject: [PATCH 008/194] Use base.select instead of just select --- src/ltn12.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ltn12.lua b/src/ltn12.lua index f75cd07..dede0fa 100644 --- a/src/ltn12.lua +++ b/src/ltn12.lua @@ -43,7 +43,7 @@ end -- (thanks to Wim Couwenberg) function filter.chain(...) local arg = {...} - local n = select('#',...) + local n = base.select('#',...) local top, index = 1, 1 local retry = "" return function(chunk) From 700ece0721b4b1b70da413f15c5df7dcbae0fe3b Mon Sep 17 00:00:00 2001 From: mpeterv Date: Thu, 11 Feb 2016 15:54:59 +0300 Subject: [PATCH 009/194] Fix base_parsed global in url module --- src/url.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/src/url.lua b/src/url.lua index 7809535..fbd93d1 100644 --- a/src/url.lua +++ b/src/url.lua @@ -219,6 +219,7 @@ end -- corresponding absolute url ----------------------------------------------------------------------------- function _M.absolute(base_url, relative_url) + local base_parsed if base.type(base_url) == "table" then base_parsed = base_url base_url = _M.build(base_parsed) From 52bb99af35159700814d78687e9d95142feb1a9c Mon Sep 17 00:00:00 2001 From: mpeterv Date: Thu, 11 Feb 2016 15:56:57 +0300 Subject: [PATCH 010/194] Fix sink method in tp module --- src/tp.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tp.lua b/src/tp.lua index cbeff56..328cbab 100644 --- a/src/tp.lua +++ b/src/tp.lua @@ -74,7 +74,7 @@ function metat.__index:command(cmd, arg) end function metat.__index:sink(snk, pat) - local chunk, err = c:receive(pat) + local chunk, err = self.c:receive(pat) return snk(chunk, err) end From 91928813466cd10b1b4e6f118f2decfb3b2aba33 Mon Sep 17 00:00:00 2001 From: mpeterv Date: Thu, 11 Feb 2016 15:57:56 +0300 Subject: [PATCH 011/194] Don't break global mbox table in mbox.split_mbox --- src/mbox.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mbox.lua b/src/mbox.lua index 7724ae2..ed9e781 100644 --- a/src/mbox.lua +++ b/src/mbox.lua @@ -61,7 +61,7 @@ function _M.parse_from(from) end function _M.split_mbox(mbox_s) - mbox = {} + local mbox = {} mbox_s = string.gsub(mbox_s, "\r\n", "\n") .."\n\nFrom \n" local nj, i, j = 1, 1, 1 while 1 do From d075e7322f0ac1de505b025fd3004b8d4123cc56 Mon Sep 17 00:00:00 2001 From: Philipp Janda Date: Sun, 21 Feb 2016 11:59:44 +0100 Subject: [PATCH 012/194] Support table errors. LuaSocket wraps error messages raised by newtry() in a table and unpacks them later so that (string) errors raised by 3rd-party code can be passed through as-is. This obviously didn't work when the 3rd-party code raised a table as an error message. This change sets a private metatable on all wrapped LuaSocket exceptions to distinguish them from 3rd-party table errors. --- src/except.c | 46 +++++++++++++++++++++++++++------------------- 1 file changed, 27 insertions(+), 19 deletions(-) diff --git a/src/except.c b/src/except.c index 261ac98..def35a0 100644 --- a/src/except.c +++ b/src/except.c @@ -12,7 +12,7 @@ #if LUA_VERSION_NUM < 502 #define lua_pcallk(L, na, nr, err, ctx, cont) \ - ((void)ctx,(void)cont,lua_pcall(L, na, nr, err)) + (((void)ctx),((void)cont),lua_pcall(L, na, nr, err)) #endif #if LUA_VERSION_NUM < 503 @@ -39,12 +39,11 @@ static luaL_Reg func[] = { * Try factory \*-------------------------------------------------------------------------*/ static void wrap(lua_State *L) { - lua_newtable(L); - lua_pushnumber(L, 1); - lua_pushvalue(L, -3); - lua_settable(L, -3); - lua_insert(L, -2); - lua_pop(L, 1); + lua_createtable(L, 1, 0); + lua_pushvalue(L, -2); + lua_rawseti(L, -2, 1); + lua_pushvalue(L, lua_upvalueindex(2)); + lua_setmetatable(L, -2); } static int finalize(lua_State *L) { @@ -58,15 +57,16 @@ static int finalize(lua_State *L) { } else return lua_gettop(L); } -static int do_nothing(lua_State *L) { +static int do_nothing(lua_State *L) { (void) L; - return 0; + return 0; } static int global_newtry(lua_State *L) { lua_settop(L, 1); if (lua_isnil(L, 1)) lua_pushcfunction(L, do_nothing); - lua_pushcclosure(L, finalize, 1); + lua_pushvalue(L, lua_upvalueindex(1)); + lua_pushcclosure(L, finalize, 2); return 1; } @@ -74,13 +74,16 @@ static int global_newtry(lua_State *L) { * Protect factory \*-------------------------------------------------------------------------*/ static int unwrap(lua_State *L) { - if (lua_istable(L, -1)) { - lua_pushnumber(L, 1); - lua_gettable(L, -2); - lua_pushnil(L); - lua_insert(L, -2); - return 1; - } else return 0; + if (lua_istable(L, -1) && lua_getmetatable(L, -1)) { + int r = lua_rawequal(L, -1, lua_upvalueindex(2)); + lua_pop(L, 1); + if (r) { + lua_pushnil(L); + lua_rawgeti(L, -2, 1); + return 1; + } + } + return 0; } static int protected_finish(lua_State *L, int status, lua_KContext ctx) { @@ -110,7 +113,9 @@ static int protected_(lua_State *L) { } static int global_protect(lua_State *L) { - lua_pushcclosure(L, protected_, 1); + lua_settop(L, 1); + lua_pushvalue(L, lua_upvalueindex(1)); + lua_pushcclosure(L, protected_, 2); return 1; } @@ -118,6 +123,9 @@ static int global_protect(lua_State *L) { * Init module \*-------------------------------------------------------------------------*/ int except_open(lua_State *L) { - luaL_setfuncs(L, func, 0); + lua_newtable(L); /* metatable for wrapped exceptions */ + lua_pushboolean(L, 0); + lua_setfield(L, -2, "__metatable"); + luaL_setfuncs(L, func, 1); return 0; } From fb713cdedb16f8eb67523f17b0d66262b4e9dca1 Mon Sep 17 00:00:00 2001 From: mpeterv Date: Mon, 25 Jan 2016 15:14:34 +0300 Subject: [PATCH 013/194] Add more tests for socket.try/protect --- test/excepttest.lua | 33 +++++++++++++++++++++++++++++---- 1 file changed, 29 insertions(+), 4 deletions(-) diff --git a/test/excepttest.lua b/test/excepttest.lua index ce9f197..6904545 100644 --- a/test/excepttest.lua +++ b/test/excepttest.lua @@ -1,6 +1,31 @@ local socket = require("socket") -try = socket.newtry(function() - print("finalized!!!") + +local finalizer_called + +local func = socket.protect(function(err, ...) + local try = socket.newtry(function() + finalizer_called = true + error("ignored") + end) + + if err then + return error(err, 0) + else + return try(...) + end end) -try = socket.protect(try) -print(try(nil, "it works")) + +local ret1, ret2, ret3 = func(false, 1, 2, 3) +assert(not finalizer_called, "unexpected finalizer call") +assert(ret1 == 1 and ret2 == 2 and ret3 == 3, "incorrect return values") + +ret1, ret2, ret3 = func(false, false, "error message") +assert(finalizer_called, "finalizer not called") +assert(ret1 == nil and ret2 == "error message" and ret3 == nil, "incorrect return values") + +local err = {key = "value"} +ret1, ret2 = pcall(func, err) +assert(not ret1, "error not rethrown") +assert(ret2 == err, "incorrect error rethrown") + +print("OK") From 7c1df8a7cd4271309160abfd28fb8011a3fee46f Mon Sep 17 00:00:00 2001 From: mpeterv Date: Tue, 16 Feb 2016 11:44:02 +0300 Subject: [PATCH 014/194] Update HTML docs for try/protect --- doc/socket.html | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/doc/socket.html b/doc/socket.html index 8a81414..a43a208 100644 --- a/doc/socket.html +++ b/doc/socket.html @@ -220,13 +220,6 @@ Returns an equivalent function that instead of throwing exceptions, returns nil followed by an error message.

    -

    -Note: Beware that if your function performs some illegal operation that -raises an error, the protected function will catch the error and return it -as a string. This is because the try function -uses errors as the mechanism to throw exceptions. -

    -

    @@ -424,8 +417,7 @@ socket.try(ret1 [, ret2 ... retN]) Throws an exception in case of error. The exception can only be caught -by the protect function. It does not explode -into an error message. +by the protect function.

    @@ -436,7 +428,10 @@ nested with try.

    The function returns ret1 to retN if -ret1 is not nil. Otherwise, it calls error passing ret2. +ret1 is not nil or false. +Otherwise, it calls error passing ret2 wrapped +in a table with metatable used by protect to +distinguish exceptions from runtime errors. 

    
From 7cab8a5006da807d83f427217e2158079bb78145 Mon Sep 17 00:00:00 2001
From: Philipp Janda 
Date: Sun, 21 Feb 2016 12:28:13 +0100
Subject: [PATCH 015/194] Update comment in except.h

---
 src/except.h | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/except.h b/src/except.h
index 1e7a245..2497c05 100644
--- a/src/except.h
+++ b/src/except.h
@@ -9,21 +9,26 @@
 * error checking was taking a substantial amount of the coding. These
 * function greatly simplify the task of checking errors.
 *
-* The main idea is that functions should return nil as its first return
-* value when it finds an error, and return an error message (or value)
+* The main idea is that functions should return nil as their first return
+* values when they find an error, and return an error message (or value)
 * following nil. In case of success, as long as the first value is not nil,
 * the other values don't matter.
 *
 * The idea is to nest function calls with the "try" function. This function
-* checks the first value, and calls "error" on the second if the first is
-* nil. Otherwise, it returns all values it received. 
+* checks the first value, and, if it's falsy, wraps the second value in a
+* table with metatable and calls "error" on it. Otherwise, it returns all
+* values it received. Basically, it works like the Lua "assert" function,
+* but it creates errors targeted specifically at "protect".
 *
-* The protect function returns a new function that behaves exactly like the
-* function it receives, but the new function doesn't throw exceptions: it
-* returns nil followed by the error message instead.
+* The "newtry" function is a factory for "try" functions that call a
+* finalizer in protected mode before calling "error".
 *
-* With these two function, it's easy to write functions that throw
-* exceptions on error, but that don't interrupt the user script. 
+* The "protect" function returns a new function that behaves exactly like
+* the function it receives, but the new function catches exceptions thrown
+* by "try" functions and returns nil followed by the error message instead.
+*
+* With these three functions, it's easy to write functions that throw
+* exceptions on error, but that don't interrupt the user script.
 \*=========================================================================*/
 
 #include "lua.h"

From 9fe38c654f6c62a4f11d993bd79c710af9313fbd Mon Sep 17 00:00:00 2001
From: Philipp Janda 
Date: Wed, 24 Feb 2016 00:48:43 +0100
Subject: [PATCH 016/194] Don't swallow errors in finalizers.

---
 doc/socket.html     | 3 +--
 src/except.c        | 2 +-
 test/excepttest.lua | 1 -
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/doc/socket.html b/doc/socket.html
index a43a208..08ef784 100644
--- a/doc/socket.html
+++ b/doc/socket.html
@@ -167,8 +167,7 @@ is  raised.
 
 
     
 Finalizer is a function that will be called before
-try throws the exception. It will be called 
-in protected mode.
+try throws the exception.
 
    
 
 
     
diff --git a/src/except.c b/src/except.c
index def35a0..309f8f0 100644
--- a/src/except.c
+++ b/src/except.c
@@ -49,7 +49,7 @@ static void wrap(lua_State *L) {
 static int finalize(lua_State *L) {
     if (!lua_toboolean(L, 1)) {
         lua_pushvalue(L, lua_upvalueindex(1));
-        lua_pcall(L, 0, 0, 0);
+        lua_call(L, 0, 0);
         lua_settop(L, 2);
         wrap(L);
         lua_error(L);
diff --git a/test/excepttest.lua b/test/excepttest.lua
index 6904545..80c9cb8 100644
--- a/test/excepttest.lua
+++ b/test/excepttest.lua
@@ -5,7 +5,6 @@ local finalizer_called
 local func = socket.protect(function(err, ...)
     local try = socket.newtry(function()
         finalizer_called = true
-        error("ignored")
     end)
 
     if err then

From 4392bdcdd40dd433fc8bf4347653ce1a796cb572 Mon Sep 17 00:00:00 2001
From: Philipp Janda 
Date: Wed, 24 Feb 2016 00:57:42 +0100
Subject: [PATCH 017/194] Always put metatable in first upvalue.

---
 src/except.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/except.c b/src/except.c
index 309f8f0..60b5005 100644
--- a/src/except.c
+++ b/src/except.c
@@ -42,13 +42,13 @@ static void wrap(lua_State *L) {
     lua_createtable(L, 1, 0);
     lua_pushvalue(L, -2);
     lua_rawseti(L, -2, 1);
-    lua_pushvalue(L, lua_upvalueindex(2));
+    lua_pushvalue(L, lua_upvalueindex(1));
     lua_setmetatable(L, -2);
 }
 
 static int finalize(lua_State *L) {
     if (!lua_toboolean(L, 1)) {
-        lua_pushvalue(L, lua_upvalueindex(1));
+        lua_pushvalue(L, lua_upvalueindex(2));
         lua_call(L, 0, 0);
         lua_settop(L, 2);
         wrap(L);
@@ -66,6 +66,7 @@ static int global_newtry(lua_State *L) {
     lua_settop(L, 1);
     if (lua_isnil(L, 1)) lua_pushcfunction(L, do_nothing);
     lua_pushvalue(L, lua_upvalueindex(1));
+    lua_insert(L, -2);
     lua_pushcclosure(L, finalize, 2);
     return 1;
 }
@@ -75,7 +76,7 @@ static int global_newtry(lua_State *L) {
 \*-------------------------------------------------------------------------*/
 static int unwrap(lua_State *L) {
     if (lua_istable(L, -1) && lua_getmetatable(L, -1)) {
-        int r = lua_rawequal(L, -1, lua_upvalueindex(2));
+        int r = lua_rawequal(L, -1, lua_upvalueindex(1));
         lua_pop(L, 1);
         if (r) {
             lua_pushnil(L);
@@ -106,7 +107,7 @@ static int protected_cont(lua_State *L) {
 
 static int protected_(lua_State *L) {
     int status;
-    lua_pushvalue(L, lua_upvalueindex(1));
+    lua_pushvalue(L, lua_upvalueindex(2));
     lua_insert(L, 1);
     status = lua_pcallk(L, lua_gettop(L) - 1, LUA_MULTRET, 0, 0, protected_cont);
     return protected_finish(L, status, 0);
@@ -115,6 +116,7 @@ static int protected_(lua_State *L) {
 static int global_protect(lua_State *L) {
     lua_settop(L, 1);
     lua_pushvalue(L, lua_upvalueindex(1));
+    lua_insert(L, 1);
     lua_pushcclosure(L, protected_, 2);
     return 1;
 }

From 0341516a2932e077b547f8105e0ea13f3f56f868 Mon Sep 17 00:00:00 2001
From: Philipp Janda 
Date: Wed, 24 Feb 2016 06:59:37 +0100
Subject: [PATCH 018/194] Clarify documentation for try/protect.

---
 doc/socket.html | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/doc/socket.html b/doc/socket.html
index 08ef784..fec09c4 100644
--- a/doc/socket.html
+++ b/doc/socket.html
@@ -215,8 +215,9 @@ to throw exceptions.
 
    
 
 
    
-Returns an equivalent function that instead of throwing exceptions,
-returns nil followed by an error message. 
+Returns an equivalent function that instead of throwing exceptions in case of
+a failed try call, returns nil
+followed by an error message.
 
    
 
 
@@ -415,8 +416,9 @@ socket.try(ret1 [, ret2 ... retN])
 
 
    
-Throws an exception in case of error. The exception can only be caught 
-by the protect function.
+Throws an exception in case ret1 is falsy, using
+ret2 as the error message. The exception is supposed to be caught 
+by a protected function only.
 
    
 
 
    

From cdce73b226cc4da6a073b79bec02a6780d32ff1a Mon Sep 17 00:00:00 2001
From: Diego Nehab 
Date: Fri, 4 Mar 2016 14:38:56 -0300
Subject: [PATCH 019/194] Added support for FTP command lists

---
 doc/socket.html |  6 ++++--
 src/ftp.lua     | 15 ++++++++++++---
 src/ltn12.lua   |  3 +++
 3 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/doc/socket.html b/doc/socket.html
index fec09c4..a99d71b 100644
--- a/doc/socket.html
+++ b/doc/socket.html
@@ -243,7 +243,9 @@ non-numeric indices) in the arrays will be silently ignored.
 
 
     The function returns a list with the sockets ready for
 reading, a list with the sockets ready for writing and an error message.
-The error message is "timeout" if a timeout condition was met and
+The error message is "timeout" if a timeout
+condition was met, "select failed" if the call
+to select failed, and
 nil otherwise. The returned tables are
 doubly keyed both by integers and also by the sockets
 themselves, to simplify the test if a specific socket has
@@ -251,7 +253,7 @@ changed status.
 
    
 
 
    
-Note: : select can monitor a limited number
+Note: select can monitor a limited number
 of sockets, as defined by the constant socket._SETSIZE. This
 number may be as high as 1024 or as low as 64 by default,
 depending on the system. It is usually possible to change this
diff --git a/src/ftp.lua b/src/ftp.lua
index 917cd89..e0c3cae 100644
--- a/src/ftp.lua
+++ b/src/ftp.lua
@@ -271,8 +271,17 @@ _M.command = socket.protect(function(cmdt)
     local f = _M.open(cmdt.host, cmdt.port, cmdt.create)
     f:greet()
     f:login(cmdt.user, cmdt.password)
-    f.try(f.tp:command(cmdt.command, cmdt.argument))
-    if cmdt.check then f.try(f.tp:check(cmdt.check)) end
+    if type(cmdt.command) == "table" then
+        local argument = cmdt.argument or {}
+        local check = cmdt.check or {}
+        for i,cmd in ipairs(cmdt.command) do
+            f.try(f.tp:command(cmd, argument[i]))
+            if check[i] then f.try(f.tp:check(check[i])) end
+        end
+    else
+        f.try(f.tp:command(cmdt.command, cmdt.argument))
+        if cmdt.check then f.try(f.tp:check(cmdt.check)) end
+    end
     f:quit()
     return f:close()
 end)
@@ -282,4 +291,4 @@ _M.get = socket.protect(function(gett)
     else return tget(gett) end
 end)
 
-return _M
\ No newline at end of file
+return _M
diff --git a/src/ltn12.lua b/src/ltn12.lua
index dede0fa..575c5a7 100644
--- a/src/ltn12.lua
+++ b/src/ltn12.lua
@@ -22,6 +22,9 @@ _M.source = source
 _M.sink = sink
 _M.pump = pump
 
+local unpack = unpack or table.unpack
+local select = base.select
+
 -- 2048 seems to be better in windows...
 _M.BLOCKSIZE = 2048
 _M._VERSION = "LTN12 1.0.3"

From 944305dc21350fd2ec32a9552d893da86894fd62 Mon Sep 17 00:00:00 2001
From: Diego Nehab 
Date: Fri, 4 Mar 2016 15:36:32 -0300
Subject: [PATCH 020/194] Added gettimeout for completeness.

Also documented.
Rordered manuals so order is alphabetical.
---
 doc/mime.html      |  59 ++--
 doc/reference.html |   2 +
 doc/smtp.html      | 235 ++++++-------
 doc/socket.html    |  70 ++--
 doc/tcp.html       | 315 +++++++++--------
 doc/udp.html       | 833 +++++++++++++++++++++++----------------------
 src/tcp.c          |   8 +
 src/timeout.c      |  10 +
 src/timeout.h      |   1 +
 src/udp.c          |   7 +
 10 files changed, 804 insertions(+), 736 deletions(-)

diff --git a/doc/mime.html b/doc/mime.html
index ae136fd..8cb3507 100644
--- a/doc/mime.html
+++ b/doc/mime.html
@@ -72,34 +72,6 @@ local mime = require("mime")
 
 
    High-level filters
    
 
-
-
-
    
-mime.normalize([marker])
-
    
-
-
    
-Converts most common end-of-line markers to a specific given marker. 
-
    
-
-
    
-Marker is the new marker. It defaults to CRLF, the canonic 
-end-of-line marker defined by the MIME standard.
-
    
-
-
    
-The function returns a filter that performs the conversion. 
-
    
-
-
    
-Note: There is no perfect solution to this problem. Different end-of-line
-markers are an evil that will probably plague developers forever. 
-This function, however, will work perfectly for text created with any of
-the most common end-of-line markers, i.e. the Mac OS (CR), the Unix (LF), 
-or the DOS (CRLF) conventions. Even if the data has mixed end-of-line
-markers, the function will still work well, although it doesn't 
-guarantee that the number of empty lines will be correct.
-
    
 
 
 
@@ -159,6 +131,35 @@ base64 = ltn12.filter.chain(
 )
    + + +

    +mime.normalize([marker]) +

    + +

    +Converts most common end-of-line markers to a specific given marker. +

    + +

    +Marker is the new marker. It defaults to CRLF, the canonic +end-of-line marker defined by the MIME standard. +

    + +

    +The function returns a filter that performs the conversion. +

    + +

    +Note: There is no perfect solution to this problem. Different end-of-line +markers are an evil that will probably plague developers forever. +This function, however, will work perfectly for text created with any of +the most common end-of-line markers, i.e. the Mac OS (CR), the Unix (LF), +or the DOS (CRLF) conventions. Even if the data has mixed end-of-line +markers, the function will still work well, although it doesn't +guarantee that the number of empty lines will be correct. +

    +

    @@ -466,7 +467,7 @@ marker.

    Last modified by Diego Nehab on
    -Thu Apr 20 00:25:44 EDT 2006 +Fri Mar 4 15:19:17 BRT 2016

    diff --git a/doc/reference.html b/doc/reference.html index 878e7d2..287dc19 100644 --- a/doc/reference.html +++ b/doc/reference.html @@ -187,6 +187,7 @@ Support, Manual"> getpeername, getsockname, getstats, +gettimeout, listen, receive, send, @@ -207,6 +208,7 @@ Support, Manual"> getoption, getpeername, getsockname, +gettimeout, receive, receivefrom, send, diff --git a/doc/smtp.html b/doc/smtp.html index bbbff80..600ec37 100644 --- a/doc/smtp.html +++ b/doc/smtp.html @@ -114,6 +114,124 @@ the SMTP module:
  • ZONE: default time zone. + + +

    +smtp.message(mesgt) +

    + +

    +Returns a simple +LTN12 source that sends an SMTP message body, possibly multipart (arbitrarily deep). +

    + +

    +The only parameter of the function is a table describing the message. +Mesgt has the following form (notice the recursive structure): +

    + +
    + + +
    +mesgt = {
    +  headers = header-table,
    +  body = LTN12 source or string or +multipart-mesgt
    +}
    + 
    +multipart-mesgt = {
    +  [preamble = string,]
    +  [1] = mesgt,
    +  [2] = mesgt,
    +  ...
    +  [n] = mesgt,
    +  [epilogue = string,]
    +}
    +
    +
    + +

    +For a simple message, all that is needed is a set of headers +and the body. The message body can be given as a string +or as a simple +LTN12 +source. For multipart messages, the body is a table that +recursively defines each part as an independent message, plus an optional +preamble and epilogue. +

    + +

    +The function returns a simple +LTN12 +source that produces the +message contents as defined by mesgt, chunk by chunk. +Hopefully, the following +example will make things clear. When in doubt, refer to the appropriate RFC +as listed in the introduction.

    + +
    +-- load the smtp support and its friends
+local smtp = require("socket.smtp")
+local mime = require("mime")
+local ltn12 = require("ltn12")
+
+-- creates a source to send a message with two parts. The first part is 
+-- plain text, the second part is a PNG image, encoded as base64.
+source = smtp.message{
+  headers = {
+     -- Remember that headers are *ignored* by smtp.send. 
+     from = "Sicrano de Oliveira <sicrano@example.com>",
+     to = "Fulano da Silva <fulano@example.com>",
+     subject = "Here is a message with attachments"
+  },
+  body = {
+    preamble = "If your client doesn't understand attachments, \r\n" ..
+               "it will still display the preamble and the epilogue.\r\n" ..
+               "Preamble will probably appear even in a MIME enabled client.",
+    -- first part: no headers means plain text, us-ascii.
+    -- The mime.eol low-level filter normalizes end-of-line markers.
+    [1] = { 
+      body = mime.eol(0, [[
+        Lines in a message body should always end with CRLF. 
+        The smtp module will *NOT* perform translation. However, the 
+        send function *DOES* perform SMTP stuffing, whereas the message
+        function does *NOT*.
+      ]])
+    },
+    -- second part: headers describe content to be a png image, 
+    -- sent under the base64 transfer content encoding.
+    -- notice that nothing happens until the message is actually sent. 
+    -- small chunks are loaded into memory right before transmission and 
+    -- translation happens on the fly.
+    [2] = { 
+      headers = {
+        ["content-type"] = 'image/png; name="image.png"',
+        ["content-disposition"] = 'attachment; filename="image.png"',
+        ["content-description"] = 'a beautiful image',
+        ["content-transfer-encoding"] = "BASE64"
+      },
+      body = ltn12.source.chain(
+        ltn12.source.file(io.open("image.png", "rb")),
+        ltn12.filter.chain(
+          mime.encode("base64"),
+          mime.wrap()
+        )
+      )
+    },
+    epilogue = "This might also show up, but after the attachments"
+  }
+}
+
+-- finally send it
+r, e = smtp.send{
+    from = "<sicrano@example.com>",
+    rcpt = "<fulano@example.com>",
+    source = source,
+}
+
    + +

    @@ -275,123 +393,6 @@ r, e = smtp.send{ } - - -

    -smtp.message(mesgt) -

    - -

    -Returns a simple -LTN12 source that sends an SMTP message body, possibly multipart (arbitrarily deep). -

    - -

    -The only parameter of the function is a table describing the message. -Mesgt has the following form (notice the recursive structure): -

    - -
    - - -
    -mesgt = {
    -  headers = header-table,
    -  body = LTN12 source or string or -multipart-mesgt
    -}
    - 
    -multipart-mesgt = {
    -  [preamble = string,]
    -  [1] = mesgt,
    -  [2] = mesgt,
    -  ...
    -  [n] = mesgt,
    -  [epilogue = string,]
    -}
    -
    -
    - -

    -For a simple message, all that is needed is a set of headers -and the body. The message body can be given as a string -or as a simple -LTN12 -source. For multipart messages, the body is a table that -recursively defines each part as an independent message, plus an optional -preamble and epilogue. -

    - -

    -The function returns a simple -LTN12 -source that produces the -message contents as defined by mesgt, chunk by chunk. -Hopefully, the following -example will make things clear. When in doubt, refer to the appropriate RFC -as listed in the introduction.

    - -
    --- load the smtp support and its friends
-local smtp = require("socket.smtp")
-local mime = require("mime")
-local ltn12 = require("ltn12")
-
--- creates a source to send a message with two parts. The first part is 
--- plain text, the second part is a PNG image, encoded as base64.
-source = smtp.message{
-  headers = {
-     -- Remember that headers are *ignored* by smtp.send. 
-     from = "Sicrano de Oliveira <sicrano@example.com>",
-     to = "Fulano da Silva <fulano@example.com>",
-     subject = "Here is a message with attachments"
-  },
-  body = {
-    preamble = "If your client doesn't understand attachments, \r\n" ..
-               "it will still display the preamble and the epilogue.\r\n" ..
-               "Preamble will probably appear even in a MIME enabled client.",
-    -- first part: no headers means plain text, us-ascii.
-    -- The mime.eol low-level filter normalizes end-of-line markers.
-    [1] = { 
-      body = mime.eol(0, [[
-        Lines in a message body should always end with CRLF. 
-        The smtp module will *NOT* perform translation. However, the 
-        send function *DOES* perform SMTP stuffing, whereas the message
-        function does *NOT*.
-      ]])
-    },
-    -- second part: headers describe content to be a png image, 
-    -- sent under the base64 transfer content encoding.
-    -- notice that nothing happens until the message is actually sent. 
-    -- small chunks are loaded into memory right before transmission and 
-    -- translation happens on the fly.
-    [2] = { 
-      headers = {
-        ["content-type"] = 'image/png; name="image.png"',
-        ["content-disposition"] = 'attachment; filename="image.png"',
-        ["content-description"] = 'a beautiful image',
-        ["content-transfer-encoding"] = "BASE64"
-      },
-      body = ltn12.source.chain(
-        ltn12.source.file(io.open("image.png", "rb")),
-        ltn12.filter.chain(
-          mime.encode("base64"),
-          mime.wrap()
-        )
-      )
-    },
-    epilogue = "This might also show up, but after the attachments"
-  }
-}
-
--- finally send it
-r, e = smtp.send{
-    from = "<sicrano@example.com>",
-    rcpt = "<fulano@example.com>",
-    source = source,
-}
-
    -
    diff --git a/doc/socket.html b/doc/socket.html index a99d71b..35f8391 100644 --- a/doc/socket.html +++ b/doc/socket.html @@ -51,6 +51,30 @@ To obtain the socket namespace, run: local socket = require("socket") + + +

    +socket.headers.canonic

    + +

    The socket.headers.canonic table +is used by the HTTP and SMTP modules to translate from +lowercase field names back into their canonic +capitalization. When a lowercase field name exists as a key +in this table, the associated value is substituted in +whenever the field name is sent out. +

    + +

    +You can obtain the headers namespace if case run-time +modifications are required by running: +

    + +
    +-- loads the headers module 
+local headers = require("headers")
+
    + +

    @@ -129,29 +153,6 @@ t = socket.gettime() print(socket.gettime() - t .. " seconds elapsed") - - -

    -socket.headers.canonic

    - -

    The socket.headers.canonic table -is used by the HTTP and SMTP modules to translate from -lowercase field names back into their canonic -capitalization. When a lowercase field name exists as a key -in this table, the associated value is substituted in -whenever the field name is sent out. -

    - -

    -You can obtain the headers namespace if case run-time -modifications are required by running: -

    - -
    --- loads the headers module 
-local headers = require("headers")
-
    -

    @@ -283,6 +284,18 @@ it to select, it will be ignored. Using select with non-socket objects: Any object that implements getfd and dirty can be used with select, allowing objects from other libraries to be used within a socket.select driven loop.

    + + +

    +socket._SETSIZE +

    + +

    +The maximum number of sockets that the select function can handle. +

    + +

    @@ -390,17 +403,6 @@ side closes the connection. The function returns a source with the appropriate behavior.

    - - -

    -socket._SETSIZE -

    - -

    -The maximum number of sockets that the select function can handle. -

    -

    diff --git a/doc/tcp.html b/doc/tcp.html index c86853d..c6c6eb2 100644 --- a/doc/tcp.html +++ b/doc/tcp.html @@ -38,84 +38,6 @@

    TCP

    - - -

    -socket.tcp() -

    - -

    -Creates and returns an TCP master object. A master object can -be transformed into a server object with the method -listen (after a call to bind) or into a client object with -the method connect. The only other -method supported by a master object is the -close method.

    - -

    -In case of success, a new master object is returned. In case of error, -nil is returned, followed by an error message. -

    - -

    -Note: The choice between IPv4 and IPv6 happens during a call to -bind or connect, depending on the address -family obtained from the resolver. -

    - -

    -Note: Before the choice between IPv4 and IPv6 happens, -the internal socket object is invalid and therefore setoption will fail. -

    - - - -

    -socket.tcp4() -

    - -

    -Creates and returns an IPv4 TCP master object. A master object can -be transformed into a server object with the method -listen (after a call to bind) or into a client object with -the method connect. The only other -method supported by a master object is the -close method.

    - -

    -In case of success, a new master object is returned. In case of error, -nil is returned, followed by an error message. -

    - - - -

    -socket.tcp6() -

    - -

    -Creates and returns an IPv6 TCP master object. A master object can -be transformed into a server object with the method -listen (after a call to bind) or into a client object with -the method connect. The only other -method supported by a master object is the -close method.

    - -

    -In case of success, a new master object is returned. In case of error, -nil is returned, followed by an error message. -

    - -

    -Note: The TCP object returned will have the option -"ipv6-v6only" set to true. -

    -

    @@ -252,6 +174,78 @@ first success or until the last failure. If the timeout was set to zero, only the first address is tried.

    + + +

    +master:dirty()
    +client:dirty()
    +server:dirty() +

    + +

    +Check the read buffer status. +

    + +

    +Returns true if there is any data in the read buffer, false otherwise. +

    + +

    +Note: This is an internal method, use at your own risk. +

    + + + + +

    +master:getfd()
    +client:getfd()
    +server:getfd() +

    + +

    +Returns the underling socket descriptor or handle associated to the object. +

    + +

    +The descriptor or handle. In case the object has been closed, the return will be -1. +

    + +

    +Note: This is an internal method. Unlikely to be +portable. Use at your own risk. +

    + + + + +

    +client:getoption(option)
    +server:getoption(option) +

    + +

    +Gets options for the TCP object. +See setoption for description of the +option names and values. +

    + +

    +Option is a string with the option name. +

      + +
    • 'keepalive' +
    • 'linger' +
    • 'reuseaddr' +
    • 'tcp-nodelay' +
    + +

    +The method returns the option value in case of success, or +nil followed by an error message otherwise. +

    + +

    @@ -310,6 +304,20 @@ The method returns the number of bytes received, the number of bytes sent, and the age of the socket object in seconds.

    + + +

    +master:gettimeout()
    +client:gettimeout()
    +server:gettimeout() +

    + +

    +Returns the current block timeout followed by the curent +total timeout. +

    + +

    @@ -483,34 +491,6 @@ followed by an error message otherwise. Note: The descriptions above come from the man pages.

    - - -

    -client:getoption(option)
    -server:getoption(option) -

    - -

    -Gets options for the TCP object. -See setoption for description of the -option names and values. -

    - -

    -Option is a string with the option name. -

      - -
    • 'keepalive' -
    • 'linger' -
    • 'reuseaddr' -
    • 'tcp-nodelay' -
    - -

    -The method returns the option value in case of success, or -nil followed by an error message otherwise. -

    -

    @@ -615,46 +595,6 @@ This is the default mode; This function returns 1.

    - - -

    -master:dirty()
    -client:dirty()
    -server:dirty() -

    - -

    -Check the read buffer status. -

    - -

    -Returns true if there is any data in the read buffer, false otherwise. -

    - -

    -Note: This is an internal method, any use is unlikely to be portable. -

    - - - -

    -master:getfd()
    -client:getfd()
    -server:getfd() -

    - -

    -Returns the underling socket descriptor or handle associated to the object. -

    - -

    -The descriptor or handle. In case the object has been closed, the return will be -1. -

    - -

    -Note: This is an internal method, any use is unlikely to be portable. -

    -

    @@ -672,9 +612,90 @@ No return value.

    -Note: This is an internal method, any use is unlikely to be portable. +Note: This is an internal method. Unlikely to be +portable. Use at your own risk.

    + + +

    +socket.tcp() +

    + +

    +Creates and returns an TCP master object. A master object can +be transformed into a server object with the method +listen (after a call to bind) or into a client object with +the method connect. The only other +method supported by a master object is the +close method.

    + +

    +In case of success, a new master object is returned. In case of error, +nil is returned, followed by an error message. +

    + +

    +Note: The choice between IPv4 and IPv6 happens during a call to +bind or connect, depending on the address +family obtained from the resolver. +

    + +

    +Note: Before the choice between IPv4 and IPv6 happens, +the internal socket object is invalid and therefore setoption will fail. +

    + + + +

    +socket.tcp4() +

    + +

    +Creates and returns an IPv4 TCP master object. A master object can +be transformed into a server object with the method +listen (after a call to bind) or into a client object with +the method connect. The only other +method supported by a master object is the +close method.

    + +

    +In case of success, a new master object is returned. In case of error, +nil is returned, followed by an error message. +

    + + + +

    +socket.tcp6() +

    + +

    +Creates and returns an IPv6 TCP master object. A master object can +be transformed into a server object with the method +listen (after a call to bind) or into a client object with +the method connect. The only other +method supported by a master object is the +close method.

    + +

    +In case of success, a new master object is returned. In case of error, +nil is returned, followed by an error message. +

    + +

    +Note: The TCP object returned will have the option +"ipv6-v6only" set to true. +

    + + +
    diff --git a/doc/udp.html b/doc/udp.html index 9437c51..4618aad 100644 --- a/doc/udp.html +++ b/doc/udp.html @@ -39,6 +39,430 @@

    UDP

    + + +

    +connected:close()
    +unconnected:close() +

    + +

    +Closes a UDP object. The internal socket +used by the object is closed and the local address to which the +object was bound is made available to other applications. No +further operations (except for further calls to the close +method) are allowed on a closed socket. +

    + +

    +Note: It is important to close all used sockets +once they are not needed, since, in many systems, each socket uses +a file descriptor, which are limited system resources. +Garbage-collected objects are automatically closed before +destruction, though. +

    + + + +

    +connected:getoption()
    +unconnected:getoption() +

    + +

    +Gets an option value from the UDP object. +See setoption for +description of the option names and values. +

    + +

    Option is a string with the option name. +

      +
    • 'dontroute' +
    • 'broadcast' +
    • 'reuseaddr' +
    • 'reuseport' +
    • 'ip-multicast-loop' +
    • 'ipv6-v6only' +
    • 'ip-multicast-if' +
    • 'ip-multicast-ttl' +
    • 'ip-add-membership' +
    • 'ip-drop-membership' +
    +

    + +

    +The method returns the option value in case of +success, or +nil followed by an error message otherwise. +

    + + + +

    +connected:getpeername() +

    + +

    +Retrieves information about the peer +associated with a connected UDP object. +

    + + +

    +Returns a string with the IP address of the peer, the +port number that peer is using for the connection, +and a string with the family ("inet" or "inet6"). +In case of error, the method returns nil. +

    + +

    +Note: It makes no sense to call this method on unconnected objects. +

    + + + +

    +connected:getsockname()
    +unconnected:getsockname() +

    + +

    +Returns the local address information associated to the object. +

    + + +

    +The method returns a string with local IP address, a number with +the local port, +and a string with the family ("inet" or "inet6"). +In case of error, the method returns nil. +

    + +

    +Note: UDP sockets are not bound to any address +until the setsockname or the +sendto method is called for the +first time (in which case it is bound to an ephemeral port and the +wild-card address). +

    + + + +

    +connected:settimeout(value)
    +unconnected:settimeout(value) +

    + +

    +Returns the current timeout value. +

    + + + + +

    +connected:receive([size])
    +unconnected:receive([size]) +

    + +

    +Receives a datagram from the UDP object. If +the UDP object is connected, only datagrams coming from the peer +are accepted. Otherwise, the returned datagram can come from any +host. +

    + +

    +The optional size parameter +specifies the maximum size of the datagram to be retrieved. If +there are more than size bytes available in the datagram, +the excess bytes are discarded. If there are less then +size bytes available in the current datagram, the +available bytes are returned. +If size is omitted, the +compile-time constant socket._DATAGRAMSIZE is used +(it defaults to 8192 bytes). Larger sizes will cause a +temporary buffer to be allocated for the operation. +

    + +

    +In case of success, the method returns the +received datagram. In case of timeout, the method returns +nil followed by the string 'timeout'. +

    + + + +

    +unconnected:receivefrom([size]) +

    + +

    +Works exactly as the receive +method, except it returns the IP +address and port as extra return values (and is therefore slightly less +efficient). +

    + + + +

    +connected:send(datagram) +

    + +

    +Sends a datagram to the UDP peer of a connected object. +

    + +

    +Datagram is a string with the datagram contents. +The maximum datagram size for UDP is 64K minus IP layer overhead. +However datagrams larger than the link layer packet size will be +fragmented, which may deteriorate performance and/or reliability. +

    + +

    +If successful, the method returns 1. In case of +error, the method returns nil followed by an error message. +

    + +

    +Note: In UDP, the send method never blocks +and the only way it can fail is if the underlying transport layer +refuses to send a message to the specified address (i.e. no +interface accepts the address). +

    + + + +

    +unconnected:sendto(datagram, ip, port) +

    + +

    +Sends a datagram to the specified IP address and port number. +

    + +

    +Datagram is a string with the +datagram contents. +The maximum datagram size for UDP is 64K minus IP layer overhead. +However datagrams larger than the link layer packet size will be +fragmented, which may deteriorate performance and/or reliability. +Ip is the IP address of the recipient. +Host names are not allowed for performance reasons. + +Port is the port number at the recipient. +

    + +

    +If successful, the method returns 1. In case of +error, the method returns nil followed by an error message. +

    + +

    +Note: In UDP, the send method never blocks +and the only way it can fail is if the underlying transport layer +refuses to send a message to the specified address (i.e. no +interface accepts the address). +

    + + + +

    +connected:setoption(option [, value])
    +unconnected:setoption(option [, value]) +

    + +

    +Sets options for the UDP object. Options are +only needed by low-level or time-critical applications. You should +only modify an option if you are sure you need it.

    +

    Option is a string with the option +name, and value depends on the option being set: +

    + +
      +
    • 'dontroute': Indicates that outgoing +messages should bypass the standard routing facilities. +Receives a boolean value; +
    • 'broadcast': Requests permission to send +broadcast datagrams on the socket. +Receives a boolean value; +
    • 'reuseaddr': Indicates that the rules used in +validating addresses supplied in a bind() call +should allow reuse of local addresses. +Receives a boolean value; +
    • 'reuseport': Allows completely duplicate +bindings by multiple processes if they all set +'reuseport' before binding the port. +Receives a boolean value; +
    • 'ip-multicast-loop': +Specifies whether or not a copy of an outgoing multicast +datagram is delivered to the sending host as long as it is a +member of the multicast group. +Receives a boolean value; +
    • 'ipv6-v6only': +Specifies whether to restrict inet6 sockets to +sending and receiving only IPv6 packets. +Receive a boolean value; +
    • 'ip-multicast-if': +Sets the interface over which outgoing multicast datagrams +are sent. +Receives an IP address; +
    • 'ip-multicast-ttl': +Sets the Time To Live in the IP header for outgoing +multicast datagrams. +Receives a number; +
    • 'ip-add-membership': +Joins the multicast group specified. +Receives a table with fields +multiaddr and interface, each containing an +IP address; +
    • 'ip-drop-membership': Leaves the multicast +group specified. +Receives a table with fields +multiaddr and interface, each containing an +IP address. +
    + +

    +The method returns 1 in case of success, or +nil followed by an error message otherwise. +

    + +

    +Note: The descriptions above come from the man pages. +

    + + + + +

    +connected:setpeername('*')
    +unconnected:setpeername(address, port) +

    + +

    +Changes the peer of a UDP object. This +method turns an unconnected UDP object into a connected UDP +object or vice versa. +

    + +

    +For connected objects, outgoing datagrams +will be sent to the specified peer, and datagrams received from +other peers will be discarded by the OS. Connected UDP objects must +use the send and +receive methods instead of +sendto and +receivefrom. +

    + +

    +Address can be an IP address or a +host name. Port is the port number. If address is +'*' and the object is connected, the peer association is +removed and the object becomes an unconnected object again. In that +case, the port argument is ignored. +

    + +

    +In case of error the method returns +nil followed by an error message. In case of success, the +method returns 1. +

    + +

    +Note: Since the address of the peer does not have +to be passed to and from the OS, the use of connected UDP objects +is recommended when the same peer is used for several transmissions +and can result in up to 30% performance gains. +

    + +

    +Note: Starting with LuaSocket 3.0, the host name resolution +depends on whether the socket was created by socket.udp or socket.udp6. Addresses from +the appropriate family are tried in succession until the +first success or until the last failure. +

    + + + +

    +unconnected:setsockname(address, port) +

    + +

    +Binds the UDP object to a local address. +

    + +

    +Address can be an IP address or a +host name. If address is '*' the system binds to +all local interfaces using the constant INADDR_ANY. If +port is 0, the system chooses an ephemeral port. +

    + +

    +If successful, the method returns 1. In case of +error, the method returns nil followed by an error +message. +

    + +

    +Note: This method can only be called before any +datagram is sent through the UDP object, and only once. Otherwise, +the system automatically binds the object to all local interfaces +and chooses an ephemeral port as soon as the first datagram is +sent. After the local address is set, either automatically by the +system or explicitly by setsockname, it cannot be +changed. +

    + + + +

    +connected:settimeout(value)
    +unconnected:settimeout(value) +

    + +

    +Changes the timeout values for the object. By default, the +receive and +receivefrom +operations are blocking. That is, any call to the methods will block +indefinitely, until data arrives. The settimeout function defines +a limit on the amount of time the functions can block. When a timeout is +set and the specified amount of time has elapsed, the affected methods +give up and fail with an error code. +

    + +

    +The amount of time to wait is specified as +the value parameter, in seconds. The nil timeout +value allows operations to block indefinitely. Negative +timeout values have the same effect. +

    + +

    +Note: In UDP, the send +and sendto methods never block (the +datagram is just passed to the OS and the call returns +immediately). Therefore, the settimeout method has no +effect on them. +

    + +

    +Note: The old timeout method is +deprecated. The name has been changed for sake of uniformity, since +all other method names already contained verbs making their +imperative nature obvious. +

    +

    @@ -145,416 +569,7 @@ Note: The TCP object returned will have the option "ipv6-v6only" set to true.

    - -

    -connected:close()
    -unconnected:close() -

    - -

    -Closes a UDP object. The internal socket -used by the object is closed and the local address to which the -object was bound is made available to other applications. No -further operations (except for further calls to the close -method) are allowed on a closed socket. -

    - -

    -Note: It is important to close all used sockets -once they are not needed, since, in many systems, each socket uses -a file descriptor, which are limited system resources. -Garbage-collected objects are automatically closed before -destruction, though. -

    - - - -

    -connected:getpeername() -

    - -

    -Retrieves information about the peer -associated with a connected UDP object. -

    - - -

    -Returns a string with the IP address of the peer, the -port number that peer is using for the connection, -and a string with the family ("inet" or "inet6"). -In case of error, the method returns nil. -

    - -

    -Note: It makes no sense to call this method on unconnected objects. -

    - - - -

    -connected:getsockname()
    -unconnected:getsockname() -

    - -

    -Returns the local address information associated to the object. -

    - - -

    -The method returns a string with local IP address, a number with -the local port, -and a string with the family ("inet" or "inet6"). -In case of error, the method returns nil. -

    - -

    -Note: UDP sockets are not bound to any address -until the setsockname or the -sendto method is called for the -first time (in which case it is bound to an ephemeral port and the -wild-card address). -

    - - - -

    -connected:receive([size])
    -unconnected:receive([size]) -

    - -

    -Receives a datagram from the UDP object. If -the UDP object is connected, only datagrams coming from the peer -are accepted. Otherwise, the returned datagram can come from any -host. -

    - -

    -The optional size parameter -specifies the maximum size of the datagram to be retrieved. If -there are more than size bytes available in the datagram, -the excess bytes are discarded. If there are less then -size bytes available in the current datagram, the -available bytes are returned. -If size is omitted, the -compile-time constant socket._DATAGRAMSIZE is used -(it defaults to 8192 bytes). Larger sizes will cause a -temporary buffer to be allocated for the operation. -

    - -

    -In case of success, the method returns the -received datagram. In case of timeout, the method returns -nil followed by the string 'timeout'. -

    - - - -

    -unconnected:receivefrom([size]) -

    - -

    -Works exactly as the receive -method, except it returns the IP -address and port as extra return values (and is therefore slightly less -efficient). -

    - - - -

    -connected:getoption()
    -unconnected:getoption() -

    - -

    -Gets an option value from the UDP object. -See setoption for -description of the option names and values. -

    - -

    Option is a string with the option name. -

      -
    • 'dontroute' -
    • 'broadcast' -
    • 'reuseaddr' -
    • 'reuseport' -
    • 'ip-multicast-loop' -
    • 'ipv6-v6only' -
    • 'ip-multicast-if' -
    • 'ip-multicast-ttl' -
    • 'ip-add-membership' -
    • 'ip-drop-membership' -
    -

    - -

    -The method returns the option value in case of -success, or -nil followed by an error message otherwise. -

    - - - -

    -connected:send(datagram) -

    - -

    -Sends a datagram to the UDP peer of a connected object. -

    - -

    -Datagram is a string with the datagram contents. -The maximum datagram size for UDP is 64K minus IP layer overhead. -However datagrams larger than the link layer packet size will be -fragmented, which may deteriorate performance and/or reliability. -

    - -

    -If successful, the method returns 1. In case of -error, the method returns nil followed by an error message. -

    - -

    -Note: In UDP, the send method never blocks -and the only way it can fail is if the underlying transport layer -refuses to send a message to the specified address (i.e. no -interface accepts the address). -

    - - - -

    -unconnected:sendto(datagram, ip, port) -

    - -

    -Sends a datagram to the specified IP address and port number. -

    - -

    -Datagram is a string with the -datagram contents. -The maximum datagram size for UDP is 64K minus IP layer overhead. -However datagrams larger than the link layer packet size will be -fragmented, which may deteriorate performance and/or reliability. -Ip is the IP address of the recipient. -Host names are not allowed for performance reasons. - -Port is the port number at the recipient. -

    - -

    -If successful, the method returns 1. In case of -error, the method returns nil followed by an error message. -

    - -

    -Note: In UDP, the send method never blocks -and the only way it can fail is if the underlying transport layer -refuses to send a message to the specified address (i.e. no -interface accepts the address). -

    - - - -

    -connected:setpeername('*')
    -unconnected:setpeername(address, port) -

    - -

    -Changes the peer of a UDP object. This -method turns an unconnected UDP object into a connected UDP -object or vice versa. -

    - -

    -For connected objects, outgoing datagrams -will be sent to the specified peer, and datagrams received from -other peers will be discarded by the OS. Connected UDP objects must -use the send and -receive methods instead of -sendto and -receivefrom. -

    - -

    -Address can be an IP address or a -host name. Port is the port number. If address is -'*' and the object is connected, the peer association is -removed and the object becomes an unconnected object again. In that -case, the port argument is ignored. -

    - -

    -In case of error the method returns -nil followed by an error message. In case of success, the -method returns 1. -

    - -

    -Note: Since the address of the peer does not have -to be passed to and from the OS, the use of connected UDP objects -is recommended when the same peer is used for several transmissions -and can result in up to 30% performance gains. -

    - -

    -Note: Starting with LuaSocket 3.0, the host name resolution -depends on whether the socket was created by socket.udp or socket.udp6. Addresses from -the appropriate family are tried in succession until the -first success or until the last failure. -

    - - - -

    -unconnected:setsockname(address, port) -

    - -

    -Binds the UDP object to a local address. -

    - -

    -Address can be an IP address or a -host name. If address is '*' the system binds to -all local interfaces using the constant INADDR_ANY. If -port is 0, the system chooses an ephemeral port. -

    - -

    -If successful, the method returns 1. In case of -error, the method returns nil followed by an error -message. -

    - -

    -Note: This method can only be called before any -datagram is sent through the UDP object, and only once. Otherwise, -the system automatically binds the object to all local interfaces -and chooses an ephemeral port as soon as the first datagram is -sent. After the local address is set, either automatically by the -system or explicitly by setsockname, it cannot be -changed. -

    - - - -

    -connected:setoption(option [, value])
    -unconnected:setoption(option [, value]) -

    - -

    -Sets options for the UDP object. Options are -only needed by low-level or time-critical applications. You should -only modify an option if you are sure you need it.

    -

    Option is a string with the option -name, and value depends on the option being set: -

    - -
      -
    • 'dontroute': Indicates that outgoing -messages should bypass the standard routing facilities. -Receives a boolean value; -
    • 'broadcast': Requests permission to send -broadcast datagrams on the socket. -Receives a boolean value; -
    • 'reuseaddr': Indicates that the rules used in -validating addresses supplied in a bind() call -should allow reuse of local addresses. -Receives a boolean value; -
    • 'reuseport': Allows completely duplicate -bindings by multiple processes if they all set -'reuseport' before binding the port. -Receives a boolean value; -
    • 'ip-multicast-loop': -Specifies whether or not a copy of an outgoing multicast -datagram is delivered to the sending host as long as it is a -member of the multicast group. -Receives a boolean value; -
    • 'ipv6-v6only': -Specifies whether to restrict inet6 sockets to -sending and receiving only IPv6 packets. -Receive a boolean value; -
    • 'ip-multicast-if': -Sets the interface over which outgoing multicast datagrams -are sent. -Receives an IP address; -
    • 'ip-multicast-ttl': -Sets the Time To Live in the IP header for outgoing -multicast datagrams. -Receives a number; -
    • 'ip-add-membership': -Joins the multicast group specified. -Receives a table with fields -multiaddr and interface, each containing an -IP address; -
    • 'ip-drop-membership': Leaves the multicast -group specified. -Receives a table with fields -multiaddr and interface, each containing an -IP address. -
    - -

    -The method returns 1 in case of success, or -nil followed by an error message otherwise. -

    - -

    -Note: The descriptions above come from the man pages. -

    - - - -

    -connected:settimeout(value)
    -unconnected:settimeout(value) -

    - -

    -Changes the timeout values for the object. By default, the -receive and -receivefrom -operations are blocking. That is, any call to the methods will block -indefinitely, until data arrives. The settimeout function defines -a limit on the amount of time the functions can block. When a timeout is -set and the specified amount of time has elapsed, the affected methods -give up and fail with an error code. -

    - -

    -The amount of time to wait is specified as -the value parameter, in seconds. The nil timeout -value allows operations to block indefinitely. Negative -timeout values have the same effect. -

    - -

    -Note: In UDP, the send -and sendto methods never block (the -datagram is just passed to the OS and the call returns -immediately). Therefore, the settimeout method has no -effect on them. -

    - -

    -Note: The old timeout method is -deprecated. The name has been changed for sake of uniformity, since -all other method names already contained verbs making their -imperative nature obvious. -

    diff --git a/src/tcp.c b/src/tcp.c index e4f1a4b..ef9ee6f 100644 --- a/src/tcp.c +++ b/src/tcp.c @@ -36,6 +36,7 @@ static int meth_accept(lua_State *L); static int meth_close(lua_State *L); static int meth_getoption(lua_State *L); static int meth_setoption(lua_State *L); +static int meth_gettimeout(lua_State *L); static int meth_settimeout(lua_State *L); static int meth_getfd(lua_State *L); static int meth_setfd(lua_State *L); @@ -65,6 +66,7 @@ static luaL_Reg tcp_methods[] = { {"setpeername", meth_connect}, {"setsockname", meth_bind}, {"settimeout", meth_settimeout}, + {"gettimeout", meth_gettimeout}, {"shutdown", meth_shutdown}, {NULL, NULL} }; @@ -350,6 +352,12 @@ static int meth_settimeout(lua_State *L) return timeout_meth_settimeout(L, &tcp->tm); } +static int meth_gettimeout(lua_State *L) +{ + p_tcp tcp = (p_tcp) auxiliar_checkgroup(L, "tcp{any}", 1); + return timeout_meth_gettimeout(L, &tcp->tm); +} + /*=========================================================================*\ * Library functions \*=========================================================================*/ diff --git a/src/timeout.c b/src/timeout.c index 087d033..5a601d5 100644 --- a/src/timeout.c +++ b/src/timeout.c @@ -173,6 +173,16 @@ int timeout_meth_settimeout(lua_State *L, p_timeout tm) { return 1; } +/*-------------------------------------------------------------------------*\ +* Gets timeout values for IO operations +* Lua Output: block, total +\*-------------------------------------------------------------------------*/ +int timeout_meth_gettimeout(lua_State *L, p_timeout tm) { + lua_pushnumber(L, tm->block); + lua_pushnumber(L, tm->total); + return 2; +} + /*=========================================================================*\ * Test support functions \*=========================================================================*/ diff --git a/src/timeout.h b/src/timeout.h index 6715ca7..af90231 100644 --- a/src/timeout.h +++ b/src/timeout.h @@ -22,6 +22,7 @@ p_timeout timeout_markstart(p_timeout tm); double timeout_getstart(p_timeout tm); double timeout_gettime(void); int timeout_meth_settimeout(lua_State *L, p_timeout tm); +int timeout_meth_gettimeout(lua_State *L, p_timeout tm); #define timeout_iszero(tm) ((tm)->block == 0.0) diff --git a/src/udp.c b/src/udp.c index 968dca8..ec97252 100644 --- a/src/udp.c +++ b/src/udp.c @@ -36,6 +36,7 @@ static int meth_receivefrom(lua_State *L); static int meth_getfamily(lua_State *L); static int meth_getsockname(lua_State *L); static int meth_getpeername(lua_State *L); +static int meth_gettimeout(lua_State *L); static int meth_setsockname(lua_State *L); static int meth_setpeername(lua_State *L); static int meth_close(lua_State *L); @@ -66,6 +67,7 @@ static luaL_Reg udp_methods[] = { {"setpeername", meth_setpeername}, {"setsockname", meth_setsockname}, {"settimeout", meth_settimeout}, + {"gettimeout", meth_gettimeout}, {NULL, NULL} }; @@ -347,6 +349,11 @@ static int meth_settimeout(lua_State *L) { return timeout_meth_settimeout(L, &udp->tm); } +static int meth_gettimeout(lua_State *L) { + p_udp udp = (p_udp) auxiliar_checkgroup(L, "udp{any}", 1); + return timeout_meth_gettimeout(L, &udp->tm); +} + /*-------------------------------------------------------------------------*\ * Turns a master udp object into a client object. \*-------------------------------------------------------------------------*/ From 5b4b9158799293eeaf8439d40a7845b5b0a5e125 Mon Sep 17 00:00:00 2001 From: Diego Nehab Date: Fri, 4 Mar 2016 16:16:41 -0300 Subject: [PATCH 021/194] Remove global PORT. Fix https redirect. --- doc/http.html | 7 +++++-- src/http.lua | 42 +++++++++++++++++++++++++----------------- 2 files changed, 30 insertions(+), 19 deletions(-) diff --git a/doc/http.html b/doc/http.html index cd41c0d..3b7a8b1 100644 --- a/doc/http.html +++ b/doc/http.html @@ -112,12 +112,15 @@ the HTTP module:

      -
    • PORT: default port used for connections; -
    • PROXY: default proxy used for connections; +
    • PROXY: default proxy used for connections;
    • TIMEOUT: sets the timeout for all I/O operations;
    • USERAGENT: default user agent reported to server.
    +

    +Note: These constants are global. Changing them will also +change the behavior other code that might be using LuaSocket. +

    diff --git a/src/http.lua b/src/http.lua index 45ffa15..d6bcc91 100644 --- a/src/http.lua +++ b/src/http.lua @@ -23,11 +23,14 @@ local _M = socket.http ----------------------------------------------------------------------------- -- connection timeout in seconds _M.TIMEOUT = 60 --- default port for document retrieval -_M.PORT = 80 -- user agent field sent in request _M.USERAGENT = socket._VERSION +-- supported schemes +local SCHEMES = { ["http"] = true } +-- default port for document retrieval +local PORT = 80 + ----------------------------------------------------------------------------- -- Reads MIME headers from a connection, unfolding where needed ----------------------------------------------------------------------------- @@ -114,7 +117,7 @@ function _M.open(host, port, create) h.try = socket.newtry(function() h:close() end) -- set timeout before connecting h.try(c:settimeout(_M.TIMEOUT)) - h.try(c:connect(host, port or _M.PORT)) + h.try(c:connect(host, port or PORT)) -- here everything worked return h end @@ -218,7 +221,7 @@ local function adjustheaders(reqt) } -- if we have authentication information, pass it along if reqt.user and reqt.password then - lower["authorization"] = + lower["authorization"] = "Basic " .. (mime.b64(reqt.user .. ":" .. reqt.password)) end -- if we have proxy authentication information, pass it along @@ -226,7 +229,7 @@ local function adjustheaders(reqt) if proxy then proxy = url.parse(proxy) if proxy.user and proxy.password then - lower["proxy-authorization"] = + lower["proxy-authorization"] = "Basic " .. (mime.b64(proxy.user .. ":" .. proxy.password)) end end @@ -240,7 +243,7 @@ end -- default url parts local default = { host = "", - port = _M.PORT, + port = PORT, path ="/", scheme = "http" } @@ -250,9 +253,10 @@ local function adjustrequest(reqt) local nreqt = reqt.url and url.parse(reqt.url, default) or {} -- explicit components override url for i,v in base.pairs(reqt) do nreqt[i] = v end - if nreqt.port == "" then nreqt.port = 80 end - socket.try(nreqt.host and nreqt.host ~= "", - "invalid host '" .. base.tostring(nreqt.host) .. "'") + if nreqt.port == "" then nreqt.port = PORT end + if not (nreqt.host and nreqt.host ~= "") then + socket.try(nil, "invalid host '" .. base.tostring(nreqt.host) .. "'") + end -- compute uri if user hasn't overriden nreqt.uri = reqt.uri or adjusturi(nreqt) -- adjust headers in request @@ -263,9 +267,13 @@ local function adjustrequest(reqt) end local function shouldredirect(reqt, code, headers) - return headers.location and - string.gsub(headers.location, "%s", "") ~= "" and - (reqt.redirect ~= false) and + local location = headers.location + if not location then return false end + location = string.gsub(location, "%s", "") + if location == "" then return false end + local scheme = string.match(location, "^([%w][%w%+%-%.]*)%:") + if scheme and not SCHEMES[scheme] then return false end + return (reqt.redirect ~= false) and (code == 301 or code == 302 or code == 303 or code == 307) and (not reqt.method or reqt.method == "GET" or reqt.method == "HEAD") and (not reqt.nredirects or reqt.nredirects < 5) @@ -289,10 +297,10 @@ local trequest, tredirect source = reqt.source, sink = reqt.sink, headers = reqt.headers, - proxy = reqt.proxy, + proxy = reqt.proxy, nredirects = (reqt.nredirects or 0) + 1, create = reqt.create - } + } -- pass location header back as a hint we redirected headers = headers or {} headers.location = headers.location or location @@ -309,7 +317,7 @@ end h:sendheaders(nreqt.headers) -- if there is a body, send it if nreqt.source then - h:sendbody(nreqt.headers, nreqt.source, nreqt.step) + h:sendbody(nreqt.headers, nreqt.source, nreqt.step) end local code, status = h:receivestatusline() -- if it is an HTTP/0.9 server, simply get the body and we are done @@ -319,13 +327,13 @@ end end local headers -- ignore any 100-continue messages - while code == 100 do + while code == 100 do headers = h:receiveheaders() code, status = h:receivestatusline() end headers = h:receiveheaders() -- at this point we should have a honest reply from the server - -- we can't redirect if we already used the source, so we report the error + -- we can't redirect if we already used the source, so we report the error if shouldredirect(nreqt, code, headers) and not nreqt.source then h:close() return tredirect(reqt, headers.location) From 916b548240b1513410b13f964d80f329aec9c13a Mon Sep 17 00:00:00 2001 From: Diego Nehab Date: Mon, 7 Mar 2016 01:30:30 -0300 Subject: [PATCH 022/194] Family agostic FTP and expose HTTP/FTP url parsing --- src/ftp.lua | 67 ++++++++++++++++++++++++++++++++++++------------ src/http.lua | 17 +++++++++--- src/tp.lua | 10 +++++++- test/ftptest.lua | 34 ++++++++++++++++-------- 4 files changed, 96 insertions(+), 32 deletions(-) diff --git a/src/ftp.lua b/src/ftp.lua index e0c3cae..11798ad 100644 --- a/src/ftp.lua +++ b/src/ftp.lua @@ -51,7 +51,7 @@ end function metat.__index:pasvconnect() self.data = self.try(socket.tcp()) self.try(self.data:settimeout(_M.TIMEOUT)) - self.try(self.data:connect(self.pasvt.ip, self.pasvt.port)) + self.try(self.data:connect(self.pasvt.address, self.pasvt.port)) end function metat.__index:login(user, password) @@ -71,32 +71,65 @@ function metat.__index:pasv() local a, b, c, d, p1, p2 = socket.skip(2, string.find(reply, pattern)) self.try(a and b and c and d and p1 and p2, reply) self.pasvt = { - ip = string.format("%d.%d.%d.%d", a, b, c, d), + address = string.format("%d.%d.%d.%d", a, b, c, d), port = p1*256 + p2 } if self.server then self.server:close() self.server = nil end - return self.pasvt.ip, self.pasvt.port + return self.pasvt.address, self.pasvt.port end -function metat.__index:port(ip, port) +function metat.__index:epsv() + self.try(self.tp:command("epsv")) + local code, reply = self.try(self.tp:check("229")) + local pattern = "%((.)(.-)%1(.-)%1(.-)%1%)" + local d, prt, address, port = string.match(reply, pattern) + self.try(port, "invalid epsv response") + self.pasvt = { + address = self.tp:getpeername(), + port = port + } + if self.server then + self.server:close() + self.server = nil + end + return self.pasvt.address, self.pasvt.port +end + + +function metat.__index:port(address, port) self.pasvt = nil - if not ip then - ip, port = self.try(self.tp:getcontrol():getsockname()) - self.server = self.try(socket.bind(ip, 0)) - ip, port = self.try(self.server:getsockname()) + if not address then + address, port = self.try(self.tp:getsockname()) + self.server = self.try(socket.bind(address, 0)) + address, port = self.try(self.server:getsockname()) self.try(self.server:settimeout(_M.TIMEOUT)) end local pl = math.mod(port, 256) local ph = (port - pl)/256 - local arg = string.gsub(string.format("%s,%d,%d", ip, ph, pl), "%.", ",") + local arg = string.gsub(string.format("%s,%d,%d", address, ph, pl), "%.", ",") self.try(self.tp:command("port", arg)) self.try(self.tp:check("2..")) return 1 end +function metat.__index:eprt(family, address, port) + self.pasvt = nil + if not address then + address, port = self.try(self.tp:getsockname()) + self.server = self.try(socket.bind(address, 0)) + address, port = self.try(self.server:getsockname()) + self.try(self.server:settimeout(_M.TIMEOUT)) + end + local arg = string.format("|%s|%s|%d|", family, address, port) + self.try(self.tp:command("eprt", arg)) + self.try(self.tp:check("2..")) + return 1 +end + + function metat.__index:send(sendt) self.try(self.pasvt or self.server, "need port or pasv first") -- if there is a pasvt table, we already sent a PASV command @@ -110,12 +143,12 @@ function metat.__index:send(sendt) -- send the transfer command and check the reply self.try(self.tp:command(command, argument)) local code, reply = self.try(self.tp:check{"2..", "1.."}) - -- if there is not a a pasvt table, then there is a server + -- if there is not a pasvt table, then there is a server -- and we already sent a PORT command if not self.pasvt then self:portconnect() end -- get the sink, source and step for the transfer local step = sendt.step or ltn12.pump.step - local readt = {self.tp.c} + local readt = { self.tp } local checkstep = function(src, snk) -- check status in control connection while downloading local readyt = socket.select(readt, nil, 0) @@ -207,7 +240,7 @@ local function tput(putt) f:greet() f:login(putt.user, putt.password) if putt.type then f:type(putt.type) end - f:pasv() + f:epsv() local sent = f:send(putt) f:quit() f:close() @@ -219,7 +252,7 @@ local default = { scheme = "ftp" } -local function parse(u) +local function genericform(u) local t = socket.try(url.parse(u, default)) socket.try(t.scheme == "ftp", "wrong scheme '" .. t.scheme .. "'") socket.try(t.host, "missing hostname") @@ -232,8 +265,10 @@ local function parse(u) return t end +_M.genericform = genericform + local function sput(u, body) - local putt = parse(u) + local putt = genericform(u) putt.source = ltn12.source.string(body) return tput(putt) end @@ -250,14 +285,14 @@ local function tget(gett) f:greet() f:login(gett.user, gett.password) if gett.type then f:type(gett.type) end - f:pasv() + f:epsv() f:receive(gett) f:quit() return f:close() end local function sget(u) - local gett = parse(u) + local gett = genericform(u) local t = {} gett.sink = ltn12.sink.table(t) tget(gett) diff --git a/src/http.lua b/src/http.lua index d6bcc91..f2fff01 100644 --- a/src/http.lua +++ b/src/http.lua @@ -346,11 +346,13 @@ end return 1, code, headers, status end -local function srequest(u, b) +-- turns an url and a body into a generic request +local function genericform(u, b) local t = {} local reqt = { url = u, - sink = ltn12.sink.table(t) + sink = ltn12.sink.table(t), + target = t } if b then reqt.source = ltn12.source.string(b) @@ -360,8 +362,15 @@ local function srequest(u, b) } reqt.method = "POST" end - local code, headers, status = socket.skip(1, trequest(reqt)) - return table.concat(t), code, headers, status + return reqt +end + +_M.genericform = genericform + +local function srequest(u, b) + local reqt = genericform(u, b) + local _, code, headers, status = trequest(reqt) + return table.concat(reqt.target), code, headers, status end _M.request = socket.protect(function(reqt, body) diff --git a/src/tp.lua b/src/tp.lua index 328cbab..b8ebc56 100644 --- a/src/tp.lua +++ b/src/tp.lua @@ -46,6 +46,14 @@ end -- metatable for sock object local metat = { __index = {} } +function metat.__index:getpeername() + return self.c:getpeername() +end + +function metat.__index:getsockname() + return self.c:getpeername() +end + function metat.__index:check(ok) local code, reply = get_reply(self.c) if not code then return nil, reply end @@ -123,4 +131,4 @@ function _M.connect(host, port, timeout, create) return base.setmetatable({c = c}, metat) end -return _M \ No newline at end of file +return _M diff --git a/test/ftptest.lua b/test/ftptest.lua index fb13326..3ea0d39 100644 --- a/test/ftptest.lua +++ b/test/ftptest.lua @@ -3,19 +3,31 @@ local ftp = require("socket.ftp") local url = require("socket.url") local ltn12 = require("ltn12") +-- use dscl to create user "luasocket" with password "password" +-- with home in /Users/diego/luasocket/test/ftp +-- with group com.apple.access_ftp +-- with shell set to /sbin/nologin +-- set /etc/ftpchroot to chroot luasocket +-- must set group com.apple.access_ftp on user _ftp (for anonymous access) +-- copy index.html to /var/empty/pub (home of user ftp) +-- start ftp server with +-- sudo -s launchctl load -w /System/Library/LaunchDaemons/ftp.plist +-- copy index.html to /Users/diego/luasocket/test/ftp +-- stop with +-- sudo -s launchctl unload -w /System/Library/LaunchDaemons/ftp.plist + -- override protection to make sure we see all errors --socket.protect = function(s) return s end dofile("testsupport.lua") -local host, port, index_file, index, back, err, ret +local host = host or "localhost" +local port, index_file, index, back, err, ret local t = socket.gettime() -host = host or "localhost" index_file = "index.html" - -- a function that returns a directory listing local function nlst(u) local t = {} @@ -55,27 +67,27 @@ assert(not err and back == index, err) print("ok") io.write("erasing before upload: ") -ret, err = dele("ftp://luasocket:pedrovian@" .. host .. "/index.up.html") -if not ret then print(err) +ret, err = dele("ftp://luasocket:password@" .. host .. "/index.up.html") +if not ret then print(err) else print("ok") end io.write("testing upload: ") -ret, err = ftp.put("ftp://luasocket:pedrovian@" .. host .. "/index.up.html;type=i", index) +ret, err = ftp.put("ftp://luasocket:password@" .. host .. "/index.up.html;type=i", index) assert(ret and not err, err) print("ok") io.write("downloading uploaded file: ") -back, err = ftp.get("ftp://luasocket:pedrovian@" .. host .. "/index.up.html;type=i") +back, err = ftp.get("ftp://luasocket:password@" .. host .. "/index.up.html;type=i") assert(ret and not err and index == back, err) print("ok") io.write("erasing after upload/download: ") -ret, err = dele("ftp://luasocket:pedrovian@" .. host .. "/index.up.html") -assert(ret and not err, err) +ret, err = dele("ftp://luasocket:password@" .. host .. "/index.up.html") +assert(ret and not err, err) print("ok") io.write("testing weird-character translation: ") -back, err = ftp.get("ftp://luasocket:pedrovian@" .. host .. "/%23%3f;type=i") +back, err = ftp.get("ftp://luasocket:password@" .. host .. "/%23%3f;type=i") assert(not err and back == index, err) print("ok") @@ -84,7 +96,7 @@ local back = {} ret, err = ftp.get{ url = "//stupid:mistake@" .. host .. "/index.html", user = "luasocket", - password = "pedrovian", + password = "password", type = "i", sink = ltn12.sink.table(back) } From 23ce5aeaa22b49d6649096b520b292a3626474ef Mon Sep 17 00:00:00 2001 From: Diego Nehab Date: Mon, 7 Mar 2016 01:33:08 -0300 Subject: [PATCH 023/194] Hide ftp.PORT "constant" as a local --- doc/ftp.html | 1 - src/ftp.lua | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/doc/ftp.html b/doc/ftp.html index 3f23a4a..091c88f 100644 --- a/doc/ftp.html +++ b/doc/ftp.html @@ -86,7 +86,6 @@ the FTP module:
    • PASSWORD: default anonymous password. -
    • PORT: default port used for the control connection;
    • TIMEOUT: sets the timeout for all I/O operations;
    • USER: default anonymous user;
    diff --git a/src/ftp.lua b/src/ftp.lua index 11798ad..bd528ca 100644 --- a/src/ftp.lua +++ b/src/ftp.lua @@ -23,7 +23,7 @@ local _M = socket.ftp -- timeout in seconds before the program gives up on a connection _M.TIMEOUT = 60 -- default port for ftp service -_M.PORT = 21 +local PORT = 21 -- this is the default anonymous password. used when no password is -- provided in url. should be changed to your e-mail. _M.USER = "ftp" @@ -35,7 +35,7 @@ _M.PASSWORD = "anonymous@anonymous.org" local metat = { __index = {} } function _M.open(server, port, create) - local tp = socket.try(tp.connect(server, port or _M.PORT, _M.TIMEOUT, create)) + local tp = socket.try(tp.connect(server, port or PORT, _M.TIMEOUT, create)) local f = base.setmetatable({ tp = tp }, metat) -- make sure everything gets closed in an exception f.try = socket.newtry(function() f:close() end) From 6fa6462636d9eecf8561d5775baa43bdf1d06348 Mon Sep 17 00:00:00 2001 From: Daniel Lemos Date: Fri, 11 Mar 2016 16:03:22 -0300 Subject: [PATCH 024/194] Given LuaRocks support Haiku as a valid platform, link the network library --- luasocket-scm-0.rockspec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/luasocket-scm-0.rockspec b/luasocket-scm-0.rockspec index 352a497..61bd645 100644 --- a/luasocket-scm-0.rockspec +++ b/luasocket-scm-0.rockspec @@ -69,8 +69,11 @@ local function make_plat(plat) socket = "src/socket.lua", mime = "src/mime.lua" } - if plat == "unix" or plat == "macosx" then + if plat == "unix" or plat == "macosx" or plat == "haiku" then modules["socket.core"].sources[#modules["socket.core"].sources+1] = "src/usocket.c" + if plat == "haiku" then + modules["socket.core"].libraries = {"network"} + end modules["socket.unix"] = { sources = { "src/buffer.c", "src/auxiliar.c", "src/options.c", "src/timeout.c", "src/io.c", "src/usocket.c", "src/unix.c" }, defines = defines[plat], @@ -94,6 +97,7 @@ build = { platforms = { unix = make_plat("unix"), macosx = make_plat("macosx"), + haiku = make_plat("haiku"), win32 = make_plat("win32"), mingw32 = make_plat("mingw32") }, From 9984741d94772be1484033d711c1a674da38217a Mon Sep 17 00:00:00 2001 From: Okash Khawaja Date: Tue, 12 Apr 2016 00:01:51 +0100 Subject: [PATCH 025/194] Update comments for url.unescape() function. --- src/url.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/url.lua b/src/url.lua index fbd93d1..b59960a 100644 --- a/src/url.lua +++ b/src/url.lua @@ -64,11 +64,11 @@ local function protect_segment(s) end ----------------------------------------------------------------------------- --- Encodes a string into its escaped hexadecimal representation +-- Unencodes a escaped hexadecimal string into its binary representation -- Input --- s: binary string to be encoded +-- s: escaped hexadecimal string to be unencoded -- Returns --- escaped representation of string binary +-- unescaped binary representation of escaped hexadecimal binary ----------------------------------------------------------------------------- function _M.unescape(s) return (string.gsub(s, "%%(%x%x)", function(hex) From b9f6fd215a8f522733caedcb4d6d6b0c6e55103e Mon Sep 17 00:00:00 2001 From: Okash Khawaja Date: Tue, 12 Apr 2016 00:04:21 +0100 Subject: [PATCH 026/194] URL-decode user password before adding to authorization header. --- src/http.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/http.lua b/src/http.lua index f2fff01..a386165 100644 --- a/src/http.lua +++ b/src/http.lua @@ -222,7 +222,8 @@ local function adjustheaders(reqt) -- if we have authentication information, pass it along if reqt.user and reqt.password then lower["authorization"] = - "Basic " .. (mime.b64(reqt.user .. ":" .. reqt.password)) + "Basic " .. (mime.b64(reqt.user .. ":" .. + url.unescape(reqt.password))) end -- if we have proxy authentication information, pass it along local proxy = reqt.proxy or _M.PROXY From 624924a77b5ea905c6bdb7607f0fae50ce58c5f7 Mon Sep 17 00:00:00 2001 From: Jonas Kunze Date: Tue, 12 Apr 2016 13:06:47 +0200 Subject: [PATCH 027/194] Enabled overwriting of MYCF/MYLDFlAGS --- src/makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/makefile b/src/makefile index adf687f..2e00950 100644 --- a/src/makefile +++ b/src/makefile @@ -21,10 +21,10 @@ PLAT?=linux LUAV?=5.1 # MYCFLAGS: to be set by user if needed -MYCFLAGS= +MYCFLAGS?= # MYLDFLAGS: to be set by user if needed -MYLDFLAGS= +MYLDFLAGS?= # DEBUG: NODEBUG DEBUG # debug mode causes luasocket to collect and returns timing information useful @@ -135,6 +135,8 @@ print: @echo LUALIB_$(PLAT)=$(LUALIB_$(PLAT)) @echo INSTALL_TOP_CDIR=$(INSTALL_TOP_CDIR) @echo INSTALL_TOP_LDIR=$(INSTALL_TOP_LDIR) + @echo CFLAGS=$(CFLAGS) + @echo LDFLAGS=$(LDFLAGS) #------ # Supported platforms From 3abd1f2dd0855668a88aeb73e80860174435ae3d Mon Sep 17 00:00:00 2001 From: Alex R Date: Wed, 15 Jun 2016 15:27:07 -0700 Subject: [PATCH 028/194] Added future release rockspec file --- rockspec/luasocket-3.0rc2-1.rockspec | 105 +++++++++++++++++++++++++++ 1 file changed, 105 insertions(+) create mode 100644 rockspec/luasocket-3.0rc2-1.rockspec diff --git a/rockspec/luasocket-3.0rc2-1.rockspec b/rockspec/luasocket-3.0rc2-1.rockspec new file mode 100644 index 0000000..8e37a4a --- /dev/null +++ b/rockspec/luasocket-3.0rc2-1.rockspec @@ -0,0 +1,105 @@ +package = "LuaSocket" +version = "3.0rc2-1" +source = { + url = "git://github.com/diegonehab/luasocket.git", + tag = "v3.0-rc2", +} +description = { + summary = "Network support for the Lua language", + detailed = [[ + LuaSocket is a Lua extension library that is composed by two parts: a C core + that provides support for the TCP and UDP transport layers, and a set of Lua + modules that add support for functionality commonly needed by applications + that deal with the Internet. + ]], + homepage = "http://luaforge.net/projects/luasocket/", + license = "MIT" +} +dependencies = { + "lua >= 5.1" +} + +local function make_plat(plat) + local defines = { + unix = { + "LUASOCKET_DEBUG", + "LUASOCKET_API=__attribute__((visibility(\"default\")))", + "UNIX_API=__attribute__((visibility(\"default\")))", + "MIME_API=__attribute__((visibility(\"default\")))" + }, + macosx = { + "LUASOCKET_DEBUG", + "UNIX_HAS_SUN_LEN", + "LUASOCKET_API=__attribute__((visibility(\"default\")))", + "UNIX_API=__attribute__((visibility(\"default\")))", + "MIME_API=__attribute__((visibility(\"default\")))" + }, + win32 = { + "LUASOCKET_DEBUG", + "NDEBUG", + "LUASOCKET_API=__declspec(dllexport)", + "MIME_API=__declspec(dllexport)" + }, + mingw32 = { + "LUASOCKET_DEBUG", + "LUASOCKET_INET_PTON", + "WINVER=0x0501", + "LUASOCKET_API=__declspec(dllexport)", + "MIME_API=__declspec(dllexport)" + } + } + local modules = { + ["socket.core"] = { + sources = { "src/luasocket.c", "src/timeout.c", "src/buffer.c", "src/io.c", "src/auxiliar.c", "src/options.c", "src/inet.c", "src/except.c", "src/select.c", "src/tcp.c", "src/udp.c", "src/compat.c" }, + defines = defines[plat], + incdir = "/src" + }, + ["mime.core"] = { + sources = { "src/mime.c", "src/compat.c" }, + defines = defines[plat], + incdir = "/src" + }, + ["socket.http"] = "src/http.lua", + ["socket.url"] = "src/url.lua", + ["socket.tp"] = "src/tp.lua", + ["socket.ftp"] = "src/ftp.lua", + ["socket.headers"] = "src/headers.lua", + ["socket.smtp"] = "src/smtp.lua", + ltn12 = "src/ltn12.lua", + socket = "src/socket.lua", + mime = "src/mime.lua" + } + if plat == "unix" or plat == "macosx" or plat == "haiku" then + modules["socket.core"].sources[#modules["socket.core"].sources+1] = "src/usocket.c" + if plat == "haiku" then + modules["socket.core"].libraries = {"network"} + end + modules["socket.unix"] = { + sources = { "src/buffer.c", "src/auxiliar.c", "src/options.c", "src/timeout.c", "src/io.c", "src/usocket.c", "src/unix.c" }, + defines = defines[plat], + incdir = "/src" + } + modules["socket.serial"] = { + sources = { "src/buffer.c", "src/auxiliar.c", "src/options.c", "src/timeout.c", "src/io.c", "src/usocket.c", "src/serial.c" }, + defines = defines[plat], + incdir = "/src" + } + end + if plat == "win32" or plat == "mingw32" then + modules["socket.core"].sources[#modules["socket.core"].sources+1] = "src/wsocket.c" + modules["socket.core"].libraries = { "ws2_32" } + end + return { modules = modules } +end + +build = { + type = "builtin", + platforms = { + unix = make_plat("unix"), + macosx = make_plat("macosx"), + haiku = make_plat("haiku"), + win32 = make_plat("win32"), + mingw32 = make_plat("mingw32") + }, + copy_directories = { "doc", "samples", "etc", "test" } +} From aa1b8cc9bc35e56de15eeb153c899e4c51de82a8 Mon Sep 17 00:00:00 2001 From: enginix Date: Fri, 24 Jun 2016 21:23:00 +0800 Subject: [PATCH 029/194] support datagram unix domain sockets --- src/makefile | 2 + src/unix.c | 328 +-------------------- src/unixtcp.c | 338 +++++++++++++++++++++ src/unixtcp.h | 21 ++ src/unixudp.c | 388 +++++++++++++++++++++++++ src/unixudp.h | 20 ++ test/{unixclnt.lua => unixtcpclnt.lua} | 2 +- test/{unixsrvr.lua => unixtcpsrvr.lua} | 2 +- test/unixudpclnt.lua | 9 + test/unixudpsrvr.lua | 9 + 10 files changed, 803 insertions(+), 316 deletions(-) create mode 100644 src/unixtcp.c create mode 100644 src/unixtcp.h create mode 100644 src/unixudp.c create mode 100644 src/unixudp.h rename test/{unixclnt.lua => unixtcpclnt.lua} (84%) rename test/{unixsrvr.lua => unixtcpsrvr.lua} (85%) create mode 100644 test/unixudpclnt.lua create mode 100644 test/unixudpsrvr.lua diff --git a/src/makefile b/src/makefile index 2e00950..0e4a544 100644 --- a/src/makefile +++ b/src/makefile @@ -307,6 +307,8 @@ UNIX_OBJS=\ timeout.$(O) \ io.$(O) \ usocket.$(O) \ + unixtcp.$(O) \ + unixudp.$(O) \ unix.$(O) #------ diff --git a/src/unix.c b/src/unix.c index 5bc3148..2009c19 100644 --- a/src/unix.c +++ b/src/unix.c @@ -2,329 +2,29 @@ * Unix domain socket * LuaSocket toolkit \*=========================================================================*/ -#include - #include "lua.h" #include "lauxlib.h" -#include "auxiliar.h" -#include "socket.h" -#include "options.h" -#include "unix.h" -#include +#include "unixtcp.h" +#include "unixudp.h" -/*=========================================================================*\ -* Internal function prototypes -\*=========================================================================*/ -static int global_create(lua_State *L); -static int meth_connect(lua_State *L); -static int meth_listen(lua_State *L); -static int meth_bind(lua_State *L); -static int meth_send(lua_State *L); -static int meth_shutdown(lua_State *L); -static int meth_receive(lua_State *L); -static int meth_accept(lua_State *L); -static int meth_close(lua_State *L); -static int meth_setoption(lua_State *L); -static int meth_settimeout(lua_State *L); -static int meth_getfd(lua_State *L); -static int meth_setfd(lua_State *L); -static int meth_dirty(lua_State *L); -static int meth_getstats(lua_State *L); -static int meth_setstats(lua_State *L); - -static const char *unix_tryconnect(p_unix un, const char *path); -static const char *unix_trybind(p_unix un, const char *path); - -/* unix object methods */ -static luaL_Reg unix_methods[] = { - {"__gc", meth_close}, - {"__tostring", auxiliar_tostring}, - {"accept", meth_accept}, - {"bind", meth_bind}, - {"close", meth_close}, - {"connect", meth_connect}, - {"dirty", meth_dirty}, - {"getfd", meth_getfd}, - {"getstats", meth_getstats}, - {"setstats", meth_setstats}, - {"listen", meth_listen}, - {"receive", meth_receive}, - {"send", meth_send}, - {"setfd", meth_setfd}, - {"setoption", meth_setoption}, - {"setpeername", meth_connect}, - {"setsockname", meth_bind}, - {"settimeout", meth_settimeout}, - {"shutdown", meth_shutdown}, - {NULL, NULL} -}; - -/* socket option handlers */ -static t_opt optset[] = { - {"keepalive", opt_set_keepalive}, - {"reuseaddr", opt_set_reuseaddr}, - {"linger", opt_set_linger}, - {NULL, NULL} +/*-------------------------------------------------------------------------*\ +* Modules and functions +\*-------------------------------------------------------------------------*/ +static const luaL_Reg mod[] = { + {"tcp", unixtcp_open}, + {"udp", unixudp_open}, + {NULL, NULL} }; /*-------------------------------------------------------------------------*\ * Initializes module \*-------------------------------------------------------------------------*/ -int luaopen_socket_unix(lua_State *L) { - /* create classes */ - auxiliar_newclass(L, "unix{master}", unix_methods); - auxiliar_newclass(L, "unix{client}", unix_methods); - auxiliar_newclass(L, "unix{server}", unix_methods); - /* create class groups */ - auxiliar_add2group(L, "unix{master}", "unix{any}"); - auxiliar_add2group(L, "unix{client}", "unix{any}"); - auxiliar_add2group(L, "unix{server}", "unix{any}"); - /* return the function instead of the 'socket' table */ - lua_pushcfunction(L, global_create); - return 1; -} - -/*=========================================================================*\ -* Lua methods -\*=========================================================================*/ -/*-------------------------------------------------------------------------*\ -* Just call buffered IO methods -\*-------------------------------------------------------------------------*/ -static int meth_send(lua_State *L) { - p_unix un = (p_unix) auxiliar_checkclass(L, "unix{client}", 1); - return buffer_meth_send(L, &un->buf); -} - -static int meth_receive(lua_State *L) { - p_unix un = (p_unix) auxiliar_checkclass(L, "unix{client}", 1); - return buffer_meth_receive(L, &un->buf); -} - -static int meth_getstats(lua_State *L) { - p_unix un = (p_unix) auxiliar_checkclass(L, "unix{client}", 1); - return buffer_meth_getstats(L, &un->buf); -} - -static int meth_setstats(lua_State *L) { - p_unix un = (p_unix) auxiliar_checkclass(L, "unix{client}", 1); - return buffer_meth_setstats(L, &un->buf); -} - -/*-------------------------------------------------------------------------*\ -* Just call option handler -\*-------------------------------------------------------------------------*/ -static int meth_setoption(lua_State *L) { - p_unix un = (p_unix) auxiliar_checkgroup(L, "unix{any}", 1); - return opt_meth_setoption(L, optset, &un->sock); -} - -/*-------------------------------------------------------------------------*\ -* Select support methods -\*-------------------------------------------------------------------------*/ -static int meth_getfd(lua_State *L) { - p_unix un = (p_unix) auxiliar_checkgroup(L, "unix{any}", 1); - lua_pushnumber(L, (int) un->sock); - return 1; -} - -/* this is very dangerous, but can be handy for those that are brave enough */ -static int meth_setfd(lua_State *L) { - p_unix un = (p_unix) auxiliar_checkgroup(L, "unix{any}", 1); - un->sock = (t_socket) luaL_checknumber(L, 2); - return 0; -} - -static int meth_dirty(lua_State *L) { - p_unix un = (p_unix) auxiliar_checkgroup(L, "unix{any}", 1); - lua_pushboolean(L, !buffer_isempty(&un->buf)); - return 1; -} - -/*-------------------------------------------------------------------------*\ -* Waits for and returns a client object attempting connection to the -* server object -\*-------------------------------------------------------------------------*/ -static int meth_accept(lua_State *L) { - p_unix server = (p_unix) auxiliar_checkclass(L, "unix{server}", 1); - p_timeout tm = timeout_markstart(&server->tm); - t_socket sock; - int err = socket_accept(&server->sock, &sock, NULL, NULL, tm); - /* if successful, push client socket */ - if (err == IO_DONE) { - p_unix clnt = (p_unix) lua_newuserdata(L, sizeof(t_unix)); - auxiliar_setclass(L, "unix{client}", -1); - /* initialize structure fields */ - socket_setnonblocking(&sock); - clnt->sock = sock; - io_init(&clnt->io, (p_send)socket_send, (p_recv)socket_recv, - (p_error) socket_ioerror, &clnt->sock); - timeout_init(&clnt->tm, -1, -1); - buffer_init(&clnt->buf, &clnt->io, &clnt->tm); - return 1; - } else { - lua_pushnil(L); - lua_pushstring(L, socket_strerror(err)); - return 2; - } -} - -/*-------------------------------------------------------------------------*\ -* Binds an object to an address -\*-------------------------------------------------------------------------*/ -static const char *unix_trybind(p_unix un, const char *path) { - struct sockaddr_un local; - size_t len = strlen(path); - int err; - if (len >= sizeof(local.sun_path)) return "path too long"; - memset(&local, 0, sizeof(local)); - strcpy(local.sun_path, path); - local.sun_family = AF_UNIX; -#ifdef UNIX_HAS_SUN_LEN - local.sun_len = sizeof(local.sun_family) + sizeof(local.sun_len) - + len + 1; - err = socket_bind(&un->sock, (SA *) &local, local.sun_len); - -#else - err = socket_bind(&un->sock, (SA *) &local, - sizeof(local.sun_family) + len); -#endif - if (err != IO_DONE) socket_destroy(&un->sock); - return socket_strerror(err); -} - -static int meth_bind(lua_State *L) { - p_unix un = (p_unix) auxiliar_checkclass(L, "unix{master}", 1); - const char *path = luaL_checkstring(L, 2); - const char *err = unix_trybind(un, path); - if (err) { - lua_pushnil(L); - lua_pushstring(L, err); - return 2; - } - lua_pushnumber(L, 1); - return 1; -} - -/*-------------------------------------------------------------------------*\ -* Turns a master unix object into a client object. -\*-------------------------------------------------------------------------*/ -static const char *unix_tryconnect(p_unix un, const char *path) +int luaopen_socket_unix(lua_State *L) { - struct sockaddr_un remote; - int err; - size_t len = strlen(path); - if (len >= sizeof(remote.sun_path)) return "path too long"; - memset(&remote, 0, sizeof(remote)); - strcpy(remote.sun_path, path); - remote.sun_family = AF_UNIX; - timeout_markstart(&un->tm); -#ifdef UNIX_HAS_SUN_LEN - remote.sun_len = sizeof(remote.sun_family) + sizeof(remote.sun_len) - + len + 1; - err = socket_connect(&un->sock, (SA *) &remote, remote.sun_len, &un->tm); -#else - err = socket_connect(&un->sock, (SA *) &remote, - sizeof(remote.sun_family) + len, &un->tm); -#endif - if (err != IO_DONE) socket_destroy(&un->sock); - return socket_strerror(err); + int i; + lua_newtable(L); + for (i = 0; mod[i].name; i++) mod[i].func(L); + return 1; } -static int meth_connect(lua_State *L) -{ - p_unix un = (p_unix) auxiliar_checkclass(L, "unix{master}", 1); - const char *path = luaL_checkstring(L, 2); - const char *err = unix_tryconnect(un, path); - if (err) { - lua_pushnil(L); - lua_pushstring(L, err); - return 2; - } - /* turn master object into a client object */ - auxiliar_setclass(L, "unix{client}", 1); - lua_pushnumber(L, 1); - return 1; -} - -/*-------------------------------------------------------------------------*\ -* Closes socket used by object -\*-------------------------------------------------------------------------*/ -static int meth_close(lua_State *L) -{ - p_unix un = (p_unix) auxiliar_checkgroup(L, "unix{any}", 1); - socket_destroy(&un->sock); - lua_pushnumber(L, 1); - return 1; -} - -/*-------------------------------------------------------------------------*\ -* Puts the sockt in listen mode -\*-------------------------------------------------------------------------*/ -static int meth_listen(lua_State *L) -{ - p_unix un = (p_unix) auxiliar_checkclass(L, "unix{master}", 1); - int backlog = (int) luaL_optnumber(L, 2, 32); - int err = socket_listen(&un->sock, backlog); - if (err != IO_DONE) { - lua_pushnil(L); - lua_pushstring(L, socket_strerror(err)); - return 2; - } - /* turn master object into a server object */ - auxiliar_setclass(L, "unix{server}", 1); - lua_pushnumber(L, 1); - return 1; -} - -/*-------------------------------------------------------------------------*\ -* Shuts the connection down partially -\*-------------------------------------------------------------------------*/ -static int meth_shutdown(lua_State *L) -{ - /* SHUT_RD, SHUT_WR, SHUT_RDWR have the value 0, 1, 2, so we can use method index directly */ - static const char* methods[] = { "receive", "send", "both", NULL }; - p_unix tcp = (p_unix) auxiliar_checkclass(L, "unix{client}", 1); - int how = luaL_checkoption(L, 2, "both", methods); - socket_shutdown(&tcp->sock, how); - lua_pushnumber(L, 1); - return 1; -} - -/*-------------------------------------------------------------------------*\ -* Just call tm methods -\*-------------------------------------------------------------------------*/ -static int meth_settimeout(lua_State *L) { - p_unix un = (p_unix) auxiliar_checkgroup(L, "unix{any}", 1); - return timeout_meth_settimeout(L, &un->tm); -} - -/*=========================================================================*\ -* Library functions -\*=========================================================================*/ -/*-------------------------------------------------------------------------*\ -* Creates a master unix object -\*-------------------------------------------------------------------------*/ -static int global_create(lua_State *L) { - t_socket sock; - int err = socket_create(&sock, AF_UNIX, SOCK_STREAM, 0); - /* try to allocate a system socket */ - if (err == IO_DONE) { - /* allocate unix object */ - p_unix un = (p_unix) lua_newuserdata(L, sizeof(t_unix)); - /* set its type as master object */ - auxiliar_setclass(L, "unix{master}", -1); - /* initialize remaining structure fields */ - socket_setnonblocking(&sock); - un->sock = sock; - io_init(&un->io, (p_send) socket_send, (p_recv) socket_recv, - (p_error) socket_ioerror, &un->sock); - timeout_init(&un->tm, -1, -1); - buffer_init(&un->buf, &un->io, &un->tm); - return 1; - } else { - lua_pushnil(L); - lua_pushstring(L, socket_strerror(err)); - return 2; - } -} diff --git a/src/unixtcp.c b/src/unixtcp.c new file mode 100644 index 0000000..88baac0 --- /dev/null +++ b/src/unixtcp.c @@ -0,0 +1,338 @@ +/*=========================================================================*\ +* Unix domain socket tcp sub module +* LuaSocket toolkit +\*=========================================================================*/ +#include + +#include "lua.h" +#include "lauxlib.h" + +#include "auxiliar.h" +#include "socket.h" +#include "options.h" +#include "unixtcp.h" +#include + +/*=========================================================================*\ +* Internal function prototypes +\*=========================================================================*/ +static int global_create(lua_State *L); +static int meth_connect(lua_State *L); +static int meth_listen(lua_State *L); +static int meth_bind(lua_State *L); +static int meth_send(lua_State *L); +static int meth_shutdown(lua_State *L); +static int meth_receive(lua_State *L); +static int meth_accept(lua_State *L); +static int meth_close(lua_State *L); +static int meth_setoption(lua_State *L); +static int meth_settimeout(lua_State *L); +static int meth_getfd(lua_State *L); +static int meth_setfd(lua_State *L); +static int meth_dirty(lua_State *L); +static int meth_getstats(lua_State *L); +static int meth_setstats(lua_State *L); + +static const char *unixtcp_tryconnect(p_unix un, const char *path); +static const char *unixtcp_trybind(p_unix un, const char *path); + +/* unixtcp object methods */ +static luaL_Reg unixtcp_methods[] = { + {"__gc", meth_close}, + {"__tostring", auxiliar_tostring}, + {"accept", meth_accept}, + {"bind", meth_bind}, + {"close", meth_close}, + {"connect", meth_connect}, + {"dirty", meth_dirty}, + {"getfd", meth_getfd}, + {"getstats", meth_getstats}, + {"setstats", meth_setstats}, + {"listen", meth_listen}, + {"receive", meth_receive}, + {"send", meth_send}, + {"setfd", meth_setfd}, + {"setoption", meth_setoption}, + {"setpeername", meth_connect}, + {"setsockname", meth_bind}, + {"settimeout", meth_settimeout}, + {"shutdown", meth_shutdown}, + {NULL, NULL} +}; + +/* socket option handlers */ +static t_opt optset[] = { + {"keepalive", opt_set_keepalive}, + {"reuseaddr", opt_set_reuseaddr}, + {"linger", opt_set_linger}, + {NULL, NULL} +}; + +/* functions in library namespace */ +static luaL_Reg func[] = { + {"tcp", global_create}, + {NULL, NULL} +}; + +/*-------------------------------------------------------------------------*\ +* Initializes module +\*-------------------------------------------------------------------------*/ +int unixtcp_open(lua_State *L) +{ + /* create classes */ + auxiliar_newclass(L, "unixtcp{master}", unixtcp_methods); + auxiliar_newclass(L, "unixtcp{client}", unixtcp_methods); + auxiliar_newclass(L, "unixtcp{server}", unixtcp_methods); + + /* create class groups */ + auxiliar_add2group(L, "unixtcp{master}", "unixtcp{any}"); + auxiliar_add2group(L, "unixtcp{client}", "unixtcp{any}"); + auxiliar_add2group(L, "unixtcp{server}", "unixtcp{any}"); + + luaL_setfuncs(L, func, 0); + return 1; +} + +/*=========================================================================*\ +* Lua methods +\*=========================================================================*/ +/*-------------------------------------------------------------------------*\ +* Just call buffered IO methods +\*-------------------------------------------------------------------------*/ +static int meth_send(lua_State *L) { + p_unix un = (p_unix) auxiliar_checkclass(L, "unixtcp{client}", 1); + return buffer_meth_send(L, &un->buf); +} + +static int meth_receive(lua_State *L) { + p_unix un = (p_unix) auxiliar_checkclass(L, "unixtcp{client}", 1); + return buffer_meth_receive(L, &un->buf); +} + +static int meth_getstats(lua_State *L) { + p_unix un = (p_unix) auxiliar_checkclass(L, "unixtcp{client}", 1); + return buffer_meth_getstats(L, &un->buf); +} + +static int meth_setstats(lua_State *L) { + p_unix un = (p_unix) auxiliar_checkclass(L, "unixtcp{client}", 1); + return buffer_meth_setstats(L, &un->buf); +} + +/*-------------------------------------------------------------------------*\ +* Just call option handler +\*-------------------------------------------------------------------------*/ +static int meth_setoption(lua_State *L) { + p_unix un = (p_unix) auxiliar_checkgroup(L, "unixtcp{any}", 1); + return opt_meth_setoption(L, optset, &un->sock); +} + +/*-------------------------------------------------------------------------*\ +* Select support methods +\*-------------------------------------------------------------------------*/ +static int meth_getfd(lua_State *L) { + p_unix un = (p_unix) auxiliar_checkgroup(L, "unixtcp{any}", 1); + lua_pushnumber(L, (int) un->sock); + return 1; +} + +/* this is very dangerous, but can be handy for those that are brave enough */ +static int meth_setfd(lua_State *L) { + p_unix un = (p_unix) auxiliar_checkgroup(L, "unixtcp{any}", 1); + un->sock = (t_socket) luaL_checknumber(L, 2); + return 0; +} + +static int meth_dirty(lua_State *L) { + p_unix un = (p_unix) auxiliar_checkgroup(L, "unixtcp{any}", 1); + lua_pushboolean(L, !buffer_isempty(&un->buf)); + return 1; +} + +/*-------------------------------------------------------------------------*\ +* Waits for and returns a client object attempting connection to the +* server object +\*-------------------------------------------------------------------------*/ +static int meth_accept(lua_State *L) { + p_unix server = (p_unix) auxiliar_checkclass(L, "unixtcp{server}", 1); + p_timeout tm = timeout_markstart(&server->tm); + t_socket sock; + int err = socket_accept(&server->sock, &sock, NULL, NULL, tm); + /* if successful, push client socket */ + if (err == IO_DONE) { + p_unix clnt = (p_unix) lua_newuserdata(L, sizeof(t_unix)); + auxiliar_setclass(L, "unixtcp{client}", -1); + /* initialize structure fields */ + socket_setnonblocking(&sock); + clnt->sock = sock; + io_init(&clnt->io, (p_send)socket_send, (p_recv)socket_recv, + (p_error) socket_ioerror, &clnt->sock); + timeout_init(&clnt->tm, -1, -1); + buffer_init(&clnt->buf, &clnt->io, &clnt->tm); + return 1; + } else { + lua_pushnil(L); + lua_pushstring(L, socket_strerror(err)); + return 2; + } +} + +/*-------------------------------------------------------------------------*\ +* Binds an object to an address +\*-------------------------------------------------------------------------*/ +static const char *unixtcp_trybind(p_unix un, const char *path) { + struct sockaddr_un local; + size_t len = strlen(path); + int err; + if (len >= sizeof(local.sun_path)) return "path too long"; + memset(&local, 0, sizeof(local)); + strcpy(local.sun_path, path); + local.sun_family = AF_UNIX; +#ifdef UNIX_HAS_SUN_LEN + local.sun_len = sizeof(local.sun_family) + sizeof(local.sun_len) + + len + 1; + err = socket_bind(&un->sock, (SA *) &local, local.sun_len); + +#else + err = socket_bind(&un->sock, (SA *) &local, + sizeof(local.sun_family) + len); +#endif + if (err != IO_DONE) socket_destroy(&un->sock); + return socket_strerror(err); +} + +static int meth_bind(lua_State *L) { + p_unix un = (p_unix) auxiliar_checkclass(L, "unixtcp{master}", 1); + const char *path = luaL_checkstring(L, 2); + const char *err = unixtcp_trybind(un, path); + if (err) { + lua_pushnil(L); + lua_pushstring(L, err); + return 2; + } + lua_pushnumber(L, 1); + return 1; +} + +/*-------------------------------------------------------------------------*\ +* Turns a master unixtcp object into a client object. +\*-------------------------------------------------------------------------*/ +static const char *unixtcp_tryconnect(p_unix un, const char *path) +{ + struct sockaddr_un remote; + int err; + size_t len = strlen(path); + if (len >= sizeof(remote.sun_path)) return "path too long"; + memset(&remote, 0, sizeof(remote)); + strcpy(remote.sun_path, path); + remote.sun_family = AF_UNIX; + timeout_markstart(&un->tm); +#ifdef UNIX_HAS_SUN_LEN + remote.sun_len = sizeof(remote.sun_family) + sizeof(remote.sun_len) + + len + 1; + err = socket_connect(&un->sock, (SA *) &remote, remote.sun_len, &un->tm); +#else + err = socket_connect(&un->sock, (SA *) &remote, + sizeof(remote.sun_family) + len, &un->tm); +#endif + if (err != IO_DONE) socket_destroy(&un->sock); + return socket_strerror(err); +} + +static int meth_connect(lua_State *L) +{ + p_unix un = (p_unix) auxiliar_checkclass(L, "unixtcp{master}", 1); + const char *path = luaL_checkstring(L, 2); + const char *err = unixtcp_tryconnect(un, path); + if (err) { + lua_pushnil(L); + lua_pushstring(L, err); + return 2; + } + /* turn master object into a client object */ + auxiliar_setclass(L, "unixtcp{client}", 1); + lua_pushnumber(L, 1); + return 1; +} + +/*-------------------------------------------------------------------------*\ +* Closes socket used by object +\*-------------------------------------------------------------------------*/ +static int meth_close(lua_State *L) +{ + p_unix un = (p_unix) auxiliar_checkgroup(L, "unixtcp{any}", 1); + socket_destroy(&un->sock); + lua_pushnumber(L, 1); + return 1; +} + +/*-------------------------------------------------------------------------*\ +* Puts the sockt in listen mode +\*-------------------------------------------------------------------------*/ +static int meth_listen(lua_State *L) +{ + p_unix un = (p_unix) auxiliar_checkclass(L, "unixtcp{master}", 1); + int backlog = (int) luaL_optnumber(L, 2, 32); + int err = socket_listen(&un->sock, backlog); + if (err != IO_DONE) { + lua_pushnil(L); + lua_pushstring(L, socket_strerror(err)); + return 2; + } + /* turn master object into a server object */ + auxiliar_setclass(L, "unixtcp{server}", 1); + lua_pushnumber(L, 1); + return 1; +} + +/*-------------------------------------------------------------------------*\ +* Shuts the connection down partially +\*-------------------------------------------------------------------------*/ +static int meth_shutdown(lua_State *L) +{ + /* SHUT_RD, SHUT_WR, SHUT_RDWR have the value 0, 1, 2, so we can use method index directly */ + static const char* methods[] = { "receive", "send", "both", NULL }; + p_unix tcp = (p_unix) auxiliar_checkclass(L, "unixtcp{client}", 1); + int how = luaL_checkoption(L, 2, "both", methods); + socket_shutdown(&tcp->sock, how); + lua_pushnumber(L, 1); + return 1; +} + +/*-------------------------------------------------------------------------*\ +* Just call tm methods +\*-------------------------------------------------------------------------*/ +static int meth_settimeout(lua_State *L) { + p_unix un = (p_unix) auxiliar_checkgroup(L, "unixtcp{any}", 1); + return timeout_meth_settimeout(L, &un->tm); +} + +/*=========================================================================*\ +* Library functions +\*=========================================================================*/ +/*-------------------------------------------------------------------------*\ +* Creates a master unixtcp object +\*-------------------------------------------------------------------------*/ +static int global_create(lua_State *L) { + t_socket sock; + int err = socket_create(&sock, AF_UNIX, SOCK_STREAM, 0); + /* try to allocate a system socket */ + if (err == IO_DONE) { + /* allocate unixtcp object */ + p_unix un = (p_unix) lua_newuserdata(L, sizeof(t_unix)); + /* set its type as master object */ + auxiliar_setclass(L, "unixtcp{master}", -1); + /* initialize remaining structure fields */ + socket_setnonblocking(&sock); + un->sock = sock; + io_init(&un->io, (p_send) socket_send, (p_recv) socket_recv, + (p_error) socket_ioerror, &un->sock); + timeout_init(&un->tm, -1, -1); + buffer_init(&un->buf, &un->io, &un->tm); + return 1; + } else { + lua_pushnil(L); + lua_pushstring(L, socket_strerror(err)); + return 2; + } +} diff --git a/src/unixtcp.h b/src/unixtcp.h new file mode 100644 index 0000000..0eababc --- /dev/null +++ b/src/unixtcp.h @@ -0,0 +1,21 @@ +#ifndef UNIXTCP_H +#define UNIXTCP_H +/*=========================================================================*\ +* UNIX TCP object +* LuaSocket toolkit +* +* The unixtcp.h module is basicly a glue that puts together modules buffer.h, +* timeout.h socket.h and inet.h to provide the LuaSocket UNIX TCP (AF_UNIX, +* SOCK_STREAM) support. +* +* Three classes are defined: master, client and server. The master class is +* a newly created unixtcp object, that has not been bound or connected. Server +* objects are unixtcp objects bound to some local address. Client objects are +* unixtcp objects either connected to some address or returned by the accept +* method of a server object. +\*=========================================================================*/ +#include "unix.h" + +int unixtcp_open(lua_State *L); + +#endif /* UNIXTCP_H */ diff --git a/src/unixudp.c b/src/unixudp.c new file mode 100644 index 0000000..ec348cf --- /dev/null +++ b/src/unixudp.c @@ -0,0 +1,388 @@ +/*=========================================================================*\ +* Unix domain socket udp submodule +* LuaSocket toolkit +\*=========================================================================*/ +#include +#include + +#include "lua.h" +#include "lauxlib.h" + +#include "auxiliar.h" +#include "socket.h" +#include "options.h" +#include "unix.h" +#include + +#define UNIXUDP_DATAGRAMSIZE 8192 + +/*=========================================================================*\ +* Internal function prototypes +\*=========================================================================*/ +static int global_create(lua_State *L); +static int meth_connect(lua_State *L); +static int meth_bind(lua_State *L); +static int meth_send(lua_State *L); +static int meth_receive(lua_State *L); +static int meth_close(lua_State *L); +static int meth_setoption(lua_State *L); +static int meth_settimeout(lua_State *L); +static int meth_gettimeout(lua_State *L); +static int meth_getfd(lua_State *L); +static int meth_setfd(lua_State *L); +static int meth_dirty(lua_State *L); +static int meth_receivefrom(lua_State *L); +static int meth_sendto(lua_State *L); + +static const char *unixudp_tryconnect(p_unix un, const char *path); +static const char *unixudp_trybind(p_unix un, const char *path); + +/* unixudp object methods */ +static luaL_Reg unixudp_methods[] = { + {"__gc", meth_close}, + {"__tostring", auxiliar_tostring}, + {"bind", meth_bind}, + {"close", meth_close}, + {"connect", meth_connect}, + {"dirty", meth_dirty}, + {"getfd", meth_getfd}, + {"send", meth_send}, + {"sendto", meth_sendto}, + {"receive", meth_receive}, + {"receivefrom", meth_receivefrom}, + {"setfd", meth_setfd}, + {"setoption", meth_setoption}, + {"setpeername", meth_connect}, + {"setsockname", meth_bind}, + {"settimeout", meth_settimeout}, + {"gettimeout", meth_gettimeout}, + {NULL, NULL} +}; + +/* socket option handlers */ +static t_opt optset[] = { + {"reuseaddr", opt_set_reuseaddr}, + {NULL, NULL} +}; + +/* functions in library namespace */ +static luaL_Reg func[] = { + {"udp", global_create}, + {NULL, NULL} +}; + +/*-------------------------------------------------------------------------*\ +* Initializes module +\*-------------------------------------------------------------------------*/ +int unixudp_open(lua_State *L) +{ + /* create classes */ + auxiliar_newclass(L, "unixudp{connected}", unixudp_methods); + auxiliar_newclass(L, "unixudp{unconnected}", unixudp_methods); + /* create class groups */ + auxiliar_add2group(L, "unixudp{connected}", "unixudp{any}"); + auxiliar_add2group(L, "unixudp{unconnected}", "unixudp{any}"); + auxiliar_add2group(L, "unixudp{connected}", "select{able}"); + auxiliar_add2group(L, "unixudp{unconnected}", "select{able}"); + + luaL_setfuncs(L, func, 0); + return 1; +} + +/*=========================================================================*\ +* Lua methods +\*=========================================================================*/ +static const char *unixudp_strerror(int err) +{ + /* a 'closed' error on an unconnected means the target address was not + * accepted by the transport layer */ + if (err == IO_CLOSED) return "refused"; + else return socket_strerror(err); +} + +static int meth_send(lua_State *L) +{ + p_unix un = (p_unix) auxiliar_checkclass(L, "unixudp{connected}", 1); + p_timeout tm = &un->tm; + size_t count, sent = 0; + int err; + const char *data = luaL_checklstring(L, 2, &count); + timeout_markstart(tm); + err = socket_send(&un->sock, data, count, &sent, tm); + if (err != IO_DONE) { + lua_pushnil(L); + lua_pushstring(L, unixudp_strerror(err)); + return 2; + } + lua_pushnumber(L, (lua_Number) sent); + return 1; +} + +/*-------------------------------------------------------------------------*\ +* Send data through unconnected unixudp socket +\*-------------------------------------------------------------------------*/ +static int meth_sendto(lua_State *L) +{ + p_unix un = (p_unix) auxiliar_checkclass(L, "unixudp{unconnected}", 1); + size_t count, sent = 0; + const char *data = luaL_checklstring(L, 2, &count); + const char *path = luaL_checkstring(L, 3); + p_timeout tm = &un->tm; + int err; + struct sockaddr_un remote; + size_t len = strlen(path); + + if (len >= sizeof(remote.sun_path)) { + lua_pushnil(L); + lua_pushstring(L, "path too long"); + return 2; + } + + memset(&remote, 0, sizeof(remote)); + strcpy(remote.sun_path, path); + remote.sun_family = AF_UNIX; + timeout_markstart(tm); +#ifdef UNIX_HAS_SUN_LEN + remote.sun_len = sizeof(remote.sun_family) + sizeof(remote.sun_len) + + len + 1; + err = socket_sendto(&un->sock, data, count, &sent, (SA *) &remote, remote.sun_len, tm); +#else + err = socket_sendto(&un->sock, data, count, &sent, (SA *) &remote, + sizeof(remote.sun_family) + len, tm); +#endif + if (err != IO_DONE) { + lua_pushnil(L); + lua_pushstring(L, unixudp_strerror(err)); + return 2; + } + lua_pushnumber(L, (lua_Number) sent); + return 1; +} + +static int meth_receive(lua_State *L) { + p_unix un = (p_unix) auxiliar_checkclass(L, "unixudp{any}", 1); + char buf[UNIXUDP_DATAGRAMSIZE]; + size_t got, wanted = (size_t) luaL_optnumber(L, 2, sizeof(buf)); + char *dgram = wanted > sizeof(buf)? (char *) malloc(wanted): buf; + int err; + p_timeout tm = &un->tm; + timeout_markstart(tm); + if (!dgram) { + lua_pushnil(L); + lua_pushliteral(L, "out of memory"); + return 2; + } + err = socket_recv(&un->sock, dgram, wanted, &got, tm); + /* Unlike TCP, recv() of zero is not closed, but a zero-length packet. */ + if (err != IO_DONE && err != IO_CLOSED) { + lua_pushnil(L); + lua_pushstring(L, unixudp_strerror(err)); + if (wanted > sizeof(buf)) free(dgram); + return 2; + } + lua_pushlstring(L, dgram, got); + if (wanted > sizeof(buf)) free(dgram); + return 1; +} + +/*-------------------------------------------------------------------------*\ +* Receives data and sender from a UDP socket +\*-------------------------------------------------------------------------*/ +static int meth_receivefrom(lua_State *L) { + p_unix un = (p_unix) auxiliar_checkclass(L, "unixudp{unconnected}", 1); + char buf[UNIXUDP_DATAGRAMSIZE]; + size_t got, wanted = (size_t) luaL_optnumber(L, 2, sizeof(buf)); + char *dgram = wanted > sizeof(buf)? (char *) malloc(wanted): buf; + struct sockaddr_un addr; + socklen_t addr_len = sizeof(addr); + int err; + p_timeout tm = &un->tm; + timeout_markstart(tm); + if (!dgram) { + lua_pushnil(L); + lua_pushliteral(L, "out of memory"); + return 2; + } + err = socket_recvfrom(&un->sock, dgram, wanted, &got, (SA *) &addr, + &addr_len, tm); + /* Unlike TCP, recv() of zero is not closed, but a zero-length packet. */ + if (err != IO_DONE && err != IO_CLOSED) { + lua_pushnil(L); + lua_pushstring(L, unixudp_strerror(err)); + if (wanted > sizeof(buf)) free(dgram); + return 2; + } + + lua_pushlstring(L, dgram, got); + /* the path may be empty, when client send without bind */ + lua_pushstring(L, addr.sun_path); + if (wanted > sizeof(buf)) free(dgram); + return 2; +} + +/*-------------------------------------------------------------------------*\ +* Just call option handler +\*-------------------------------------------------------------------------*/ +static int meth_setoption(lua_State *L) { + p_unix un = (p_unix) auxiliar_checkgroup(L, "unixudp{any}", 1); + return opt_meth_setoption(L, optset, &un->sock); +} + +/*-------------------------------------------------------------------------*\ +* Select support methods +\*-------------------------------------------------------------------------*/ +static int meth_getfd(lua_State *L) { + p_unix un = (p_unix) auxiliar_checkgroup(L, "unixudp{any}", 1); + lua_pushnumber(L, (int) un->sock); + return 1; +} + +/* this is very dangerous, but can be handy for those that are brave enough */ +static int meth_setfd(lua_State *L) { + p_unix un = (p_unix) auxiliar_checkgroup(L, "unixudp{any}", 1); + un->sock = (t_socket) luaL_checknumber(L, 2); + return 0; +} + +static int meth_dirty(lua_State *L) { + p_unix un = (p_unix) auxiliar_checkgroup(L, "unixudp{any}", 1); + (void) un; + lua_pushboolean(L, 0); + return 1; +} + +/*-------------------------------------------------------------------------*\ +* Binds an object to an address +\*-------------------------------------------------------------------------*/ +static const char *unixudp_trybind(p_unix un, const char *path) { + struct sockaddr_un local; + size_t len = strlen(path); + int err; + if (len >= sizeof(local.sun_path)) return "path too long"; + memset(&local, 0, sizeof(local)); + strcpy(local.sun_path, path); + local.sun_family = AF_UNIX; +#ifdef UNIX_HAS_SUN_LEN + local.sun_len = sizeof(local.sun_family) + sizeof(local.sun_len) + + len + 1; + err = socket_bind(&un->sock, (SA *) &local, local.sun_len); + +#else + err = socket_bind(&un->sock, (SA *) &local, + sizeof(local.sun_family) + len); +#endif + if (err != IO_DONE) socket_destroy(&un->sock); + return socket_strerror(err); +} + +static int meth_bind(lua_State *L) +{ + p_unix un = (p_unix) auxiliar_checkclass(L, "unixudp{unconnected}", 1); + const char *path = luaL_checkstring(L, 2); + const char *err = unixudp_trybind(un, path); + if (err) { + lua_pushnil(L); + lua_pushstring(L, err); + return 2; + } + lua_pushnumber(L, 1); + return 1; +} + +/*-------------------------------------------------------------------------*\ +* Turns a master unixudp object into a client object. +\*-------------------------------------------------------------------------*/ +static const char *unixudp_tryconnect(p_unix un, const char *path) +{ + struct sockaddr_un remote; + int err; + size_t len = strlen(path); + if (len >= sizeof(remote.sun_path)) return "path too long"; + memset(&remote, 0, sizeof(remote)); + strcpy(remote.sun_path, path); + remote.sun_family = AF_UNIX; + timeout_markstart(&un->tm); +#ifdef UNIX_HAS_SUN_LEN + remote.sun_len = sizeof(remote.sun_family) + sizeof(remote.sun_len) + + len + 1; + err = socket_connect(&un->sock, (SA *) &remote, remote.sun_len, &un->tm); +#else + err = socket_connect(&un->sock, (SA *) &remote, + sizeof(remote.sun_family) + len, &un->tm); +#endif + if (err != IO_DONE) socket_destroy(&un->sock); + return socket_strerror(err); +} + +static int meth_connect(lua_State *L) +{ + p_unix un = (p_unix) auxiliar_checkclass(L, "unixudp{any}", 1); + const char *path = luaL_checkstring(L, 2); + const char *err = unixudp_tryconnect(un, path); + if (err) { + lua_pushnil(L); + lua_pushstring(L, err); + return 2; + } + /* turn unconnected object into a connected object */ + auxiliar_setclass(L, "unixudp{connected}", 1); + lua_pushnumber(L, 1); + return 1; +} + +/*-------------------------------------------------------------------------*\ +* Closes socket used by object +\*-------------------------------------------------------------------------*/ +static int meth_close(lua_State *L) +{ + p_unix un = (p_unix) auxiliar_checkgroup(L, "unixudp{any}", 1); + socket_destroy(&un->sock); + lua_pushnumber(L, 1); + return 1; +} + +/*-------------------------------------------------------------------------*\ +* Just call tm methods +\*-------------------------------------------------------------------------*/ +static int meth_settimeout(lua_State *L) +{ + p_unix un = (p_unix) auxiliar_checkgroup(L, "unixudp{any}", 1); + return timeout_meth_settimeout(L, &un->tm); +} + +static int meth_gettimeout(lua_State *L) +{ + p_unix un = (p_unix) auxiliar_checkgroup(L, "unixudp{any}", 1); + return timeout_meth_gettimeout(L, &un->tm); +} + +/*=========================================================================*\ +* Library functions +\*=========================================================================*/ +/*-------------------------------------------------------------------------*\ +* Creates a master unixudp object +\*-------------------------------------------------------------------------*/ +static int global_create(lua_State *L) +{ + t_socket sock; + int err = socket_create(&sock, AF_UNIX, SOCK_DGRAM, 0); + /* try to allocate a system socket */ + if (err == IO_DONE) { + /* allocate unixudp object */ + p_unix un = (p_unix) lua_newuserdata(L, sizeof(t_unix)); + /* set its type as master object */ + auxiliar_setclass(L, "unixudp{unconnected}", -1); + /* initialize remaining structure fields */ + socket_setnonblocking(&sock); + un->sock = sock; + io_init(&un->io, (p_send) socket_send, (p_recv) socket_recv, + (p_error) socket_ioerror, &un->sock); + timeout_init(&un->tm, -1, -1); + buffer_init(&un->buf, &un->io, &un->tm); + return 1; + } else { + lua_pushnil(L); + lua_pushstring(L, socket_strerror(err)); + return 2; + } +} diff --git a/src/unixudp.h b/src/unixudp.h new file mode 100644 index 0000000..ccfdc07 --- /dev/null +++ b/src/unixudp.h @@ -0,0 +1,20 @@ +#ifndef UNIXUDP_H +#define UNIXUDP_H +/*=========================================================================*\ +* UDP object +* LuaSocket toolkit +* +* The udp.h module provides LuaSocket with support for UDP protocol +* (AF_INET, SOCK_DGRAM). +* +* Two classes are defined: connected and unconnected. UDP objects are +* originally unconnected. They can be "connected" to a given address +* with a call to the setpeername function. The same function can be used to +* break the connection. +\*=========================================================================*/ + +#include "unix.h" + +int unixudp_open(lua_State *L); + +#endif /* UNIXUDP_H */ diff --git a/test/unixclnt.lua b/test/unixtcpclnt.lua similarity index 84% rename from test/unixclnt.lua rename to test/unixtcpclnt.lua index 5171535..652a680 100644 --- a/test/unixclnt.lua +++ b/test/unixtcpclnt.lua @@ -1,6 +1,6 @@ socket = require"socket" socket.unix = require"socket.unix" -c = assert(socket.unix()) +c = assert(socket.unix.tcp()) assert(c:connect("/tmp/foo")) while 1 do local l = io.read() diff --git a/test/unixsrvr.lua b/test/unixtcpsrvr.lua similarity index 85% rename from test/unixsrvr.lua rename to test/unixtcpsrvr.lua index 81b9c99..2a2b065 100644 --- a/test/unixsrvr.lua +++ b/test/unixtcpsrvr.lua @@ -1,6 +1,6 @@ socket = require"socket" socket.unix = require"socket.unix" - u = assert(socket.unix()) + u = assert(socket.unix.tcp()) assert(u:bind("/tmp/foo")) assert(u:listen()) c = assert(u:accept()) diff --git a/test/unixudpclnt.lua b/test/unixudpclnt.lua new file mode 100644 index 0000000..bbbff7f --- /dev/null +++ b/test/unixudpclnt.lua @@ -0,0 +1,9 @@ +socket = require"socket" +socket.unix = require"socket.unix" +c = assert(socket.unix.udp()) +c:bind("/tmp/bar") +while 1 do + local l = io.read("*l") + assert(c:sendto(l, "/tmp/foo")) + print(assert(c:receivefrom())) +end diff --git a/test/unixudpsrvr.lua b/test/unixudpsrvr.lua new file mode 100644 index 0000000..5ed71dc --- /dev/null +++ b/test/unixudpsrvr.lua @@ -0,0 +1,9 @@ + socket = require"socket" + socket.unix = require"socket.unix" + u = assert(socket.unix.udp()) + assert(u:bind("/tmp/foo")) + while 1 do + x, r = assert(u:receivefrom()) + print(x, r) + assert(u:sendto(">" .. x, r)) + end From 9f77f8b24f7fcce66678b5c73ca82ceb23576536 Mon Sep 17 00:00:00 2001 From: enginix Date: Thu, 30 Jun 2016 15:40:51 +0800 Subject: [PATCH 030/194] unix socket: compat lua 5.1 --- src/makefile | 1 + src/unixtcp.c | 3 ++- src/unixudp.c | 3 ++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/makefile b/src/makefile index 0e4a544..2ffd7d9 100644 --- a/src/makefile +++ b/src/makefile @@ -309,6 +309,7 @@ UNIX_OBJS=\ usocket.$(O) \ unixtcp.$(O) \ unixudp.$(O) \ + compat.$(O) \ unix.$(O) #------ diff --git a/src/unixtcp.c b/src/unixtcp.c index 88baac0..a9c4962 100644 --- a/src/unixtcp.c +++ b/src/unixtcp.c @@ -6,6 +6,7 @@ #include "lua.h" #include "lauxlib.h" +#include "compat.h" #include "auxiliar.h" #include "socket.h" @@ -90,7 +91,7 @@ int unixtcp_open(lua_State *L) auxiliar_add2group(L, "unixtcp{server}", "unixtcp{any}"); luaL_setfuncs(L, func, 0); - return 1; + return 0; } /*=========================================================================*\ diff --git a/src/unixudp.c b/src/unixudp.c index ec348cf..75f5b08 100644 --- a/src/unixudp.c +++ b/src/unixudp.c @@ -7,6 +7,7 @@ #include "lua.h" #include "lauxlib.h" +#include "compat.h" #include "auxiliar.h" #include "socket.h" @@ -86,7 +87,7 @@ int unixudp_open(lua_State *L) auxiliar_add2group(L, "unixudp{unconnected}", "select{able}"); luaL_setfuncs(L, func, 0); - return 1; + return 0; } /*=========================================================================*\ From c87f953d81420e64cb5bb324ae3ca15f1bb28b1a Mon Sep 17 00:00:00 2001 From: enginix Date: Mon, 4 Jul 2016 16:38:37 +0800 Subject: [PATCH 031/194] fix unixudp object checking issue --- src/unixudp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/unixudp.c b/src/unixudp.c index 75f5b08..1088c6b 100644 --- a/src/unixudp.c +++ b/src/unixudp.c @@ -161,7 +161,7 @@ static int meth_sendto(lua_State *L) } static int meth_receive(lua_State *L) { - p_unix un = (p_unix) auxiliar_checkclass(L, "unixudp{any}", 1); + p_unix un = (p_unix) auxiliar_checkgroup(L, "unixudp{any}", 1); char buf[UNIXUDP_DATAGRAMSIZE]; size_t got, wanted = (size_t) luaL_optnumber(L, 2, sizeof(buf)); char *dgram = wanted > sizeof(buf)? (char *) malloc(wanted): buf; @@ -317,7 +317,7 @@ static const char *unixudp_tryconnect(p_unix un, const char *path) static int meth_connect(lua_State *L) { - p_unix un = (p_unix) auxiliar_checkclass(L, "unixudp{any}", 1); + p_unix un = (p_unix) auxiliar_checkgroup(L, "unixudp{any}", 1); const char *path = luaL_checkstring(L, 2); const char *err = unixudp_tryconnect(un, path); if (err) { From 2205c2053c9bdd270c90f93d23fe44c9674bad3e Mon Sep 17 00:00:00 2001 From: enginix Date: Fri, 22 Jul 2016 22:46:45 +0800 Subject: [PATCH 032/194] add getsockname api for unix {udp,tcp} socket --- src/unixtcp.c | 18 ++++++++++++++++++ src/unixudp.c | 18 ++++++++++++++++++ 2 files changed, 36 insertions(+) diff --git a/src/unixtcp.c b/src/unixtcp.c index a9c4962..747ef5f 100644 --- a/src/unixtcp.c +++ b/src/unixtcp.c @@ -33,6 +33,7 @@ static int meth_setfd(lua_State *L); static int meth_dirty(lua_State *L); static int meth_getstats(lua_State *L); static int meth_setstats(lua_State *L); +static int meth_getsockname(lua_State *L); static const char *unixtcp_tryconnect(p_unix un, const char *path); static const char *unixtcp_trybind(p_unix un, const char *path); @@ -56,6 +57,7 @@ static luaL_Reg unixtcp_methods[] = { {"setoption", meth_setoption}, {"setpeername", meth_connect}, {"setsockname", meth_bind}, + {"getsockname", meth_getsockname}, {"settimeout", meth_settimeout}, {"shutdown", meth_shutdown}, {NULL, NULL} @@ -215,6 +217,22 @@ static int meth_bind(lua_State *L) { return 1; } +static int meth_getsockname(lua_State *L) +{ + p_unix un = (p_unix) auxiliar_checkgroup(L, "unixtcp{any}", 1); + struct sockaddr_un peer = {0}; + socklen_t peer_len = sizeof(peer); + + if (getsockname(un->sock, (SA *) &peer, &peer_len) < 0) { + lua_pushnil(L); + lua_pushstring(L, socket_strerror(errno)); + return 2; + } + + lua_pushstring(L, peer.sun_path); + return 1; +} + /*-------------------------------------------------------------------------*\ * Turns a master unixtcp object into a client object. \*-------------------------------------------------------------------------*/ diff --git a/src/unixudp.c b/src/unixudp.c index 1088c6b..0e0a19a 100644 --- a/src/unixudp.c +++ b/src/unixudp.c @@ -34,6 +34,7 @@ static int meth_setfd(lua_State *L); static int meth_dirty(lua_State *L); static int meth_receivefrom(lua_State *L); static int meth_sendto(lua_State *L); +static int meth_getsockname(lua_State *L); static const char *unixudp_tryconnect(p_unix un, const char *path); static const char *unixudp_trybind(p_unix un, const char *path); @@ -55,6 +56,7 @@ static luaL_Reg unixudp_methods[] = { {"setoption", meth_setoption}, {"setpeername", meth_connect}, {"setsockname", meth_bind}, + {"getsockname", meth_getsockname}, {"settimeout", meth_settimeout}, {"gettimeout", meth_gettimeout}, {NULL, NULL} @@ -290,6 +292,22 @@ static int meth_bind(lua_State *L) return 1; } +static int meth_getsockname(lua_State *L) +{ + p_unix un = (p_unix) auxiliar_checkgroup(L, "unixudp{any}", 1); + struct sockaddr_un peer = {0}; + socklen_t peer_len = sizeof(peer); + + if (getsockname(un->sock, (SA *) &peer, &peer_len) < 0) { + lua_pushnil(L); + lua_pushstring(L, socket_strerror(errno)); + return 2; + } + + lua_pushstring(L, peer.sun_path); + return 1; +} + /*-------------------------------------------------------------------------*\ * Turns a master unixudp object into a client object. \*-------------------------------------------------------------------------*/ From cd1e52eb7ad050c083703662dfbb870e57c3a1f0 Mon Sep 17 00:00:00 2001 From: Mike Usenko Date: Tue, 8 Nov 2016 22:07:20 +0300 Subject: [PATCH 033/194] allow DESTDIR to be set from the environment --- src/makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/makefile b/src/makefile index 2ffd7d9..2dfe549 100644 --- a/src/makefile +++ b/src/makefile @@ -102,7 +102,7 @@ LDIR?=$(LDIR_$(PLAT)) # DESTDIR: (no default) # used by package managers to install into a temporary destination -DESTDIR= +DESTDIR?= #------ # Definitions below can be overridden on the make command line, but From 3a33c37b9ce852d0b3531e82c6ffdb47bb937f0a Mon Sep 17 00:00:00 2001 From: enginix Date: Sun, 25 Dec 2016 23:15:12 +0800 Subject: [PATCH 034/194] rename unix.tcp to unix.stream, unix.udp to unix.dgram --- src/makefile | 4 +- src/unix.c | 8 +- src/{unixudp.c => unixdgram.c} | 96 ++++++++++---------- src/{unixudp.h => unixdgram.h} | 14 +-- src/{unixtcp.c => unixstream.c} | 84 ++++++++--------- src/unixstream.h | 21 +++++ src/unixtcp.h | 21 ----- test/{unixudpclnt.lua => unixdgramclnt.lua} | 4 +- test/{unixudpsrvr.lua => unixdgramsrvr.lua} | 2 +- test/{unixtcpclnt.lua => unixstreamclnt.lua} | 2 +- test/{unixtcpsrvr.lua => unixstreamsrvr.lua} | 2 +- 11 files changed, 129 insertions(+), 129 deletions(-) rename src/{unixudp.c => unixdgram.c} (79%) rename src/{unixudp.h => unixdgram.h} (60%) rename src/{unixtcp.c => unixstream.c} (80%) create mode 100644 src/unixstream.h delete mode 100644 src/unixtcp.h rename test/{unixudpclnt.lua => unixdgramclnt.lua} (74%) rename test/{unixudpsrvr.lua => unixdgramsrvr.lua} (84%) rename test/{unixtcpclnt.lua => unixstreamclnt.lua} (82%) rename test/{unixtcpsrvr.lua => unixstreamsrvr.lua} (84%) diff --git a/src/makefile b/src/makefile index 2dfe549..494baab 100644 --- a/src/makefile +++ b/src/makefile @@ -307,8 +307,8 @@ UNIX_OBJS=\ timeout.$(O) \ io.$(O) \ usocket.$(O) \ - unixtcp.$(O) \ - unixudp.$(O) \ + unixstream.$(O) \ + unixdgram.$(O) \ compat.$(O) \ unix.$(O) diff --git a/src/unix.c b/src/unix.c index 2009c19..e604733 100644 --- a/src/unix.c +++ b/src/unix.c @@ -5,15 +5,15 @@ #include "lua.h" #include "lauxlib.h" -#include "unixtcp.h" -#include "unixudp.h" +#include "unixstream.h" +#include "unixdgram.h" /*-------------------------------------------------------------------------*\ * Modules and functions \*-------------------------------------------------------------------------*/ static const luaL_Reg mod[] = { - {"tcp", unixtcp_open}, - {"udp", unixudp_open}, + {"stream", unixstream_open}, + {"dgram", unixdgram_open}, {NULL, NULL} }; diff --git a/src/unixudp.c b/src/unixdgram.c similarity index 79% rename from src/unixudp.c rename to src/unixdgram.c index 0e0a19a..c07cbd5 100644 --- a/src/unixudp.c +++ b/src/unixdgram.c @@ -1,5 +1,5 @@ /*=========================================================================*\ -* Unix domain socket udp submodule +* Unix domain socket dgram submodule * LuaSocket toolkit \*=========================================================================*/ #include @@ -15,7 +15,7 @@ #include "unix.h" #include -#define UNIXUDP_DATAGRAMSIZE 8192 +#define UNIXDGRAM_DATAGRAMSIZE 8192 /*=========================================================================*\ * Internal function prototypes @@ -36,11 +36,11 @@ static int meth_receivefrom(lua_State *L); static int meth_sendto(lua_State *L); static int meth_getsockname(lua_State *L); -static const char *unixudp_tryconnect(p_unix un, const char *path); -static const char *unixudp_trybind(p_unix un, const char *path); +static const char *unixdgram_tryconnect(p_unix un, const char *path); +static const char *unixdgram_trybind(p_unix un, const char *path); -/* unixudp object methods */ -static luaL_Reg unixudp_methods[] = { +/* unixdgram object methods */ +static luaL_Reg unixdgram_methods[] = { {"__gc", meth_close}, {"__tostring", auxiliar_tostring}, {"bind", meth_bind}, @@ -70,23 +70,23 @@ static t_opt optset[] = { /* functions in library namespace */ static luaL_Reg func[] = { - {"udp", global_create}, + {"dgram", global_create}, {NULL, NULL} }; /*-------------------------------------------------------------------------*\ * Initializes module \*-------------------------------------------------------------------------*/ -int unixudp_open(lua_State *L) +int unixdgram_open(lua_State *L) { /* create classes */ - auxiliar_newclass(L, "unixudp{connected}", unixudp_methods); - auxiliar_newclass(L, "unixudp{unconnected}", unixudp_methods); + auxiliar_newclass(L, "unixdgram{connected}", unixdgram_methods); + auxiliar_newclass(L, "unixdgram{unconnected}", unixdgram_methods); /* create class groups */ - auxiliar_add2group(L, "unixudp{connected}", "unixudp{any}"); - auxiliar_add2group(L, "unixudp{unconnected}", "unixudp{any}"); - auxiliar_add2group(L, "unixudp{connected}", "select{able}"); - auxiliar_add2group(L, "unixudp{unconnected}", "select{able}"); + auxiliar_add2group(L, "unixdgram{connected}", "unixdgram{any}"); + auxiliar_add2group(L, "unixdgram{unconnected}", "unixdgram{any}"); + auxiliar_add2group(L, "unixdgram{connected}", "select{able}"); + auxiliar_add2group(L, "unixdgram{unconnected}", "select{able}"); luaL_setfuncs(L, func, 0); return 0; @@ -95,7 +95,7 @@ int unixudp_open(lua_State *L) /*=========================================================================*\ * Lua methods \*=========================================================================*/ -static const char *unixudp_strerror(int err) +static const char *unixdgram_strerror(int err) { /* a 'closed' error on an unconnected means the target address was not * accepted by the transport layer */ @@ -105,7 +105,7 @@ static const char *unixudp_strerror(int err) static int meth_send(lua_State *L) { - p_unix un = (p_unix) auxiliar_checkclass(L, "unixudp{connected}", 1); + p_unix un = (p_unix) auxiliar_checkclass(L, "unixdgram{connected}", 1); p_timeout tm = &un->tm; size_t count, sent = 0; int err; @@ -114,7 +114,7 @@ static int meth_send(lua_State *L) err = socket_send(&un->sock, data, count, &sent, tm); if (err != IO_DONE) { lua_pushnil(L); - lua_pushstring(L, unixudp_strerror(err)); + lua_pushstring(L, unixdgram_strerror(err)); return 2; } lua_pushnumber(L, (lua_Number) sent); @@ -122,11 +122,11 @@ static int meth_send(lua_State *L) } /*-------------------------------------------------------------------------*\ -* Send data through unconnected unixudp socket +* Send data through unconnected unixdgram socket \*-------------------------------------------------------------------------*/ static int meth_sendto(lua_State *L) { - p_unix un = (p_unix) auxiliar_checkclass(L, "unixudp{unconnected}", 1); + p_unix un = (p_unix) auxiliar_checkclass(L, "unixdgram{unconnected}", 1); size_t count, sent = 0; const char *data = luaL_checklstring(L, 2, &count); const char *path = luaL_checkstring(L, 3); @@ -155,7 +155,7 @@ static int meth_sendto(lua_State *L) #endif if (err != IO_DONE) { lua_pushnil(L); - lua_pushstring(L, unixudp_strerror(err)); + lua_pushstring(L, unixdgram_strerror(err)); return 2; } lua_pushnumber(L, (lua_Number) sent); @@ -163,8 +163,8 @@ static int meth_sendto(lua_State *L) } static int meth_receive(lua_State *L) { - p_unix un = (p_unix) auxiliar_checkgroup(L, "unixudp{any}", 1); - char buf[UNIXUDP_DATAGRAMSIZE]; + p_unix un = (p_unix) auxiliar_checkgroup(L, "unixdgram{any}", 1); + char buf[UNIXDGRAM_DATAGRAMSIZE]; size_t got, wanted = (size_t) luaL_optnumber(L, 2, sizeof(buf)); char *dgram = wanted > sizeof(buf)? (char *) malloc(wanted): buf; int err; @@ -176,10 +176,10 @@ static int meth_receive(lua_State *L) { return 2; } err = socket_recv(&un->sock, dgram, wanted, &got, tm); - /* Unlike TCP, recv() of zero is not closed, but a zero-length packet. */ + /* Unlike STREAM, recv() of zero is not closed, but a zero-length packet. */ if (err != IO_DONE && err != IO_CLOSED) { lua_pushnil(L); - lua_pushstring(L, unixudp_strerror(err)); + lua_pushstring(L, unixdgram_strerror(err)); if (wanted > sizeof(buf)) free(dgram); return 2; } @@ -189,11 +189,11 @@ static int meth_receive(lua_State *L) { } /*-------------------------------------------------------------------------*\ -* Receives data and sender from a UDP socket +* Receives data and sender from a DGRAM socket \*-------------------------------------------------------------------------*/ static int meth_receivefrom(lua_State *L) { - p_unix un = (p_unix) auxiliar_checkclass(L, "unixudp{unconnected}", 1); - char buf[UNIXUDP_DATAGRAMSIZE]; + p_unix un = (p_unix) auxiliar_checkclass(L, "unixdgram{unconnected}", 1); + char buf[UNIXDGRAM_DATAGRAMSIZE]; size_t got, wanted = (size_t) luaL_optnumber(L, 2, sizeof(buf)); char *dgram = wanted > sizeof(buf)? (char *) malloc(wanted): buf; struct sockaddr_un addr; @@ -208,10 +208,10 @@ static int meth_receivefrom(lua_State *L) { } err = socket_recvfrom(&un->sock, dgram, wanted, &got, (SA *) &addr, &addr_len, tm); - /* Unlike TCP, recv() of zero is not closed, but a zero-length packet. */ + /* Unlike STREAM, recv() of zero is not closed, but a zero-length packet. */ if (err != IO_DONE && err != IO_CLOSED) { lua_pushnil(L); - lua_pushstring(L, unixudp_strerror(err)); + lua_pushstring(L, unixdgram_strerror(err)); if (wanted > sizeof(buf)) free(dgram); return 2; } @@ -227,7 +227,7 @@ static int meth_receivefrom(lua_State *L) { * Just call option handler \*-------------------------------------------------------------------------*/ static int meth_setoption(lua_State *L) { - p_unix un = (p_unix) auxiliar_checkgroup(L, "unixudp{any}", 1); + p_unix un = (p_unix) auxiliar_checkgroup(L, "unixdgram{any}", 1); return opt_meth_setoption(L, optset, &un->sock); } @@ -235,20 +235,20 @@ static int meth_setoption(lua_State *L) { * Select support methods \*-------------------------------------------------------------------------*/ static int meth_getfd(lua_State *L) { - p_unix un = (p_unix) auxiliar_checkgroup(L, "unixudp{any}", 1); + p_unix un = (p_unix) auxiliar_checkgroup(L, "unixdgram{any}", 1); lua_pushnumber(L, (int) un->sock); return 1; } /* this is very dangerous, but can be handy for those that are brave enough */ static int meth_setfd(lua_State *L) { - p_unix un = (p_unix) auxiliar_checkgroup(L, "unixudp{any}", 1); + p_unix un = (p_unix) auxiliar_checkgroup(L, "unixdgram{any}", 1); un->sock = (t_socket) luaL_checknumber(L, 2); return 0; } static int meth_dirty(lua_State *L) { - p_unix un = (p_unix) auxiliar_checkgroup(L, "unixudp{any}", 1); + p_unix un = (p_unix) auxiliar_checkgroup(L, "unixdgram{any}", 1); (void) un; lua_pushboolean(L, 0); return 1; @@ -257,7 +257,7 @@ static int meth_dirty(lua_State *L) { /*-------------------------------------------------------------------------*\ * Binds an object to an address \*-------------------------------------------------------------------------*/ -static const char *unixudp_trybind(p_unix un, const char *path) { +static const char *unixdgram_trybind(p_unix un, const char *path) { struct sockaddr_un local; size_t len = strlen(path); int err; @@ -280,9 +280,9 @@ static const char *unixudp_trybind(p_unix un, const char *path) { static int meth_bind(lua_State *L) { - p_unix un = (p_unix) auxiliar_checkclass(L, "unixudp{unconnected}", 1); + p_unix un = (p_unix) auxiliar_checkclass(L, "unixdgram{unconnected}", 1); const char *path = luaL_checkstring(L, 2); - const char *err = unixudp_trybind(un, path); + const char *err = unixdgram_trybind(un, path); if (err) { lua_pushnil(L); lua_pushstring(L, err); @@ -294,7 +294,7 @@ static int meth_bind(lua_State *L) static int meth_getsockname(lua_State *L) { - p_unix un = (p_unix) auxiliar_checkgroup(L, "unixudp{any}", 1); + p_unix un = (p_unix) auxiliar_checkgroup(L, "unixdgram{any}", 1); struct sockaddr_un peer = {0}; socklen_t peer_len = sizeof(peer); @@ -309,9 +309,9 @@ static int meth_getsockname(lua_State *L) } /*-------------------------------------------------------------------------*\ -* Turns a master unixudp object into a client object. +* Turns a master unixdgram object into a client object. \*-------------------------------------------------------------------------*/ -static const char *unixudp_tryconnect(p_unix un, const char *path) +static const char *unixdgram_tryconnect(p_unix un, const char *path) { struct sockaddr_un remote; int err; @@ -335,16 +335,16 @@ static const char *unixudp_tryconnect(p_unix un, const char *path) static int meth_connect(lua_State *L) { - p_unix un = (p_unix) auxiliar_checkgroup(L, "unixudp{any}", 1); + p_unix un = (p_unix) auxiliar_checkgroup(L, "unixdgram{any}", 1); const char *path = luaL_checkstring(L, 2); - const char *err = unixudp_tryconnect(un, path); + const char *err = unixdgram_tryconnect(un, path); if (err) { lua_pushnil(L); lua_pushstring(L, err); return 2; } /* turn unconnected object into a connected object */ - auxiliar_setclass(L, "unixudp{connected}", 1); + auxiliar_setclass(L, "unixdgram{connected}", 1); lua_pushnumber(L, 1); return 1; } @@ -354,7 +354,7 @@ static int meth_connect(lua_State *L) \*-------------------------------------------------------------------------*/ static int meth_close(lua_State *L) { - p_unix un = (p_unix) auxiliar_checkgroup(L, "unixudp{any}", 1); + p_unix un = (p_unix) auxiliar_checkgroup(L, "unixdgram{any}", 1); socket_destroy(&un->sock); lua_pushnumber(L, 1); return 1; @@ -365,13 +365,13 @@ static int meth_close(lua_State *L) \*-------------------------------------------------------------------------*/ static int meth_settimeout(lua_State *L) { - p_unix un = (p_unix) auxiliar_checkgroup(L, "unixudp{any}", 1); + p_unix un = (p_unix) auxiliar_checkgroup(L, "unixdgram{any}", 1); return timeout_meth_settimeout(L, &un->tm); } static int meth_gettimeout(lua_State *L) { - p_unix un = (p_unix) auxiliar_checkgroup(L, "unixudp{any}", 1); + p_unix un = (p_unix) auxiliar_checkgroup(L, "unixdgram{any}", 1); return timeout_meth_gettimeout(L, &un->tm); } @@ -379,7 +379,7 @@ static int meth_gettimeout(lua_State *L) * Library functions \*=========================================================================*/ /*-------------------------------------------------------------------------*\ -* Creates a master unixudp object +* Creates a master unixdgram object \*-------------------------------------------------------------------------*/ static int global_create(lua_State *L) { @@ -387,10 +387,10 @@ static int global_create(lua_State *L) int err = socket_create(&sock, AF_UNIX, SOCK_DGRAM, 0); /* try to allocate a system socket */ if (err == IO_DONE) { - /* allocate unixudp object */ + /* allocate unixdgram object */ p_unix un = (p_unix) lua_newuserdata(L, sizeof(t_unix)); /* set its type as master object */ - auxiliar_setclass(L, "unixudp{unconnected}", -1); + auxiliar_setclass(L, "unixdgram{unconnected}", -1); /* initialize remaining structure fields */ socket_setnonblocking(&sock); un->sock = sock; diff --git a/src/unixudp.h b/src/unixdgram.h similarity index 60% rename from src/unixudp.h rename to src/unixdgram.h index ccfdc07..7187966 100644 --- a/src/unixudp.h +++ b/src/unixdgram.h @@ -1,13 +1,13 @@ -#ifndef UNIXUDP_H -#define UNIXUDP_H +#ifndef UNIXDGRAM_H +#define UNIXDGRAM_H /*=========================================================================*\ -* UDP object +* DGRAM object * LuaSocket toolkit * -* The udp.h module provides LuaSocket with support for UDP protocol +* The dgram.h module provides LuaSocket with support for DGRAM protocol * (AF_INET, SOCK_DGRAM). * -* Two classes are defined: connected and unconnected. UDP objects are +* Two classes are defined: connected and unconnected. DGRAM objects are * originally unconnected. They can be "connected" to a given address * with a call to the setpeername function. The same function can be used to * break the connection. @@ -15,6 +15,6 @@ #include "unix.h" -int unixudp_open(lua_State *L); +int unixdgram_open(lua_State *L); -#endif /* UNIXUDP_H */ +#endif /* UNIXDGRAM_H */ diff --git a/src/unixtcp.c b/src/unixstream.c similarity index 80% rename from src/unixtcp.c rename to src/unixstream.c index 747ef5f..0b9055c 100644 --- a/src/unixtcp.c +++ b/src/unixstream.c @@ -1,5 +1,5 @@ /*=========================================================================*\ -* Unix domain socket tcp sub module +* Unix domain socket stream sub module * LuaSocket toolkit \*=========================================================================*/ #include @@ -11,7 +11,7 @@ #include "auxiliar.h" #include "socket.h" #include "options.h" -#include "unixtcp.h" +#include "unixstream.h" #include /*=========================================================================*\ @@ -35,11 +35,11 @@ static int meth_getstats(lua_State *L); static int meth_setstats(lua_State *L); static int meth_getsockname(lua_State *L); -static const char *unixtcp_tryconnect(p_unix un, const char *path); -static const char *unixtcp_trybind(p_unix un, const char *path); +static const char *unixstream_tryconnect(p_unix un, const char *path); +static const char *unixstream_trybind(p_unix un, const char *path); -/* unixtcp object methods */ -static luaL_Reg unixtcp_methods[] = { +/* unixstream object methods */ +static luaL_Reg unixstream_methods[] = { {"__gc", meth_close}, {"__tostring", auxiliar_tostring}, {"accept", meth_accept}, @@ -73,24 +73,24 @@ static t_opt optset[] = { /* functions in library namespace */ static luaL_Reg func[] = { - {"tcp", global_create}, + {"stream", global_create}, {NULL, NULL} }; /*-------------------------------------------------------------------------*\ * Initializes module \*-------------------------------------------------------------------------*/ -int unixtcp_open(lua_State *L) +int unixstream_open(lua_State *L) { /* create classes */ - auxiliar_newclass(L, "unixtcp{master}", unixtcp_methods); - auxiliar_newclass(L, "unixtcp{client}", unixtcp_methods); - auxiliar_newclass(L, "unixtcp{server}", unixtcp_methods); + auxiliar_newclass(L, "unixstream{master}", unixstream_methods); + auxiliar_newclass(L, "unixstream{client}", unixstream_methods); + auxiliar_newclass(L, "unixstream{server}", unixstream_methods); /* create class groups */ - auxiliar_add2group(L, "unixtcp{master}", "unixtcp{any}"); - auxiliar_add2group(L, "unixtcp{client}", "unixtcp{any}"); - auxiliar_add2group(L, "unixtcp{server}", "unixtcp{any}"); + auxiliar_add2group(L, "unixstream{master}", "unixstream{any}"); + auxiliar_add2group(L, "unixstream{client}", "unixstream{any}"); + auxiliar_add2group(L, "unixstream{server}", "unixstream{any}"); luaL_setfuncs(L, func, 0); return 0; @@ -103,22 +103,22 @@ int unixtcp_open(lua_State *L) * Just call buffered IO methods \*-------------------------------------------------------------------------*/ static int meth_send(lua_State *L) { - p_unix un = (p_unix) auxiliar_checkclass(L, "unixtcp{client}", 1); + p_unix un = (p_unix) auxiliar_checkclass(L, "unixstream{client}", 1); return buffer_meth_send(L, &un->buf); } static int meth_receive(lua_State *L) { - p_unix un = (p_unix) auxiliar_checkclass(L, "unixtcp{client}", 1); + p_unix un = (p_unix) auxiliar_checkclass(L, "unixstream{client}", 1); return buffer_meth_receive(L, &un->buf); } static int meth_getstats(lua_State *L) { - p_unix un = (p_unix) auxiliar_checkclass(L, "unixtcp{client}", 1); + p_unix un = (p_unix) auxiliar_checkclass(L, "unixstream{client}", 1); return buffer_meth_getstats(L, &un->buf); } static int meth_setstats(lua_State *L) { - p_unix un = (p_unix) auxiliar_checkclass(L, "unixtcp{client}", 1); + p_unix un = (p_unix) auxiliar_checkclass(L, "unixstream{client}", 1); return buffer_meth_setstats(L, &un->buf); } @@ -126,7 +126,7 @@ static int meth_setstats(lua_State *L) { * Just call option handler \*-------------------------------------------------------------------------*/ static int meth_setoption(lua_State *L) { - p_unix un = (p_unix) auxiliar_checkgroup(L, "unixtcp{any}", 1); + p_unix un = (p_unix) auxiliar_checkgroup(L, "unixstream{any}", 1); return opt_meth_setoption(L, optset, &un->sock); } @@ -134,20 +134,20 @@ static int meth_setoption(lua_State *L) { * Select support methods \*-------------------------------------------------------------------------*/ static int meth_getfd(lua_State *L) { - p_unix un = (p_unix) auxiliar_checkgroup(L, "unixtcp{any}", 1); + p_unix un = (p_unix) auxiliar_checkgroup(L, "unixstream{any}", 1); lua_pushnumber(L, (int) un->sock); return 1; } /* this is very dangerous, but can be handy for those that are brave enough */ static int meth_setfd(lua_State *L) { - p_unix un = (p_unix) auxiliar_checkgroup(L, "unixtcp{any}", 1); + p_unix un = (p_unix) auxiliar_checkgroup(L, "unixstream{any}", 1); un->sock = (t_socket) luaL_checknumber(L, 2); return 0; } static int meth_dirty(lua_State *L) { - p_unix un = (p_unix) auxiliar_checkgroup(L, "unixtcp{any}", 1); + p_unix un = (p_unix) auxiliar_checkgroup(L, "unixstream{any}", 1); lua_pushboolean(L, !buffer_isempty(&un->buf)); return 1; } @@ -157,14 +157,14 @@ static int meth_dirty(lua_State *L) { * server object \*-------------------------------------------------------------------------*/ static int meth_accept(lua_State *L) { - p_unix server = (p_unix) auxiliar_checkclass(L, "unixtcp{server}", 1); + p_unix server = (p_unix) auxiliar_checkclass(L, "unixstream{server}", 1); p_timeout tm = timeout_markstart(&server->tm); t_socket sock; int err = socket_accept(&server->sock, &sock, NULL, NULL, tm); /* if successful, push client socket */ if (err == IO_DONE) { p_unix clnt = (p_unix) lua_newuserdata(L, sizeof(t_unix)); - auxiliar_setclass(L, "unixtcp{client}", -1); + auxiliar_setclass(L, "unixstream{client}", -1); /* initialize structure fields */ socket_setnonblocking(&sock); clnt->sock = sock; @@ -183,7 +183,7 @@ static int meth_accept(lua_State *L) { /*-------------------------------------------------------------------------*\ * Binds an object to an address \*-------------------------------------------------------------------------*/ -static const char *unixtcp_trybind(p_unix un, const char *path) { +static const char *unixstream_trybind(p_unix un, const char *path) { struct sockaddr_un local; size_t len = strlen(path); int err; @@ -205,9 +205,9 @@ static const char *unixtcp_trybind(p_unix un, const char *path) { } static int meth_bind(lua_State *L) { - p_unix un = (p_unix) auxiliar_checkclass(L, "unixtcp{master}", 1); + p_unix un = (p_unix) auxiliar_checkclass(L, "unixstream{master}", 1); const char *path = luaL_checkstring(L, 2); - const char *err = unixtcp_trybind(un, path); + const char *err = unixstream_trybind(un, path); if (err) { lua_pushnil(L); lua_pushstring(L, err); @@ -219,7 +219,7 @@ static int meth_bind(lua_State *L) { static int meth_getsockname(lua_State *L) { - p_unix un = (p_unix) auxiliar_checkgroup(L, "unixtcp{any}", 1); + p_unix un = (p_unix) auxiliar_checkgroup(L, "unixstream{any}", 1); struct sockaddr_un peer = {0}; socklen_t peer_len = sizeof(peer); @@ -234,9 +234,9 @@ static int meth_getsockname(lua_State *L) } /*-------------------------------------------------------------------------*\ -* Turns a master unixtcp object into a client object. +* Turns a master unixstream object into a client object. \*-------------------------------------------------------------------------*/ -static const char *unixtcp_tryconnect(p_unix un, const char *path) +static const char *unixstream_tryconnect(p_unix un, const char *path) { struct sockaddr_un remote; int err; @@ -260,16 +260,16 @@ static const char *unixtcp_tryconnect(p_unix un, const char *path) static int meth_connect(lua_State *L) { - p_unix un = (p_unix) auxiliar_checkclass(L, "unixtcp{master}", 1); + p_unix un = (p_unix) auxiliar_checkclass(L, "unixstream{master}", 1); const char *path = luaL_checkstring(L, 2); - const char *err = unixtcp_tryconnect(un, path); + const char *err = unixstream_tryconnect(un, path); if (err) { lua_pushnil(L); lua_pushstring(L, err); return 2; } /* turn master object into a client object */ - auxiliar_setclass(L, "unixtcp{client}", 1); + auxiliar_setclass(L, "unixstream{client}", 1); lua_pushnumber(L, 1); return 1; } @@ -279,7 +279,7 @@ static int meth_connect(lua_State *L) \*-------------------------------------------------------------------------*/ static int meth_close(lua_State *L) { - p_unix un = (p_unix) auxiliar_checkgroup(L, "unixtcp{any}", 1); + p_unix un = (p_unix) auxiliar_checkgroup(L, "unixstream{any}", 1); socket_destroy(&un->sock); lua_pushnumber(L, 1); return 1; @@ -290,7 +290,7 @@ static int meth_close(lua_State *L) \*-------------------------------------------------------------------------*/ static int meth_listen(lua_State *L) { - p_unix un = (p_unix) auxiliar_checkclass(L, "unixtcp{master}", 1); + p_unix un = (p_unix) auxiliar_checkclass(L, "unixstream{master}", 1); int backlog = (int) luaL_optnumber(L, 2, 32); int err = socket_listen(&un->sock, backlog); if (err != IO_DONE) { @@ -299,7 +299,7 @@ static int meth_listen(lua_State *L) return 2; } /* turn master object into a server object */ - auxiliar_setclass(L, "unixtcp{server}", 1); + auxiliar_setclass(L, "unixstream{server}", 1); lua_pushnumber(L, 1); return 1; } @@ -311,9 +311,9 @@ static int meth_shutdown(lua_State *L) { /* SHUT_RD, SHUT_WR, SHUT_RDWR have the value 0, 1, 2, so we can use method index directly */ static const char* methods[] = { "receive", "send", "both", NULL }; - p_unix tcp = (p_unix) auxiliar_checkclass(L, "unixtcp{client}", 1); + p_unix stream = (p_unix) auxiliar_checkclass(L, "unixstream{client}", 1); int how = luaL_checkoption(L, 2, "both", methods); - socket_shutdown(&tcp->sock, how); + socket_shutdown(&stream->sock, how); lua_pushnumber(L, 1); return 1; } @@ -322,7 +322,7 @@ static int meth_shutdown(lua_State *L) * Just call tm methods \*-------------------------------------------------------------------------*/ static int meth_settimeout(lua_State *L) { - p_unix un = (p_unix) auxiliar_checkgroup(L, "unixtcp{any}", 1); + p_unix un = (p_unix) auxiliar_checkgroup(L, "unixstream{any}", 1); return timeout_meth_settimeout(L, &un->tm); } @@ -330,17 +330,17 @@ static int meth_settimeout(lua_State *L) { * Library functions \*=========================================================================*/ /*-------------------------------------------------------------------------*\ -* Creates a master unixtcp object +* Creates a master unixstream object \*-------------------------------------------------------------------------*/ static int global_create(lua_State *L) { t_socket sock; int err = socket_create(&sock, AF_UNIX, SOCK_STREAM, 0); /* try to allocate a system socket */ if (err == IO_DONE) { - /* allocate unixtcp object */ + /* allocate unixstream object */ p_unix un = (p_unix) lua_newuserdata(L, sizeof(t_unix)); /* set its type as master object */ - auxiliar_setclass(L, "unixtcp{master}", -1); + auxiliar_setclass(L, "unixstream{master}", -1); /* initialize remaining structure fields */ socket_setnonblocking(&sock); un->sock = sock; diff --git a/src/unixstream.h b/src/unixstream.h new file mode 100644 index 0000000..ef1d071 --- /dev/null +++ b/src/unixstream.h @@ -0,0 +1,21 @@ +#ifndef UNIXSTREAM_H +#define UNIXSTREAM_H +/*=========================================================================*\ +* UNIX STREAM object +* LuaSocket toolkit +* +* The unixstream.h module is basicly a glue that puts together modules buffer.h, +* timeout.h socket.h and inet.h to provide the LuaSocket UNIX STREAM (AF_UNIX, +* SOCK_STREAM) support. +* +* Three classes are defined: master, client and server. The master class is +* a newly created unixstream object, that has not been bound or connected. Server +* objects are unixstream objects bound to some local address. Client objects are +* unixstream objects either connected to some address or returned by the accept +* method of a server object. +\*=========================================================================*/ +#include "unix.h" + +int unixstream_open(lua_State *L); + +#endif /* UNIXSTREAM_H */ diff --git a/src/unixtcp.h b/src/unixtcp.h deleted file mode 100644 index 0eababc..0000000 --- a/src/unixtcp.h +++ /dev/null @@ -1,21 +0,0 @@ -#ifndef UNIXTCP_H -#define UNIXTCP_H -/*=========================================================================*\ -* UNIX TCP object -* LuaSocket toolkit -* -* The unixtcp.h module is basicly a glue that puts together modules buffer.h, -* timeout.h socket.h and inet.h to provide the LuaSocket UNIX TCP (AF_UNIX, -* SOCK_STREAM) support. -* -* Three classes are defined: master, client and server. The master class is -* a newly created unixtcp object, that has not been bound or connected. Server -* objects are unixtcp objects bound to some local address. Client objects are -* unixtcp objects either connected to some address or returned by the accept -* method of a server object. -\*=========================================================================*/ -#include "unix.h" - -int unixtcp_open(lua_State *L); - -#endif /* UNIXTCP_H */ diff --git a/test/unixudpclnt.lua b/test/unixdgramclnt.lua similarity index 74% rename from test/unixudpclnt.lua rename to test/unixdgramclnt.lua index bbbff7f..9bd60f7 100644 --- a/test/unixudpclnt.lua +++ b/test/unixdgramclnt.lua @@ -1,7 +1,7 @@ socket = require"socket" socket.unix = require"socket.unix" -c = assert(socket.unix.udp()) -c:bind("/tmp/bar") +c = assert(socket.unix.dgram()) +print(c:bind("/tmp/bar")) while 1 do local l = io.read("*l") assert(c:sendto(l, "/tmp/foo")) diff --git a/test/unixudpsrvr.lua b/test/unixdgramsrvr.lua similarity index 84% rename from test/unixudpsrvr.lua rename to test/unixdgramsrvr.lua index 5ed71dc..4c11f55 100644 --- a/test/unixudpsrvr.lua +++ b/test/unixdgramsrvr.lua @@ -1,6 +1,6 @@ socket = require"socket" socket.unix = require"socket.unix" - u = assert(socket.unix.udp()) + u = assert(socket.unix.dgram()) assert(u:bind("/tmp/foo")) while 1 do x, r = assert(u:receivefrom()) diff --git a/test/unixtcpclnt.lua b/test/unixstreamclnt.lua similarity index 82% rename from test/unixtcpclnt.lua rename to test/unixstreamclnt.lua index 652a680..4f2e1e3 100644 --- a/test/unixtcpclnt.lua +++ b/test/unixstreamclnt.lua @@ -1,6 +1,6 @@ socket = require"socket" socket.unix = require"socket.unix" -c = assert(socket.unix.tcp()) +c = assert(socket.unix.stream()) assert(c:connect("/tmp/foo")) while 1 do local l = io.read() diff --git a/test/unixtcpsrvr.lua b/test/unixstreamsrvr.lua similarity index 84% rename from test/unixtcpsrvr.lua rename to test/unixstreamsrvr.lua index 2a2b065..0a5c644 100644 --- a/test/unixtcpsrvr.lua +++ b/test/unixstreamsrvr.lua @@ -1,6 +1,6 @@ socket = require"socket" socket.unix = require"socket.unix" - u = assert(socket.unix.tcp()) + u = assert(socket.unix.stream()) assert(u:bind("/tmp/foo")) assert(u:listen()) c = assert(u:accept()) From 3041a808c3797e3c87272d71666e7b2f7c7a9f46 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Wed, 25 Jan 2017 12:43:29 +0100 Subject: [PATCH 035/194] Create socket on first sendto if family agnostic udp() was used Create socket and set family on first sendto() if udp() was created without address family. Signed-off-by: Natanael Copa --- src/udp.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/src/udp.c b/src/udp.c index ec97252..605c195 100644 --- a/src/udp.c +++ b/src/udp.c @@ -189,6 +189,27 @@ static int meth_sendto(lua_State *L) { lua_pushstring(L, gai_strerror(err)); return 2; } + + /* create socket if on first sendto if AF_UNSPEC was set */ + if (udp->family == AF_UNSPEC && udp->sock == SOCKET_INVALID) { + struct addrinfo *ap; + const char *errstr = NULL; + for (ap = ai; ap != NULL; ap = ap->ai_next) { + errstr = inet_trycreate(&udp->sock, ap->ai_family, SOCK_DGRAM, 0); + if (errstr == NULL) { + socket_setnonblocking(&udp->sock); + udp->family = ap->ai_family; + break; + } + } + if (errstr != NULL) { + lua_pushnil(L); + lua_pushstring(L, errstr); + freeaddrinfo(ai); + return 2; + } + } + timeout_markstart(tm); err = socket_sendto(&udp->sock, data, count, &sent, ai->ai_addr, (socklen_t) ai->ai_addrlen, tm); From ea0064625b2a4cf279977477fe2ca627afbd5ad0 Mon Sep 17 00:00:00 2001 From: Courtney Bane Date: Wed, 25 Jan 2017 18:04:35 -0600 Subject: [PATCH 036/194] Add backwards compatibility wrappers for socket.unix Add backwards compatibility aliases "tcp" and "udp" for the recently renamed "stream" and "dgram" functions, as well as a wrapper function and metatable setup so that socket.unix() calls socket.unix.stream(). --- src/unix.c | 50 +++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 45 insertions(+), 5 deletions(-) diff --git a/src/unix.c b/src/unix.c index e604733..dbc8710 100644 --- a/src/unix.c +++ b/src/unix.c @@ -17,14 +17,54 @@ static const luaL_Reg mod[] = { {NULL, NULL} }; +static void add_alias(lua_State *L, int index, const char *name, const char *target) +{ + lua_getfield(L, index, target); + lua_setfield(L, index, name); +} + +static int compat_socket_unix_call(lua_State *L) +{ + /* Look up socket.unix.stream in the socket.unix table (which is the first + * argument). */ + lua_getfield(L, 1, "stream"); + + /* Replace the stack entry for the socket.unix table with the + * socket.unix.stream function. */ + lua_replace(L, 1); + + /* Call socket.unix.stream, passing along any arguments. */ + int n = lua_gettop(L); + lua_call(L, n-1, LUA_MULTRET); + + /* Pass along the return values from socket.unix.stream. */ + n = lua_gettop(L); + return n; +} + /*-------------------------------------------------------------------------*\ * Initializes module \*-------------------------------------------------------------------------*/ int luaopen_socket_unix(lua_State *L) { - int i; - lua_newtable(L); - for (i = 0; mod[i].name; i++) mod[i].func(L); - return 1; -} + int i; + lua_newtable(L); + int socket_unix_table = lua_gettop(L); + for (i = 0; mod[i].name; i++) + mod[i].func(L); + + /* Add backwards compatibility aliases "tcp" and "udp" for the "stream" and + * "dgram" functions. */ + add_alias(L, socket_unix_table, "tcp", "stream"); + add_alias(L, socket_unix_table, "udp", "dgram"); + + /* Add a backwards compatibility function and a metatable setup to call it + * for the old socket.unix() interface. */ + lua_pushcfunction(L, compat_socket_unix_call); + lua_setfield(L, socket_unix_table, "__call"); + lua_pushvalue(L, socket_unix_table); + lua_setmetatable(L, socket_unix_table); + + return 1; +} From 860da0f4b4d9d6ca647ff0a3b15389b41557dec4 Mon Sep 17 00:00:00 2001 From: LordHelmchen Date: Thu, 16 Mar 2017 16:33:28 +0100 Subject: [PATCH 037/194] make protect_segment in url.lua rfc compliant percent-encode uppercase see https://tools.ietf.org/html/rfc3986#section-6.2.2 --- src/url.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/url.lua b/src/url.lua index b59960a..3290ce7 100644 --- a/src/url.lua +++ b/src/url.lua @@ -59,7 +59,7 @@ local segment_set = make_set { local function protect_segment(s) return string.gsub(s, "([^A-Za-z0-9_])", function (c) if segment_set[c] then return c - else return string.format("%%%02x", string.byte(c)) end + else return string.format("%%%02X", string.byte(c)) end end) end From 16bb5487464be076136cc230e5b46754e03d559c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Perrad?= Date: Thu, 16 Mar 2017 16:57:17 +0100 Subject: [PATCH 038/194] fix for Lua 5.3 built without number / string conversion This kind of Lua could be built with this command: ``` hererocks --lua 5.3 --cflags="-DLUA_NOCVTN2S -DLUA_NOCVTS2N" ``` --- src/url.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/url.lua b/src/url.lua index b59960a..eb094d5 100644 --- a/src/url.lua +++ b/src/url.lua @@ -193,7 +193,7 @@ function _M.build(parsed) if string.find(authority, ":") then -- IPv6? authority = "[" .. authority .. "]" end - if parsed.port then authority = authority .. ":" .. parsed.port end + if parsed.port then authority = authority .. ":" .. base.tostring(parsed.port) end local userinfo = parsed.userinfo if parsed.user then userinfo = parsed.user From 44fb9e911281a2ff2c032cd20959ad91a1f470b4 Mon Sep 17 00:00:00 2001 From: LordHelmchen Date: Thu, 16 Mar 2017 17:53:02 +0100 Subject: [PATCH 039/194] correct typo --- src/url.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/url.lua b/src/url.lua index 3290ce7..fb333b1 100644 --- a/src/url.lua +++ b/src/url.lua @@ -49,7 +49,7 @@ local function make_set(t) return s end --- these are allowed withing a path segment, along with alphanum +-- these are allowed within a path segment, along with alphanum -- other characters must be escaped local segment_set = make_set { "-", "_", ".", "!", "~", "*", "'", "(", From 1b4debffee52e69a2d523cea5d2c308e7cb3b187 Mon Sep 17 00:00:00 2001 From: Diego Nehab Date: Mon, 20 Mar 2017 15:50:47 -0300 Subject: [PATCH 040/194] Fix issue #196 --- src/unixdgram.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/unixdgram.c b/src/unixdgram.c index c07cbd5..4645892 100644 --- a/src/unixdgram.c +++ b/src/unixdgram.c @@ -206,6 +206,7 @@ static int meth_receivefrom(lua_State *L) { lua_pushliteral(L, "out of memory"); return 2; } + addr.sun_path[0] = '\0'; err = socket_recvfrom(&un->sock, dgram, wanted, &got, (SA *) &addr, &addr_len, tm); /* Unlike STREAM, recv() of zero is not closed, but a zero-length packet. */ From 47e644031fed0ced1066ff843c9b42d45b54042d Mon Sep 17 00:00:00 2001 From: Diego Nehab Date: Mon, 20 Mar 2017 16:56:15 -0300 Subject: [PATCH 041/194] Preserve path when parsing urls. --- src/url.lua | 5 +++-- test/auth/.htaccess | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/url.lua b/src/url.lua index eb094d5..1e5a3f6 100644 --- a/src/url.lua +++ b/src/url.lua @@ -183,8 +183,9 @@ end -- a stringing with the corresponding URL ----------------------------------------------------------------------------- function _M.build(parsed) - local ppath = _M.parse_path(parsed.path or "") - local url = _M.build_path(ppath) + --local ppath = _M.parse_path(parsed.path or "") + --local url = _M.build_path(ppath) + local url = parsed.path or "" if parsed.params then url = url .. ";" .. parsed.params end if parsed.query then url = url .. "?" .. parsed.query end local authority = parsed.authority diff --git a/test/auth/.htaccess b/test/auth/.htaccess index bb2794a..2509ae3 100644 --- a/test/auth/.htaccess +++ b/test/auth/.htaccess @@ -1,4 +1,4 @@ AuthName "test-auth" AuthType Basic - AuthUserFile /Users/diego/impa/luasocket/test/auth/.htpasswd + AuthUserFile /home/diego/impa/luasocket/test/auth/.htpasswd Require valid-user From aef7bcf2882263d4b56dd3f6ed4707193719f3d8 Mon Sep 17 00:00:00 2001 From: Elliptica Date: Mon, 17 Apr 2017 18:47:48 +0300 Subject: [PATCH 042/194] Fix typo --- src/usocket.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/usocket.c b/src/usocket.c index 8adc573..6e7f8f6 100644 --- a/src/usocket.c +++ b/src/usocket.c @@ -76,7 +76,7 @@ int socket_waitfd(p_socket ps, int sw, p_timeout tm) { * Initializes module \*-------------------------------------------------------------------------*/ int socket_open(void) { - /* instals a handler to ignore sigpipe or it will crash us */ + /* installs a handler to ignore sigpipe or it will crash us */ signal(SIGPIPE, SIG_IGN); return 1; } From 053c032a709750dc67ff458dcf562402972ec4b1 Mon Sep 17 00:00:00 2001 From: Pieter De Gendt Date: Mon, 4 Sep 2017 10:26:11 +0200 Subject: [PATCH 043/194] mime.lua: Obsolete require("io") The `io` package is included but never used. --- src/mime.lua | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/mime.lua b/src/mime.lua index 642cd9c..d3abac5 100644 --- a/src/mime.lua +++ b/src/mime.lua @@ -10,7 +10,6 @@ local base = _G local ltn12 = require("ltn12") local mime = require("mime.core") -local io = require("io") local string = require("string") local _M = mime @@ -87,4 +86,4 @@ function _M.stuff() return ltn12.filter.cycle(_M.dot, 2) end -return _M \ No newline at end of file +return _M From 3ee89515a0ef4852f64b13133c22aa7d3a322cfd Mon Sep 17 00:00:00 2001 From: Herbert Leuwer Date: Sun, 19 Nov 2017 19:48:37 +0100 Subject: [PATCH 044/194] fixed URL parsing in url.lua: parse fragment after parsing username and password. --- src/url.lua | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/url.lua b/src/url.lua index d61111e..6448853 100644 --- a/src/url.lua +++ b/src/url.lua @@ -131,11 +131,6 @@ function _M.parse(url, default) if not url or url == "" then return nil, "invalid url" end -- remove whitespace -- url = string.gsub(url, "%s", "") - -- get fragment - url = string.gsub(url, "#(.*)$", function(f) - parsed.fragment = f - return "" - end) -- get scheme url = string.gsub(url, "^([%w][%w%+%-%.]*)%:", function(s) parsed.scheme = s; return "" end) @@ -149,6 +144,11 @@ function _M.parse(url, default) parsed.query = q return "" end) + -- get fragment + url = string.gsub(url, "#(.*)$", function(f) + parsed.fragment = f + return "" + end) -- get params url = string.gsub(url, "%;(.*)", function(p) parsed.params = p From 2d6a0f7bda9241f827a3edbfa738603c024a423b Mon Sep 17 00:00:00 2001 From: Herbert Leuwer Date: Wed, 22 Nov 2017 09:30:12 +0100 Subject: [PATCH 045/194] fixed url parsing; postpone fragment parsing after authority parsing; added test cases to test/urltest.lua fixed reference patterns in check_protect() to upper case hex letters --- src/url.lua | 10 +++---- test/urltest.lua | 75 ++++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 77 insertions(+), 8 deletions(-) diff --git a/src/url.lua b/src/url.lua index 6448853..110ea94 100644 --- a/src/url.lua +++ b/src/url.lua @@ -139,16 +139,16 @@ function _M.parse(url, default) parsed.authority = n return "" end) - -- get query string - url = string.gsub(url, "%?(.*)", function(q) - parsed.query = q - return "" - end) -- get fragment url = string.gsub(url, "#(.*)$", function(f) parsed.fragment = f return "" end) + -- get query string + url = string.gsub(url, "%?(.*)", function(q) + parsed.query = q + return "" + end) -- get params url = string.gsub(url, "%;(.*)", function(p) parsed.params = p diff --git a/test/urltest.lua b/test/urltest.lua index 32cb348..1090a7e 100644 --- a/test/urltest.lua +++ b/test/urltest.lua @@ -90,6 +90,75 @@ local check_parse_url = function(gaba) end print("testing URL parsing") +check_parse_url{ + url = "scheme://user:pass$%?#wd@host:port/path;params?query#fragment", + scheme = "scheme", + authority = "user:pass$%?#wd@host:port", + host = "host", + port = "port", + userinfo = "user:pass$%?#wd", + password = "pass$%?#wd", + user = "user", + path = "/path", + params = "params", + query = "query", + fragment = "fragment" +} +check_parse_url{ + url = "scheme://user:pass?#wd@host:port/path;params?query#fragment", + scheme = "scheme", + authority = "user:pass?#wd@host:port", + host = "host", + port = "port", + userinfo = "user:pass?#wd", + password = "pass?#wd", + user = "user", + path = "/path", + params = "params", + query = "query", + fragment = "fragment" +} +check_parse_url{ + url = "scheme://user:pass-wd@host:port/path;params?query#fragment", + scheme = "scheme", + authority = "user:pass-wd@host:port", + host = "host", + port = "port", + userinfo = "user:pass-wd", + password = "pass-wd", + user = "user", + path = "/path", + params = "params", + query = "query", + fragment = "fragment" +} +check_parse_url{ + url = "scheme://user:pass#wd@host:port/path;params?query#fragment", + scheme = "scheme", + authority = "user:pass#wd@host:port", + host = "host", + port = "port", + userinfo = "user:pass#wd", + password = "pass#wd", + user = "user", + path = "/path", + params = "params", + query = "query", + fragment = "fragment" +} +check_parse_url{ + url = "scheme://user:pass#wd@host:port/path;params?query", + scheme = "scheme", + authority = "user:pass#wd@host:port", + host = "host", + port = "port", + userinfo = "user:pass#wd", + password = "pass#wd", + user = "user", + path = "/path", + params = "params", + query = "query", +} check_parse_url{ url = "scheme://userinfo@host:port/path;params?query#fragment", scheme = "scheme", @@ -608,9 +677,9 @@ check_parse_path("eu/tu", { "eu", "tu" }) print("testing path protection") check_protect({ "eu", "-_.!~*'():@&=+$,", "tu" }, "eu/-_.!~*'():@&=+$,/tu") check_protect({ "eu ", "~diego" }, "eu%20/~diego") -check_protect({ "/eu>", "", "", "/ Date: Fri, 22 Dec 2017 16:57:20 -0700 Subject: [PATCH 046/194] src/options.c: increase buffer from 45 to 57, to accommodate string sizes specified (detected by gcc7's -Wstringpop-overflow) --- src/options.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/options.c b/src/options.c index 20f4c28..fabfe8c 100644 --- a/src/options.c +++ b/src/options.c @@ -37,7 +37,7 @@ int opt_meth_setoption(lua_State *L, p_opt opt, p_socket ps) while (opt->name && strcmp(name, opt->name)) opt++; if (!opt->func) { - char msg[45]; + char msg[57]; sprintf(msg, "unsupported option `%.35s'", name); luaL_argerror(L, 2, msg); } @@ -50,7 +50,7 @@ int opt_meth_getoption(lua_State *L, p_opt opt, p_socket ps) while (opt->name && strcmp(name, opt->name)) opt++; if (!opt->func) { - char msg[45]; + char msg[57]; sprintf(msg, "unsupported option `%.35s'", name); luaL_argerror(L, 2, msg); } From 97bfe1e0437e5f31d47e1fa3bd2e8784a862482d Mon Sep 17 00:00:00 2001 From: surenyi Date: Sun, 25 Mar 2018 14:58:10 +0800 Subject: [PATCH 047/194] add options: get/set : recv-buffer-size get/set : send-buffer-size Signed-off-by: surenyi --- src/options.c | 20 ++++++++++++++++++++ src/options.h | 4 ++++ src/tcp.c | 4 ++++ src/udp.c | 4 ++++ 4 files changed, 32 insertions(+) diff --git a/src/options.c b/src/options.c index fabfe8c..fe4e9bb 100644 --- a/src/options.c +++ b/src/options.c @@ -115,6 +115,26 @@ int opt_set_broadcast(lua_State *L, p_socket ps) return opt_setboolean(L, ps, SOL_SOCKET, SO_BROADCAST); } +int opt_set_recv_buf_size(lua_State *L, p_socket ps) +{ + return opt_setint(L, ps, SOL_SOCKET, SO_RCVBUF); +} + +int opt_get_recv_buf_size(lua_State *L, p_socket ps) +{ + return opt_getint(L, ps, SOL_SOCKET, SO_RCVBUF); +} + +int opt_get_send_buf_size(lua_State *L, p_socket ps) +{ + return opt_getint(L, ps, SOL_SOCKET, SO_SNDBUF); +} + +int opt_set_send_buf_size(lua_State *L, p_socket ps) +{ + return opt_setint(L, ps, SOL_SOCKET, SO_SNDBUF); +} + int opt_get_broadcast(lua_State *L, p_socket ps) { return opt_getboolean(L, ps, SOL_SOCKET, SO_BROADCAST); diff --git a/src/options.h b/src/options.h index 19ba0df..4530389 100644 --- a/src/options.h +++ b/src/options.h @@ -37,6 +37,8 @@ int opt_set_ip6_multicast_loop(lua_State *L, p_socket ps); int opt_set_ip6_add_membership(lua_State *L, p_socket ps); int opt_set_ip6_drop_membersip(lua_State *L, p_socket ps); int opt_set_ip6_v6only(lua_State *L, p_socket ps); +int opt_set_recv_buf_size(lua_State *L, p_socket ps); +int opt_set_send_buf_size(lua_State *L, p_socket ps); /* supported options for getoption */ int opt_get_dontroute(lua_State *L, p_socket ps); @@ -54,6 +56,8 @@ int opt_get_ip6_multicast_hops(lua_State *L, p_socket ps); int opt_get_ip6_unicast_hops(lua_State *L, p_socket ps); int opt_get_ip6_v6only(lua_State *L, p_socket ps); int opt_get_reuseport(lua_State *L, p_socket ps); +int opt_get_recv_buf_size(lua_State *L, p_socket ps); +int opt_get_send_buf_size(lua_State *L, p_socket ps); /* invokes the appropriate option handler */ int opt_meth_setoption(lua_State *L, p_opt opt, p_socket ps); diff --git a/src/tcp.c b/src/tcp.c index ef9ee6f..f64cb10 100644 --- a/src/tcp.c +++ b/src/tcp.c @@ -79,6 +79,8 @@ static t_opt optget[] = { {"tcp-nodelay", opt_get_tcp_nodelay}, {"linger", opt_get_linger}, {"error", opt_get_error}, + {"recv-buffer-size", opt_get_recv_buf_size}, + {"send-buffer-size", opt_get_send_buf_size}, {NULL, NULL} }; @@ -89,6 +91,8 @@ static t_opt optset[] = { {"tcp-nodelay", opt_set_tcp_nodelay}, {"ipv6-v6only", opt_set_ip6_v6only}, {"linger", opt_set_linger}, + {"recv-buffer-size", opt_set_recv_buf_size}, + {"send-buffer-size", opt_set_send_buf_size}, {NULL, NULL} }; diff --git a/src/udp.c b/src/udp.c index 605c195..037f9a4 100644 --- a/src/udp.c +++ b/src/udp.c @@ -88,6 +88,8 @@ static t_opt optset[] = { {"ipv6-add-membership", opt_set_ip6_add_membership}, {"ipv6-drop-membership", opt_set_ip6_drop_membersip}, {"ipv6-v6only", opt_set_ip6_v6only}, + {"recv-buffer-size", opt_set_recv_buf_size}, + {"send-buffer-size", opt_set_send_buf_size}, {NULL, NULL} }; @@ -104,6 +106,8 @@ static t_opt optget[] = { {"ipv6-multicast-hops", opt_get_ip6_unicast_hops}, {"ipv6-multicast-loop", opt_get_ip6_multicast_loop}, {"ipv6-v6only", opt_get_ip6_v6only}, + {"recv-buffer-size", opt_get_recv_buf_size}, + {"send-buffer-size", opt_get_send_buf_size}, {NULL, NULL} }; From 4a3504612cda28f25ab777db94bfeab55e081e16 Mon Sep 17 00:00:00 2001 From: xyida <522918670@qq.com> Date: Thu, 26 Apr 2018 16:39:29 +0800 Subject: [PATCH 048/194] Fixed an issue that was mistaken for HTTP 0.9 when timeout --- src/http.lua | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/http.lua b/src/http.lua index a386165..79a931c 100644 --- a/src/http.lua +++ b/src/http.lua @@ -147,10 +147,15 @@ function metat.__index:sendbody(headers, source, step) end function metat.__index:receivestatusline() - local status = self.try(self.c:receive(5)) + local status,ec = self.try(self.c:receive(5)) -- identify HTTP/0.9 responses, which do not contain a status line -- this is just a heuristic, but is what the RFC recommends - if status ~= "HTTP/" then return nil, status end + if status ~= "HTTP/" then + if ec == "timeout" then + return 408 + end + return nil, status + end -- otherwise proceed reading a status line status = self.try(self.c:receive("*l", status)) local code = socket.skip(2, string.find(status, "HTTP/%d*%.%d* (%d%d%d)")) @@ -325,6 +330,8 @@ end if not code then h:receive09body(status, nreqt.sink, nreqt.step) return 1, 200 + elseif code == 408 then + return 1, code end local headers -- ignore any 100-continue messages From e1e41be948196a98af67345d51fe7a238c850c54 Mon Sep 17 00:00:00 2001 From: George Zhao Date: Sun, 3 Jun 2018 20:08:02 +0800 Subject: [PATCH 049/194] Update auxiliar.c --- src/auxiliar.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/auxiliar.c b/src/auxiliar.c index 18fa8e4..5251549 100644 --- a/src/auxiliar.c +++ b/src/auxiliar.c @@ -143,7 +143,7 @@ void *auxiliar_getgroupudata(lua_State *L, const char *groupname, int objidx) { * otherwise \*-------------------------------------------------------------------------*/ void *auxiliar_getclassudata(lua_State *L, const char *classname, int objidx) { - return luaL_checkudata(L, objidx, classname); + return luaL_testudata(L, objidx, classname); } /*-------------------------------------------------------------------------*\ From 5848de4851619a757951f3ef041c1e71691b6a97 Mon Sep 17 00:00:00 2001 From: "E. Westbrook" Date: Mon, 4 Jun 2018 20:14:13 -0600 Subject: [PATCH 050/194] src/compat.c: provide luaL_testudata() for use by auxiliar.c under Lua 5.1 --- src/compat.c | 18 ++++++++++++++++++ src/compat.h | 1 + 2 files changed, 19 insertions(+) diff --git a/src/compat.c b/src/compat.c index c2d99cb..988fa68 100644 --- a/src/compat.c +++ b/src/compat.c @@ -16,4 +16,22 @@ void luaL_setfuncs (lua_State *L, const luaL_Reg *l, int nup) { } lua_pop(L, nup); /* remove upvalues */ } + +/* +** Duplicated from Lua 5.2 +*/ +void *luaL_testudata (lua_State *L, int ud, const char *tname) { + void *p = lua_touserdata(L, ud); + if (p != NULL) { /* value is a userdata? */ + if (lua_getmetatable(L, ud)) { /* does it have a metatable? */ + luaL_getmetatable(L, tname); /* get correct metatable */ + if (!lua_rawequal(L, -1, -2)) /* not the same? */ + p = NULL; /* value is a userdata with wrong metatable */ + lua_pop(L, 2); /* remove both metatables */ + return p; + } + } + return NULL; /* value is not a userdata with a metatable */ +} + #endif diff --git a/src/compat.h b/src/compat.h index 7bf8010..e2ab307 100644 --- a/src/compat.h +++ b/src/compat.h @@ -6,6 +6,7 @@ #if LUA_VERSION_NUM==501 void luaL_setfuncs (lua_State *L, const luaL_Reg *l, int nup); +void *luaL_testudata ( lua_State *L, int arg, const char *tname); #endif #endif From 8fee6363093611302af3af5139eba9716267f03b Mon Sep 17 00:00:00 2001 From: "E. Westbrook" Date: Mon, 4 Jun 2018 23:23:39 -0600 Subject: [PATCH 051/194] Add ltn12.source.table() --- doc/ltn12.html | 10 ++++++++++ doc/reference.html | 3 ++- src/ltn12.lua | 10 ++++++++++ test/ltn12test.lua | 9 +++++++++ 4 files changed, 31 insertions(+), 1 deletion(-) diff --git a/doc/ltn12.html b/doc/ltn12.html index 54e66fb..ee2502f 100644 --- a/doc/ltn12.html +++ b/doc/ltn12.html @@ -405,6 +405,16 @@ Creates and returns a source that produces the contents of a string, chunk by chunk.

    + + +

    +ltn12.source.table(table) +

    + +

    +Creates and returns a source that produces the numerically-indexed values of a table successively beginning at 1. The source returns nil (end-of-stream) whenever a nil value is produced by the current index, which proceeds forward regardless. +

    +
    diff --git a/doc/reference.html b/doc/reference.html index 287dc19..163a8a2 100644 --- a/doc/reference.html +++ b/doc/reference.html @@ -99,7 +99,8 @@ Support, Manual"> error, file, simplify, -string. +string, +table. diff --git a/src/ltn12.lua b/src/ltn12.lua index 575c5a7..afa735d 100644 --- a/src/ltn12.lua +++ b/src/ltn12.lua @@ -128,6 +128,16 @@ function source.string(s) else return source.empty() end end +-- creates table source +function source.table(t) + base.assert('table' == type(t)) + local i = 0 + return function() + i = i + 1 + return t[i] + end +end + -- creates rewindable source function source.rewind(src) base.assert(src) diff --git a/test/ltn12test.lua b/test/ltn12test.lua index e3f85fb..e7d368d 100644 --- a/test/ltn12test.lua +++ b/test/ltn12test.lua @@ -180,6 +180,15 @@ assert(ltn12.pump.all(source, sink), "returned error") assert(table.concat(t) == s, "mismatch") print("ok") +-------------------------------- +io.write("testing source.table: ") +local inp = {'a','b','c','d','e'} +local source = ltn12.source.table(inp) +sink, t = ltn12.sink.table() +assert(ltn12.pump.all(source, sink), "returned error") +for i = 1, #inp do assert(t[i] == inp[i], "mismatch") end +print("ok") + -------------------------------- io.write("testing source.chain (with split): ") source = ltn12.source.string(s) From 9b82c7871d8d9a8561812d5c2d5a67e151d8fcb6 Mon Sep 17 00:00:00 2001 From: Joris Clement Date: Mon, 6 Aug 2018 15:30:13 +0200 Subject: [PATCH 052/194] Fix gcc-8.1.0 warning. --- src/mime.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/mime.c b/src/mime.c index ed44104..db356fc 100644 --- a/src/mime.c +++ b/src/mime.c @@ -689,6 +689,7 @@ static size_t dot(int c, size_t state, luaL_Buffer *buffer) case '.': if (state == 2) luaL_addchar(buffer, '.'); + /* Falls through. */ default: return 0; } From 17a95c126a178b17292637785c6ec09bb1180493 Mon Sep 17 00:00:00 2001 From: "E. Westbrook" Date: Sun, 19 Aug 2018 11:32:42 -0600 Subject: [PATCH 053/194] url.lua:absolute_path(): fix issue #254, simplify, add more test cases --- src/url.lua | 26 ++++++++++++-------------- test/urltest.lua | 25 ++++++++++++++++++++++++- 2 files changed, 36 insertions(+), 15 deletions(-) diff --git a/src/url.lua b/src/url.lua index 110ea94..29b6734 100644 --- a/src/url.lua +++ b/src/url.lua @@ -88,20 +88,18 @@ local function absolute_path(base_path, relative_path) if string.sub(relative_path, 1, 1) == "/" then return relative_path end local path = string.gsub(base_path, "[^/]*$", "") path = path .. relative_path - path = string.gsub(path, "([^/]*%./)", function (s) - if s ~= "./" then return s else return "" end - end) - path = string.gsub(path, "/%.$", "/") - local reduced - while reduced ~= path do - reduced = path - path = string.gsub(reduced, "([^/]*/%.%./)", function (s) - if s ~= "../../" then return "" else return s end - end) - end - path = string.gsub(reduced, "([^/]*/%.%.)$", function (s) - if s ~= "../.." then return "" else return s end - end) + repeat + local was = path + path = path:gsub('/%./', '/') + until path == was + repeat + local was = path + path = path:gsub('[^/]+/%.%./([^/]+)', '%1') + until path == was + path = path:gsub('[^/]+/%.%./*$', '') + path = path:gsub('/%.%.$', '/') + path = path:gsub('/%.$', '/') + path = path:gsub('^/%.%.', '') return path end diff --git a/test/urltest.lua b/test/urltest.lua index 1090a7e..63a33ea 100644 --- a/test/urltest.lua +++ b/test/urltest.lua @@ -61,7 +61,7 @@ end local check_absolute_url = function(base, relative, absolute) local res = socket.url.absolute(base, relative) if res ~= absolute then - io.write("absolute: In test for '", relative, "' expected '", + io.write("absolute: In test for base='", base, "', rel='", relative, "' expected '", absolute, "' but got '", res, "'\n") os.exit() end @@ -637,6 +637,17 @@ check_absolute_url("http://a/b/c/d;p?q#f", "g;x", "http://a/b/c/g;x") check_absolute_url("http://a/b/c/d;p?q#f", "g;x?y#s", "http://a/b/c/g;x?y#s") check_absolute_url("http://a/b/c/d;p?q#f", ".", "http://a/b/c/") check_absolute_url("http://a/b/c/d;p?q#f", "./", "http://a/b/c/") +check_absolute_url("http://a/b/c/d;p?q#f", "./g", "http://a/b/c/g") +check_absolute_url("http://a/b/c/d;p?q#f", "./g/", "http://a/b/c/g/") +check_absolute_url("http://a/b/c/d;p?q#f", "././g", "http://a/b/c/g") +check_absolute_url("http://a/b/c/d;p?q#f", "././g/", "http://a/b/c/g/") +check_absolute_url("http://a/b/c/d;p?q#f", "g/.", "http://a/b/c/g/") +check_absolute_url("http://a/b/c/d;p?q#f", "g/./", "http://a/b/c/g/") +check_absolute_url("http://a/b/c/d;p?q#f", "g/./.", "http://a/b/c/g/") +check_absolute_url("http://a/b/c/d;p?q#f", "g/././", "http://a/b/c/g/") +check_absolute_url("http://a/b/c/d;p?q#f", "./.", "http://a/b/c/") +check_absolute_url("http://a/b/c/d;p?q#f", "././.", "http://a/b/c/") +check_absolute_url("http://a/b/c/d;p?q#f", "././g/./.", "http://a/b/c/g/") check_absolute_url("http://a/b/c/d;p?q#f", "..", "http://a/b/") check_absolute_url("http://a/b/c/d;p?q#f", "../", "http://a/b/") check_absolute_url("http://a/b/c/d;p?q#f", "../g", "http://a/b/g") @@ -655,6 +666,17 @@ check_absolute_url("http://a/b/c/d;p?q#f", "./g/.", "http://a/b/c/g/") check_absolute_url("http://a/b/c/d;p?q#f", "g/./h", "http://a/b/c/g/h") check_absolute_url("http://a/b/c/d;p?q#f", "g/../h", "http://a/b/c/h") +check_absolute_url("http://a/b/c/d:p?q#f/", "../g/", "http://a/b/g/") +check_absolute_url("http://a/b/c/d:p?q#f/", "../g", "http://a/b/g") +check_absolute_url("http://a/b/c/d:p?q#f/", "../.g/", "http://a/b/.g/") +check_absolute_url("http://a/b/c/d:p?q#f/", "../.g", "http://a/b/.g") +check_absolute_url("http://a/b/c/d:p?q#f/", "../.g.h/", "http://a/b/.g.h/") +check_absolute_url("http://a/b/c/d:p?q#f/", "../.g.h", "http://a/b/.g.h") + +check_absolute_url("http://a/b/c/d:p?q#f/", "g.h/", "http://a/b/c/g.h/") +check_absolute_url("http://a/b/c/d:p?q#f/", "../g.h/", "http://a/b/g.h/") +check_absolute_url("http://a/", "../g.h/", "http://a/g.h/") + -- extra tests check_absolute_url("//a/b/c/d;p?q#f", "d/e/f", "//a/b/c/d/e/f") check_absolute_url("/a/b/c/d;p?q#f", "d/e/f", "/a/b/c/d/e/f") @@ -662,6 +684,7 @@ check_absolute_url("a/b/c/d", "d/e/f", "a/b/c/d/e/f") check_absolute_url("a/b/c/d/../", "d/e/f", "a/b/c/d/e/f") check_absolute_url("http://velox.telemar.com.br", "/dashboard/index.html", "http://velox.telemar.com.br/dashboard/index.html") +check_absolute_url("http://example.com/", "../.badhost.com/", "http://example.com/.badhost.com/") print("testing path parsing and composition") check_parse_path("/eu/tu/ele", { "eu", "tu", "ele"; is_absolute = 1 }) From c905b5d44f8cdfbc8110a9a7d1d62c08b5703ae3 Mon Sep 17 00:00:00 2001 From: "E. Westbrook" Date: Tue, 21 Aug 2018 08:03:51 -0600 Subject: [PATCH 054/194] url.lua: separate remove_dot_components() from absolute_path(); also use in _M.absolute() even when not merging --- src/url.lua | 55 +++++++++++++++++++++++++++++++----------------- test/urltest.lua | 8 +++---- 2 files changed, 40 insertions(+), 23 deletions(-) diff --git a/src/url.lua b/src/url.lua index 29b6734..a354ab5 100644 --- a/src/url.lua +++ b/src/url.lua @@ -76,6 +76,28 @@ function _M.unescape(s) end)) end +----------------------------------------------------------------------------- +-- Removes '..' and '.' components appropriately from a path. +-- Input +-- path +-- Returns +-- dot-normalized path +local function remove_dot_components(path) + repeat + local was = path + path = path:gsub('/%./', '/') + until path == was + repeat + local was = path + path = path:gsub('[^/]+/%.%./([^/]+)', '%1') + until path == was + path = path:gsub('[^/]+/%.%./*$', '') + path = path:gsub('/%.%.$', '/') + path = path:gsub('/%.$', '/') + path = path:gsub('^/%.%.', '') + return path +end + ----------------------------------------------------------------------------- -- Builds a path from a base path and a relative path -- Input @@ -85,21 +107,11 @@ end -- corresponding absolute path ----------------------------------------------------------------------------- local function absolute_path(base_path, relative_path) - if string.sub(relative_path, 1, 1) == "/" then return relative_path end - local path = string.gsub(base_path, "[^/]*$", "") - path = path .. relative_path - repeat - local was = path - path = path:gsub('/%./', '/') - until path == was - repeat - local was = path - path = path:gsub('[^/]+/%.%./([^/]+)', '%1') - until path == was - path = path:gsub('[^/]+/%.%./*$', '') - path = path:gsub('/%.%.$', '/') - path = path:gsub('/%.$', '/') - path = path:gsub('^/%.%.', '') + if string.sub(relative_path, 1, 1) == "/" then + return remove_dot_components(relative_path) end + base_path = base_path:gsub("[^/]*$", "") + local path = base_path .. relative_path + path = remove_dot_components(path) return path end @@ -225,10 +237,14 @@ function _M.absolute(base_url, relative_url) else base_parsed = _M.parse(base_url) end + local result local relative_parsed = _M.parse(relative_url) - if not base_parsed then return relative_url - elseif not relative_parsed then return base_url - elseif relative_parsed.scheme then return relative_url + if not base_parsed then + result = relative_url + elseif not relative_parsed then + result = base_url + elseif relative_parsed.scheme then + result = relative_url else relative_parsed.scheme = base_parsed.scheme if not relative_parsed.authority then @@ -246,8 +262,9 @@ function _M.absolute(base_url, relative_url) relative_parsed.path) end end - return _M.build(relative_parsed) + result = _M.build(relative_parsed) end + return remove_dot_components(result) end ----------------------------------------------------------------------------- diff --git a/test/urltest.lua b/test/urltest.lua index 63a33ea..649be88 100644 --- a/test/urltest.lua +++ b/test/urltest.lua @@ -627,10 +627,10 @@ check_absolute_url("http://a/b/c/d;p?q#f", "/g", "http://a/g") check_absolute_url("http://a/b/c/d;p?q#f", "//g", "http://g") check_absolute_url("http://a/b/c/d;p?q#f", "?y", "http://a/b/c/d;p?y") check_absolute_url("http://a/b/c/d;p?q#f", "g?y", "http://a/b/c/g?y") -check_absolute_url("http://a/b/c/d;p?q#f", "g?y/./x", "http://a/b/c/g?y/./x") +check_absolute_url("http://a/b/c/d;p?q#f", "g?y/./x", "http://a/b/c/g?y/x") check_absolute_url("http://a/b/c/d;p?q#f", "#s", "http://a/b/c/d;p?q#s") check_absolute_url("http://a/b/c/d;p?q#f", "g#s", "http://a/b/c/g#s") -check_absolute_url("http://a/b/c/d;p?q#f", "g#s/./x", "http://a/b/c/g#s/./x") +check_absolute_url("http://a/b/c/d;p?q#f", "g#s/./x", "http://a/b/c/g#s/x") check_absolute_url("http://a/b/c/d;p?q#f", "g?y#s", "http://a/b/c/g?y#s") check_absolute_url("http://a/b/c/d;p?q#f", ";x", "http://a/b/c/d;x") check_absolute_url("http://a/b/c/d;p?q#f", "g;x", "http://a/b/c/g;x") @@ -655,8 +655,8 @@ check_absolute_url("http://a/b/c/d;p?q#f", "../..", "http://a/") check_absolute_url("http://a/b/c/d;p?q#f", "../../", "http://a/") check_absolute_url("http://a/b/c/d;p?q#f", "../../g", "http://a/g") check_absolute_url("http://a/b/c/d;p?q#f", "", "http://a/b/c/d;p?q#f") -check_absolute_url("http://a/b/c/d;p?q#f", "/./g", "http://a/./g") -check_absolute_url("http://a/b/c/d;p?q#f", "/../g", "http://a/../g") +check_absolute_url("http://a/b/c/d;p?q#f", "/./g", "http://a/g") +check_absolute_url("http://a/b/c/d;p?q#f", "/../g", "http://a/g") check_absolute_url("http://a/b/c/d;p?q#f", "g.", "http://a/b/c/g.") check_absolute_url("http://a/b/c/d;p?q#f", ".g", "http://a/b/c/.g") check_absolute_url("http://a/b/c/d;p?q#f", "g..", "http://a/b/c/g..") From c570a32c219c957fd405ed018f2500f06952c043 Mon Sep 17 00:00:00 2001 From: "E. Westbrook" Date: Tue, 21 Aug 2018 09:07:42 -0600 Subject: [PATCH 055/194] url.lua:remove_dot_components(): limit beginning-of-string double-dot corner case to prevent triple-dot activation and authority collision --- src/url.lua | 2 +- test/urltest.lua | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/url.lua b/src/url.lua index a354ab5..0d88adb 100644 --- a/src/url.lua +++ b/src/url.lua @@ -94,7 +94,7 @@ local function remove_dot_components(path) path = path:gsub('[^/]+/%.%./*$', '') path = path:gsub('/%.%.$', '/') path = path:gsub('/%.$', '/') - path = path:gsub('^/%.%.', '') + path = path:gsub('^/%.%./', '/') return path end diff --git a/test/urltest.lua b/test/urltest.lua index 649be88..8664fa6 100644 --- a/test/urltest.lua +++ b/test/urltest.lua @@ -685,6 +685,7 @@ check_absolute_url("a/b/c/d/../", "d/e/f", "a/b/c/d/e/f") check_absolute_url("http://velox.telemar.com.br", "/dashboard/index.html", "http://velox.telemar.com.br/dashboard/index.html") check_absolute_url("http://example.com/", "../.badhost.com/", "http://example.com/.badhost.com/") +check_absolute_url("http://example.com/", "...badhost.com/", "http://example.com/...badhost.com/") print("testing path parsing and composition") check_parse_path("/eu/tu/ele", { "eu", "tu", "ele"; is_absolute = 1 }) From 7ccea58776b8084f29a48610cb44b17ca604e4b5 Mon Sep 17 00:00:00 2001 From: "E. Westbrook" Date: Tue, 21 Aug 2018 09:59:45 -0600 Subject: [PATCH 056/194] url.lua:remove_dot_components(): avoid overconsuming dot segments --- src/url.lua | 4 ++-- test/urltest.lua | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/url.lua b/src/url.lua index 0d88adb..e1fa2bc 100644 --- a/src/url.lua +++ b/src/url.lua @@ -85,11 +85,11 @@ end local function remove_dot_components(path) repeat local was = path - path = path:gsub('/%./', '/') + path = path:gsub('/%./', '/', 1) until path == was repeat local was = path - path = path:gsub('[^/]+/%.%./([^/]+)', '%1') + path = path:gsub('[^/]+/%.%./([^/]+)', '%1', 1) until path == was path = path:gsub('[^/]+/%.%./*$', '') path = path:gsub('/%.%.$', '/') diff --git a/test/urltest.lua b/test/urltest.lua index 8664fa6..04b3c7f 100644 --- a/test/urltest.lua +++ b/test/urltest.lua @@ -654,6 +654,7 @@ check_absolute_url("http://a/b/c/d;p?q#f", "../g", "http://a/b/g") check_absolute_url("http://a/b/c/d;p?q#f", "../..", "http://a/") check_absolute_url("http://a/b/c/d;p?q#f", "../../", "http://a/") check_absolute_url("http://a/b/c/d;p?q#f", "../../g", "http://a/g") +check_absolute_url("http://a/b/c/d;p?q#f", "../../../g", "http://a/g") check_absolute_url("http://a/b/c/d;p?q#f", "", "http://a/b/c/d;p?q#f") check_absolute_url("http://a/b/c/d;p?q#f", "/./g", "http://a/g") check_absolute_url("http://a/b/c/d;p?q#f", "/../g", "http://a/g") @@ -686,6 +687,10 @@ check_absolute_url("http://velox.telemar.com.br", "/dashboard/index.html", "http://velox.telemar.com.br/dashboard/index.html") check_absolute_url("http://example.com/", "../.badhost.com/", "http://example.com/.badhost.com/") check_absolute_url("http://example.com/", "...badhost.com/", "http://example.com/...badhost.com/") +check_absolute_url("http://example.com/a/b/c/d/", "../q", "http://example.com/a/b/c/q") +check_absolute_url("http://example.com/a/b/c/d/", "../../q", "http://example.com/a/b/q") +check_absolute_url("http://example.com/a/b/c/d/", "../../../q", "http://example.com/a/q") +check_absolute_url("http://example.com/a/b/c/d/", "../../../../q", "http://example.com/q") print("testing path parsing and composition") check_parse_path("/eu/tu/ele", { "eu", "tu", "ele"; is_absolute = 1 }) From 5b862e6a3c79b8e336a0ac2f0d23ca69993b326d Mon Sep 17 00:00:00 2001 From: "E. Westbrook" Date: Tue, 21 Aug 2018 10:43:04 -0600 Subject: [PATCH 057/194] url.lua:absolute_path(): ensure a separator between base_path and relative_path --- src/url.lua | 1 + test/urltest.lua | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/url.lua b/src/url.lua index e1fa2bc..243ee1c 100644 --- a/src/url.lua +++ b/src/url.lua @@ -110,6 +110,7 @@ local function absolute_path(base_path, relative_path) if string.sub(relative_path, 1, 1) == "/" then return remove_dot_components(relative_path) end base_path = base_path:gsub("[^/]*$", "") + if not base_path:find'/$' then base_path = base_path .. '/' end local path = base_path .. relative_path path = remove_dot_components(path) return path diff --git a/test/urltest.lua b/test/urltest.lua index 04b3c7f..b6ee299 100644 --- a/test/urltest.lua +++ b/test/urltest.lua @@ -690,7 +690,7 @@ check_absolute_url("http://example.com/", "...badhost.com/", "http://example.com check_absolute_url("http://example.com/a/b/c/d/", "../q", "http://example.com/a/b/c/q") check_absolute_url("http://example.com/a/b/c/d/", "../../q", "http://example.com/a/b/q") check_absolute_url("http://example.com/a/b/c/d/", "../../../q", "http://example.com/a/q") -check_absolute_url("http://example.com/a/b/c/d/", "../../../../q", "http://example.com/q") +check_absolute_url("http://example.com", ".badhost.com", "http://example.com/.badhost.com") print("testing path parsing and composition") check_parse_path("/eu/tu/ele", { "eu", "tu", "ele"; is_absolute = 1 }) From 38d936ec0ea05da9f85a5c582e5073e0d1b82209 Mon Sep 17 00:00:00 2001 From: "E. Westbrook" Date: Tue, 21 Aug 2018 11:27:42 -0600 Subject: [PATCH 058/194] url.lua:remove_dot_components(): empty path component double-dot corner case --- src/url.lua | 4 ++++ test/urltest.lua | 1 + 2 files changed, 5 insertions(+) diff --git a/src/url.lua b/src/url.lua index 243ee1c..10a9d90 100644 --- a/src/url.lua +++ b/src/url.lua @@ -87,6 +87,10 @@ local function remove_dot_components(path) local was = path path = path:gsub('/%./', '/', 1) until path == was + repeat + local was = path + path = path:gsub('//%.%./([^/]+)', '/%1', 1) + until path == was repeat local was = path path = path:gsub('[^/]+/%.%./([^/]+)', '%1', 1) diff --git a/test/urltest.lua b/test/urltest.lua index b6ee299..13deb10 100644 --- a/test/urltest.lua +++ b/test/urltest.lua @@ -691,6 +691,7 @@ check_absolute_url("http://example.com/a/b/c/d/", "../q", "http://example.com/a/ check_absolute_url("http://example.com/a/b/c/d/", "../../q", "http://example.com/a/b/q") check_absolute_url("http://example.com/a/b/c/d/", "../../../q", "http://example.com/a/q") check_absolute_url("http://example.com", ".badhost.com", "http://example.com/.badhost.com") +check_absolute_url("http://example.com/a/b/c/d/", "..//../../../q", "http://example.com/a/q") print("testing path parsing and composition") check_parse_path("/eu/tu/ele", { "eu", "tu", "ele"; is_absolute = 1 }) From ca5398be098b571912dcbd93c83ab78151814f99 Mon Sep 17 00:00:00 2001 From: "E. Westbrook" Date: Tue, 21 Aug 2018 12:02:25 -0600 Subject: [PATCH 059/194] url.lua:remove_dot_components(): use temporary NUL marker to reduce empty-segment special-case code --- src/url.lua | 5 +++-- test/urltest.lua | 4 ++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/url.lua b/src/url.lua index 10a9d90..466d4fa 100644 --- a/src/url.lua +++ b/src/url.lua @@ -85,11 +85,11 @@ end local function remove_dot_components(path) repeat local was = path - path = path:gsub('/%./', '/', 1) + path = path:gsub('//', '/'..0x00..'/', 1) until path == was repeat local was = path - path = path:gsub('//%.%./([^/]+)', '/%1', 1) + path = path:gsub('/%./', '/', 1) until path == was repeat local was = path @@ -99,6 +99,7 @@ local function remove_dot_components(path) path = path:gsub('/%.%.$', '/') path = path:gsub('/%.$', '/') path = path:gsub('^/%.%./', '/') + path = path:gsub(0x00, '') return path end diff --git a/test/urltest.lua b/test/urltest.lua index 13deb10..ae8ba75 100644 --- a/test/urltest.lua +++ b/test/urltest.lua @@ -692,6 +692,10 @@ check_absolute_url("http://example.com/a/b/c/d/", "../../q", "http://example.com check_absolute_url("http://example.com/a/b/c/d/", "../../../q", "http://example.com/a/q") check_absolute_url("http://example.com", ".badhost.com", "http://example.com/.badhost.com") check_absolute_url("http://example.com/a/b/c/d/", "..//../../../q", "http://example.com/a/q") +check_absolute_url("http://example.com/a/b/c/d/", "..//a/../../../../q", "http://example.com/a/q") +check_absolute_url("http://example.com/a/b/c/d/", "..//a/..//../../../q", "http://example.com/a/b/q") +check_absolute_url("http://example.com/a/b/c/d/", "..//a/..///../../../../q", "http://example.com/a/b/q") +check_absolute_url("http://example.com/a/b/c/d/", "../x/a/../y/z/../../../../q", "http://example.com/a/b/q") print("testing path parsing and composition") check_parse_path("/eu/tu/ele", { "eu", "tu", "ele"; is_absolute = 1 }) From 043e99771352aff47680b99f09b66a32f0cc3ef5 Mon Sep 17 00:00:00 2001 From: "E. Westbrook" Date: Tue, 21 Aug 2018 12:42:26 -0600 Subject: [PATCH 060/194] url.lua:remove_dot_components(): avoid ambiguous numeric representation as empty-path-segment marker --- src/url.lua | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/url.lua b/src/url.lua index 466d4fa..0a3a80a 100644 --- a/src/url.lua +++ b/src/url.lua @@ -83,9 +83,10 @@ end -- Returns -- dot-normalized path local function remove_dot_components(path) + local marker = string.char(1) repeat local was = path - path = path:gsub('//', '/'..0x00..'/', 1) + path = path:gsub('//', '/'..marker..'/', 1) until path == was repeat local was = path @@ -99,7 +100,7 @@ local function remove_dot_components(path) path = path:gsub('/%.%.$', '/') path = path:gsub('/%.$', '/') path = path:gsub('^/%.%./', '/') - path = path:gsub(0x00, '') + path = path:gsub(marker, '') return path end From 288219fd6b53ce2e709745c9918aa4c4b7f715c9 Mon Sep 17 00:00:00 2001 From: Diego Nehab Date: Wed, 22 Aug 2018 17:37:32 -0300 Subject: [PATCH 061/194] Update to Visual Studio 2017. --- .gitignore | 1 - Lua.props | 28 ++++++++ Lua51.props | 28 -------- Lua52.props | 28 -------- mime.vcxproj | 61 ++++++++--------- socket.vcxproj | 173 ++++++++++++++++++++++++------------------------ src/luasocket.c | 2 +- src/makefile | 2 +- src/mime.c | 2 +- src/wsocket.c | 4 +- 10 files changed, 151 insertions(+), 178 deletions(-) create mode 100755 Lua.props delete mode 100644 Lua51.props delete mode 100644 Lua52.props mode change 100644 => 100755 src/luasocket.c mode change 100644 => 100755 src/mime.c mode change 100644 => 100755 src/wsocket.c diff --git a/.gitignore b/.gitignore index 8307483..9ed661c 100644 --- a/.gitignore +++ b/.gitignore @@ -6,7 +6,6 @@ *.dll* *.user *.sdf -Lua.props Debug Release *.manifest diff --git a/Lua.props b/Lua.props new file mode 100755 index 0000000..bdfca40 --- /dev/null +++ b/Lua.props @@ -0,0 +1,28 @@ + + + + + z:\data\build\vc14\ + $(BUILD)\bin\lua\5.3\ + $(BUILD)\lib\lua\5.3\ + $(BUILD)\include\lua\5.3\ + + + <_PropertySheetDisplayName>Lua53 + + + + + $(LUALIB) + + + $(LUAINC) + + + $(LUABIN) + + + $(BUILD) + + + diff --git a/Lua51.props b/Lua51.props deleted file mode 100644 index 1bd6256..0000000 --- a/Lua51.props +++ /dev/null @@ -1,28 +0,0 @@ - - - - - ..\build\vc12\bin\lua\5.1\ - ..\build\vc12\bin\lua\5.1\ - ..\build\vc12\include\lua\5.1\ - lua51.lib - - - <_PropertySheetDisplayName>Lua51 - - - - - $(LUALIB_PATH) - - - $(LUABIN_PATH) - - - $(LUAINC_PATH) - - - $(LUALIB) - - - diff --git a/Lua52.props b/Lua52.props deleted file mode 100644 index 01afcfa..0000000 --- a/Lua52.props +++ /dev/null @@ -1,28 +0,0 @@ - - - - - ..\build\vc12\bin\lua\5.2\ - ..\build\vc12\bin\lua\5.2\ - ..\build\vc12\include\lua\5.2\ - lua52.lib - - - <_PropertySheetDisplayName>Lua52 - - - - - $(LUALIB_PATH) - - - $(LUABIN_PATH) - - - $(LUAINC_PATH) - - - $(LUALIB) - - - diff --git a/mime.vcxproj b/mime.vcxproj index c77d611..74bba0c 100755 --- a/mime.vcxproj +++ b/mime.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -24,39 +24,40 @@ Document - copy %(FullPath) $(LUABIN_PATH)$(Configuration) - $(LUABIN_PATH)$(Configuration)\%(Filename)%(Extension) - copy %(FullPath) $(LUABIN_PATH)$(Configuration) - $(LUABIN_PATH)$(Configuration)\%(Filename)%(Extension) - copy %(FullPath) $(LUALIB_PATH)$(Platform)\$(Configuration) - copy %(FullPath) $(LUALIB_PATH)$(Platform)\$(Configuration) - $(LUABIN_PATH)$(Platform)\$(Configuration)\%(Filename)%(Extension) - $(LUABIN_PATH)$(Platform)\$(Configuration)\%(Filename)%(Extension) + copy %(FullPath) $(LUABIN)$(Configuration) + copy %(FullPath) $(LUABIN)$(Configuration) + copy %(FullPath) $(LUABIN)$(Platform)\$(Configuration) + copy %(FullPath) $(LUABIN)$(Platform)\$(Configuration) + $(LUABIN)$(Configuration)\%(Filename)%(Extension) + $(LUABIN)$(Configuration)\%(Filename)%(Extension) + $(LUABIN)$(Platform)\$(Configuration)\%(Filename)%(Extension) + $(LUABIN)$(Platform)\$(Configuration)\%(Filename)%(Extension) {128E8BD0-174A-48F0-8771-92B1E8D18713} Win32Proj + 10.0.15063.0 DynamicLibrary - v110 + v141 MultiByte DynamicLibrary - v110 + v141 MultiByte DynamicLibrary - v110 + v141 MultiByte DynamicLibrary - v110 + v141 MultiByte @@ -87,7 +88,7 @@ <_ProjectFileVersion>11.0.50727.1 - $(LUABIN_PATH)$(Configuration)\mime\ + $(LUABIN)$(Configuration)\mime\ $(Configuration)\ true core @@ -95,23 +96,23 @@ true core - $(LUABIN_PATH)$(Platform)\$(Configuration)\mime\ + $(LUABIN)$(Platform)\$(Configuration)\mime\ - $(LUABIN_PATH)$(Configuration)\mime\ + $(LUABIN)$(Configuration)\mime\ $(Configuration)\ false core false - $(LUABIN_PATH)$(Platform)\$(Configuration)\mime\ + $(LUABIN)$(Platform)\$(Configuration)\mime\ core Disabled - $(LUAINC_PATH);%(AdditionalIncludeDirectories) + $(LUAINC);%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;MIME_API=__declspec(dllexport);_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true EnableFastChecks @@ -122,9 +123,9 @@ $(IntDir)$(TargetName)$(PlatformToolsetVersion).pdb - $(LUALIB);%(AdditionalDependencies) + lualib.lib;%(AdditionalDependencies) $(OutDir)$(TargetName).dll - $(LUALIB_PATH)$(Configuration);%(AdditionalLibraryDirectories) + $(LUALIB)$(Configuration);%(AdditionalLibraryDirectories) true $(OutDir)mime.pdb Windows @@ -138,7 +139,7 @@ Disabled - $(LUAINC_PATH);%(AdditionalIncludeDirectories) + $(LUAINC);%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;MIME_API=__declspec(dllexport);_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -149,9 +150,9 @@ $(IntDir)$(TargetName)$(PlatformToolsetVersion).pdb - $(LUALIB);%(AdditionalDependencies) + lualib.lib;%(AdditionalDependencies) $(OutDir)$(TargetName).dll - $(LUALIB_PATH)$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) + $(LUALIB)$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) true $(OutDir)mime.pdb Windows @@ -163,7 +164,7 @@ - $(LUAINC_PATH);%(AdditionalIncludeDirectories) + $(LUAINC);%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;MIME_API=__declspec(dllexport);_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) MultiThreadedDLL @@ -172,9 +173,9 @@ $(IntDir)$(TargetName)$(PlatformToolsetVersion).pdb - $(LUALIB);%(AdditionalDependencies) + lualib.lib;%(AdditionalDependencies) $(OutDir)$(TargetName).dll - $(LUALIB_PATH)$(Configuration);%(AdditionalLibraryDirectories) + $(LUALIB)$(Configuration);%(AdditionalLibraryDirectories) true Windows true @@ -187,7 +188,7 @@ - $(LUAINC_PATH);%(AdditionalIncludeDirectories) + $(LUAINC);%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;MIME_API=__declspec(dllexport);_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) MultiThreadedDLL @@ -198,9 +199,9 @@ $(IntDir)$(TargetName)$(PlatformToolsetVersion).pdb - $(LUALIB);%(AdditionalDependencies) + lualib.lib;%(AdditionalDependencies) $(OutDir)$(TargetName).dll - $(LUALIB_PATH)$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) + $(LUALIB)$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) true Windows true @@ -214,4 +215,4 @@ - \ No newline at end of file + diff --git a/socket.vcxproj b/socket.vcxproj index 16daeef..cfa32b3 100755 --- a/socket.vcxproj +++ b/socket.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -35,118 +35,119 @@ Document - copy %(FullPath) $(LUABIN_PATH)$(Configuration) - copy %(FullPath) $(LUABIN_PATH)$(Configuration) - copy %(FullPath) $(LUABIN_PATH)$(Platform)\$(Configuration) - copy %(FullPath) $(LUABIN_PATH)$(Platform)\$(Configuration) - $(LUABIN_PATH)$(Configuration)\%(Filename)%(Extension) - $(LUABIN_PATH)$(Configuration)\%(Filename)%(Extension) - $(LUABIN_PATH)$(Platform)\$(Configuration)\%(Filename)%(Extension) - $(LUABIN_PATH)$(Platform)\$(Configuration)\%(Filename)%(Extension) + copy %(FullPath) $(LUABIN)$(Configuration) + copy %(FullPath) $(LUABIN)$(Configuration) + copy %(FullPath) $(LUABIN)$(Platform)\$(Configuration) + copy %(FullPath) $(LUABIN)$(Platform)\$(Configuration) + $(LUABIN)$(Configuration)\%(Filename)%(Extension) + $(LUABIN)$(Configuration)\%(Filename)%(Extension) + $(LUABIN)$(Platform)\$(Configuration)\%(Filename)%(Extension) + $(LUABIN)$(Platform)\$(Configuration)\%(Filename)%(Extension) Document - copy %(FullPath) $(LUABIN_PATH)$(Configuration) - copy %(FullPath) $(LUABIN_PATH)$(Configuration) - copy %(FullPath) $(LUABIN_PATH)$(Platform)\$(Configuration) - copy %(FullPath) $(LUABIN_PATH)$(Platform)\$(Configuration) - $(LUABIN_PATH)$(Configuration)\%(Filename)%(Extension) - $(LUABIN_PATH)$(Configuration)\%(Filename)%(Extension) - $(LUABIN_PATH)$(Platform)\$(Configuration)\%(Filename)%(Extension) - $(LUABIN_PATH)$(Platform)\$(Configuration)\%(Filename)%(Extension) + copy %(FullPath) $(LUABIN)$(Configuration) + copy %(FullPath) $(LUABIN)$(Configuration) + copy %(FullPath) $(LUABIN)$(Platform)\$(Configuration) + copy %(FullPath) $(LUABIN)$(Platform)\$(Configuration) + $(LUABIN)$(Configuration)\%(Filename)%(Extension) + $(LUABIN)$(Configuration)\%(Filename)%(Extension) + $(LUABIN)$(Platform)\$(Configuration)\%(Filename)%(Extension) + $(LUABIN)$(Platform)\$(Configuration)\%(Filename)%(Extension) Document - $(LUABIN_PATH)$(Platform)\$(Configuration)\socket\%(Filename)%(Extension) - $(LUABIN_PATH)$(Platform)\$(Configuration)\socket\%(Filename)%(Extension) - $(LUABIN_PATH)$(Configuration)\socket\%(Filename)%(Extension) - $(LUABIN_PATH)$(Configuration)\socket\%(Filename)%(Extension) - copy %(FullPath) $(LUABIN_PATH)$(Platform)\$(Configuration)\socket - copy %(FullPath) $(LUABIN_PATH)$(Platform)\$(Configuration)\socket - copy %(FullPath) $(LUABIN_PATH)$(Configuration)\socket - copy %(FullPath) $(LUABIN_PATH)$(Configuration)\socket + copy %(FullPath) $(LUABIN)$(Configuration) + copy %(FullPath) $(LUABIN)$(Configuration) + copy %(FullPath) $(LUABIN)$(Platform)\$(Configuration) + copy %(FullPath) $(LUABIN)$(Platform)\$(Configuration) + $(LUABIN)$(Configuration)\%(Filename)%(Extension) + $(LUABIN)$(Configuration)\%(Filename)%(Extension) + $(LUABIN)$(Platform)\$(Configuration)\%(Filename)%(Extension) + $(LUABIN)$(Platform)\$(Configuration)\%(Filename)%(Extension) Document - $(LUABIN_PATH)$(Platform)\$(Configuration)\socket\%(Filename)%(Extension) - $(LUABIN_PATH)$(Platform)\$(Configuration)\socket\%(Filename)%(Extension) - $(LUABIN_PATH)$(Configuration)\socket\%(Filename)%(Extension) - $(LUABIN_PATH)$(Configuration)\socket\%(Filename)%(Extension) - copy %(FullPath) $(LUABIN_PATH)$(Platform)\$(Configuration)\socket - copy %(FullPath) $(LUABIN_PATH)$(Platform)\$(Configuration)\socket - copy %(FullPath) $(LUABIN_PATH)$(Configuration)\socket - copy %(FullPath) $(LUABIN_PATH)$(Configuration)\socket + copy %(FullPath) $(LUABIN)$(Configuration) + copy %(FullPath) $(LUABIN)$(Configuration) + copy %(FullPath) $(LUABIN)$(Platform)\$(Configuration) + copy %(FullPath) $(LUABIN)$(Platform)\$(Configuration) + $(LUABIN)$(Configuration)\%(Filename)%(Extension) + $(LUABIN)$(Configuration)\%(Filename)%(Extension) + $(LUABIN)$(Platform)\$(Configuration)\%(Filename)%(Extension) + $(LUABIN)$(Platform)\$(Configuration)\%(Filename)%(Extension) Document - $(LUABIN_PATH)$(Platform)\$(Configuration)\socket\%(Filename)%(Extension) - $(LUABIN_PATH)$(Platform)\$(Configuration)\socket\%(Filename)%(Extension) - $(LUABIN_PATH)$(Configuration)\socket\%(Filename)%(Extension) - $(LUABIN_PATH)$(Configuration)\socket\%(Filename)%(Extension) - copy %(FullPath) $(LUABIN_PATH)$(Platform)\$(Configuration)\socket - copy %(FullPath) $(LUABIN_PATH)$(Platform)\$(Configuration)\socket - copy %(FullPath) $(LUABIN_PATH)$(Configuration)\socket - copy %(FullPath) $(LUABIN_PATH)$(Configuration)\socket + copy %(FullPath) $(LUABIN)$(Configuration) + copy %(FullPath) $(LUABIN)$(Configuration) + copy %(FullPath) $(LUABIN)$(Platform)\$(Configuration) + copy %(FullPath) $(LUABIN)$(Platform)\$(Configuration) + $(LUABIN)$(Configuration)\%(Filename)%(Extension) + $(LUABIN)$(Configuration)\%(Filename)%(Extension) + $(LUABIN)$(Platform)\$(Configuration)\%(Filename)%(Extension) + $(LUABIN)$(Platform)\$(Configuration)\%(Filename)%(Extension) Document - $(LUABIN_PATH)$(Platform)\$(Configuration)\socket\%(Filename)%(Extension) - $(LUABIN_PATH)$(Platform)\$(Configuration)\socket\%(Filename)%(Extension) - $(LUABIN_PATH)$(Configuration)\socket\%(Filename)%(Extension) - $(LUABIN_PATH)$(Configuration)\socket\%(Filename)%(Extension) - copy %(FullPath) $(LUABIN_PATH)$(Platform)\$(Configuration)\socket - copy %(FullPath) $(LUABIN_PATH)$(Platform)\$(Configuration)\socket - copy %(FullPath) $(LUABIN_PATH)$(Configuration)\socket - copy %(FullPath) $(LUABIN_PATH)$(Configuration)\socket + copy %(FullPath) $(LUABIN)$(Configuration) + copy %(FullPath) $(LUABIN)$(Configuration) + copy %(FullPath) $(LUABIN)$(Platform)\$(Configuration) + copy %(FullPath) $(LUABIN)$(Platform)\$(Configuration) + $(LUABIN)$(Configuration)\%(Filename)%(Extension) + $(LUABIN)$(Configuration)\%(Filename)%(Extension) + $(LUABIN)$(Platform)\$(Configuration)\%(Filename)%(Extension) + $(LUABIN)$(Platform)\$(Configuration)\%(Filename)%(Extension) Document - $(LUABIN_PATH)$(Platform)\$(Configuration)\socket\%(Filename)%(Extension) - $(LUABIN_PATH)$(Platform)\$(Configuration)\socket\%(Filename)%(Extension) - $(LUABIN_PATH)$(Configuration)\socket\%(Filename)%(Extension) - $(LUABIN_PATH)$(Configuration)\socket\%(Filename)%(Extension) - copy %(FullPath) $(LUABIN_PATH)$(Platform)\$(Configuration)\socket - copy %(FullPath) $(LUABIN_PATH)$(Platform)\$(Configuration)\socket - copy %(FullPath) $(LUABIN_PATH)$(Configuration)\socket - copy %(FullPath) $(LUABIN_PATH)$(Configuration)\socket + copy %(FullPath) $(LUABIN)$(Configuration) + copy %(FullPath) $(LUABIN)$(Configuration) + copy %(FullPath) $(LUABIN)$(Platform)\$(Configuration) + copy %(FullPath) $(LUABIN)$(Platform)\$(Configuration) + $(LUABIN)$(Configuration)\%(Filename)%(Extension) + $(LUABIN)$(Configuration)\%(Filename)%(Extension) + $(LUABIN)$(Platform)\$(Configuration)\%(Filename)%(Extension) + $(LUABIN)$(Platform)\$(Configuration)\%(Filename)%(Extension) Document - $(LUABIN_PATH)$(Platform)\$(Configuration)\socket\%(Filename)%(Extension) - $(LUABIN_PATH)$(Platform)\$(Configuration)\socket\%(Filename)%(Extension) - $(LUABIN_PATH)$(Configuration)\socket\%(Filename)%(Extension) - $(LUABIN_PATH)$(Configuration)\socket\%(Filename)%(Extension) - copy %(FullPath) $(LUABIN_PATH)$(Platform)\$(Configuration)\socket - copy %(FullPath) $(LUABIN_PATH)$(Platform)\$(Configuration)\socket - copy %(FullPath) $(LUABIN_PATH)$(Configuration)\socket - copy %(FullPath) $(LUABIN_PATH)$(Configuration)\socket + copy %(FullPath) $(LUABIN)$(Configuration) + copy %(FullPath) $(LUABIN)$(Configuration) + copy %(FullPath) $(LUABIN)$(Platform)\$(Configuration) + copy %(FullPath) $(LUABIN)$(Platform)\$(Configuration) + $(LUABIN)$(Configuration)\%(Filename)%(Extension) + $(LUABIN)$(Configuration)\%(Filename)%(Extension) + $(LUABIN)$(Platform)\$(Configuration)\%(Filename)%(Extension) + $(LUABIN)$(Platform)\$(Configuration)\%(Filename)%(Extension) {66E3CE14-884D-4AEA-9F20-15A0BEAF8C5A} Win32Proj + 10.0.15063.0 DynamicLibrary - v110 + v141 MultiByte DynamicLibrary - v110 + v141 MultiByte DynamicLibrary - v110 + v141 MultiByte DynamicLibrary - v110 + v141 MultiByte @@ -177,7 +178,7 @@ <_ProjectFileVersion>11.0.50727.1 - $(LUALIB_PATH)$(Configuration)\socket\ + $(LUABIN)$(Configuration)\socket\ $(Configuration)\ true core @@ -185,23 +186,23 @@ true core - $(LUABIN_PATH)$(Platform)\$(Configuration)\socket\ + $(LUABIN)$(Platform)\$(Configuration)\socket\ - $(LUALIB_PATH)$(Configuration)\socket\ + $(LUABIN)$(Configuration)\socket\ $(Configuration)\ false core false - $(LUABIN_PATH)$(Platform)\$(Configuration)\socket\ + $(LUABIN)$(Platform)\$(Configuration)\socket\ core Disabled - $(LUAINC_PATH);%(AdditionalIncludeDirectories) + $(LUAINC);%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;LUASOCKET_API=__declspec(dllexport);_CRT_SECURE_NO_WARNINGS;LUASOCKET_DEBUG;%(PreprocessorDefinitions) true EnableFastChecks @@ -212,9 +213,9 @@ $(IntDir)$(TargetName)$(PlatformToolsetVersion).pdb - $(LUALIB);ws2_32.lib;%(AdditionalDependencies) + lualib.lib;ws2_32.lib;%(AdditionalDependencies) $(OutDir)$(TargetName).dll - $(LUALIB_PATH)$(Configuration);%(AdditionalLibraryDirectories) + $(LUALIB)$(Configuration);%(AdditionalLibraryDirectories) true $(OutDir)mime.pdb Windows @@ -228,7 +229,7 @@ Disabled - $(LUAINC_PATH);%(AdditionalIncludeDirectories) + $(LUAINC);%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;LUASOCKET_API=__declspec(dllexport);_CRT_SECURE_NO_WARNINGS;LUASOCKET_DEBUG;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -239,9 +240,9 @@ $(IntDir)$(TargetName)$(PlatformToolsetVersion).pdb - $(LUALIB);ws2_32.lib;%(AdditionalDependencies) + lualib.lib;ws2_32.lib;%(AdditionalDependencies) $(OutDir)$(TargetName).dll - $(LUALIB_PATH)$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) + $(LUALIB)$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) true $(OutDir)mime.pdb Windows @@ -253,7 +254,7 @@ - $(LUAINC_PATH);%(AdditionalIncludeDirectories) + $(LUAINC);%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;LUASOCKET_API=__declspec(dllexport);_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) MultiThreadedDLL @@ -262,9 +263,9 @@ $(IntDir)$(TargetName)$(PlatformToolsetVersion).pdb - $(LUALIB);ws2_32.lib;%(AdditionalDependencies) + lualib.lib;ws2_32.lib;%(AdditionalDependencies) $(OutDir)$(TargetName).dll - $(LUALIB_PATH)$(Configuration);%(AdditionalLibraryDirectories) + $(LUALIB)$(Configuration);%(AdditionalLibraryDirectories) true Windows true @@ -277,7 +278,7 @@ - $(LUAINC_PATH);%(AdditionalIncludeDirectories) + $(LUAINC);%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;LUASOCKET_API=__declspec(dllexport);_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) MultiThreadedDLL @@ -288,9 +289,9 @@ $(IntDir)$(TargetName)$(PlatformToolsetVersion).pdb - $(LUALIB);ws2_32.lib;%(AdditionalDependencies) + lualib.lib;ws2_32.lib;%(AdditionalDependencies) $(OutDir)$(TargetName).dll - $(LUALIB_PATH)$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) + $(LUALIB)$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) true Windows true @@ -304,4 +305,4 @@ - \ No newline at end of file + diff --git a/src/luasocket.c b/src/luasocket.c old mode 100644 new mode 100755 index 7d9c802..d2752a7 --- a/src/luasocket.c +++ b/src/luasocket.c @@ -64,7 +64,7 @@ static luaL_Reg func[] = { * Skip a few arguments \*-------------------------------------------------------------------------*/ static int global_skip(lua_State *L) { - int amount = luaL_checkinteger(L, 1); + int amount = (int) luaL_checkinteger(L, 1); int ret = lua_gettop(L) - amount - 1; return ret >= 0 ? ret : 0; } diff --git a/src/makefile b/src/makefile index 494baab..1ed3f4f 100644 --- a/src/makefile +++ b/src/makefile @@ -386,7 +386,7 @@ $(UNIX_SO): $(UNIX_OBJS) $(SERIAL_SO): $(SERIAL_OBJS) $(LD) $(SERIAL_OBJS) $(LDFLAGS)$@ -install: +install: $(INSTALL_DIR) $(INSTALL_TOP_LDIR) $(INSTALL_DATA) $(TO_TOP_LDIR) $(INSTALL_TOP_LDIR) $(INSTALL_DIR) $(INSTALL_SOCKET_LDIR) diff --git a/src/mime.c b/src/mime.c old mode 100644 new mode 100755 index db356fc..338ecd4 --- a/src/mime.c +++ b/src/mime.c @@ -654,7 +654,7 @@ static int eolprocess(int c, int last, const char *marker, \*-------------------------------------------------------------------------*/ static int mime_global_eol(lua_State *L) { - int ctx = luaL_checkinteger(L, 1); + int ctx = (int) luaL_checkinteger(L, 1); size_t isize = 0; const char *input = luaL_optlstring(L, 2, NULL, &isize); const char *last = input + isize; diff --git a/src/wsocket.c b/src/wsocket.c old mode 100644 new mode 100755 index 8ecb0fc..ac8411f --- a/src/wsocket.c +++ b/src/wsocket.c @@ -131,11 +131,11 @@ int socket_connect(p_socket ps, SA *addr, socklen_t len, p_timeout tm) { /* we wait until something happens */ err = socket_waitfd(ps, WAITFD_C, tm); if (err == IO_CLOSED) { - int len = sizeof(err); + int elen = sizeof(err); /* give windows time to set the error (yes, disgusting) */ Sleep(10); /* find out why we failed */ - getsockopt(*ps, SOL_SOCKET, SO_ERROR, (char *)&err, &len); + getsockopt(*ps, SOL_SOCKET, SO_ERROR, (char *)&err, &elen); /* we KNOW there was an error. if 'why' is 0, we will return * "unknown error", but it's not really our fault */ return err > 0? err: IO_UNKNOWN; From e2bb1d3b42e4d2efef12c07c1b954bb308c83f24 Mon Sep 17 00:00:00 2001 From: David Gumberg Date: Sat, 29 Sep 2018 16:29:58 -0700 Subject: [PATCH 062/194] Make macosx.cmd generic --- macosx.cmd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/macosx.cmd b/macosx.cmd index 46a0709..dd5d8cf 100644 --- a/macosx.cmd +++ b/macosx.cmd @@ -1 +1 @@ -make DEBUG=DEBUG PLAT=macosx LUAINC_macosx_base=/Users/diego/build/macosx/include LUAPREFIX_macosx=/Users/diego/build/macosx install-both +make DEBUG=DEBUG PLAT=macosx LUAINC_macosx_base=/Users/$USER/build/macosx/include LUAPREFIX_macosx=/Users/$USER/build/macosx install-both From 4950294c262fec06763f0cc76185fa1b2eca9794 Mon Sep 17 00:00:00 2001 From: fregie Date: Fri, 11 Jan 2019 16:04:34 +0800 Subject: [PATCH 063/194] compile unixdgram.c, unixstream.c into unix.so --- luasocket-scm-0.rockspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/luasocket-scm-0.rockspec b/luasocket-scm-0.rockspec index 61bd645..c827e46 100644 --- a/luasocket-scm-0.rockspec +++ b/luasocket-scm-0.rockspec @@ -75,7 +75,7 @@ local function make_plat(plat) modules["socket.core"].libraries = {"network"} end modules["socket.unix"] = { - sources = { "src/buffer.c", "src/auxiliar.c", "src/options.c", "src/timeout.c", "src/io.c", "src/usocket.c", "src/unix.c" }, + sources = { "src/buffer.c", "src/auxiliar.c", "src/options.c", "src/timeout.c", "src/io.c", "src/usocket.c", "src/unix.c", "src/unixdgram.c", "src/unixstream.c" }, defines = defines[plat], incdir = "/src" } From d1e35c9573c0a6055a22072aed23c478151be133 Mon Sep 17 00:00:00 2001 From: "E. Westbrook" Date: Tue, 19 Feb 2019 04:02:37 -0700 Subject: [PATCH 064/194] src/makefile: define UNIX_HAS_SUN_LEN for FreeBSD builds --- src/makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/makefile b/src/makefile index 1ed3f4f..0f4b359 100644 --- a/src/makefile +++ b/src/makefile @@ -181,7 +181,7 @@ SOCKET_linux=usocket.o SO_freebsd=so O_freebsd=o CC_freebsd=gcc -DEF_freebsd=-DLUASOCKET_$(DEBUG) \ +DEF_freebsd=-DLUASOCKET_$(DEBUG) -DUNIX_HAS_SUN_LEN \ -DLUASOCKET_API='__attribute__((visibility("default")))' \ -DUNIX_API='__attribute__((visibility("default")))' \ -DMIME_API='__attribute__((visibility("default")))' @@ -360,7 +360,7 @@ linux: mingw: $(MAKE) all PLAT=mingw - + solaris: $(MAKE) all-unix PLAT=solaris From 531012df1ad65d9b075a1644a930a09ac584f106 Mon Sep 17 00:00:00 2001 From: "E. Westbrook" Date: Tue, 19 Feb 2019 04:51:23 -0700 Subject: [PATCH 065/194] src/unixdgram.c: allow connect() and bind() on freebsd without dummy char, and simplify calculations --- src/unixdgram.c | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/src/unixdgram.c b/src/unixdgram.c index 4645892..07c394c 100644 --- a/src/unixdgram.c +++ b/src/unixdgram.c @@ -261,20 +261,15 @@ static int meth_dirty(lua_State *L) { static const char *unixdgram_trybind(p_unix un, const char *path) { struct sockaddr_un local; size_t len = strlen(path); - int err; if (len >= sizeof(local.sun_path)) return "path too long"; memset(&local, 0, sizeof(local)); strcpy(local.sun_path, path); local.sun_family = AF_UNIX; + size_t addrlen = sizeof(local) - sizeof(local.sun_path) + len; #ifdef UNIX_HAS_SUN_LEN - local.sun_len = sizeof(local.sun_family) + sizeof(local.sun_len) - + len + 1; - err = socket_bind(&un->sock, (SA *) &local, local.sun_len); - -#else - err = socket_bind(&un->sock, (SA *) &local, - sizeof(local.sun_family) + len); + local.sun_len = addrlen + 1; #endif + int err = socket_bind(&un->sock, (SA *) &local, addrlen); if (err != IO_DONE) socket_destroy(&un->sock); return socket_strerror(err); } @@ -315,21 +310,17 @@ static int meth_getsockname(lua_State *L) static const char *unixdgram_tryconnect(p_unix un, const char *path) { struct sockaddr_un remote; - int err; size_t len = strlen(path); if (len >= sizeof(remote.sun_path)) return "path too long"; memset(&remote, 0, sizeof(remote)); strcpy(remote.sun_path, path); remote.sun_family = AF_UNIX; timeout_markstart(&un->tm); + size_t addrlen = sizeof(remote) - sizeof(remote.sun_path) + len; #ifdef UNIX_HAS_SUN_LEN - remote.sun_len = sizeof(remote.sun_family) + sizeof(remote.sun_len) - + len + 1; - err = socket_connect(&un->sock, (SA *) &remote, remote.sun_len, &un->tm); -#else - err = socket_connect(&un->sock, (SA *) &remote, - sizeof(remote.sun_family) + len, &un->tm); + remote.sun_len = addrlen + 1; #endif + int err = socket_connect(&un->sock, (SA *) &remote, addrlen, &un->tm); if (err != IO_DONE) socket_destroy(&un->sock); return socket_strerror(err); } From 024646de54dca99c65b705a6c01260f1d1d8ff91 Mon Sep 17 00:00:00 2001 From: "E. Westbrook" Date: Tue, 19 Feb 2019 09:59:35 -0700 Subject: [PATCH 066/194] Use SUN_LEN macro --- src/unixdgram.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/unixdgram.c b/src/unixdgram.c index 07c394c..0d6f18c 100644 --- a/src/unixdgram.c +++ b/src/unixdgram.c @@ -17,6 +17,12 @@ #define UNIXDGRAM_DATAGRAMSIZE 8192 +// provide a SUN_LEN macro if sys/un.h doesn't (e.g. Android) +#ifndef SUN_LEN +#define SUN_LEN(ptr) \ + ((size_t) (((struct sockaddr_un *) 0)->sun_path) \ + + strlen ((ptr)->sun_path)) +#endif /*=========================================================================*\ * Internal function prototypes \*=========================================================================*/ @@ -265,7 +271,7 @@ static const char *unixdgram_trybind(p_unix un, const char *path) { memset(&local, 0, sizeof(local)); strcpy(local.sun_path, path); local.sun_family = AF_UNIX; - size_t addrlen = sizeof(local) - sizeof(local.sun_path) + len; + size_t addrlen = SUN_LEN(&local); #ifdef UNIX_HAS_SUN_LEN local.sun_len = addrlen + 1; #endif @@ -316,7 +322,7 @@ static const char *unixdgram_tryconnect(p_unix un, const char *path) strcpy(remote.sun_path, path); remote.sun_family = AF_UNIX; timeout_markstart(&un->tm); - size_t addrlen = sizeof(remote) - sizeof(remote.sun_path) + len; + size_t addrlen = SUN_LEN(&remote); #ifdef UNIX_HAS_SUN_LEN remote.sun_len = addrlen + 1; #endif From 686f2ce8222077e13ecdf9cf09f43f0b1878a737 Mon Sep 17 00:00:00 2001 From: "E. Westbrook" Date: Thu, 12 Jul 2018 11:07:20 -0600 Subject: [PATCH 067/194] http.lua: if default for scheme, omit port number in "Host:" header --- src/http.lua | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/src/http.lua b/src/http.lua index a386165..6b26a0a 100644 --- a/src/http.lua +++ b/src/http.lua @@ -27,9 +27,13 @@ _M.TIMEOUT = 60 _M.USERAGENT = socket._VERSION -- supported schemes -local SCHEMES = { ["http"] = true } --- default port for document retrieval -local PORT = 80 +local SCHEMES = { + http = { port = 80 } + , https = { port = 443 }} + +-- default scheme and port for document retrieval +local SCHEME = 'http' +local PORT = SCHEMES[SCHEME].port ----------------------------------------------------------------------------- -- Reads MIME headers from a connection, unfolding where needed @@ -212,10 +216,14 @@ end local function adjustheaders(reqt) -- default headers - local host = string.gsub(reqt.authority, "^.-@", "") + local headhost = reqt.host + local headport = tostring(reqt.port) + local schemeport = tostring(SCHEMES[reqt.scheme].port) + if headport ~= schemeport then + headhost = headhost .. ':' .. headport end local lower = { ["user-agent"] = _M.USERAGENT, - ["host"] = host, + ["host"] = headhost, ["connection"] = "close, TE", ["te"] = "trailers" } @@ -246,7 +254,7 @@ local default = { host = "", port = PORT, path ="/", - scheme = "http" + scheme = SCHEME } local function adjustrequest(reqt) From 5858c8e7769b2855a9492b244b8bfa9254ce1c42 Mon Sep 17 00:00:00 2001 From: "E. Westbrook" Date: Fri, 22 Feb 2019 16:16:03 -0700 Subject: [PATCH 068/194] src/makefile: support both lua/$(LUAV) and lua$(LUAV) include paths --- src/makefile | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/makefile b/src/makefile index 0f4b359..cc1ec7e 100644 --- a/src/makefile +++ b/src/makefile @@ -35,7 +35,7 @@ DEBUG?=NODEBUG # LUAINC_macosx: # /opt/local/include LUAINC_macosx_base?=/opt/local/include -LUAINC_macosx?=$(LUAINC_macosx_base)/lua/$(LUAV) +LUAINC_macosx?=$(LUAINC_macosx_base)/lua/$(LUAV) $(LUAINC_macosx_base)/lua$(LUAV) # FIXME default should this default to fink or to macports? # What happens when more than one Lua version is installed? LUAPREFIX_macosx?=/opt/local @@ -48,7 +48,7 @@ LDIR_macosx?=share/lua/$(LUAV) # /usr/local/include/lua$(LUAV) # where lua headers are found for linux builds LUAINC_linux_base?=/usr/include -LUAINC_linux?=$(LUAINC_linux_base)/lua/$(LUAV) +LUAINC_linux?=$(LUAINC_linux_base)/lua/$(LUAV) $(LUAINC_linux_base)/lua$(LUAV) LUAPREFIX_linux?=/usr/local CDIR_linux?=lib/lua/$(LUAV) LDIR_linux?=share/lua/$(LUAV) @@ -57,7 +57,7 @@ LDIR_linux?=share/lua/$(LUAV) # /usr/local/include/lua$(LUAV) # where lua headers are found for freebsd builds LUAINC_freebsd_base?=/usr/local/include/ -LUAINC_freebsd?=$(LUAINC_freebsd_base)/lua$(LUAV) +LUAINC_freebsd?=$(LUAINC_freebsd_base)/lua/$(LUAV) $(LUAINC_freebsd_base)/lua$(LUAV) LUAPREFIX_freebsd?=/usr/local/ CDIR_freebsd?=lib/lua/$(LUAV) LDIR_freebsd?=share/lua/$(LUAV) @@ -66,7 +66,7 @@ LDIR_freebsd?=share/lua/$(LUAV) # LUAINC_mingw: # /opt/local/include LUAINC_mingw_base?=/usr/include -LUAINC_mingw?=$(LUAINC_mingw_base)/lua/$(LUAV) +LUAINC_mingw?=$(LUAINC_mingw_base)/lua/$(LUAV) $(LUAINC_mingw_base)/lua$(LUAV) LUALIB_mingw_base?=/usr/bin LUALIB_mingw?=$(LUALIB_mingw_base)/lua/$(LUAV)/lua$(subst .,,$(LUAV)).dll LUAPREFIX_mingw?=/usr @@ -78,7 +78,7 @@ LDIR_mingw?=lua/$(LUAV)/lua # LUALIB_win32: # where lua headers and libraries are found for win32 builds LUAPREFIX_win32?= -LUAINC_win32?=$(LUAPREFIX_win32)/include/lua/$(LUAV) +LUAINC_win32?=$(LUAPREFIX_win32)/include/lua/$(LUAV) $(LUAPREFIX_win32)/include/lua$(LUAV) PLATFORM_win32?=Release CDIR_win32?=bin/lua/$(LUAV)/$(PLATFORM_win32) LDIR_win32?=bin/lua/$(LUAV)/$(PLATFORM_win32)/lua @@ -88,7 +88,7 @@ LUALIBNAME_win32?=lua$(subst .,,$(LUAV)).lib # LUAINC_solaris: LUAINC_solaris_base?=/usr/include -LUAINC_solaris?=$(LUAINC_solaris_base)/lua/$(LUAV) +LUAINC_solaris?=$(LUAINC_solaris_base)/lua/$(LUAV) $(LUAINC_solaris_base)/lua$(LUAV) LUAPREFIX_solaris?=/usr/local CDIR_solaris?=lib/lua/$(LUAV) LDIR_solaris?=share/lua/$(LUAV) @@ -153,7 +153,7 @@ DEF_macosx= -DLUASOCKET_$(DEBUG) -DUNIX_HAS_SUN_LEN \ -DLUASOCKET_API='__attribute__((visibility("default")))' \ -DUNIX_API='__attribute__((visibility("default")))' \ -DMIME_API='__attribute__((visibility("default")))' -CFLAGS_macosx= -I$(LUAINC) $(DEF) -Wall -O2 -fno-common \ +CFLAGS_macosx=$(LUAINC:%=-I%) $(DEF) -Wall -O2 -fno-common \ -fvisibility=hidden LDFLAGS_macosx= -bundle -undefined dynamic_lookup -o LD_macosx= export MACOSX_DEPLOYMENT_TARGET="10.3"; gcc @@ -169,7 +169,7 @@ DEF_linux=-DLUASOCKET_$(DEBUG) \ -DLUASOCKET_API='__attribute__((visibility("default")))' \ -DUNIX_API='__attribute__((visibility("default")))' \ -DMIME_API='__attribute__((visibility("default")))' -CFLAGS_linux= -I$(LUAINC) $(DEF) -Wall -Wshadow -Wextra \ +CFLAGS_linux=$(LUAINC:%=-I%) $(DEF) -Wall -Wshadow -Wextra \ -Wimplicit -O2 -ggdb3 -fpic -fvisibility=hidden LDFLAGS_linux=-O -shared -fpic -o LD_linux=gcc @@ -185,7 +185,7 @@ DEF_freebsd=-DLUASOCKET_$(DEBUG) -DUNIX_HAS_SUN_LEN \ -DLUASOCKET_API='__attribute__((visibility("default")))' \ -DUNIX_API='__attribute__((visibility("default")))' \ -DMIME_API='__attribute__((visibility("default")))' -CFLAGS_freebsd= -I$(LUAINC) $(DEF) -Wall -Wshadow -Wextra \ +CFLAGS_freebsd=$(LUAINC:%=-I%) $(DEF) -Wall -Wshadow -Wextra \ -Wimplicit -O2 -ggdb3 -fpic -fvisibility=hidden LDFLAGS_freebsd=-O -shared -fpic -o LD_freebsd=gcc @@ -201,7 +201,7 @@ DEF_solaris=-DLUASOCKET_$(DEBUG) \ -DLUASOCKET_API='__attribute__((visibility("default")))' \ -DUNIX_API='__attribute__((visibility("default")))' \ -DMIME_API='__attribute__((visibility("default")))' -CFLAGS_solaris=-I$(LUAINC) $(DEF) -Wall -Wshadow -Wextra \ +CFLAGS_solaris=$(LUAINC:%=-I%) $(DEF) -Wall -Wshadow -Wextra \ -Wimplicit -O2 -ggdb3 -fpic -fvisibility=hidden LDFLAGS_solaris=-lnsl -lsocket -lresolv -O -shared -fpic -o LD_solaris=gcc @@ -216,7 +216,7 @@ CC_mingw=gcc DEF_mingw= -DLUASOCKET_INET_PTON -DLUASOCKET_$(DEBUG) \ -DWINVER=0x0501 -DLUASOCKET_API='__declspec(dllexport)' \ -DMIME_API='__declspec(dllexport)' -CFLAGS_mingw= -I$(LUAINC) $(DEF) -Wall -O2 -fno-common \ +CFLAGS_mingw=$(LUAINC:%=-I%) $(DEF) -Wall -O2 -fno-common \ -fvisibility=hidden LDFLAGS_mingw= $(LUALIB) -shared -Wl,-s -lws2_32 -o LD_mingw=gcc @@ -233,7 +233,7 @@ DEF_win32= //D "WIN32" //D "NDEBUG" //D "_WINDOWS" //D "_USRDLL" \ //D "LUASOCKET_API=__declspec(dllexport)" //D "_CRT_SECURE_NO_WARNINGS" \ //D "_WINDLL" //D "MIME_API=__declspec(dllexport)" \ //D "LUASOCKET_$(DEBUG)" -CFLAGS_win32=//I "$(LUAINC)" $(DEF) //O2 //Ot //MD //W3 //nologo +CFLAGS_win32=$(LUAINC:%=//I "%") $(DEF) //O2 //Ot //MD //W3 //nologo LDFLAGS_win32= //nologo //link //NOLOGO //DLL //INCREMENTAL:NO \ //MANIFEST //MANIFESTFILE:"intermediate.manifest" \ //MANIFESTUAC:"level='asInvoker' uiAccess='false'" \ From 59c8aaac3425108e3137677863cc8cee6c84e20b Mon Sep 17 00:00:00 2001 From: Philipp Janda Date: Sat, 23 Feb 2019 10:32:25 +0100 Subject: [PATCH 069/194] Fix static linking problem with LuaJIT LuaJIT and LuaSocket both define new Lua APIs from Lua 5.2 (in particular `luaL_setfuncs` and `luaL_testudata`). When linking both statically, the one definition rule strikes and linking fails. This commit fixes the issue by renaming the LuaSocket versions of those functions behind the scenes using the C preprocessor. Closes #214 --- src/compat.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/compat.h b/src/compat.h index e2ab307..49e83f9 100644 --- a/src/compat.h +++ b/src/compat.h @@ -5,6 +5,8 @@ #include "lauxlib.h" #if LUA_VERSION_NUM==501 +#define luaL_setfuncs socket_setfuncs +#define luaL_testudata socket_testudata void luaL_setfuncs (lua_State *L, const luaL_Reg *l, int nup); void *luaL_testudata ( lua_State *L, int arg, const char *tname); #endif From 09ff9b650c3567c91eed62f4dd571729df2dedd4 Mon Sep 17 00:00:00 2001 From: "E. Westbrook" Date: Fri, 13 Jul 2018 12:52:26 -0600 Subject: [PATCH 070/194] http.lua: allow override of hard-coded 5 max redirects --- doc/http.html | 8 +++++--- src/http.lua | 5 ++++- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/doc/http.html b/doc/http.html index 3b7a8b1..78f785a 100644 --- a/doc/http.html +++ b/doc/http.html @@ -135,7 +135,8 @@ http.request{
      [step = LTN12 pump step,]
      [proxy = string,]
      [redirect = boolean,]
    -  [create = function]
    +  [create = function,]
    +  [maxredirects = number]
    }

    @@ -185,6 +186,7 @@ Defaults to the LTN12 pump.step function. function from automatically following 301 or 302 server redirect messages;
  • create: An optional function to be used instead of socket.tcp when the communications socket is created. +
  • maxredirects: An optional number specifying the maximum number of redirects to follow. Defaults to 5 if not specified. A boolean false value means no maximum (unlimited).

    @@ -324,8 +326,8 @@ r, c = http.request {

    -Last modified by Diego Nehab on
    -Thu Apr 20 00:25:26 EDT 2006 +Last modified by Eric Westbrook on
    +Sat Feb 23 19:09:42 UTC 2019

    diff --git a/src/http.lua b/src/http.lua index a386165..8bda0d8 100644 --- a/src/http.lua +++ b/src/http.lua @@ -277,7 +277,9 @@ local function shouldredirect(reqt, code, headers) return (reqt.redirect ~= false) and (code == 301 or code == 302 or code == 303 or code == 307) and (not reqt.method or reqt.method == "GET" or reqt.method == "HEAD") - and (not reqt.nredirects or reqt.nredirects < 5) + and ((false == reqt.maxredirects) + or ((reqt.nredirects or 0) + < (reqt.maxredirects or 5))) end local function shouldreceivebody(reqt, code) @@ -299,6 +301,7 @@ local trequest, tredirect sink = reqt.sink, headers = reqt.headers, proxy = reqt.proxy, + maxredirects = reqt.maxredirects, nredirects = (reqt.nredirects or 0) + 1, create = reqt.create } From e587800164d5d6fb75fe34166978438c949db215 Mon Sep 17 00:00:00 2001 From: "E. Westbrook" Date: Thu, 12 Jul 2018 01:10:11 -0600 Subject: [PATCH 071/194] socket.http.request(): simultaneous support for http and https URL schemes, with caller-adjustable scheme-to-transport mappings (default "socket.http" and "ssl.https") --- src/http.lua | 56 ++++++++++++++++++++++++++++++++++------------------ 1 file changed, 37 insertions(+), 19 deletions(-) diff --git a/src/http.lua b/src/http.lua index 19b4dd3..25eb25d 100644 --- a/src/http.lua +++ b/src/http.lua @@ -26,15 +26,20 @@ _M.TIMEOUT = 60 -- user agent field sent in request _M.USERAGENT = socket._VERSION --- supported schemes +-- supported schemes and their particulars local SCHEMES = { - http = { port = 80 } - , https = { port = 443 }} + http = { + port = 80 + , create = function(t) + return socket.tcp end } + , https = { + port = 443 + , create = function(t) + return require("ssl.https").tcp(t) end }} -- default scheme and port for document retrieval local SCHEME = 'http' local PORT = SCHEMES[SCHEME].port - ----------------------------------------------------------------------------- -- Reads MIME headers from a connection, unfolding where needed ----------------------------------------------------------------------------- @@ -115,13 +120,13 @@ local metat = { __index = {} } function _M.open(host, port, create) -- create socket with user connect function, or with default - local c = socket.try((create or socket.tcp)()) + local c = socket.try(create()) local h = base.setmetatable({ c = c }, metat) -- create finalized try h.try = socket.newtry(function() h:close() end) -- set timeout before connecting h.try(c:settimeout(_M.TIMEOUT)) - h.try(c:connect(host, port or PORT)) + h.try(c:connect(host, port)) -- here everything worked return h end @@ -221,14 +226,13 @@ end local function adjustheaders(reqt) -- default headers - local headhost = reqt.host - local headport = tostring(reqt.port) - local schemeport = tostring(SCHEMES[reqt.scheme].port) - if headport ~= schemeport then - headhost = headhost .. ':' .. headport end + local host = reqt.host + local port = tostring(reqt.port) + if port ~= tostring(SCHEMES[reqt.scheme].port) then + host = host .. ':' .. port end local lower = { ["user-agent"] = _M.USERAGENT, - ["host"] = headhost, + ["host"] = host, ["connection"] = "close, TE", ["te"] = "trailers" } @@ -267,8 +271,13 @@ local function adjustrequest(reqt) local nreqt = reqt.url and url.parse(reqt.url, default) or {} -- explicit components override url for i,v in base.pairs(reqt) do nreqt[i] = v end - if nreqt.port == "" then nreqt.port = PORT end - if not (nreqt.host and nreqt.host ~= "") then + -- default to scheme particulars + local schemedefs, host, port, method + = SCHEMES[nreqt.scheme], nreqt.host, nreqt.port, nreqt.method + if not nreqt.create then nreqt.create = schemedefs.create(nreqt) end + if not (port and port ~= '') then nreqt.port = schemedefs.port end + if not (method and method ~= '') then nreqt.method = 'GET' end + if not (host and host ~= "") then socket.try(nil, "invalid host '" .. base.tostring(nreqt.host) .. "'") end -- compute uri if user hasn't overriden @@ -285,8 +294,10 @@ local function shouldredirect(reqt, code, headers) if not location then return false end location = string.gsub(location, "%s", "") if location == "" then return false end - local scheme = string.match(location, "^([%w][%w%+%-%.]*)%:") - if scheme and not SCHEMES[scheme] then return false end + local scheme = url.parse(location).scheme + if scheme and (not SCHEMES[scheme]) then return false end + -- avoid https downgrades + if ('https' == reqt.scheme) and ('https' ~= scheme) then return false end return (reqt.redirect ~= false) and (code == 301 or code == 302 or code == 303 or code == 307) and (not reqt.method or reqt.method == "GET" or reqt.method == "HEAD") @@ -306,10 +317,16 @@ end local trequest, tredirect --[[local]] function tredirect(reqt, location) + -- the RFC says the redirect URL has to be absolute, but some + -- servers do not respect that + local newurl = url.absolute(reqt.url, location) + -- if switching schemes, reset port and create function + if url.parse(newurl).scheme ~= reqt.scheme then + reqt.port = nil + reqt.create = nil end + -- make new request local result, code, headers, status = trequest { - -- the RFC says the redirect URL has to be absolute, but some - -- servers do not respect that - url = url.absolute(reqt.url, location), + url = newurl, source = reqt.source, sink = reqt.sink, headers = reqt.headers, @@ -397,4 +414,5 @@ _M.request = socket.protect(function(reqt, body) else return trequest(reqt) end end) +_M.schemes = SCHEMES return _M From 2a467001f6dbadf447a79dfbd036f32b6a82ce05 Mon Sep 17 00:00:00 2001 From: "E. Westbrook" Date: Sun, 24 Feb 2019 16:24:42 -0700 Subject: [PATCH 072/194] http.lua: Error informatively if insufficient LuaSec support --- src/http.lua | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/http.lua b/src/http.lua index 25eb25d..2fa5a26 100644 --- a/src/http.lua +++ b/src/http.lua @@ -35,7 +35,11 @@ local SCHEMES = { , https = { port = 443 , create = function(t) - return require("ssl.https").tcp(t) end }} + local https = assert( + require("ssl.https"), 'LuaSocket: LuaSec not found') + local tcp = assert( + https.tcp, 'LuaSocket: Function tcp() not available from LuaSec') + return tcp(t) end }} -- default scheme and port for document retrieval local SCHEME = 'http' From f06b17c4c918e1132ae78d1075c8c9654fdc016d Mon Sep 17 00:00:00 2001 From: "E. Westbrook" Date: Mon, 25 Feb 2019 15:54:09 -0700 Subject: [PATCH 073/194] luasocket.h: define LUASOCKET_API and LUASOCKET_PRIVATE for export visibility --- src/luasocket.h | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/luasocket.h b/src/luasocket.h index f75d21f..0121a15 100644 --- a/src/luasocket.h +++ b/src/luasocket.h @@ -18,7 +18,19 @@ * This macro prefixes all exported API functions \*-------------------------------------------------------------------------*/ #ifndef LUASOCKET_API -#define LUASOCKET_API extern +#ifdef _WIN32 +#define LUASOCKET_API __declspec(dllexport) +#else +#define LUASOCKET_API __attribute__ ((visibility ("default"))) +#endif +#endif + +#ifndef LUASOCKET_PRIVATE +#ifdef _WIN32 +#define LUASOCKET_PRIVATE +#else +#define LUASOCKET_PRIVATE __attribute__ ((visibility ("hidden"))) +#endif #endif /*-------------------------------------------------------------------------*\ From efc4bb3e2df90732d46b8b1cdae18c8173bad07b Mon Sep 17 00:00:00 2001 From: "E. Westbrook" Date: Mon, 25 Feb 2019 15:55:04 -0700 Subject: [PATCH 074/194] mime.h: use LUASOCKET_API --- src/mime.h | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/src/mime.h b/src/mime.h index 99968a5..e57fc9c 100644 --- a/src/mime.h +++ b/src/mime.h @@ -8,6 +8,7 @@ * and formatting conforming to RFC 2045. It is used by mime.lua, which * provide a higher level interface to this functionality. \*=========================================================================*/ +#include "luasocket.h" #include "lua.h" /*-------------------------------------------------------------------------*\ @@ -17,13 +18,6 @@ #define MIME_COPYRIGHT "Copyright (C) 2004-2013 Diego Nehab" #define MIME_AUTHORS "Diego Nehab" -/*-------------------------------------------------------------------------*\ -* This macro prefixes all exported API functions -\*-------------------------------------------------------------------------*/ -#ifndef MIME_API -#define MIME_API extern -#endif - -MIME_API int luaopen_mime_core(lua_State *L); +LUASOCKET_API int luaopen_mime_core(lua_State *L); #endif /* MIME_H */ From c23bf865ce32666e8f3bb0abd7d82f84a891ce82 Mon Sep 17 00:00:00 2001 From: "E. Westbrook" Date: Mon, 25 Feb 2019 15:55:36 -0700 Subject: [PATCH 075/194] unix.h: use LUASOCKET_API --- src/unix.h | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/unix.h b/src/unix.h index 8cc7a79..a1674ef 100644 --- a/src/unix.h +++ b/src/unix.h @@ -7,16 +7,13 @@ * This module is just an example of how to extend LuaSocket with a new * domain. \*=========================================================================*/ +#include "luasocket.h" #include "lua.h" #include "buffer.h" #include "timeout.h" #include "socket.h" -#ifndef UNIX_API -#define UNIX_API extern -#endif - typedef struct t_unix_ { t_socket sock; t_io io; @@ -25,6 +22,6 @@ typedef struct t_unix_ { } t_unix; typedef t_unix *p_unix; -UNIX_API int luaopen_socket_unix(lua_State *L); +LUASOCKET_API int luaopen_socket_unix(lua_State *L); #endif /* UNIX_H */ From 1f6035070fd5e2185dfb3a3bf48e1d12668c6599 Mon Sep 17 00:00:00 2001 From: "E. Westbrook" Date: Mon, 25 Feb 2019 15:56:17 -0700 Subject: [PATCH 076/194] mime.c: use LUASOCKET_API --- src/mime.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mime.c b/src/mime.c index 338ecd4..6e359af 100755 --- a/src/mime.c +++ b/src/mime.c @@ -76,7 +76,7 @@ static UC b64unbase[256]; /*-------------------------------------------------------------------------*\ * Initializes module \*-------------------------------------------------------------------------*/ -MIME_API int luaopen_mime_core(lua_State *L) +LUASOCKET_API int luaopen_mime_core(lua_State *L) { lua_newtable(L); luaL_setfuncs(L, func, 0); From 16b0026e27d4c77fc5e723d52b811ebc23dddc0c Mon Sep 17 00:00:00 2001 From: "E. Westbrook" Date: Mon, 25 Feb 2019 15:56:28 -0700 Subject: [PATCH 077/194] unix.c: use LUASOCKET_API --- src/unix.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/unix.c b/src/unix.c index dbc8710..c618a20 100644 --- a/src/unix.c +++ b/src/unix.c @@ -2,6 +2,8 @@ * Unix domain socket * LuaSocket toolkit \*=========================================================================*/ +#include "luasocket.h" + #include "lua.h" #include "lauxlib.h" @@ -45,7 +47,7 @@ static int compat_socket_unix_call(lua_State *L) /*-------------------------------------------------------------------------*\ * Initializes module \*-------------------------------------------------------------------------*/ -int luaopen_socket_unix(lua_State *L) +LUASOCKET_API int luaopen_socket_unix(lua_State *L) { int i; lua_newtable(L); From c0374dd46ff7b3a8c1913ade4a3746873d6060c1 Mon Sep 17 00:00:00 2001 From: "E. Westbrook" Date: Mon, 25 Feb 2019 15:57:01 -0700 Subject: [PATCH 078/194] auxiliar.c: use LUASOCKET_PRIVATE --- src/auxiliar.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/auxiliar.c b/src/auxiliar.c index 5251549..0bd7927 100644 --- a/src/auxiliar.c +++ b/src/auxiliar.c @@ -2,18 +2,18 @@ * Auxiliar routines for class hierarchy manipulation * LuaSocket toolkit \*=========================================================================*/ +#include "luasocket.h" +#include "auxiliar.h" #include #include -#include "auxiliar.h" - /*=========================================================================*\ * Exported functions \*=========================================================================*/ /*-------------------------------------------------------------------------*\ * Initializes the module \*-------------------------------------------------------------------------*/ -int auxiliar_open(lua_State *L) { +LUASOCKET_PRIVATE int auxiliar_open(lua_State *L) { (void) L; return 0; } @@ -22,7 +22,7 @@ int auxiliar_open(lua_State *L) { * Creates a new class with given methods * Methods whose names start with __ are passed directly to the metatable. \*-------------------------------------------------------------------------*/ -void auxiliar_newclass(lua_State *L, const char *classname, luaL_Reg *func) { +LUASOCKET_PRIVATE void auxiliar_newclass(lua_State *L, const char *classname, luaL_Reg *func) { luaL_newmetatable(L, classname); /* mt */ /* create __index table to place methods */ lua_pushstring(L, "__index"); /* mt,"__index" */ @@ -45,7 +45,7 @@ void auxiliar_newclass(lua_State *L, const char *classname, luaL_Reg *func) { /*-------------------------------------------------------------------------*\ * Prints the value of a class in a nice way \*-------------------------------------------------------------------------*/ -int auxiliar_tostring(lua_State *L) { +LUASOCKET_PRIVATE int auxiliar_tostring(lua_State *L) { char buf[32]; if (!lua_getmetatable(L, 1)) goto error; lua_pushstring(L, "__index"); @@ -66,7 +66,7 @@ error: /*-------------------------------------------------------------------------*\ * Insert class into group \*-------------------------------------------------------------------------*/ -void auxiliar_add2group(lua_State *L, const char *classname, const char *groupname) { +LUASOCKET_PRIVATE void auxiliar_add2group(lua_State *L, const char *classname, const char *groupname) { luaL_getmetatable(L, classname); lua_pushstring(L, groupname); lua_pushboolean(L, 1); @@ -77,7 +77,7 @@ void auxiliar_add2group(lua_State *L, const char *classname, const char *groupna /*-------------------------------------------------------------------------*\ * Make sure argument is a boolean \*-------------------------------------------------------------------------*/ -int auxiliar_checkboolean(lua_State *L, int objidx) { +LUASOCKET_PRIVATE int auxiliar_checkboolean(lua_State *L, int objidx) { if (!lua_isboolean(L, objidx)) auxiliar_typeerror(L, objidx, lua_typename(L, LUA_TBOOLEAN)); return lua_toboolean(L, objidx); @@ -87,7 +87,7 @@ int auxiliar_checkboolean(lua_State *L, int objidx) { * Return userdata pointer if object belongs to a given class, abort with * error otherwise \*-------------------------------------------------------------------------*/ -void *auxiliar_checkclass(lua_State *L, const char *classname, int objidx) { +LUASOCKET_PRIVATE void *auxiliar_checkclass(lua_State *L, const char *classname, int objidx) { void *data = auxiliar_getclassudata(L, classname, objidx); if (!data) { char msg[45]; @@ -101,7 +101,7 @@ void *auxiliar_checkclass(lua_State *L, const char *classname, int objidx) { * Return userdata pointer if object belongs to a given group, abort with * error otherwise \*-------------------------------------------------------------------------*/ -void *auxiliar_checkgroup(lua_State *L, const char *groupname, int objidx) { +LUASOCKET_PRIVATE void *auxiliar_checkgroup(lua_State *L, const char *groupname, int objidx) { void *data = auxiliar_getgroupudata(L, groupname, objidx); if (!data) { char msg[45]; @@ -114,7 +114,7 @@ void *auxiliar_checkgroup(lua_State *L, const char *groupname, int objidx) { /*-------------------------------------------------------------------------*\ * Set object class \*-------------------------------------------------------------------------*/ -void auxiliar_setclass(lua_State *L, const char *classname, int objidx) { +LUASOCKET_PRIVATE void auxiliar_setclass(lua_State *L, const char *classname, int objidx) { luaL_getmetatable(L, classname); if (objidx < 0) objidx--; lua_setmetatable(L, objidx); @@ -124,7 +124,7 @@ void auxiliar_setclass(lua_State *L, const char *classname, int objidx) { * Get a userdata pointer if object belongs to a given group. Return NULL * otherwise \*-------------------------------------------------------------------------*/ -void *auxiliar_getgroupudata(lua_State *L, const char *groupname, int objidx) { +LUASOCKET_PRIVATE void *auxiliar_getgroupudata(lua_State *L, const char *groupname, int objidx) { if (!lua_getmetatable(L, objidx)) return NULL; lua_pushstring(L, groupname); @@ -142,7 +142,7 @@ void *auxiliar_getgroupudata(lua_State *L, const char *groupname, int objidx) { * Get a userdata pointer if object belongs to a given class. Return NULL * otherwise \*-------------------------------------------------------------------------*/ -void *auxiliar_getclassudata(lua_State *L, const char *classname, int objidx) { +LUASOCKET_PRIVATE void *auxiliar_getclassudata(lua_State *L, const char *classname, int objidx) { return luaL_testudata(L, objidx, classname); } @@ -150,7 +150,7 @@ void *auxiliar_getclassudata(lua_State *L, const char *classname, int objidx) { * Throws error when argument does not have correct type. * Used to be part of lauxlib in Lua 5.1, was dropped from 5.2. \*-------------------------------------------------------------------------*/ -int auxiliar_typeerror (lua_State *L, int narg, const char *tname) { +LUASOCKET_PRIVATE int auxiliar_typeerror (lua_State *L, int narg, const char *tname) { const char *msg = lua_pushfstring(L, "%s expected, got %s", tname, luaL_typename(L, narg)); return luaL_argerror(L, narg, msg); From b95527e140fd0ec573ca0e83c5f64dffadd7e228 Mon Sep 17 00:00:00 2001 From: "E. Westbrook" Date: Mon, 25 Feb 2019 15:57:25 -0700 Subject: [PATCH 079/194] buffer.c: use LUASOCKET_PRIVATE --- src/buffer.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/buffer.c b/src/buffer.c index fff1634..357730a 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -2,6 +2,8 @@ * Input/Output interface for Lua programs * LuaSocket toolkit \*=========================================================================*/ +#include "luasocket.h" + #include "lua.h" #include "lauxlib.h" #include "compat.h" @@ -32,7 +34,7 @@ static int sendraw(p_buffer buf, const char *data, size_t count, size_t *sent); /*-------------------------------------------------------------------------*\ * Initializes module \*-------------------------------------------------------------------------*/ -int buffer_open(lua_State *L) { +LUASOCKET_PRIVATE int buffer_open(lua_State *L) { (void) L; return 0; } @@ -40,7 +42,7 @@ int buffer_open(lua_State *L) { /*-------------------------------------------------------------------------*\ * Initializes C structure \*-------------------------------------------------------------------------*/ -void buffer_init(p_buffer buf, p_io io, p_timeout tm) { +LUASOCKET_PRIVATE void buffer_init(p_buffer buf, p_io io, p_timeout tm) { buf->first = buf->last = 0; buf->io = io; buf->tm = tm; @@ -51,7 +53,7 @@ void buffer_init(p_buffer buf, p_io io, p_timeout tm) { /*-------------------------------------------------------------------------*\ * object:getstats() interface \*-------------------------------------------------------------------------*/ -int buffer_meth_getstats(lua_State *L, p_buffer buf) { +LUASOCKET_PRIVATE int buffer_meth_getstats(lua_State *L, p_buffer buf) { lua_pushnumber(L, (lua_Number) buf->received); lua_pushnumber(L, (lua_Number) buf->sent); lua_pushnumber(L, timeout_gettime() - buf->birthday); @@ -61,7 +63,7 @@ int buffer_meth_getstats(lua_State *L, p_buffer buf) { /*-------------------------------------------------------------------------*\ * object:setstats() interface \*-------------------------------------------------------------------------*/ -int buffer_meth_setstats(lua_State *L, p_buffer buf) { +LUASOCKET_PRIVATE int buffer_meth_setstats(lua_State *L, p_buffer buf) { buf->received = (long) luaL_optnumber(L, 2, (lua_Number) buf->received); buf->sent = (long) luaL_optnumber(L, 3, (lua_Number) buf->sent); if (lua_isnumber(L, 4)) buf->birthday = timeout_gettime() - lua_tonumber(L, 4); @@ -72,7 +74,7 @@ int buffer_meth_setstats(lua_State *L, p_buffer buf) { /*-------------------------------------------------------------------------*\ * object:send() interface \*-------------------------------------------------------------------------*/ -int buffer_meth_send(lua_State *L, p_buffer buf) { +LUASOCKET_PRIVATE int buffer_meth_send(lua_State *L, p_buffer buf) { int top = lua_gettop(L); int err = IO_DONE; size_t size = 0, sent = 0; @@ -105,7 +107,7 @@ int buffer_meth_send(lua_State *L, p_buffer buf) { /*-------------------------------------------------------------------------*\ * object:receive() interface \*-------------------------------------------------------------------------*/ -int buffer_meth_receive(lua_State *L, p_buffer buf) { +LUASOCKET_PRIVATE int buffer_meth_receive(lua_State *L, p_buffer buf) { int err = IO_DONE, top = lua_gettop(L); luaL_Buffer b; size_t size; @@ -154,7 +156,7 @@ int buffer_meth_receive(lua_State *L, p_buffer buf) { /*-------------------------------------------------------------------------*\ * Determines if there is any data in the read buffer \*-------------------------------------------------------------------------*/ -int buffer_isempty(p_buffer buf) { +LUASOCKET_PRIVATE int buffer_isempty(p_buffer buf) { return buf->first >= buf->last; } From 2bf6730fd559e06727903eec77e52b29637c2af1 Mon Sep 17 00:00:00 2001 From: "E. Westbrook" Date: Mon, 25 Feb 2019 15:58:30 -0700 Subject: [PATCH 080/194] pragma.c: use LUASOCKET_PRIVATE --- src/compat.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/compat.c b/src/compat.c index 988fa68..1290f70 100644 --- a/src/compat.c +++ b/src/compat.c @@ -1,10 +1,11 @@ +#include "luasocket.h" #include "compat.h" #if LUA_VERSION_NUM==501 /* ** Adapted from Lua 5.2 */ -void luaL_setfuncs (lua_State *L, const luaL_Reg *l, int nup) { +LUASOCKET_PRIVATE void luaL_setfuncs (lua_State *L, const luaL_Reg *l, int nup) { luaL_checkstack(L, nup+1, "too many upvalues"); for (; l->name != NULL; l++) { /* fill the table with given functions */ int i; @@ -20,7 +21,7 @@ void luaL_setfuncs (lua_State *L, const luaL_Reg *l, int nup) { /* ** Duplicated from Lua 5.2 */ -void *luaL_testudata (lua_State *L, int ud, const char *tname) { +LUASOCKET_PRIVATE void *luaL_testudata (lua_State *L, int ud, const char *tname) { void *p = lua_touserdata(L, ud); if (p != NULL) { /* value is a userdata? */ if (lua_getmetatable(L, ud)) { /* does it have a metatable? */ From 395729d4314dfeda2a095760cf2de042af7581f8 Mon Sep 17 00:00:00 2001 From: "E. Westbrook" Date: Mon, 25 Feb 2019 15:58:45 -0700 Subject: [PATCH 081/194] except.c: use LUASOCKET_PRIVATE --- src/except.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/except.c b/src/except.c index 60b5005..dab70e7 100644 --- a/src/except.c +++ b/src/except.c @@ -2,6 +2,8 @@ * Simple exception support * LuaSocket toolkit \*=========================================================================*/ +#include "luasocket.h" + #include #include "lua.h" @@ -124,7 +126,7 @@ static int global_protect(lua_State *L) { /*-------------------------------------------------------------------------*\ * Init module \*-------------------------------------------------------------------------*/ -int except_open(lua_State *L) { +LUASOCKET_PRIVATE int except_open(lua_State *L) { lua_newtable(L); /* metatable for wrapped exceptions */ lua_pushboolean(L, 0); lua_setfield(L, -2, "__metatable"); From 731b23bc891fdf6136af7457972b8a8f8f1b55ec Mon Sep 17 00:00:00 2001 From: "E. Westbrook" Date: Mon, 25 Feb 2019 15:58:54 -0700 Subject: [PATCH 082/194] inet.c: use LUASOCKET_PRIVATE --- src/inet.c | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/src/inet.c b/src/inet.c index f4c8404..bed8a7c 100644 --- a/src/inet.c +++ b/src/inet.c @@ -2,6 +2,8 @@ * Internet domain functions * LuaSocket toolkit \*=========================================================================*/ +#include "luasocket.h" + #include #include #include @@ -38,7 +40,7 @@ static luaL_Reg func[] = { /*-------------------------------------------------------------------------*\ * Initializes module \*-------------------------------------------------------------------------*/ -int inet_open(lua_State *L) +LUASOCKET_PRIVATE int inet_open(lua_State *L) { lua_pushstring(L, "dns"); lua_newtable(L); @@ -143,7 +145,7 @@ static int inet_global_toip(lua_State *L) return 2; } -int inet_optfamily(lua_State* L, int narg, const char* def) +LUASOCKET_PRIVATE int inet_optfamily(lua_State* L, int narg, const char* def) { static const char* optname[] = { "unspec", "inet", "inet6", NULL }; static int optvalue[] = { AF_UNSPEC, AF_INET, AF_INET6, 0 }; @@ -151,7 +153,7 @@ int inet_optfamily(lua_State* L, int narg, const char* def) return optvalue[luaL_checkoption(L, narg, def, optname)]; } -int inet_optsocktype(lua_State* L, int narg, const char* def) +LUASOCKET_PRIVATE int inet_optsocktype(lua_State* L, int narg, const char* def) { static const char* optname[] = { "stream", "dgram", NULL }; static int optvalue[] = { SOCK_STREAM, SOCK_DGRAM, 0 }; @@ -242,7 +244,7 @@ static int inet_global_gethostname(lua_State *L) /*-------------------------------------------------------------------------*\ * Retrieves socket peer name \*-------------------------------------------------------------------------*/ -int inet_meth_getpeername(lua_State *L, p_socket ps, int family) +LUASOCKET_PRIVATE int inet_meth_getpeername(lua_State *L, p_socket ps, int family) { int err; struct sockaddr_storage peer; @@ -276,7 +278,7 @@ int inet_meth_getpeername(lua_State *L, p_socket ps, int family) /*-------------------------------------------------------------------------*\ * Retrieves socket local name \*-------------------------------------------------------------------------*/ -int inet_meth_getsockname(lua_State *L, p_socket ps, int family) +LUASOCKET_PRIVATE int inet_meth_getsockname(lua_State *L, p_socket ps, int family) { int err; struct sockaddr_storage peer; @@ -352,7 +354,7 @@ static void inet_pushresolved(lua_State *L, struct hostent *hp) /*-------------------------------------------------------------------------*\ * Tries to create a new inet socket \*-------------------------------------------------------------------------*/ -const char *inet_trycreate(p_socket ps, int family, int type, int protocol) { +LUASOCKET_PRIVATE const char *inet_trycreate(p_socket ps, int family, int type, int protocol) { const char *err = socket_strerror(socket_create(ps, family, type, protocol)); if (err == NULL && family == AF_INET6) { int yes = 1; @@ -364,7 +366,7 @@ const char *inet_trycreate(p_socket ps, int family, int type, int protocol) { /*-------------------------------------------------------------------------*\ * "Disconnects" a DGRAM socket \*-------------------------------------------------------------------------*/ -const char *inet_trydisconnect(p_socket ps, int family, p_timeout tm) +LUASOCKET_PRIVATE const char *inet_trydisconnect(p_socket ps, int family, p_timeout tm) { switch (family) { case AF_INET: { @@ -391,7 +393,7 @@ const char *inet_trydisconnect(p_socket ps, int family, p_timeout tm) /*-------------------------------------------------------------------------*\ * Tries to connect to remote address (address, port) \*-------------------------------------------------------------------------*/ -const char *inet_tryconnect(p_socket ps, int *family, const char *address, +LUASOCKET_PRIVATE const char *inet_tryconnect(p_socket ps, int *family, const char *address, const char *serv, p_timeout tm, struct addrinfo *connecthints) { struct addrinfo *iterator = NULL, *resolved = NULL; @@ -437,7 +439,7 @@ const char *inet_tryconnect(p_socket ps, int *family, const char *address, /*-------------------------------------------------------------------------*\ * Tries to accept a socket \*-------------------------------------------------------------------------*/ -const char *inet_tryaccept(p_socket server, int family, p_socket client, +LUASOCKET_PRIVATE const char *inet_tryaccept(p_socket server, int family, p_socket client, p_timeout tm) { socklen_t len; t_sockaddr_storage addr; @@ -453,7 +455,7 @@ const char *inet_tryaccept(p_socket server, int family, p_socket client, /*-------------------------------------------------------------------------*\ * Tries to bind socket to (address, port) \*-------------------------------------------------------------------------*/ -const char *inet_trybind(p_socket ps, int *family, const char *address, +LUASOCKET_PRIVATE const char *inet_trybind(p_socket ps, int *family, const char *address, const char *serv, struct addrinfo *bindhints) { struct addrinfo *iterator = NULL, *resolved = NULL; const char *err = NULL; @@ -497,7 +499,7 @@ const char *inet_trybind(p_socket ps, int *family, const char *address, * Some systems do not provide these so that we provide our own. \*-------------------------------------------------------------------------*/ #ifdef LUASOCKET_INET_ATON -int inet_aton(const char *cp, struct in_addr *inp) +LUASOCKET_PRIVATE int inet_aton(const char *cp, struct in_addr *inp) { unsigned int a = 0, b = 0, c = 0, d = 0; int n = 0, r; @@ -519,7 +521,7 @@ int inet_aton(const char *cp, struct in_addr *inp) #endif #ifdef LUASOCKET_INET_PTON -int inet_pton(int af, const char *src, void *dst) +LUASOCKET_PRIVATE int inet_pton(int af, const char *src, void *dst) { struct addrinfo hints, *res; int ret = 1; From 3f19a052e8f0c014365e9a07aaf82afd586f3ee1 Mon Sep 17 00:00:00 2001 From: "E. Westbrook" Date: Mon, 25 Feb 2019 15:59:09 -0700 Subject: [PATCH 083/194] io.c: use LUASOCKET_PRIVATE --- src/io.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/io.c b/src/io.c index a4230ce..f1a2b9d 100644 --- a/src/io.c +++ b/src/io.c @@ -2,6 +2,7 @@ * Input/Output abstraction * LuaSocket toolkit \*=========================================================================*/ +#include "luasocket.h" #include "io.h" /*=========================================================================*\ @@ -10,7 +11,7 @@ /*-------------------------------------------------------------------------*\ * Initializes C structure \*-------------------------------------------------------------------------*/ -void io_init(p_io io, p_send send, p_recv recv, p_error error, void *ctx) { +LUASOCKET_PRIVATE void io_init(p_io io, p_send send, p_recv recv, p_error error, void *ctx) { io->send = send; io->recv = recv; io->error = error; @@ -20,7 +21,7 @@ void io_init(p_io io, p_send send, p_recv recv, p_error error, void *ctx) { /*-------------------------------------------------------------------------*\ * I/O error strings \*-------------------------------------------------------------------------*/ -const char *io_strerror(int err) { +LUASOCKET_PRIVATE const char *io_strerror(int err) { switch (err) { case IO_DONE: return NULL; case IO_CLOSED: return "closed"; From ef2a3fcedb8c03a2e64942cb794f4ffd6a9beef7 Mon Sep 17 00:00:00 2001 From: "E. Westbrook" Date: Mon, 25 Feb 2019 15:59:19 -0700 Subject: [PATCH 084/194] options.c: use LUASOCKET_PRIVATE --- src/options.c | 94 +++++++++++++++++++++++++-------------------------- 1 file changed, 46 insertions(+), 48 deletions(-) diff --git a/src/options.c b/src/options.c index bbadec3..b0bacbf 100644 --- a/src/options.c +++ b/src/options.c @@ -2,14 +2,12 @@ * Common option interface * LuaSocket toolkit \*=========================================================================*/ -#include - +#include "luasocket.h" #include "lauxlib.h" - #include "auxiliar.h" #include "options.h" #include "inet.h" - +#include /*=========================================================================*\ * Internal functions prototypes @@ -31,7 +29,7 @@ static int opt_get(lua_State *L, p_socket ps, int level, int name, /*-------------------------------------------------------------------------*\ * Calls appropriate option handler \*-------------------------------------------------------------------------*/ -int opt_meth_setoption(lua_State *L, p_opt opt, p_socket ps) +LUASOCKET_PRIVATE int opt_meth_setoption(lua_State *L, p_opt opt, p_socket ps) { const char *name = luaL_checkstring(L, 2); /* obj, name, ... */ while (opt->name && strcmp(name, opt->name)) @@ -44,7 +42,7 @@ int opt_meth_setoption(lua_State *L, p_opt opt, p_socket ps) return opt->func(L, ps); } -int opt_meth_getoption(lua_State *L, p_opt opt, p_socket ps) +LUASOCKET_PRIVATE int opt_meth_getoption(lua_State *L, p_opt opt, p_socket ps) { const char *name = luaL_checkstring(L, 2); /* obj, name, ... */ while (opt->name && strcmp(name, opt->name)) @@ -58,165 +56,165 @@ int opt_meth_getoption(lua_State *L, p_opt opt, p_socket ps) } /* enables reuse of local address */ -int opt_set_reuseaddr(lua_State *L, p_socket ps) +LUASOCKET_PRIVATE int opt_set_reuseaddr(lua_State *L, p_socket ps) { return opt_setboolean(L, ps, SOL_SOCKET, SO_REUSEADDR); } -int opt_get_reuseaddr(lua_State *L, p_socket ps) +LUASOCKET_PRIVATE int opt_get_reuseaddr(lua_State *L, p_socket ps) { return opt_getboolean(L, ps, SOL_SOCKET, SO_REUSEADDR); } /* enables reuse of local port */ -int opt_set_reuseport(lua_State *L, p_socket ps) +LUASOCKET_PRIVATE int opt_set_reuseport(lua_State *L, p_socket ps) { return opt_setboolean(L, ps, SOL_SOCKET, SO_REUSEPORT); } -int opt_get_reuseport(lua_State *L, p_socket ps) +LUASOCKET_PRIVATE int opt_get_reuseport(lua_State *L, p_socket ps) { return opt_getboolean(L, ps, SOL_SOCKET, SO_REUSEPORT); } /* disables the Naggle algorithm */ -int opt_set_tcp_nodelay(lua_State *L, p_socket ps) +LUASOCKET_PRIVATE int opt_set_tcp_nodelay(lua_State *L, p_socket ps) { return opt_setboolean(L, ps, IPPROTO_TCP, TCP_NODELAY); } -int opt_get_tcp_nodelay(lua_State *L, p_socket ps) +LUASOCKET_PRIVATE int opt_get_tcp_nodelay(lua_State *L, p_socket ps) { return opt_getboolean(L, ps, IPPROTO_TCP, TCP_NODELAY); } #ifdef TCP_KEEPIDLE -int opt_get_tcp_keepidle(lua_State *L, p_socket ps) +LUASOCKET_PRIVATE int opt_get_tcp_keepidle(lua_State *L, p_socket ps) { return opt_getint(L, ps, IPPROTO_TCP, TCP_KEEPIDLE); } -int opt_set_tcp_keepidle(lua_State *L, p_socket ps) +LUASOCKET_PRIVATE int opt_set_tcp_keepidle(lua_State *L, p_socket ps) { return opt_setint(L, ps, IPPROTO_TCP, TCP_KEEPIDLE); } #endif #ifdef TCP_KEEPCNT -int opt_get_tcp_keepcnt(lua_State *L, p_socket ps) +LUASOCKET_PRIVATE int opt_get_tcp_keepcnt(lua_State *L, p_socket ps) { return opt_getint(L, ps, IPPROTO_TCP, TCP_KEEPCNT); } -int opt_set_tcp_keepcnt(lua_State *L, p_socket ps) +LUASOCKET_PRIVATE int opt_set_tcp_keepcnt(lua_State *L, p_socket ps) { return opt_setint(L, ps, IPPROTO_TCP, TCP_KEEPCNT); } #endif #ifdef TCP_KEEPINTVL -int opt_get_tcp_keepintvl(lua_State *L, p_socket ps) +LUASOCKET_PRIVATE int opt_get_tcp_keepintvl(lua_State *L, p_socket ps) { return opt_getint(L, ps, IPPROTO_TCP, TCP_KEEPINTVL); } -int opt_set_tcp_keepintvl(lua_State *L, p_socket ps) +LUASOCKET_PRIVATE int opt_set_tcp_keepintvl(lua_State *L, p_socket ps) { return opt_setint(L, ps, IPPROTO_TCP, TCP_KEEPINTVL); } #endif -int opt_set_keepalive(lua_State *L, p_socket ps) +LUASOCKET_PRIVATE int opt_set_keepalive(lua_State *L, p_socket ps) { return opt_setboolean(L, ps, SOL_SOCKET, SO_KEEPALIVE); } -int opt_get_keepalive(lua_State *L, p_socket ps) +LUASOCKET_PRIVATE int opt_get_keepalive(lua_State *L, p_socket ps) { return opt_getboolean(L, ps, SOL_SOCKET, SO_KEEPALIVE); } -int opt_set_dontroute(lua_State *L, p_socket ps) +LUASOCKET_PRIVATE int opt_set_dontroute(lua_State *L, p_socket ps) { return opt_setboolean(L, ps, SOL_SOCKET, SO_DONTROUTE); } -int opt_get_dontroute(lua_State *L, p_socket ps) +LUASOCKET_PRIVATE int opt_get_dontroute(lua_State *L, p_socket ps) { return opt_getboolean(L, ps, SOL_SOCKET, SO_DONTROUTE); } -int opt_set_broadcast(lua_State *L, p_socket ps) +LUASOCKET_PRIVATE int opt_set_broadcast(lua_State *L, p_socket ps) { return opt_setboolean(L, ps, SOL_SOCKET, SO_BROADCAST); } -int opt_set_recv_buf_size(lua_State *L, p_socket ps) +LUASOCKET_PRIVATE int opt_set_recv_buf_size(lua_State *L, p_socket ps) { return opt_setint(L, ps, SOL_SOCKET, SO_RCVBUF); } -int opt_get_recv_buf_size(lua_State *L, p_socket ps) +LUASOCKET_PRIVATE int opt_get_recv_buf_size(lua_State *L, p_socket ps) { return opt_getint(L, ps, SOL_SOCKET, SO_RCVBUF); } -int opt_get_send_buf_size(lua_State *L, p_socket ps) +LUASOCKET_PRIVATE int opt_get_send_buf_size(lua_State *L, p_socket ps) { return opt_getint(L, ps, SOL_SOCKET, SO_SNDBUF); } -int opt_set_send_buf_size(lua_State *L, p_socket ps) +LUASOCKET_PRIVATE int opt_set_send_buf_size(lua_State *L, p_socket ps) { return opt_setint(L, ps, SOL_SOCKET, SO_SNDBUF); } -int opt_get_broadcast(lua_State *L, p_socket ps) +LUASOCKET_PRIVATE int opt_get_broadcast(lua_State *L, p_socket ps) { return opt_getboolean(L, ps, SOL_SOCKET, SO_BROADCAST); } -int opt_set_ip6_unicast_hops(lua_State *L, p_socket ps) +LUASOCKET_PRIVATE int opt_set_ip6_unicast_hops(lua_State *L, p_socket ps) { return opt_setint(L, ps, IPPROTO_IPV6, IPV6_UNICAST_HOPS); } -int opt_get_ip6_unicast_hops(lua_State *L, p_socket ps) +LUASOCKET_PRIVATE int opt_get_ip6_unicast_hops(lua_State *L, p_socket ps) { return opt_getint(L, ps, IPPROTO_IPV6, IPV6_UNICAST_HOPS); } -int opt_set_ip6_multicast_hops(lua_State *L, p_socket ps) +LUASOCKET_PRIVATE int opt_set_ip6_multicast_hops(lua_State *L, p_socket ps) { return opt_setint(L, ps, IPPROTO_IPV6, IPV6_MULTICAST_HOPS); } -int opt_get_ip6_multicast_hops(lua_State *L, p_socket ps) +LUASOCKET_PRIVATE int opt_get_ip6_multicast_hops(lua_State *L, p_socket ps) { return opt_getint(L, ps, IPPROTO_IPV6, IPV6_MULTICAST_HOPS); } -int opt_set_ip_multicast_loop(lua_State *L, p_socket ps) +LUASOCKET_PRIVATE int opt_set_ip_multicast_loop(lua_State *L, p_socket ps) { return opt_setboolean(L, ps, IPPROTO_IP, IP_MULTICAST_LOOP); } -int opt_get_ip_multicast_loop(lua_State *L, p_socket ps) +LUASOCKET_PRIVATE int opt_get_ip_multicast_loop(lua_State *L, p_socket ps) { return opt_getboolean(L, ps, IPPROTO_IP, IP_MULTICAST_LOOP); } -int opt_set_ip6_multicast_loop(lua_State *L, p_socket ps) +LUASOCKET_PRIVATE int opt_set_ip6_multicast_loop(lua_State *L, p_socket ps) { return opt_setboolean(L, ps, IPPROTO_IPV6, IPV6_MULTICAST_LOOP); } -int opt_get_ip6_multicast_loop(lua_State *L, p_socket ps) +LUASOCKET_PRIVATE int opt_get_ip6_multicast_loop(lua_State *L, p_socket ps) { return opt_getboolean(L, ps, IPPROTO_IPV6, IPV6_MULTICAST_LOOP); } -int opt_set_linger(lua_State *L, p_socket ps) +LUASOCKET_PRIVATE int opt_set_linger(lua_State *L, p_socket ps) { struct linger li; /* obj, name, table */ if (!lua_istable(L, 3)) auxiliar_typeerror(L,3,lua_typename(L, LUA_TTABLE)); @@ -233,7 +231,7 @@ int opt_set_linger(lua_State *L, p_socket ps) return opt_set(L, ps, SOL_SOCKET, SO_LINGER, (char *) &li, sizeof(li)); } -int opt_get_linger(lua_State *L, p_socket ps) +LUASOCKET_PRIVATE int opt_get_linger(lua_State *L, p_socket ps) { struct linger li; /* obj, name */ int len = sizeof(li); @@ -248,12 +246,12 @@ int opt_get_linger(lua_State *L, p_socket ps) return 1; } -int opt_set_ip_multicast_ttl(lua_State *L, p_socket ps) +LUASOCKET_PRIVATE int opt_set_ip_multicast_ttl(lua_State *L, p_socket ps) { return opt_setint(L, ps, IPPROTO_IP, IP_MULTICAST_TTL); } -int opt_set_ip_multicast_if(lua_State *L, p_socket ps) +LUASOCKET_PRIVATE int opt_set_ip_multicast_if(lua_State *L, p_socket ps) { const char *address = luaL_checkstring(L, 3); /* obj, name, ip */ struct in_addr val; @@ -264,7 +262,7 @@ int opt_set_ip_multicast_if(lua_State *L, p_socket ps) (char *) &val, sizeof(val)); } -int opt_get_ip_multicast_if(lua_State *L, p_socket ps) +LUASOCKET_PRIVATE int opt_get_ip_multicast_if(lua_State *L, p_socket ps) { struct in_addr val; socklen_t len = sizeof(val); @@ -277,32 +275,32 @@ int opt_get_ip_multicast_if(lua_State *L, p_socket ps) return 1; } -int opt_set_ip_add_membership(lua_State *L, p_socket ps) +LUASOCKET_PRIVATE int opt_set_ip_add_membership(lua_State *L, p_socket ps) { return opt_setmembership(L, ps, IPPROTO_IP, IP_ADD_MEMBERSHIP); } -int opt_set_ip_drop_membersip(lua_State *L, p_socket ps) +LUASOCKET_PRIVATE int opt_set_ip_drop_membersip(lua_State *L, p_socket ps) { return opt_setmembership(L, ps, IPPROTO_IP, IP_DROP_MEMBERSHIP); } -int opt_set_ip6_add_membership(lua_State *L, p_socket ps) +LUASOCKET_PRIVATE int opt_set_ip6_add_membership(lua_State *L, p_socket ps) { return opt_ip6_setmembership(L, ps, IPPROTO_IPV6, IPV6_ADD_MEMBERSHIP); } -int opt_set_ip6_drop_membersip(lua_State *L, p_socket ps) +LUASOCKET_PRIVATE int opt_set_ip6_drop_membersip(lua_State *L, p_socket ps) { return opt_ip6_setmembership(L, ps, IPPROTO_IPV6, IPV6_DROP_MEMBERSHIP); } -int opt_get_ip6_v6only(lua_State *L, p_socket ps) +LUASOCKET_PRIVATE int opt_get_ip6_v6only(lua_State *L, p_socket ps) { return opt_getboolean(L, ps, IPPROTO_IPV6, IPV6_V6ONLY); } -int opt_set_ip6_v6only(lua_State *L, p_socket ps) +LUASOCKET_PRIVATE int opt_set_ip6_v6only(lua_State *L, p_socket ps) { return opt_setboolean(L, ps, IPPROTO_IPV6, IPV6_V6ONLY); } @@ -393,7 +391,7 @@ static int opt_getboolean(lua_State *L, p_socket ps, int level, int name) return 1; } -int opt_get_error(lua_State *L, p_socket ps) +LUASOCKET_PRIVATE int opt_get_error(lua_State *L, p_socket ps) { int val = 0; socklen_t len = sizeof(val); From fae993c118cd1b88b35d5760b233b790ac9e1109 Mon Sep 17 00:00:00 2001 From: "E. Westbrook" Date: Mon, 25 Feb 2019 15:59:29 -0700 Subject: [PATCH 085/194] select.c: use LUASOCKET_PRIVATE --- src/select.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/select.c b/src/select.c index 9d133b7..b615b19 100644 --- a/src/select.c +++ b/src/select.c @@ -2,7 +2,7 @@ * Select implementation * LuaSocket toolkit \*=========================================================================*/ -#include +#include "luasocket.h" #include "lua.h" #include "lauxlib.h" @@ -12,6 +12,8 @@ #include "timeout.h" #include "select.h" +#include + /*=========================================================================*\ * Internal function prototypes. \*=========================================================================*/ @@ -37,7 +39,7 @@ static luaL_Reg func[] = { /*-------------------------------------------------------------------------*\ * Initializes module \*-------------------------------------------------------------------------*/ -int select_open(lua_State *L) { +LUASOCKET_PRIVATE int select_open(lua_State *L) { lua_pushstring(L, "_SETSIZE"); lua_pushinteger(L, FD_SETSIZE); lua_rawset(L, -3); From 898f2df025a3bcc9b1639f64d407fba0ac9acefc Mon Sep 17 00:00:00 2001 From: "E. Westbrook" Date: Mon, 25 Feb 2019 16:00:38 -0700 Subject: [PATCH 086/194] serial.c: include luasocket.h --- src/serial.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/serial.c b/src/serial.c index 7bdb21c..cb46edb 100644 --- a/src/serial.c +++ b/src/serial.c @@ -2,6 +2,8 @@ * Serial stream * LuaSocket toolkit \*=========================================================================*/ +#include "luasocket.h" + #include #include "lua.h" From 525d703e16c1f557b95f742f7d2681ad6815f92f Mon Sep 17 00:00:00 2001 From: "E. Westbrook" Date: Mon, 25 Feb 2019 16:00:51 -0700 Subject: [PATCH 087/194] tcp.c: use LUASOCKET_PRIVATE --- src/tcp.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/tcp.c b/src/tcp.c index c7384b4..cc5b6a7 100644 --- a/src/tcp.c +++ b/src/tcp.c @@ -2,18 +2,21 @@ * TCP object * LuaSocket toolkit \*=========================================================================*/ -#include +#include "luasocket.h" #include "lua.h" #include "lauxlib.h" -#include "compat.h" +#include "compat.h" #include "auxiliar.h" + #include "socket.h" #include "inet.h" #include "options.h" #include "tcp.h" +#include + /*=========================================================================*\ * Internal function prototypes \*=========================================================================*/ @@ -126,7 +129,7 @@ static luaL_Reg func[] = { /*-------------------------------------------------------------------------*\ * Initializes module \*-------------------------------------------------------------------------*/ -int tcp_open(lua_State *L) +LUASOCKET_PRIVATE int tcp_open(lua_State *L) { /* create classes */ auxiliar_newclass(L, "tcp{master}", tcp_methods); From 87c2dee13e05d5474e2acde7f5dca29edd589335 Mon Sep 17 00:00:00 2001 From: "E. Westbrook" Date: Mon, 25 Feb 2019 16:01:04 -0700 Subject: [PATCH 088/194] timeout.c: use LUASOCKET_PRIVATE --- src/timeout.c | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/src/timeout.c b/src/timeout.c index 5a601d5..8fb8f55 100644 --- a/src/timeout.c +++ b/src/timeout.c @@ -2,9 +2,7 @@ * Timeout management functions * LuaSocket toolkit \*=========================================================================*/ -#include -#include -#include +#include "luasocket.h" #include "lua.h" #include "lauxlib.h" @@ -13,6 +11,10 @@ #include "auxiliar.h" #include "timeout.h" +#include +#include +#include + #ifdef _WIN32 #include #else @@ -46,7 +48,7 @@ static luaL_Reg func[] = { /*-------------------------------------------------------------------------*\ * Initialize structure \*-------------------------------------------------------------------------*/ -void timeout_init(p_timeout tm, double block, double total) { +LUASOCKET_PRIVATE void timeout_init(p_timeout tm, double block, double total) { tm->block = block; tm->total = total; } @@ -59,7 +61,7 @@ void timeout_init(p_timeout tm, double block, double total) { * Returns * the number of ms left or -1 if there is no time limit \*-------------------------------------------------------------------------*/ -double timeout_get(p_timeout tm) { +LUASOCKET_PRIVATE double timeout_get(p_timeout tm) { if (tm->block < 0.0 && tm->total < 0.0) { return -1; } else if (tm->block < 0.0) { @@ -80,7 +82,7 @@ double timeout_get(p_timeout tm) { * Returns * start field of structure \*-------------------------------------------------------------------------*/ -double timeout_getstart(p_timeout tm) { +LUASOCKET_PRIVATE double timeout_getstart(p_timeout tm) { return tm->start; } @@ -92,7 +94,7 @@ double timeout_getstart(p_timeout tm) { * Returns * the number of ms left or -1 if there is no time limit \*-------------------------------------------------------------------------*/ -double timeout_getretry(p_timeout tm) { +LUASOCKET_PRIVATE double timeout_getretry(p_timeout tm) { if (tm->block < 0.0 && tm->total < 0.0) { return -1; } else if (tm->block < 0.0) { @@ -112,7 +114,7 @@ double timeout_getretry(p_timeout tm) { * Input * tm: timeout control structure \*-------------------------------------------------------------------------*/ -p_timeout timeout_markstart(p_timeout tm) { +LUASOCKET_PRIVATE p_timeout timeout_markstart(p_timeout tm) { tm->start = timeout_gettime(); return tm; } @@ -123,7 +125,7 @@ p_timeout timeout_markstart(p_timeout tm) { * time in s. \*-------------------------------------------------------------------------*/ #ifdef _WIN32 -double timeout_gettime(void) { +LUASOCKET_PRIVATE double timeout_gettime(void) { FILETIME ft; double t; GetSystemTimeAsFileTime(&ft); @@ -133,7 +135,7 @@ double timeout_gettime(void) { return (t - 11644473600.0); } #else -double timeout_gettime(void) { +LUASOCKET_PRIVATE double timeout_gettime(void) { struct timeval v; gettimeofday(&v, (struct timezone *) NULL); /* Unix Epoch time (time since January 1, 1970 (UTC)) */ @@ -144,7 +146,7 @@ double timeout_gettime(void) { /*-------------------------------------------------------------------------*\ * Initializes module \*-------------------------------------------------------------------------*/ -int timeout_open(lua_State *L) { +LUASOCKET_PRIVATE int timeout_open(lua_State *L) { luaL_setfuncs(L, func, 0); return 0; } @@ -155,7 +157,7 @@ int timeout_open(lua_State *L) { * time: time out value in seconds * mode: "b" for block timeout, "t" for total timeout. (default: b) \*-------------------------------------------------------------------------*/ -int timeout_meth_settimeout(lua_State *L, p_timeout tm) { +LUASOCKET_PRIVATE int timeout_meth_settimeout(lua_State *L, p_timeout tm) { double t = luaL_optnumber(L, 2, -1); const char *mode = luaL_optstring(L, 3, "b"); switch (*mode) { @@ -177,7 +179,7 @@ int timeout_meth_settimeout(lua_State *L, p_timeout tm) { * Gets timeout values for IO operations * Lua Output: block, total \*-------------------------------------------------------------------------*/ -int timeout_meth_gettimeout(lua_State *L, p_timeout tm) { +LUASOCKET_PRIVATE int timeout_meth_gettimeout(lua_State *L, p_timeout tm) { lua_pushnumber(L, tm->block); lua_pushnumber(L, tm->total); return 2; @@ -199,7 +201,7 @@ static int timeout_lua_gettime(lua_State *L) * Sleep for n seconds. \*-------------------------------------------------------------------------*/ #ifdef _WIN32 -int timeout_lua_sleep(lua_State *L) +LUASOCKET_PRIVATE int timeout_lua_sleep(lua_State *L) { double n = luaL_checknumber(L, 1); if (n < 0.0) n = 0.0; @@ -209,7 +211,7 @@ int timeout_lua_sleep(lua_State *L) return 0; } #else -int timeout_lua_sleep(lua_State *L) +LUASOCKET_PRIVATE int timeout_lua_sleep(lua_State *L) { double n = luaL_checknumber(L, 1); struct timespec t, r; From 30a0a6003b3150af8b317cc8e39ebfa43636e2d0 Mon Sep 17 00:00:00 2001 From: "E. Westbrook" Date: Mon, 25 Feb 2019 16:01:21 -0700 Subject: [PATCH 089/194] udp.c: use LUASOCKET_PRIVATE --- src/udp.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/udp.c b/src/udp.c index 037f9a4..99a766f 100644 --- a/src/udp.c +++ b/src/udp.c @@ -2,8 +2,7 @@ * UDP object * LuaSocket toolkit \*=========================================================================*/ -#include -#include +#include "luasocket.h" #include "lua.h" #include "lauxlib.h" @@ -15,6 +14,9 @@ #include "options.h" #include "udp.h" +#include +#include + /* min and max macros */ #ifndef MIN #define MIN(x, y) ((x) < (y) ? x : y) @@ -122,7 +124,7 @@ static luaL_Reg func[] = { /*-------------------------------------------------------------------------*\ * Initializes module \*-------------------------------------------------------------------------*/ -int udp_open(lua_State *L) { +LUASOCKET_PRIVATE int udp_open(lua_State *L) { /* create classes */ auxiliar_newclass(L, "udp{connected}", udp_methods); auxiliar_newclass(L, "udp{unconnected}", udp_methods); From 678d558c5f5db9af64d33ae78c37056a44848b4c Mon Sep 17 00:00:00 2001 From: "E. Westbrook" Date: Mon, 25 Feb 2019 16:01:33 -0700 Subject: [PATCH 090/194] unixdgram.c: use LUASOCKET_PRIVATE --- src/unixdgram.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/unixdgram.c b/src/unixdgram.c index 0d6f18c..840257a 100644 --- a/src/unixdgram.c +++ b/src/unixdgram.c @@ -2,8 +2,7 @@ * Unix domain socket dgram submodule * LuaSocket toolkit \*=========================================================================*/ -#include -#include +#include "luasocket.h" #include "lua.h" #include "lauxlib.h" @@ -13,6 +12,10 @@ #include "socket.h" #include "options.h" #include "unix.h" + +#include +#include + #include #define UNIXDGRAM_DATAGRAMSIZE 8192 @@ -83,7 +86,7 @@ static luaL_Reg func[] = { /*-------------------------------------------------------------------------*\ * Initializes module \*-------------------------------------------------------------------------*/ -int unixdgram_open(lua_State *L) +LUASOCKET_PRIVATE int unixdgram_open(lua_State *L) { /* create classes */ auxiliar_newclass(L, "unixdgram{connected}", unixdgram_methods); From fe437ee844e8e51ef0b7437bb34efd8c18927a75 Mon Sep 17 00:00:00 2001 From: "E. Westbrook" Date: Mon, 25 Feb 2019 16:01:44 -0700 Subject: [PATCH 091/194] unixstream.c: use LUASOCKET_PRIVATE --- src/unixstream.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/unixstream.c b/src/unixstream.c index 0b9055c..ce2d3af 100644 --- a/src/unixstream.c +++ b/src/unixstream.c @@ -2,7 +2,7 @@ * Unix domain socket stream sub module * LuaSocket toolkit \*=========================================================================*/ -#include +#include "luasocket.h" #include "lua.h" #include "lauxlib.h" @@ -12,6 +12,8 @@ #include "socket.h" #include "options.h" #include "unixstream.h" + +#include #include /*=========================================================================*\ @@ -80,7 +82,7 @@ static luaL_Reg func[] = { /*-------------------------------------------------------------------------*\ * Initializes module \*-------------------------------------------------------------------------*/ -int unixstream_open(lua_State *L) +LUASOCKET_PRIVATE int unixstream_open(lua_State *L) { /* create classes */ auxiliar_newclass(L, "unixstream{master}", unixstream_methods); From d7ffc2f4e69ff24a88f00456cd9a538ecc90d14c Mon Sep 17 00:00:00 2001 From: "E. Westbrook" Date: Mon, 25 Feb 2019 16:04:16 -0700 Subject: [PATCH 092/194] usocket.c use LUASOCKET_PRIVATE --- src/usocket.c | 58 ++++++++++++++++++++++++++------------------------- 1 file changed, 30 insertions(+), 28 deletions(-) diff --git a/src/usocket.c b/src/usocket.c index 6e7f8f6..08a961d 100644 --- a/src/usocket.c +++ b/src/usocket.c @@ -6,12 +6,14 @@ * The penalty of calling select to avoid busy-wait is only paid when * the I/O call fail in the first place. \*=========================================================================*/ -#include -#include +#include "luasocket.h" #include "socket.h" #include "pierror.h" +#include +#include + /*-------------------------------------------------------------------------*\ * Wait for readable/writable/connected socket with timeout \*-------------------------------------------------------------------------*/ @@ -21,7 +23,7 @@ #define WAITFD_R POLLIN #define WAITFD_W POLLOUT #define WAITFD_C (POLLIN|POLLOUT) -int socket_waitfd(p_socket ps, int sw, p_timeout tm) { +LUASOCKET_PRIVATE int socket_waitfd(p_socket ps, int sw, p_timeout tm) { int ret; struct pollfd pfd; pfd.fd = *ps; @@ -43,7 +45,7 @@ int socket_waitfd(p_socket ps, int sw, p_timeout tm) { #define WAITFD_W 2 #define WAITFD_C (WAITFD_R|WAITFD_W) -int socket_waitfd(p_socket ps, int sw, p_timeout tm) { +LUASOCKET_PRIVATE int socket_waitfd(p_socket ps, int sw, p_timeout tm) { int ret; fd_set rfds, wfds, *rp, *wp; struct timeval tv, *tp; @@ -75,7 +77,7 @@ int socket_waitfd(p_socket ps, int sw, p_timeout tm) { /*-------------------------------------------------------------------------*\ * Initializes module \*-------------------------------------------------------------------------*/ -int socket_open(void) { +LUASOCKET_PRIVATE int socket_open(void) { /* installs a handler to ignore sigpipe or it will crash us */ signal(SIGPIPE, SIG_IGN); return 1; @@ -84,14 +86,14 @@ int socket_open(void) { /*-------------------------------------------------------------------------*\ * Close module \*-------------------------------------------------------------------------*/ -int socket_close(void) { +LUASOCKET_PRIVATE int socket_close(void) { return 1; } /*-------------------------------------------------------------------------*\ * Close and inutilize socket \*-------------------------------------------------------------------------*/ -void socket_destroy(p_socket ps) { +LUASOCKET_PRIVATE void socket_destroy(p_socket ps) { if (*ps != SOCKET_INVALID) { close(*ps); *ps = SOCKET_INVALID; @@ -101,7 +103,7 @@ void socket_destroy(p_socket ps) { /*-------------------------------------------------------------------------*\ * Select with timeout control \*-------------------------------------------------------------------------*/ -int socket_select(t_socket n, fd_set *rfds, fd_set *wfds, fd_set *efds, +LUASOCKET_PRIVATE int socket_select(t_socket n, fd_set *rfds, fd_set *wfds, fd_set *efds, p_timeout tm) { int ret; do { @@ -118,7 +120,7 @@ int socket_select(t_socket n, fd_set *rfds, fd_set *wfds, fd_set *efds, /*-------------------------------------------------------------------------*\ * Creates and sets up a socket \*-------------------------------------------------------------------------*/ -int socket_create(p_socket ps, int domain, int type, int protocol) { +LUASOCKET_PRIVATE int socket_create(p_socket ps, int domain, int type, int protocol) { *ps = socket(domain, type, protocol); if (*ps != SOCKET_INVALID) return IO_DONE; else return errno; @@ -127,7 +129,7 @@ int socket_create(p_socket ps, int domain, int type, int protocol) { /*-------------------------------------------------------------------------*\ * Binds or returns error message \*-------------------------------------------------------------------------*/ -int socket_bind(p_socket ps, SA *addr, socklen_t len) { +LUASOCKET_PRIVATE int socket_bind(p_socket ps, SA *addr, socklen_t len) { int err = IO_DONE; socket_setblocking(ps); if (bind(*ps, addr, len) < 0) err = errno; @@ -138,7 +140,7 @@ int socket_bind(p_socket ps, SA *addr, socklen_t len) { /*-------------------------------------------------------------------------*\ * \*-------------------------------------------------------------------------*/ -int socket_listen(p_socket ps, int backlog) { +LUASOCKET_PRIVATE int socket_listen(p_socket ps, int backlog) { int err = IO_DONE; if (listen(*ps, backlog)) err = errno; return err; @@ -147,14 +149,14 @@ int socket_listen(p_socket ps, int backlog) { /*-------------------------------------------------------------------------*\ * \*-------------------------------------------------------------------------*/ -void socket_shutdown(p_socket ps, int how) { +LUASOCKET_PRIVATE void socket_shutdown(p_socket ps, int how) { shutdown(*ps, how); } /*-------------------------------------------------------------------------*\ * Connects or returns error message \*-------------------------------------------------------------------------*/ -int socket_connect(p_socket ps, SA *addr, socklen_t len, p_timeout tm) { +LUASOCKET_PRIVATE int socket_connect(p_socket ps, SA *addr, socklen_t len, p_timeout tm) { int err; /* avoid calling on closed sockets */ if (*ps == SOCKET_INVALID) return IO_CLOSED; @@ -176,7 +178,7 @@ int socket_connect(p_socket ps, SA *addr, socklen_t len, p_timeout tm) { /*-------------------------------------------------------------------------*\ * Accept with timeout \*-------------------------------------------------------------------------*/ -int socket_accept(p_socket ps, p_socket pa, SA *addr, socklen_t *len, p_timeout tm) { +LUASOCKET_PRIVATE int socket_accept(p_socket ps, p_socket pa, SA *addr, socklen_t *len, p_timeout tm) { if (*ps == SOCKET_INVALID) return IO_CLOSED; for ( ;; ) { int err; @@ -193,7 +195,7 @@ int socket_accept(p_socket ps, p_socket pa, SA *addr, socklen_t *len, p_timeout /*-------------------------------------------------------------------------*\ * Send with timeout \*-------------------------------------------------------------------------*/ -int socket_send(p_socket ps, const char *data, size_t count, +LUASOCKET_PRIVATE int socket_send(p_socket ps, const char *data, size_t count, size_t *sent, p_timeout tm) { int err; @@ -227,7 +229,7 @@ int socket_send(p_socket ps, const char *data, size_t count, /*-------------------------------------------------------------------------*\ * Sendto with timeout \*-------------------------------------------------------------------------*/ -int socket_sendto(p_socket ps, const char *data, size_t count, size_t *sent, +LUASOCKET_PRIVATE int socket_sendto(p_socket ps, const char *data, size_t count, size_t *sent, SA *addr, socklen_t len, p_timeout tm) { int err; @@ -252,7 +254,7 @@ 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) { +LUASOCKET_PRIVATE int socket_recv(p_socket ps, char *data, size_t count, size_t *got, p_timeout tm) { int err; *got = 0; if (*ps == SOCKET_INVALID) return IO_CLOSED; @@ -274,7 +276,7 @@ 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, +LUASOCKET_PRIVATE int socket_recvfrom(p_socket ps, char *data, size_t count, size_t *got, SA *addr, socklen_t *len, p_timeout tm) { int err; *got = 0; @@ -302,7 +304,7 @@ int socket_recvfrom(p_socket ps, char *data, size_t count, size_t *got, * with send/recv replaced with write/read. We can't just use write/read * in the socket version, because behaviour when size is zero is different. \*-------------------------------------------------------------------------*/ -int socket_write(p_socket ps, const char *data, size_t count, +LUASOCKET_PRIVATE int socket_write(p_socket ps, const char *data, size_t count, size_t *sent, p_timeout tm) { int err; @@ -337,7 +339,7 @@ int socket_write(p_socket ps, const char *data, size_t count, * Read with timeout * See note for socket_write \*-------------------------------------------------------------------------*/ -int socket_read(p_socket ps, char *data, size_t count, size_t *got, p_timeout tm) { +LUASOCKET_PRIVATE int socket_read(p_socket ps, char *data, size_t count, size_t *got, p_timeout tm) { int err; *got = 0; if (*ps == SOCKET_INVALID) return IO_CLOSED; @@ -359,7 +361,7 @@ int socket_read(p_socket ps, char *data, size_t count, size_t *got, p_timeout tm /*-------------------------------------------------------------------------*\ * Put socket into blocking mode \*-------------------------------------------------------------------------*/ -void socket_setblocking(p_socket ps) { +LUASOCKET_PRIVATE void socket_setblocking(p_socket ps) { int flags = fcntl(*ps, F_GETFL, 0); flags &= (~(O_NONBLOCK)); fcntl(*ps, F_SETFL, flags); @@ -368,7 +370,7 @@ void socket_setblocking(p_socket ps) { /*-------------------------------------------------------------------------*\ * Put socket into non-blocking mode \*-------------------------------------------------------------------------*/ -void socket_setnonblocking(p_socket ps) { +LUASOCKET_PRIVATE void socket_setnonblocking(p_socket ps) { int flags = fcntl(*ps, F_GETFL, 0); flags |= O_NONBLOCK; fcntl(*ps, F_SETFL, flags); @@ -377,7 +379,7 @@ void socket_setnonblocking(p_socket ps) { /*-------------------------------------------------------------------------*\ * DNS helpers \*-------------------------------------------------------------------------*/ -int socket_gethostbyaddr(const char *addr, socklen_t len, struct hostent **hp) { +LUASOCKET_PRIVATE int socket_gethostbyaddr(const char *addr, socklen_t len, struct hostent **hp) { *hp = gethostbyaddr(addr, len, AF_INET); if (*hp) return IO_DONE; else if (h_errno) return h_errno; @@ -385,7 +387,7 @@ int socket_gethostbyaddr(const char *addr, socklen_t len, struct hostent **hp) { else return IO_UNKNOWN; } -int socket_gethostbyname(const char *addr, struct hostent **hp) { +LUASOCKET_PRIVATE int socket_gethostbyname(const char *addr, struct hostent **hp) { *hp = gethostbyname(addr); if (*hp) return IO_DONE; else if (h_errno) return h_errno; @@ -397,7 +399,7 @@ int socket_gethostbyname(const char *addr, struct hostent **hp) { * Error translation functions * Make sure important error messages are standard \*-------------------------------------------------------------------------*/ -const char *socket_hoststrerror(int err) { +LUASOCKET_PRIVATE const char *socket_hoststrerror(int err) { if (err <= 0) return io_strerror(err); switch (err) { case HOST_NOT_FOUND: return PIE_HOST_NOT_FOUND; @@ -405,7 +407,7 @@ const char *socket_hoststrerror(int err) { } } -const char *socket_strerror(int err) { +LUASOCKET_PRIVATE const char *socket_strerror(int err) { if (err <= 0) return io_strerror(err); switch (err) { case EADDRINUSE: return PIE_ADDRINUSE; @@ -421,12 +423,12 @@ const char *socket_strerror(int err) { } } -const char *socket_ioerror(p_socket ps, int err) { +LUASOCKET_PRIVATE const char *socket_ioerror(p_socket ps, int err) { (void) ps; return socket_strerror(err); } -const char *socket_gaistrerror(int err) { +LUASOCKET_PRIVATE const char *socket_gaistrerror(int err) { if (err == 0) return NULL; switch (err) { case EAI_AGAIN: return PIE_AGAIN; From f8183bab875f541af3932fe4e430fcff8bd8aba0 Mon Sep 17 00:00:00 2001 From: "E. Westbrook" Date: Mon, 25 Feb 2019 16:04:29 -0700 Subject: [PATCH 093/194] usocket.c: use LUASOCKET_PRIVATE --- src/wsocket.c | 50 ++++++++++++++++++++++++++------------------------ 1 file changed, 26 insertions(+), 24 deletions(-) diff --git a/src/wsocket.c b/src/wsocket.c index ac8411f..c281058 100755 --- a/src/wsocket.c +++ b/src/wsocket.c @@ -5,6 +5,8 @@ * The penalty of calling select to avoid busy-wait is only paid when * the I/O call fail in the first place. \*=========================================================================*/ +#include "luasocket.h" + #include #include "socket.h" @@ -16,7 +18,7 @@ static const char *wstrerror(int err); /*-------------------------------------------------------------------------*\ * Initializes module \*-------------------------------------------------------------------------*/ -int socket_open(void) { +LUASOCKET_PRIVATE int socket_open(void) { WSADATA wsaData; WORD wVersionRequested = MAKEWORD(2, 0); int err = WSAStartup(wVersionRequested, &wsaData ); @@ -32,7 +34,7 @@ int socket_open(void) { /*-------------------------------------------------------------------------*\ * Close module \*-------------------------------------------------------------------------*/ -int socket_close(void) { +LUASOCKET_PRIVATE int socket_close(void) { WSACleanup(); return 1; } @@ -45,7 +47,7 @@ int socket_close(void) { #define WAITFD_E 4 #define WAITFD_C (WAITFD_E|WAITFD_W) -int socket_waitfd(p_socket ps, int sw, p_timeout tm) { +LUASOCKET_PRIVATE int socket_waitfd(p_socket ps, int sw, p_timeout tm) { int ret; fd_set rfds, wfds, efds, *rp = NULL, *wp = NULL, *ep = NULL; struct timeval tv, *tp = NULL; @@ -73,7 +75,7 @@ int socket_waitfd(p_socket ps, int sw, p_timeout tm) { /*-------------------------------------------------------------------------*\ * Select with int timeout in ms \*-------------------------------------------------------------------------*/ -int socket_select(t_socket n, fd_set *rfds, fd_set *wfds, fd_set *efds, +LUASOCKET_PRIVATE int socket_select(t_socket n, fd_set *rfds, fd_set *wfds, fd_set *efds, p_timeout tm) { struct timeval tv; double t = timeout_get(tm); @@ -88,7 +90,7 @@ int socket_select(t_socket n, fd_set *rfds, fd_set *wfds, fd_set *efds, /*-------------------------------------------------------------------------*\ * Close and inutilize socket \*-------------------------------------------------------------------------*/ -void socket_destroy(p_socket ps) { +LUASOCKET_PRIVATE void socket_destroy(p_socket ps) { if (*ps != SOCKET_INVALID) { socket_setblocking(ps); /* close can take a long time on WIN32 */ closesocket(*ps); @@ -99,7 +101,7 @@ void socket_destroy(p_socket ps) { /*-------------------------------------------------------------------------*\ * \*-------------------------------------------------------------------------*/ -void socket_shutdown(p_socket ps, int how) { +LUASOCKET_PRIVATE void socket_shutdown(p_socket ps, int how) { socket_setblocking(ps); shutdown(*ps, how); socket_setnonblocking(ps); @@ -108,7 +110,7 @@ void socket_shutdown(p_socket ps, int how) { /*-------------------------------------------------------------------------*\ * Creates and sets up a socket \*-------------------------------------------------------------------------*/ -int socket_create(p_socket ps, int domain, int type, int protocol) { +LUASOCKET_PRIVATE int socket_create(p_socket ps, int domain, int type, int protocol) { *ps = socket(domain, type, protocol); if (*ps != SOCKET_INVALID) return IO_DONE; else return WSAGetLastError(); @@ -117,7 +119,7 @@ int socket_create(p_socket ps, int domain, int type, int protocol) { /*-------------------------------------------------------------------------*\ * Connects or returns error message \*-------------------------------------------------------------------------*/ -int socket_connect(p_socket ps, SA *addr, socklen_t len, p_timeout tm) { +LUASOCKET_PRIVATE int socket_connect(p_socket ps, SA *addr, socklen_t len, p_timeout tm) { int err; /* don't call on closed socket */ if (*ps == SOCKET_INVALID) return IO_CLOSED; @@ -146,7 +148,7 @@ int socket_connect(p_socket ps, SA *addr, socklen_t len, p_timeout tm) { /*-------------------------------------------------------------------------*\ * Binds or returns error message \*-------------------------------------------------------------------------*/ -int socket_bind(p_socket ps, SA *addr, socklen_t len) { +LUASOCKET_PRIVATE int socket_bind(p_socket ps, SA *addr, socklen_t len) { int err = IO_DONE; socket_setblocking(ps); if (bind(*ps, addr, len) < 0) err = WSAGetLastError(); @@ -157,7 +159,7 @@ int socket_bind(p_socket ps, SA *addr, socklen_t len) { /*-------------------------------------------------------------------------*\ * \*-------------------------------------------------------------------------*/ -int socket_listen(p_socket ps, int backlog) { +LUASOCKET_PRIVATE int socket_listen(p_socket ps, int backlog) { int err = IO_DONE; socket_setblocking(ps); if (listen(*ps, backlog) < 0) err = WSAGetLastError(); @@ -168,7 +170,7 @@ int socket_listen(p_socket ps, int backlog) { /*-------------------------------------------------------------------------*\ * Accept with timeout \*-------------------------------------------------------------------------*/ -int socket_accept(p_socket ps, p_socket pa, SA *addr, socklen_t *len, +LUASOCKET_PRIVATE int socket_accept(p_socket ps, p_socket pa, SA *addr, socklen_t *len, p_timeout tm) { if (*ps == SOCKET_INVALID) return IO_CLOSED; for ( ;; ) { @@ -190,7 +192,7 @@ int socket_accept(p_socket ps, p_socket pa, SA *addr, socklen_t *len, * this can take an awful lot of time and we will end up blocked. * Therefore, whoever calls this function should not pass a huge buffer. \*-------------------------------------------------------------------------*/ -int socket_send(p_socket ps, const char *data, size_t count, +LUASOCKET_PRIVATE int socket_send(p_socket ps, const char *data, size_t count, size_t *sent, p_timeout tm) { int err; @@ -218,7 +220,7 @@ int socket_send(p_socket ps, const char *data, size_t count, /*-------------------------------------------------------------------------*\ * Sendto with timeout \*-------------------------------------------------------------------------*/ -int socket_sendto(p_socket ps, const char *data, size_t count, size_t *sent, +LUASOCKET_PRIVATE int socket_sendto(p_socket ps, const char *data, size_t count, size_t *sent, SA *addr, socklen_t len, p_timeout tm) { int err; @@ -239,7 +241,7 @@ 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, +LUASOCKET_PRIVATE int socket_recv(p_socket ps, char *data, size_t count, size_t *got, p_timeout tm) { int err, prev = IO_DONE; @@ -268,7 +270,7 @@ int socket_recv(p_socket ps, char *data, size_t count, size_t *got, /*-------------------------------------------------------------------------*\ * Recvfrom with timeout \*-------------------------------------------------------------------------*/ -int socket_recvfrom(p_socket ps, char *data, size_t count, size_t *got, +LUASOCKET_PRIVATE int socket_recvfrom(p_socket ps, char *data, size_t count, size_t *got, SA *addr, socklen_t *len, p_timeout tm) { int err, prev = IO_DONE; @@ -297,7 +299,7 @@ int socket_recvfrom(p_socket ps, char *data, size_t count, size_t *got, /*-------------------------------------------------------------------------*\ * Put socket into blocking mode \*-------------------------------------------------------------------------*/ -void socket_setblocking(p_socket ps) { +LUASOCKET_PRIVATE void socket_setblocking(p_socket ps) { u_long argp = 0; ioctlsocket(*ps, FIONBIO, &argp); } @@ -305,7 +307,7 @@ void socket_setblocking(p_socket ps) { /*-------------------------------------------------------------------------*\ * Put socket into non-blocking mode \*-------------------------------------------------------------------------*/ -void socket_setnonblocking(p_socket ps) { +LUASOCKET_PRIVATE void socket_setnonblocking(p_socket ps) { u_long argp = 1; ioctlsocket(*ps, FIONBIO, &argp); } @@ -313,13 +315,13 @@ void socket_setnonblocking(p_socket ps) { /*-------------------------------------------------------------------------*\ * DNS helpers \*-------------------------------------------------------------------------*/ -int socket_gethostbyaddr(const char *addr, socklen_t len, struct hostent **hp) { +LUASOCKET_PRIVATE int socket_gethostbyaddr(const char *addr, socklen_t len, struct hostent **hp) { *hp = gethostbyaddr(addr, len, AF_INET); if (*hp) return IO_DONE; else return WSAGetLastError(); } -int socket_gethostbyname(const char *addr, struct hostent **hp) { +LUASOCKET_PRIVATE int socket_gethostbyname(const char *addr, struct hostent **hp) { *hp = gethostbyname(addr); if (*hp) return IO_DONE; else return WSAGetLastError(); @@ -328,7 +330,7 @@ int socket_gethostbyname(const char *addr, struct hostent **hp) { /*-------------------------------------------------------------------------*\ * Error translation functions \*-------------------------------------------------------------------------*/ -const char *socket_hoststrerror(int err) { +LUASOCKET_PRIVATE const char *socket_hoststrerror(int err) { if (err <= 0) return io_strerror(err); switch (err) { case WSAHOST_NOT_FOUND: return PIE_HOST_NOT_FOUND; @@ -336,7 +338,7 @@ const char *socket_hoststrerror(int err) { } } -const char *socket_strerror(int err) { +LUASOCKET_PRIVATE const char *socket_strerror(int err) { if (err <= 0) return io_strerror(err); switch (err) { case WSAEADDRINUSE: return PIE_ADDRINUSE; @@ -350,12 +352,12 @@ const char *socket_strerror(int err) { } } -const char *socket_ioerror(p_socket ps, int err) { +LUASOCKET_PRIVATE const char *socket_ioerror(p_socket ps, int err) { (void) ps; return socket_strerror(err); } -static const char *wstrerror(int err) { +LUASOCKET_PRIVATE static const char *wstrerror(int err) { switch (err) { case WSAEINTR: return "Interrupted function call"; case WSAEACCES: return PIE_ACCESS; // "Permission denied"; @@ -404,7 +406,7 @@ static const char *wstrerror(int err) { } } -const char *socket_gaistrerror(int err) { +LUASOCKET_PRIVATE const char *socket_gaistrerror(int err) { if (err == 0) return NULL; switch (err) { case EAI_AGAIN: return PIE_AGAIN; From 2d8f0d99011b267ed354ab6e8317d93b9627eed4 Mon Sep 17 00:00:00 2001 From: "E. Westbrook" Date: Mon, 25 Feb 2019 16:04:49 -0700 Subject: [PATCH 094/194] src/makefile: remove visibility and dllexport defines in favor of in-source labeling --- src/makefile | 39 ++++++++++++--------------------------- 1 file changed, 12 insertions(+), 27 deletions(-) diff --git a/src/makefile b/src/makefile index cc1ec7e..74bf3d5 100644 --- a/src/makefile +++ b/src/makefile @@ -149,12 +149,8 @@ PLATS= macosx linux win32 mingw solaris SO_macosx=so O_macosx=o CC_macosx=gcc -DEF_macosx= -DLUASOCKET_$(DEBUG) -DUNIX_HAS_SUN_LEN \ - -DLUASOCKET_API='__attribute__((visibility("default")))' \ - -DUNIX_API='__attribute__((visibility("default")))' \ - -DMIME_API='__attribute__((visibility("default")))' -CFLAGS_macosx=$(LUAINC:%=-I%) $(DEF) -Wall -O2 -fno-common \ - -fvisibility=hidden +DEF_macosx= -DLUASOCKET_$(DEBUG) -DUNIX_HAS_SUN_LEN +CFLAGS_macosx=$(LUAINC:%=-I%) $(DEF) -Wall -O2 -fno-common LDFLAGS_macosx= -bundle -undefined dynamic_lookup -o LD_macosx= export MACOSX_DEPLOYMENT_TARGET="10.3"; gcc SOCKET_macosx=usocket.o @@ -165,12 +161,9 @@ SOCKET_macosx=usocket.o SO_linux=so O_linux=o CC_linux=gcc -DEF_linux=-DLUASOCKET_$(DEBUG) \ - -DLUASOCKET_API='__attribute__((visibility("default")))' \ - -DUNIX_API='__attribute__((visibility("default")))' \ - -DMIME_API='__attribute__((visibility("default")))' +DEF_linux=-DLUASOCKET_$(DEBUG) CFLAGS_linux=$(LUAINC:%=-I%) $(DEF) -Wall -Wshadow -Wextra \ - -Wimplicit -O2 -ggdb3 -fpic -fvisibility=hidden + -Wimplicit -O2 -ggdb3 -fpic LDFLAGS_linux=-O -shared -fpic -o LD_linux=gcc SOCKET_linux=usocket.o @@ -181,12 +174,9 @@ SOCKET_linux=usocket.o SO_freebsd=so O_freebsd=o CC_freebsd=gcc -DEF_freebsd=-DLUASOCKET_$(DEBUG) -DUNIX_HAS_SUN_LEN \ - -DLUASOCKET_API='__attribute__((visibility("default")))' \ - -DUNIX_API='__attribute__((visibility("default")))' \ - -DMIME_API='__attribute__((visibility("default")))' +DEF_freebsd=-DLUASOCKET_$(DEBUG) -DUNIX_HAS_SUN_LEN CFLAGS_freebsd=$(LUAINC:%=-I%) $(DEF) -Wall -Wshadow -Wextra \ - -Wimplicit -O2 -ggdb3 -fpic -fvisibility=hidden + -Wimplicit -O2 -ggdb3 -fpic LDFLAGS_freebsd=-O -shared -fpic -o LD_freebsd=gcc SOCKET_freebsd=usocket.o @@ -197,12 +187,9 @@ SOCKET_freebsd=usocket.o SO_solaris=so O_solaris=o CC_solaris=gcc -DEF_solaris=-DLUASOCKET_$(DEBUG) \ - -DLUASOCKET_API='__attribute__((visibility("default")))' \ - -DUNIX_API='__attribute__((visibility("default")))' \ - -DMIME_API='__attribute__((visibility("default")))' +DEF_solaris=-DLUASOCKET_$(DEBUG) CFLAGS_solaris=$(LUAINC:%=-I%) $(DEF) -Wall -Wshadow -Wextra \ - -Wimplicit -O2 -ggdb3 -fpic -fvisibility=hidden + -Wimplicit -O2 -ggdb3 -fpic LDFLAGS_solaris=-lnsl -lsocket -lresolv -O -shared -fpic -o LD_solaris=gcc SOCKET_solaris=usocket.o @@ -214,10 +201,8 @@ SO_mingw=dll O_mingw=o CC_mingw=gcc DEF_mingw= -DLUASOCKET_INET_PTON -DLUASOCKET_$(DEBUG) \ - -DWINVER=0x0501 -DLUASOCKET_API='__declspec(dllexport)' \ - -DMIME_API='__declspec(dllexport)' -CFLAGS_mingw=$(LUAINC:%=-I%) $(DEF) -Wall -O2 -fno-common \ - -fvisibility=hidden + -DWINVER=0x0501 +CFLAGS_mingw=$(LUAINC:%=-I%) $(DEF) -Wall -O2 -fno-common LDFLAGS_mingw= $(LUALIB) -shared -Wl,-s -lws2_32 -o LD_mingw=gcc SOCKET_mingw=wsocket.o @@ -230,8 +215,8 @@ SO_win32=dll O_win32=obj CC_win32=cl DEF_win32= //D "WIN32" //D "NDEBUG" //D "_WINDOWS" //D "_USRDLL" \ - //D "LUASOCKET_API=__declspec(dllexport)" //D "_CRT_SECURE_NO_WARNINGS" \ - //D "_WINDLL" //D "MIME_API=__declspec(dllexport)" \ + //D "_CRT_SECURE_NO_WARNINGS" \ + //D "_WINDLL" \ //D "LUASOCKET_$(DEBUG)" CFLAGS_win32=$(LUAINC:%=//I "%") $(DEF) //O2 //Ot //MD //W3 //nologo LDFLAGS_win32= //nologo //link //NOLOGO //DLL //INCREMENTAL:NO \ From e2e43d62fa925e7e22385505ed0c635255c77c0a Mon Sep 17 00:00:00 2001 From: "E. Westbrook" Date: Mon, 25 Feb 2019 16:06:30 -0700 Subject: [PATCH 095/194] rockspecs: remove visibility and dllexport defines in favor of in-source labeling --- luasocket-scm-0.rockspec | 199 ++++++++++++++----------- rockspec/luasocket-3.0rc2-1.rockspec | 209 +++++++++++++++------------ 2 files changed, 231 insertions(+), 177 deletions(-) diff --git a/luasocket-scm-0.rockspec b/luasocket-scm-0.rockspec index c827e46..6cdb0ce 100644 --- a/luasocket-scm-0.rockspec +++ b/luasocket-scm-0.rockspec @@ -1,105 +1,132 @@ package = "LuaSocket" version = "scm-0" source = { - url = "https://github.com/diegonehab/luasocket/archive/master.zip", - dir = "luasocket-master", + url = "git://github.com/diegonehab/luasocket.git" + , branch="master" } description = { - summary = "Network support for the Lua language", - detailed = [[ + summary = "Network support for the Lua language", + detailed = [[ LuaSocket is a Lua extension library that is composed by two parts: a C core that provides support for the TCP and UDP transport layers, and a set of Lua modules that add support for functionality commonly needed by applications that deal with the Internet. ]], - homepage = "http://luaforge.net/projects/luasocket/", - license = "MIT" + homepage = "http://luaforge.net/projects/luasocket/", + license = "MIT" } dependencies = { - "lua >= 5.1" + "lua >= 5.1" } local function make_plat(plat) - local defines = { - unix = { - "LUASOCKET_DEBUG", - "LUASOCKET_API=__attribute__((visibility(\"default\")))", - "UNIX_API=__attribute__((visibility(\"default\")))", - "MIME_API=__attribute__((visibility(\"default\")))" - }, - macosx = { - "LUASOCKET_DEBUG", - "UNIX_HAS_SUN_LEN", - "LUASOCKET_API=__attribute__((visibility(\"default\")))", - "UNIX_API=__attribute__((visibility(\"default\")))", - "MIME_API=__attribute__((visibility(\"default\")))" - }, - win32 = { - "LUASOCKET_DEBUG", - "NDEBUG", - "LUASOCKET_API=__declspec(dllexport)", - "MIME_API=__declspec(dllexport)" - }, - mingw32 = { - "LUASOCKET_DEBUG", - "LUASOCKET_INET_PTON", - "WINVER=0x0501", - "LUASOCKET_API=__declspec(dllexport)", - "MIME_API=__declspec(dllexport)" - } - } - local modules = { - ["socket.core"] = { - sources = { "src/luasocket.c", "src/timeout.c", "src/buffer.c", "src/io.c", "src/auxiliar.c", "src/options.c", "src/inet.c", "src/except.c", "src/select.c", "src/tcp.c", "src/udp.c", "src/compat.c" }, - defines = defines[plat], - incdir = "/src" - }, - ["mime.core"] = { - sources = { "src/mime.c", "src/compat.c" }, - defines = defines[plat], - incdir = "/src" - }, - ["socket.http"] = "src/http.lua", - ["socket.url"] = "src/url.lua", - ["socket.tp"] = "src/tp.lua", - ["socket.ftp"] = "src/ftp.lua", - ["socket.headers"] = "src/headers.lua", - ["socket.smtp"] = "src/smtp.lua", - ltn12 = "src/ltn12.lua", - socket = "src/socket.lua", - mime = "src/mime.lua" - } - if plat == "unix" or plat == "macosx" or plat == "haiku" then - modules["socket.core"].sources[#modules["socket.core"].sources+1] = "src/usocket.c" - if plat == "haiku" then - modules["socket.core"].libraries = {"network"} - end - modules["socket.unix"] = { - sources = { "src/buffer.c", "src/auxiliar.c", "src/options.c", "src/timeout.c", "src/io.c", "src/usocket.c", "src/unix.c", "src/unixdgram.c", "src/unixstream.c" }, - defines = defines[plat], - incdir = "/src" - } - modules["socket.serial"] = { - sources = { "src/buffer.c", "src/auxiliar.c", "src/options.c", "src/timeout.c", "src/io.c", "src/usocket.c", "src/serial.c" }, - defines = defines[plat], - incdir = "/src" - } - end - if plat == "win32" or plat == "mingw32" then - modules["socket.core"].sources[#modules["socket.core"].sources+1] = "src/wsocket.c" - modules["socket.core"].libraries = { "ws2_32" } - end - return { modules = modules } + local defines = { + unix = { + "LUASOCKET_DEBUG" + }, + macosx = { + "LUASOCKET_DEBUG", + "UNIX_HAS_SUN_LEN" + }, + win32 = { + "LUASOCKET_DEBUG", + "NDEBUG" + }, + mingw32 = { + "LUASOCKET_DEBUG", + "LUASOCKET_INET_PTON", + "WINVER=0x0501" + } + } + local modules = { + ["socket.core"] = { + sources = { + "src/luasocket.c" + , "src/timeout.c" + , "src/buffer.c" + , "src/io.c" + , "src/auxiliar.c" + , "src/options.c" + , "src/inet.c" + , "src/except.c" + , "src/select.c" + , "src/tcp.c" + , "src/udp.c" + , "src/compat.c" }, + defines = defines[plat], + incdir = "/src" + }, + ["mime.core"] = { + sources = { "src/mime.c", "src/compat.c" }, + defines = defines[plat], + incdir = "/src" + }, + ["socket.http"] = "src/http.lua", + ["socket.url"] = "src/url.lua", + ["socket.tp"] = "src/tp.lua", + ["socket.ftp"] = "src/ftp.lua", + ["socket.headers"] = "src/headers.lua", + ["socket.smtp"] = "src/smtp.lua", + ltn12 = "src/ltn12.lua", + socket = "src/socket.lua", + mime = "src/mime.lua" + } + if plat == "unix" + or plat == "macosx" + or plat == "haiku" + then + modules["socket.core"].sources[#modules["socket.core"].sources+1] = "src/usocket.c" + if plat == "haiku" then + modules["socket.core"].libraries = {"network"} + end + modules["socket.unix"] = { + sources = { + "src/buffer.c" + , "src/auxiliar.c" + , "src/options.c" + , "src/timeout.c" + , "src/io.c" + , "src/usocket.c" + , "src/unix.c" + , "src/unixdgram.c" + , "src/unixstream.c" }, + defines = defines[plat], + incdir = "/src" + } + modules["socket.serial"] = { + sources = { + "src/buffer.c" + , "src/auxiliar.c" + , "src/options.c" + , "src/timeout.c" + , "src/io.c" + , "src/usocket.c" + , "src/serial.c" }, + defines = defines[plat], + incdir = "/src" + } + end + if plat == "win32" + or plat == "mingw32" + then + modules["socket.core"].sources[#modules["socket.core"].sources+1] = "src/wsocket.c" + modules["socket.core"].libraries = { "ws2_32" } + end + return { modules = modules } end build = { - type = "builtin", - platforms = { - unix = make_plat("unix"), - macosx = make_plat("macosx"), - haiku = make_plat("haiku"), - win32 = make_plat("win32"), - mingw32 = make_plat("mingw32") - }, - copy_directories = { "doc", "samples", "etc", "test" } + type = "builtin", + platforms = { + unix = make_plat("unix"), + macosx = make_plat("macosx"), + haiku = make_plat("haiku"), + win32 = make_plat("win32"), + mingw32 = make_plat("mingw32") + }, + copy_directories = { + "doc" + , "samples" + , "etc" + , "test" } } diff --git a/rockspec/luasocket-3.0rc2-1.rockspec b/rockspec/luasocket-3.0rc2-1.rockspec index 8e37a4a..2b299f3 100644 --- a/rockspec/luasocket-3.0rc2-1.rockspec +++ b/rockspec/luasocket-3.0rc2-1.rockspec @@ -1,105 +1,132 @@ package = "LuaSocket" version = "3.0rc2-1" source = { - url = "git://github.com/diegonehab/luasocket.git", - tag = "v3.0-rc2", + url = "git://github.com/diegonehab/luasocket.git", + tag = "v3.0-rc2", } description = { - summary = "Network support for the Lua language", - detailed = [[ - LuaSocket is a Lua extension library that is composed by two parts: a C core - that provides support for the TCP and UDP transport layers, and a set of Lua - modules that add support for functionality commonly needed by applications - that deal with the Internet. - ]], - homepage = "http://luaforge.net/projects/luasocket/", - license = "MIT" + summary = "Network support for the Lua language", + detailed = [[ + LuaSocket is a Lua extension library that is composed by two parts: a C core + that provides support for the TCP and UDP transport layers, and a set of Lua + modules that add support for functionality commonly needed by applications + that deal with the Internet. + ]], + homepage = "http://luaforge.net/projects/luasocket/", + license = "MIT" } dependencies = { - "lua >= 5.1" + "lua >= 5.1" } local function make_plat(plat) - local defines = { - unix = { - "LUASOCKET_DEBUG", - "LUASOCKET_API=__attribute__((visibility(\"default\")))", - "UNIX_API=__attribute__((visibility(\"default\")))", - "MIME_API=__attribute__((visibility(\"default\")))" - }, - macosx = { - "LUASOCKET_DEBUG", - "UNIX_HAS_SUN_LEN", - "LUASOCKET_API=__attribute__((visibility(\"default\")))", - "UNIX_API=__attribute__((visibility(\"default\")))", - "MIME_API=__attribute__((visibility(\"default\")))" - }, - win32 = { - "LUASOCKET_DEBUG", - "NDEBUG", - "LUASOCKET_API=__declspec(dllexport)", - "MIME_API=__declspec(dllexport)" - }, - mingw32 = { - "LUASOCKET_DEBUG", - "LUASOCKET_INET_PTON", - "WINVER=0x0501", - "LUASOCKET_API=__declspec(dllexport)", - "MIME_API=__declspec(dllexport)" - } - } - local modules = { - ["socket.core"] = { - sources = { "src/luasocket.c", "src/timeout.c", "src/buffer.c", "src/io.c", "src/auxiliar.c", "src/options.c", "src/inet.c", "src/except.c", "src/select.c", "src/tcp.c", "src/udp.c", "src/compat.c" }, - defines = defines[plat], - incdir = "/src" - }, - ["mime.core"] = { - sources = { "src/mime.c", "src/compat.c" }, - defines = defines[plat], - incdir = "/src" - }, - ["socket.http"] = "src/http.lua", - ["socket.url"] = "src/url.lua", - ["socket.tp"] = "src/tp.lua", - ["socket.ftp"] = "src/ftp.lua", - ["socket.headers"] = "src/headers.lua", - ["socket.smtp"] = "src/smtp.lua", - ltn12 = "src/ltn12.lua", - socket = "src/socket.lua", - mime = "src/mime.lua" - } - if plat == "unix" or plat == "macosx" or plat == "haiku" then - modules["socket.core"].sources[#modules["socket.core"].sources+1] = "src/usocket.c" - if plat == "haiku" then - modules["socket.core"].libraries = {"network"} - end - modules["socket.unix"] = { - sources = { "src/buffer.c", "src/auxiliar.c", "src/options.c", "src/timeout.c", "src/io.c", "src/usocket.c", "src/unix.c" }, - defines = defines[plat], - incdir = "/src" - } - modules["socket.serial"] = { - sources = { "src/buffer.c", "src/auxiliar.c", "src/options.c", "src/timeout.c", "src/io.c", "src/usocket.c", "src/serial.c" }, - defines = defines[plat], - incdir = "/src" - } - end - if plat == "win32" or plat == "mingw32" then - modules["socket.core"].sources[#modules["socket.core"].sources+1] = "src/wsocket.c" - modules["socket.core"].libraries = { "ws2_32" } - end - return { modules = modules } + local defines = { + unix = { + "LUASOCKET_DEBUG" + }, + macosx = { + "LUASOCKET_DEBUG", + "UNIX_HAS_SUN_LEN" + }, + win32 = { + "LUASOCKET_DEBUG", + "NDEBUG" + }, + mingw32 = { + "LUASOCKET_DEBUG", + "LUASOCKET_INET_PTON", + "WINVER=0x0501" + } + } + local modules = { + ["socket.core"] = { + sources = { + "src/luasocket.c" + , "src/timeout.c" + , "src/buffer.c" + , "src/io.c" + , "src/auxiliar.c" + , "src/options.c" + , "src/inet.c" + , "src/except.c" + , "src/select.c" + , "src/tcp.c" + , "src/udp.c" + , "src/compat.c" }, + defines = defines[plat], + incdir = "/src" + }, + ["mime.core"] = { + sources = { "src/mime.c", "src/compat.c" }, + defines = defines[plat], + incdir = "/src" + }, + ["socket.http"] = "src/http.lua", + ["socket.url"] = "src/url.lua", + ["socket.tp"] = "src/tp.lua", + ["socket.ftp"] = "src/ftp.lua", + ["socket.headers"] = "src/headers.lua", + ["socket.smtp"] = "src/smtp.lua", + ltn12 = "src/ltn12.lua", + socket = "src/socket.lua", + mime = "src/mime.lua" + } + if plat == "unix" + or plat == "macosx" + or plat == "haiku" + then + modules["socket.core"].sources[#modules["socket.core"].sources+1] = "src/usocket.c" + if plat == "haiku" then + modules["socket.core"].libraries = {"network"} + end + modules["socket.unix"] = { + sources = { + "src/buffer.c" + , "src/auxiliar.c" + , "src/options.c" + , "src/timeout.c" + , "src/io.c" + , "src/usocket.c" + , "src/unix.c" + , "src/unixdgram.c" + , "src/unixstream.c" }, + defines = defines[plat], + incdir = "/src" + } + modules["socket.serial"] = { + sources = { + "src/buffer.c" + , "src/auxiliar.c" + , "src/options.c" + , "src/timeout.c" + , "src/io.c" + , "src/usocket.c" + , "src/serial.c" }, + defines = defines[plat], + incdir = "/src" + } + end + if plat == "win32" + or plat == "mingw32" + then + modules["socket.core"].sources[#modules["socket.core"].sources+1] = "src/wsocket.c" + modules["socket.core"].libraries = { "ws2_32" } + end + return { modules = modules } end build = { - type = "builtin", - platforms = { - unix = make_plat("unix"), - macosx = make_plat("macosx"), - haiku = make_plat("haiku"), - win32 = make_plat("win32"), - mingw32 = make_plat("mingw32") - }, - copy_directories = { "doc", "samples", "etc", "test" } + type = "builtin", + platforms = { + unix = make_plat("unix"), + macosx = make_plat("macosx"), + haiku = make_plat("haiku"), + win32 = make_plat("win32"), + mingw32 = make_plat("mingw32") + }, + copy_directories = { + "doc" + , "samples" + , "etc" + , "test" } } From d9afe3fd9ccf64a0686683f5453937c08611aa28 Mon Sep 17 00:00:00 2001 From: Mojca Miklavec Date: Wed, 21 Mar 2018 18:02:46 +0100 Subject: [PATCH 096/194] Only use EAI_OVERFLOW, AI_NUMERICSERV if defined Some systems like Mac OS X 10.5 (and lower) do not have EAI_OVERFLOW and AI_NUMERICSERV defined. These variables are used to avoid a potentially slow name resolution for the hostname (which will always be an ip address) and for service name (which will always be an actual port number). The code might be slower, but it should still work. Closes: #242 --- src/udp.c | 5 ++++- src/usocket.c | 2 ++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/udp.c b/src/udp.c index 99a766f..e59fa1b 100644 --- a/src/udp.c +++ b/src/udp.c @@ -188,7 +188,10 @@ static int meth_sendto(lua_State *L) { memset(&aihint, 0, sizeof(aihint)); aihint.ai_family = udp->family; aihint.ai_socktype = SOCK_DGRAM; - aihint.ai_flags = AI_NUMERICHOST | AI_NUMERICSERV; + aihint.ai_flags = AI_NUMERICHOST; +#ifdef AI_NUMERICSERV + aihint.ai_flags |= AI_NUMERICSERV; +#endif err = getaddrinfo(ip, port, &aihint, &ai); if (err) { lua_pushnil(L); diff --git a/src/usocket.c b/src/usocket.c index 08a961d..aee876d 100644 --- a/src/usocket.c +++ b/src/usocket.c @@ -440,7 +440,9 @@ LUASOCKET_PRIVATE const char *socket_gaistrerror(int err) { case EAI_FAMILY: return PIE_FAMILY; case EAI_MEMORY: return PIE_MEMORY; case EAI_NONAME: return PIE_NONAME; +#ifdef EAI_OVERFLOW case EAI_OVERFLOW: return PIE_OVERFLOW; +#endif #ifdef EAI_PROTOCOL case EAI_PROTOCOL: return PIE_PROTOCOL; #endif From 297f9d0277ca4c93a5bd4306e0d31a4a98940089 Mon Sep 17 00:00:00 2001 From: "E. Westbrook" Date: Thu, 28 Feb 2019 18:40:30 -0700 Subject: [PATCH 097/194] bugfix: http.lua multischeme change that got dropped during PR conflict resolution --- src/http.lua | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/http.lua b/src/http.lua index 2fa5a26..6a3416e 100644 --- a/src/http.lua +++ b/src/http.lua @@ -264,10 +264,8 @@ end -- default url parts local default = { - host = "", - port = PORT, - path ="/", - scheme = SCHEME + path ="/" + , scheme = "http" } local function adjustrequest(reqt) From 1e4255e2a937d46dd46695eea56b570090427001 Mon Sep 17 00:00:00 2001 From: Diego Nehab Date: Fri, 1 Mar 2019 20:46:37 -0300 Subject: [PATCH 098/194] Update Windows projects vor Visual Studio 2017 --- Lua.props | 39 +++++++++++++---- makefile | 2 +- mime.vcxproj | 37 +++++----------- socket.vcxproj | 116 +++++-------------------------------------------- src/makefile | 50 ++++++++++++++++++--- vc32.bat | 3 ++ vc64.bat | 3 ++ win32.cmd | 2 +- win64.cmd | 1 + 9 files changed, 106 insertions(+), 147 deletions(-) mode change 100644 => 100755 makefile mode change 100644 => 100755 src/makefile create mode 100755 vc32.bat create mode 100755 vc64.bat mode change 100644 => 100755 win32.cmd create mode 100755 win64.cmd diff --git a/Lua.props b/Lua.props index bdfca40..d748448 100755 --- a/Lua.props +++ b/Lua.props @@ -1,28 +1,49 @@  + + $(Platform)/$(Configuration) + + + $(Configuration) + - z:\data\build\vc14\ - $(BUILD)\bin\lua\5.3\ - $(BUILD)\lib\lua\5.3\ - $(BUILD)\include\lua\5.3\ + 5.3 + z:\data\build\vc14\ + $(LUAPREFIX)\lib\lua\$(LUAV)\$(LUAPLAT) + $(LUAPREFIX)\bin\lua\$(LUAV)\$(LUAPLAT) + $(LUAPREFIX)\bin\lua\$(LUAV)\$(LUAPLAT)\lua + $(LUAPREFIX)\include\lua\$(LUAV);$(LUAPREFIX)\include\lua$(LUAV) + lua$(LUAV.Replace('.', '')).lib - <_PropertySheetDisplayName>Lua53 + <_PropertySheetDisplayName>Lua + + $(LUAPLAT) + + + $(LUAPREFIX) + + + $(LUAV) + $(LUALIB) $(LUAINC) - - $(LUABIN) + + $(LUACDIR) - - $(BUILD) + + $(LUALDIR) + + + $(LUALIBNAME) diff --git a/makefile b/makefile old mode 100644 new mode 100755 index cc15b4e..f766a25 --- a/makefile +++ b/makefile @@ -10,7 +10,7 @@ # print print the build settings PLAT?= linux -PLATS= macosx linux win32 mingw freebsd solaris +PLATS= macosx linux win32 win64 mingw freebsd solaris all: $(PLAT) diff --git a/mime.vcxproj b/mime.vcxproj index 74bba0c..6a7b35a 100755 --- a/mime.vcxproj +++ b/mime.vcxproj @@ -21,19 +21,6 @@ - - - Document - copy %(FullPath) $(LUABIN)$(Configuration) - copy %(FullPath) $(LUABIN)$(Configuration) - copy %(FullPath) $(LUABIN)$(Platform)\$(Configuration) - copy %(FullPath) $(LUABIN)$(Platform)\$(Configuration) - $(LUABIN)$(Configuration)\%(Filename)%(Extension) - $(LUABIN)$(Configuration)\%(Filename)%(Extension) - $(LUABIN)$(Platform)\$(Configuration)\%(Filename)%(Extension) - $(LUABIN)$(Platform)\$(Configuration)\%(Filename)%(Extension) - - {128E8BD0-174A-48F0-8771-92B1E8D18713} Win32Proj @@ -88,7 +75,7 @@ <_ProjectFileVersion>11.0.50727.1 - $(LUABIN)$(Configuration)\mime\ + $(Configuration)\mime\ $(Configuration)\ true core @@ -96,17 +83,17 @@ true core - $(LUABIN)$(Platform)\$(Configuration)\mime\ + $(Platform)\$(Configuration)\mime\ - $(LUABIN)$(Configuration)\mime\ + $(Configuration)\mime\ $(Configuration)\ false core false - $(LUABIN)$(Platform)\$(Configuration)\mime\ + $(Platform)\$(Configuration)\mime\ core @@ -123,9 +110,9 @@ $(IntDir)$(TargetName)$(PlatformToolsetVersion).pdb - lualib.lib;%(AdditionalDependencies) + $(LUALIBNAME);%(AdditionalDependencies) $(OutDir)$(TargetName).dll - $(LUALIB)$(Configuration);%(AdditionalLibraryDirectories) + $(LUALIB);%(AdditionalLibraryDirectories) true $(OutDir)mime.pdb Windows @@ -150,9 +137,9 @@ $(IntDir)$(TargetName)$(PlatformToolsetVersion).pdb - lualib.lib;%(AdditionalDependencies) + $(LUALIBNAME);%(AdditionalDependencies) $(OutDir)$(TargetName).dll - $(LUALIB)$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) + $(LUALIB);%(AdditionalLibraryDirectories) true $(OutDir)mime.pdb Windows @@ -173,9 +160,9 @@ $(IntDir)$(TargetName)$(PlatformToolsetVersion).pdb - lualib.lib;%(AdditionalDependencies) + $(LUALIBNAME);%(AdditionalDependencies) $(OutDir)$(TargetName).dll - $(LUALIB)$(Configuration);%(AdditionalLibraryDirectories) + $(LUALIB);%(AdditionalLibraryDirectories) true Windows true @@ -199,9 +186,9 @@ $(IntDir)$(TargetName)$(PlatformToolsetVersion).pdb - lualib.lib;%(AdditionalDependencies) + $(LUALIBNAME);%(AdditionalDependencies) $(OutDir)$(TargetName).dll - $(LUALIB)$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) + $(LUALIB);%(AdditionalLibraryDirectories) true Windows true diff --git a/socket.vcxproj b/socket.vcxproj index cfa32b3..e639216 100755 --- a/socket.vcxproj +++ b/socket.vcxproj @@ -32,98 +32,6 @@ - - - Document - copy %(FullPath) $(LUABIN)$(Configuration) - copy %(FullPath) $(LUABIN)$(Configuration) - copy %(FullPath) $(LUABIN)$(Platform)\$(Configuration) - copy %(FullPath) $(LUABIN)$(Platform)\$(Configuration) - $(LUABIN)$(Configuration)\%(Filename)%(Extension) - $(LUABIN)$(Configuration)\%(Filename)%(Extension) - $(LUABIN)$(Platform)\$(Configuration)\%(Filename)%(Extension) - $(LUABIN)$(Platform)\$(Configuration)\%(Filename)%(Extension) - - - Document - copy %(FullPath) $(LUABIN)$(Configuration) - copy %(FullPath) $(LUABIN)$(Configuration) - copy %(FullPath) $(LUABIN)$(Platform)\$(Configuration) - copy %(FullPath) $(LUABIN)$(Platform)\$(Configuration) - $(LUABIN)$(Configuration)\%(Filename)%(Extension) - $(LUABIN)$(Configuration)\%(Filename)%(Extension) - $(LUABIN)$(Platform)\$(Configuration)\%(Filename)%(Extension) - $(LUABIN)$(Platform)\$(Configuration)\%(Filename)%(Extension) - - - - - Document - copy %(FullPath) $(LUABIN)$(Configuration) - copy %(FullPath) $(LUABIN)$(Configuration) - copy %(FullPath) $(LUABIN)$(Platform)\$(Configuration) - copy %(FullPath) $(LUABIN)$(Platform)\$(Configuration) - $(LUABIN)$(Configuration)\%(Filename)%(Extension) - $(LUABIN)$(Configuration)\%(Filename)%(Extension) - $(LUABIN)$(Platform)\$(Configuration)\%(Filename)%(Extension) - $(LUABIN)$(Platform)\$(Configuration)\%(Filename)%(Extension) - - - Document - copy %(FullPath) $(LUABIN)$(Configuration) - copy %(FullPath) $(LUABIN)$(Configuration) - copy %(FullPath) $(LUABIN)$(Platform)\$(Configuration) - copy %(FullPath) $(LUABIN)$(Platform)\$(Configuration) - $(LUABIN)$(Configuration)\%(Filename)%(Extension) - $(LUABIN)$(Configuration)\%(Filename)%(Extension) - $(LUABIN)$(Platform)\$(Configuration)\%(Filename)%(Extension) - $(LUABIN)$(Platform)\$(Configuration)\%(Filename)%(Extension) - - - Document - copy %(FullPath) $(LUABIN)$(Configuration) - copy %(FullPath) $(LUABIN)$(Configuration) - copy %(FullPath) $(LUABIN)$(Platform)\$(Configuration) - copy %(FullPath) $(LUABIN)$(Platform)\$(Configuration) - $(LUABIN)$(Configuration)\%(Filename)%(Extension) - $(LUABIN)$(Configuration)\%(Filename)%(Extension) - $(LUABIN)$(Platform)\$(Configuration)\%(Filename)%(Extension) - $(LUABIN)$(Platform)\$(Configuration)\%(Filename)%(Extension) - - - Document - copy %(FullPath) $(LUABIN)$(Configuration) - copy %(FullPath) $(LUABIN)$(Configuration) - copy %(FullPath) $(LUABIN)$(Platform)\$(Configuration) - copy %(FullPath) $(LUABIN)$(Platform)\$(Configuration) - $(LUABIN)$(Configuration)\%(Filename)%(Extension) - $(LUABIN)$(Configuration)\%(Filename)%(Extension) - $(LUABIN)$(Platform)\$(Configuration)\%(Filename)%(Extension) - $(LUABIN)$(Platform)\$(Configuration)\%(Filename)%(Extension) - - - Document - copy %(FullPath) $(LUABIN)$(Configuration) - copy %(FullPath) $(LUABIN)$(Configuration) - copy %(FullPath) $(LUABIN)$(Platform)\$(Configuration) - copy %(FullPath) $(LUABIN)$(Platform)\$(Configuration) - $(LUABIN)$(Configuration)\%(Filename)%(Extension) - $(LUABIN)$(Configuration)\%(Filename)%(Extension) - $(LUABIN)$(Platform)\$(Configuration)\%(Filename)%(Extension) - $(LUABIN)$(Platform)\$(Configuration)\%(Filename)%(Extension) - - - Document - copy %(FullPath) $(LUABIN)$(Configuration) - copy %(FullPath) $(LUABIN)$(Configuration) - copy %(FullPath) $(LUABIN)$(Platform)\$(Configuration) - copy %(FullPath) $(LUABIN)$(Platform)\$(Configuration) - $(LUABIN)$(Configuration)\%(Filename)%(Extension) - $(LUABIN)$(Configuration)\%(Filename)%(Extension) - $(LUABIN)$(Platform)\$(Configuration)\%(Filename)%(Extension) - $(LUABIN)$(Platform)\$(Configuration)\%(Filename)%(Extension) - - {66E3CE14-884D-4AEA-9F20-15A0BEAF8C5A} Win32Proj @@ -178,7 +86,7 @@ <_ProjectFileVersion>11.0.50727.1 - $(LUABIN)$(Configuration)\socket\ + $(Configuration)\socket\ $(Configuration)\ true core @@ -186,17 +94,17 @@ true core - $(LUABIN)$(Platform)\$(Configuration)\socket\ + $(Platform)\$(Configuration)\socket\ - $(LUABIN)$(Configuration)\socket\ + $(Configuration)\socket\ $(Configuration)\ false core false - $(LUABIN)$(Platform)\$(Configuration)\socket\ + $(Platform)\$(Configuration)\socket\ core @@ -213,9 +121,9 @@ $(IntDir)$(TargetName)$(PlatformToolsetVersion).pdb - lualib.lib;ws2_32.lib;%(AdditionalDependencies) + $(LUALIBNAME);ws2_32.lib;%(AdditionalDependencies) $(OutDir)$(TargetName).dll - $(LUALIB)$(Configuration);%(AdditionalLibraryDirectories) + $(LUALIB);%(AdditionalLibraryDirectories) true $(OutDir)mime.pdb Windows @@ -240,9 +148,9 @@ $(IntDir)$(TargetName)$(PlatformToolsetVersion).pdb - lualib.lib;ws2_32.lib;%(AdditionalDependencies) + $(LUALIBNAME);ws2_32.lib;%(AdditionalDependencies) $(OutDir)$(TargetName).dll - $(LUALIB)$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) + $(LUALIB);%(AdditionalLibraryDirectories) true $(OutDir)mime.pdb Windows @@ -263,9 +171,9 @@ $(IntDir)$(TargetName)$(PlatformToolsetVersion).pdb - lualib.lib;ws2_32.lib;%(AdditionalDependencies) + $(LUALIBNAME);ws2_32.lib;%(AdditionalDependencies) $(OutDir)$(TargetName).dll - $(LUALIB)$(Configuration);%(AdditionalLibraryDirectories) + $(LUALIB);%(AdditionalLibraryDirectories) true Windows true @@ -289,9 +197,9 @@ $(IntDir)$(TargetName)$(PlatformToolsetVersion).pdb - lualib.lib;ws2_32.lib;%(AdditionalDependencies) + $(LUALIBNAME);ws2_32.lib;%(AdditionalDependencies) $(OutDir)$(TargetName).dll - $(LUALIB)$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) + $(LUALIB);%(AdditionalLibraryDirectories) true Windows true diff --git a/src/makefile b/src/makefile old mode 100644 new mode 100755 index 74bf3d5..e6baf78 --- a/src/makefile +++ b/src/makefile @@ -12,7 +12,7 @@ # # make PLAT=linux DEBUG=DEBUG LUAV=5.2 prefix=/sw -# PLAT: linux macosx win32 mingw +# PLAT: linux macosx win32 win64 mingw # platform to build for PLAT?=linux @@ -83,7 +83,18 @@ PLATFORM_win32?=Release CDIR_win32?=bin/lua/$(LUAV)/$(PLATFORM_win32) LDIR_win32?=bin/lua/$(LUAV)/$(PLATFORM_win32)/lua LUALIB_win32?=$(LUAPREFIX_win32)/lib/lua/$(LUAV)/$(PLATFORM_win32) -LUALIBNAME_win32?=lua$(subst .,,$(LUAV)).lib +LUALIBNAME_win32?=lua$(subst .,,$(LUAV)).lib + +# LUAINC_win64: +# LUALIB_win64: +# where lua headers and libraries are found for win64 builds +LUAPREFIX_win64?= +LUAINC_win64?=$(LUAPREFIX_win64)/include/lua/$(LUAV) $(LUAPREFIX_win64)/include/lua$(LUAV) +PLATFORM_win64?=x64/Release +CDIR_win64?=bin/lua/$(LUAV)/$(PLATFORM_win64) +LDIR_win64?=bin/lua/$(LUAV)/$(PLATFORM_win64)/lua +LUALIB_win64?=$(LUAPREFIX_win64)/lib/lua/$(LUAV)/$(PLATFORM_win64) +LUALIBNAME_win64?=lua$(subst .,,$(LUAV)).lib # LUAINC_solaris: @@ -141,7 +152,7 @@ print: #------ # Supported platforms # -PLATS= macosx linux win32 mingw solaris +PLATS= macosx linux win32 win64 mingw solaris #------ # Compiler and linker settings @@ -152,7 +163,7 @@ CC_macosx=gcc DEF_macosx= -DLUASOCKET_$(DEBUG) -DUNIX_HAS_SUN_LEN CFLAGS_macosx=$(LUAINC:%=-I%) $(DEF) -Wall -O2 -fno-common LDFLAGS_macosx= -bundle -undefined dynamic_lookup -o -LD_macosx= export MACOSX_DEPLOYMENT_TARGET="10.3"; gcc +LD_macosx=gcc SOCKET_macosx=usocket.o #------ @@ -217,17 +228,39 @@ CC_win32=cl DEF_win32= //D "WIN32" //D "NDEBUG" //D "_WINDOWS" //D "_USRDLL" \ //D "_CRT_SECURE_NO_WARNINGS" \ //D "_WINDLL" \ - //D "LUASOCKET_$(DEBUG)" + //D "LUASOCKET_$(DEBUG)" CFLAGS_win32=$(LUAINC:%=//I "%") $(DEF) //O2 //Ot //MD //W3 //nologo LDFLAGS_win32= //nologo //link //NOLOGO //DLL //INCREMENTAL:NO \ //MANIFEST //MANIFESTFILE:"intermediate.manifest" \ - //MANIFESTUAC:"level='asInvoker' uiAccess='false'" \ + /MANIFESTUAC:"level='asInvoker' uiAccess='false'" \ //SUBSYSTEM:WINDOWS //OPT:REF //OPT:ICF //DYNAMICBASE:NO \ - //MACHINE:X86 /LIBPATH:"$(shell cmd //c echo $(LUALIB))" \ + //MACHINE:X86 /LIBPATH:"$(LUALIB)" \ $(LUALIBNAME_win32) ws2_32.lib //OUT: + LD_win32=cl SOCKET_win32=wsocket.obj +#------ +# Compiler and linker settings +# for Win64 +SO_win64=dll +O_win64=obj +CC_win64=cl +DEF_win64= //D "WIN32" //D "NDEBUG" //D "_WINDOWS" //D "_USRDLL" \ + //D "_CRT_SECURE_NO_WARNINGS" \ + //D "_WINDLL" \ + //D "LUASOCKET_$(DEBUG)" +CFLAGS_win64=$(LUAINC:%=//I "%") $(DEF) //O2 //Ot //MD //W3 //nologo +LDFLAGS_win64= //nologo //link //NOLOGO //DLL //INCREMENTAL:NO \ + //MANIFEST //MANIFESTFILE:"intermediate.manifest" \ + /MANIFESTUAC:"level='asInvoker' uiAccess='false'" \ + //SUBSYSTEM:WINDOWS //OPT:REF //OPT:ICF //DYNAMICBASE:NO \ + /LIBPATH:"$(LUALIB)" \ + $(LUALIBNAME_win64) ws2_32.lib //OUT: + +LD_win64=cl +SOCKET_win64=wsocket.obj + .SUFFIXES: .obj .c.obj: @@ -340,6 +373,9 @@ macosx: win32: $(MAKE) all PLAT=win32 +win64: + $(MAKE) all PLAT=win64 + linux: $(MAKE) all-unix PLAT=linux diff --git a/vc32.bat b/vc32.bat new file mode 100755 index 0000000..7ff8c0e --- /dev/null +++ b/vc32.bat @@ -0,0 +1,3 @@ +call "c:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\bin\vcvars32.bat" +cls +"c:\Program Files\Git\git-bash.exe" --cd-to-home diff --git a/vc64.bat b/vc64.bat new file mode 100755 index 0000000..ed5cb3a --- /dev/null +++ b/vc64.bat @@ -0,0 +1,3 @@ +call "c:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\bin\amd64\vcvars64.bat" +cls +"c:\Program Files\Git\git-bash.exe" --cd-to-home diff --git a/win32.cmd b/win32.cmd old mode 100644 new mode 100755 index 3045721..5eda3b1 --- a/win32.cmd +++ b/win32.cmd @@ -1 +1 @@ -make LUAPREFIX_win32='c:\cygwin\home\diego\vc12' LUAV=5.1 PLAT=win32 LUALIBNAME_win32=lualib.lib PLATFORM_win32=Debug install-both +LUAV=5.3 PLAT=win32 LUAPREFIX_win32=/z/data/build/vc14 make diff --git a/win64.cmd b/win64.cmd new file mode 100755 index 0000000..b1f9ac0 --- /dev/null +++ b/win64.cmd @@ -0,0 +1 @@ +LUAV=5.3 PLAT=win64 LUAPREFIX_win64=/z/data/build/vc14 make From c7215bef07cb855844d1da42d2e64c5be869d5b7 Mon Sep 17 00:00:00 2001 From: Diego Nehab Date: Sat, 2 Mar 2019 17:47:18 -0300 Subject: [PATCH 099/194] Remove .filters and hardcoded platform. --- mime.vcxproj | 3 +-- mime.vcxproj.filters | 16 ------------- socket.vcxproj | 3 +-- socket.vcxproj.filters | 51 ------------------------------------------ 4 files changed, 2 insertions(+), 71 deletions(-) delete mode 100644 mime.vcxproj.filters delete mode 100644 socket.vcxproj.filters diff --git a/mime.vcxproj b/mime.vcxproj index 6a7b35a..43acee9 100755 --- a/mime.vcxproj +++ b/mime.vcxproj @@ -24,7 +24,6 @@ {128E8BD0-174A-48F0-8771-92B1E8D18713} Win32Proj - 10.0.15063.0 @@ -202,4 +201,4 @@ - + \ No newline at end of file diff --git a/mime.vcxproj.filters b/mime.vcxproj.filters deleted file mode 100644 index 621215b..0000000 --- a/mime.vcxproj.filters +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - {fad87a86-297c-4881-a114-73b967bb3c92} - - - - - cdir - - - \ No newline at end of file diff --git a/socket.vcxproj b/socket.vcxproj index e639216..305c094 100755 --- a/socket.vcxproj +++ b/socket.vcxproj @@ -35,7 +35,6 @@ {66E3CE14-884D-4AEA-9F20-15A0BEAF8C5A} Win32Proj - 10.0.15063.0 @@ -213,4 +212,4 @@ - + \ No newline at end of file diff --git a/socket.vcxproj.filters b/socket.vcxproj.filters deleted file mode 100644 index 38f2f07..0000000 --- a/socket.vcxproj.filters +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - - - - - - - - - - cdir - - - cdir - - - ldir - - - ldir - - - ldir - - - ldir - - - ldir - - - ldir - - - - - {b053460d-5439-4e3a-a2eb-c31a95b5691f} - - - {b301b82c-37cb-4e05-9333-194e92ed7a62} - - - \ No newline at end of file From 03b72d8f7ee5e35f76f97da299ce676946023725 Mon Sep 17 00:00:00 2001 From: Diego Nehab Date: Sat, 9 Mar 2019 23:23:48 -0300 Subject: [PATCH 100/194] Use static initialization This helps with multi-threaded apps. --- src/makefile | 3 +- src/mime.c | 152 ++++++++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 145 insertions(+), 10 deletions(-) diff --git a/src/makefile b/src/makefile index e6baf78..b9e2f93 100755 --- a/src/makefile +++ b/src/makefile @@ -35,7 +35,8 @@ DEBUG?=NODEBUG # LUAINC_macosx: # /opt/local/include LUAINC_macosx_base?=/opt/local/include -LUAINC_macosx?=$(LUAINC_macosx_base)/lua/$(LUAV) $(LUAINC_macosx_base)/lua$(LUAV) +LUAINC_macosx?=$(LUAINC_macosx_base)/lua/$(LUAV) $(LUAINC_macosx_base)/lua$(LUAV) $(LUAINC_macosx_base)/lua-$(LUAV) + # FIXME default should this default to fink or to macports? # What happens when more than one Lua version is installed? LUAPREFIX_macosx?=/opt/local diff --git a/src/mime.c b/src/mime.c index 6e359af..ce28826 100755 --- a/src/mime.c +++ b/src/mime.c @@ -3,6 +3,7 @@ * LuaSocket toolkit \*=========================================================================*/ #include +#include #include "lua.h" #include "lauxlib.h" @@ -30,12 +31,12 @@ static int mime_global_eol(lua_State *L); static int mime_global_dot(lua_State *L); static size_t dot(int c, size_t state, luaL_Buffer *buffer); -static void b64setup(UC *base); +//static void b64setup(UC *base); static size_t b64encode(UC c, UC *input, size_t size, luaL_Buffer *buffer); static size_t b64pad(const UC *input, size_t size, luaL_Buffer *buffer); static size_t b64decode(UC c, UC *input, size_t size, luaL_Buffer *buffer); -static void qpsetup(UC *class, UC *unbase); +//static void qpsetup(UC *class, UC *unbase); static void qpquote(UC c, luaL_Buffer *buffer); static size_t qpdecode(UC c, UC *input, size_t size, luaL_Buffer *buffer); static size_t qpencode(UC c, UC *input, size_t size, @@ -58,17 +59,111 @@ static luaL_Reg func[] = { /*-------------------------------------------------------------------------*\ * Quoted-printable globals \*-------------------------------------------------------------------------*/ -static UC qpclass[256]; -static UC qpbase[] = "0123456789ABCDEF"; -static UC qpunbase[256]; enum {QP_PLAIN, QP_QUOTED, QP_CR, QP_IF_LAST}; +static UC qpclass[] = { + QP_QUOTED, QP_QUOTED, QP_QUOTED, QP_QUOTED, QP_QUOTED, QP_QUOTED, + QP_QUOTED, QP_QUOTED, QP_QUOTED, QP_IF_LAST, QP_QUOTED, QP_QUOTED, + QP_QUOTED, QP_CR, QP_QUOTED, QP_QUOTED, QP_QUOTED, QP_QUOTED, + QP_QUOTED, QP_QUOTED, QP_QUOTED, QP_QUOTED, QP_QUOTED, QP_QUOTED, + QP_QUOTED, QP_QUOTED, QP_QUOTED, QP_QUOTED, QP_QUOTED, QP_QUOTED, + QP_QUOTED, QP_QUOTED, QP_IF_LAST, QP_PLAIN, QP_PLAIN, QP_PLAIN, + QP_PLAIN, QP_PLAIN, QP_PLAIN, QP_PLAIN, QP_PLAIN, QP_PLAIN, + QP_PLAIN, QP_PLAIN, QP_PLAIN, QP_PLAIN, QP_PLAIN, QP_PLAIN, + QP_PLAIN, QP_PLAIN, QP_PLAIN, QP_PLAIN, QP_PLAIN, QP_PLAIN, + QP_PLAIN, QP_PLAIN, QP_PLAIN, QP_PLAIN, QP_PLAIN, QP_PLAIN, + QP_PLAIN, QP_QUOTED, QP_PLAIN, QP_PLAIN, QP_PLAIN, QP_PLAIN, + QP_PLAIN, QP_PLAIN, QP_PLAIN, QP_PLAIN, QP_PLAIN, QP_PLAIN, + QP_PLAIN, QP_PLAIN, QP_PLAIN, QP_PLAIN, QP_PLAIN, QP_PLAIN, + QP_PLAIN, QP_PLAIN, QP_PLAIN, QP_PLAIN, QP_PLAIN, QP_PLAIN, + QP_PLAIN, QP_PLAIN, QP_PLAIN, QP_PLAIN, QP_PLAIN, QP_PLAIN, + QP_PLAIN, QP_PLAIN, QP_PLAIN, QP_PLAIN, QP_PLAIN, QP_PLAIN, + QP_PLAIN, QP_PLAIN, QP_PLAIN, QP_PLAIN, QP_PLAIN, QP_PLAIN, + QP_PLAIN, QP_PLAIN, QP_PLAIN, QP_PLAIN, QP_PLAIN, QP_PLAIN, + QP_PLAIN, QP_PLAIN, QP_PLAIN, QP_PLAIN, QP_PLAIN, QP_PLAIN, + QP_PLAIN, QP_PLAIN, QP_PLAIN, QP_PLAIN, QP_PLAIN, QP_PLAIN, + QP_PLAIN, QP_PLAIN, QP_PLAIN, QP_PLAIN, QP_PLAIN, QP_PLAIN, + QP_PLAIN, QP_QUOTED, QP_QUOTED, QP_QUOTED, QP_QUOTED, QP_QUOTED, + QP_QUOTED, QP_QUOTED, QP_QUOTED, QP_QUOTED, QP_QUOTED, QP_QUOTED, + QP_QUOTED, QP_QUOTED, QP_QUOTED, QP_QUOTED, QP_QUOTED, QP_QUOTED, + QP_QUOTED, QP_QUOTED, QP_QUOTED, QP_QUOTED, QP_QUOTED, QP_QUOTED, + QP_QUOTED, QP_QUOTED, QP_QUOTED, QP_QUOTED, QP_QUOTED, QP_QUOTED, + QP_QUOTED, QP_QUOTED, QP_QUOTED, QP_QUOTED, QP_QUOTED, QP_QUOTED, + QP_QUOTED, QP_QUOTED, QP_QUOTED, QP_QUOTED, QP_QUOTED, QP_QUOTED, + QP_QUOTED, QP_QUOTED, QP_QUOTED, QP_QUOTED, QP_QUOTED, QP_QUOTED, + QP_QUOTED, QP_QUOTED, QP_QUOTED, QP_QUOTED, QP_QUOTED, QP_QUOTED, + QP_QUOTED, QP_QUOTED, QP_QUOTED, QP_QUOTED, QP_QUOTED, QP_QUOTED, + QP_QUOTED, QP_QUOTED, QP_QUOTED, QP_QUOTED, QP_QUOTED, QP_QUOTED, + QP_QUOTED, QP_QUOTED, QP_QUOTED, QP_QUOTED, QP_QUOTED, QP_QUOTED, + QP_QUOTED, QP_QUOTED, QP_QUOTED, QP_QUOTED, QP_QUOTED, QP_QUOTED, + QP_QUOTED, QP_QUOTED, QP_QUOTED, QP_QUOTED, QP_QUOTED, QP_QUOTED, + QP_QUOTED, QP_QUOTED, QP_QUOTED, QP_QUOTED, QP_QUOTED, QP_QUOTED, + QP_QUOTED, QP_QUOTED, QP_QUOTED, QP_QUOTED, QP_QUOTED, QP_QUOTED, + QP_QUOTED, QP_QUOTED, QP_QUOTED, QP_QUOTED, QP_QUOTED, QP_QUOTED, + QP_QUOTED, QP_QUOTED, QP_QUOTED, QP_QUOTED, QP_QUOTED, QP_QUOTED, + QP_QUOTED, QP_QUOTED, QP_QUOTED, QP_QUOTED, QP_QUOTED, QP_QUOTED, + QP_QUOTED, QP_QUOTED, QP_QUOTED, QP_QUOTED, QP_QUOTED, QP_QUOTED, + QP_QUOTED, QP_QUOTED, QP_QUOTED, QP_QUOTED, QP_QUOTED, QP_QUOTED, + QP_QUOTED, QP_QUOTED, QP_QUOTED, QP_QUOTED +}; + +static const UC qpbase[] = "0123456789ABCDEF"; + +static const UC qpunbase[] = { + 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, + 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, + 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, + 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, + 255, 255, 255, 255, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 255, + 255, 255, 255, 255, 255, 255, 10, 11, 12, 13, 14, 15, + 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, + 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, + 255, 255, 255, 255, 10, 11, 12, 13, 14, 15, 255, 255, + 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, + 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, + 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, + 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, + 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, + 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, + 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, + 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, + 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, + 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, + 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, + 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, + 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, + 255, 255, 255, 255, 255, 255, 255, 255 +}; + /*-------------------------------------------------------------------------*\ * Base64 globals \*-------------------------------------------------------------------------*/ static const UC b64base[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; -static UC b64unbase[256]; + +static const UC b64unbase[] = { + 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, + 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, + 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, + 255, 255, 255, 255, 255, 255, 255, 62, 255, 255, 255, 63, + 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 255, 255, 255, 0, + 255, 255, 255, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, + 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 255, 255, + 255, 255, 255, 255, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, + 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, + 51, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, + 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, + 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, + 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, + 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, + 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, + 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, + 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, + 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, + 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, + 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, + 255, 255 +}; /*=========================================================================*\ * Exported functions @@ -85,8 +180,8 @@ LUASOCKET_API int luaopen_mime_core(lua_State *L) lua_pushstring(L, MIME_VERSION); lua_rawset(L, -3); /* initialize lookup tables */ - qpsetup(qpclass, qpunbase); - b64setup(b64unbase); + // qpsetup(qpclass, qpunbase); + // b64setup(b64unbase); return 1; } @@ -145,13 +240,21 @@ static int mime_global_wrp(lua_State *L) /*-------------------------------------------------------------------------*\ * Fill base64 decode map. \*-------------------------------------------------------------------------*/ +#if 0 static void b64setup(UC *unbase) { int i; for (i = 0; i <= 255; i++) unbase[i] = (UC) 255; for (i = 0; i < 64; i++) unbase[b64base[i]] = (UC) i; unbase['='] = 0; + + printf("static const UC b64unbase[] = {\n"); + for (int i = 0; i < 256; i++) { + printf("%d, ", unbase[i]); + } + printf("\n}\n;"); } +#endif /*-------------------------------------------------------------------------*\ * Acumulates bytes in input buffer until 3 bytes are available. @@ -349,8 +452,10 @@ static int mime_global_unb64(lua_State *L) * Split quoted-printable characters into classes * Precompute reverse map for encoding \*-------------------------------------------------------------------------*/ +#if 0 static void qpsetup(UC *cl, UC *unbase) { + int i; for (i = 0; i < 256; i++) cl[i] = QP_QUOTED; for (i = 33; i <= 60; i++) cl[i] = QP_PLAIN; @@ -367,7 +472,37 @@ static void qpsetup(UC *cl, UC *unbase) unbase['c'] = 12; unbase['D'] = 13; unbase['d'] = 13; unbase['E'] = 14; unbase['e'] = 14; unbase['F'] = 15; unbase['f'] = 15; + +printf("static UC qpclass[] = {"); + for (int i = 0; i < 256; i++) { + if (i % 6 == 0) { + printf("\n "); + } + switch(cl[i]) { + case QP_QUOTED: + printf("QP_QUOTED, "); + break; + case QP_PLAIN: + printf("QP_PLAIN, "); + break; + case QP_CR: + printf("QP_CR, "); + break; + case QP_IF_LAST: + printf("QP_IF_LAST, "); + break; + } + } +printf("\n};\n"); + +printf("static const UC qpunbase[] = {"); + for (int i = 0; i < 256; i++) { + int c = qpunbase[i]; + printf("%d, ", c); + } +printf("\";\n"); } +#endif /*-------------------------------------------------------------------------*\ * Output one character in form =XX @@ -447,7 +582,6 @@ static size_t qppad(UC *input, size_t size, luaL_Buffer *buffer) \*-------------------------------------------------------------------------*/ static int mime_global_qp(lua_State *L) { - size_t asize = 0, isize = 0; UC atom[3]; const UC *input = (const UC *) luaL_optlstring(L, 1, NULL, &isize); From 2af4872a401cbd0c1255e19ee26620f0431dd9f5 Mon Sep 17 00:00:00 2001 From: Diego Nehab Date: Sun, 10 Mar 2019 00:47:17 -0300 Subject: [PATCH 101/194] Fix formatting. --- src/mime.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/mime.c b/src/mime.c index ce28826..0e9863b 100755 --- a/src/mime.c +++ b/src/mime.c @@ -61,7 +61,7 @@ static luaL_Reg func[] = { \*-------------------------------------------------------------------------*/ enum {QP_PLAIN, QP_QUOTED, QP_CR, QP_IF_LAST}; -static UC qpclass[] = { +static const UC qpclass[] = { QP_QUOTED, QP_QUOTED, QP_QUOTED, QP_QUOTED, QP_QUOTED, QP_QUOTED, QP_QUOTED, QP_QUOTED, QP_QUOTED, QP_IF_LAST, QP_QUOTED, QP_QUOTED, QP_QUOTED, QP_CR, QP_QUOTED, QP_QUOTED, QP_QUOTED, QP_QUOTED, @@ -237,10 +237,10 @@ static int mime_global_wrp(lua_State *L) return 2; } +#if 0 /*-------------------------------------------------------------------------*\ * Fill base64 decode map. \*-------------------------------------------------------------------------*/ -#if 0 static void b64setup(UC *unbase) { int i; @@ -448,11 +448,11 @@ static int mime_global_unb64(lua_State *L) * To encode one byte, we need to see the next two. * Worst case is when we see a space, and wonder if a CRLF is comming \*-------------------------------------------------------------------------*/ +#if 0 /*-------------------------------------------------------------------------*\ * Split quoted-printable characters into classes * Precompute reverse map for encoding \*-------------------------------------------------------------------------*/ -#if 0 static void qpsetup(UC *cl, UC *unbase) { From 98800e9129a63e8d0f751108d79efdffe58e98f7 Mon Sep 17 00:00:00 2001 From: "E. Westbrook" Date: Wed, 27 Feb 2019 20:55:43 -0700 Subject: [PATCH 102/194] auxiliar: pragma visibility --- src/auxiliar.c | 26 +++++++++++--------------- src/auxiliar.h | 16 +++++++++------- 2 files changed, 20 insertions(+), 22 deletions(-) diff --git a/src/auxiliar.c b/src/auxiliar.c index 0bd7927..93a66a0 100644 --- a/src/auxiliar.c +++ b/src/auxiliar.c @@ -7,13 +7,10 @@ #include #include -/*=========================================================================*\ -* Exported functions -\*=========================================================================*/ /*-------------------------------------------------------------------------*\ * Initializes the module \*-------------------------------------------------------------------------*/ -LUASOCKET_PRIVATE int auxiliar_open(lua_State *L) { +int auxiliar_open(lua_State *L) { (void) L; return 0; } @@ -22,7 +19,7 @@ LUASOCKET_PRIVATE int auxiliar_open(lua_State *L) { * Creates a new class with given methods * Methods whose names start with __ are passed directly to the metatable. \*-------------------------------------------------------------------------*/ -LUASOCKET_PRIVATE void auxiliar_newclass(lua_State *L, const char *classname, luaL_Reg *func) { +void auxiliar_newclass(lua_State *L, const char *classname, luaL_Reg *func) { luaL_newmetatable(L, classname); /* mt */ /* create __index table to place methods */ lua_pushstring(L, "__index"); /* mt,"__index" */ @@ -45,7 +42,7 @@ LUASOCKET_PRIVATE void auxiliar_newclass(lua_State *L, const char *classname, lu /*-------------------------------------------------------------------------*\ * Prints the value of a class in a nice way \*-------------------------------------------------------------------------*/ -LUASOCKET_PRIVATE int auxiliar_tostring(lua_State *L) { +int auxiliar_tostring(lua_State *L) { char buf[32]; if (!lua_getmetatable(L, 1)) goto error; lua_pushstring(L, "__index"); @@ -66,7 +63,7 @@ error: /*-------------------------------------------------------------------------*\ * Insert class into group \*-------------------------------------------------------------------------*/ -LUASOCKET_PRIVATE void auxiliar_add2group(lua_State *L, const char *classname, const char *groupname) { +void auxiliar_add2group(lua_State *L, const char *classname, const char *groupname) { luaL_getmetatable(L, classname); lua_pushstring(L, groupname); lua_pushboolean(L, 1); @@ -77,7 +74,7 @@ LUASOCKET_PRIVATE void auxiliar_add2group(lua_State *L, const char *classname, c /*-------------------------------------------------------------------------*\ * Make sure argument is a boolean \*-------------------------------------------------------------------------*/ -LUASOCKET_PRIVATE int auxiliar_checkboolean(lua_State *L, int objidx) { +int auxiliar_checkboolean(lua_State *L, int objidx) { if (!lua_isboolean(L, objidx)) auxiliar_typeerror(L, objidx, lua_typename(L, LUA_TBOOLEAN)); return lua_toboolean(L, objidx); @@ -87,7 +84,7 @@ LUASOCKET_PRIVATE int auxiliar_checkboolean(lua_State *L, int objidx) { * Return userdata pointer if object belongs to a given class, abort with * error otherwise \*-------------------------------------------------------------------------*/ -LUASOCKET_PRIVATE void *auxiliar_checkclass(lua_State *L, const char *classname, int objidx) { +void *auxiliar_checkclass(lua_State *L, const char *classname, int objidx) { void *data = auxiliar_getclassudata(L, classname, objidx); if (!data) { char msg[45]; @@ -101,7 +98,7 @@ LUASOCKET_PRIVATE void *auxiliar_checkclass(lua_State *L, const char *classname, * Return userdata pointer if object belongs to a given group, abort with * error otherwise \*-------------------------------------------------------------------------*/ -LUASOCKET_PRIVATE void *auxiliar_checkgroup(lua_State *L, const char *groupname, int objidx) { +void *auxiliar_checkgroup(lua_State *L, const char *groupname, int objidx) { void *data = auxiliar_getgroupudata(L, groupname, objidx); if (!data) { char msg[45]; @@ -114,7 +111,7 @@ LUASOCKET_PRIVATE void *auxiliar_checkgroup(lua_State *L, const char *groupname, /*-------------------------------------------------------------------------*\ * Set object class \*-------------------------------------------------------------------------*/ -LUASOCKET_PRIVATE void auxiliar_setclass(lua_State *L, const char *classname, int objidx) { +void auxiliar_setclass(lua_State *L, const char *classname, int objidx) { luaL_getmetatable(L, classname); if (objidx < 0) objidx--; lua_setmetatable(L, objidx); @@ -124,7 +121,7 @@ LUASOCKET_PRIVATE void auxiliar_setclass(lua_State *L, const char *classname, in * Get a userdata pointer if object belongs to a given group. Return NULL * otherwise \*-------------------------------------------------------------------------*/ -LUASOCKET_PRIVATE void *auxiliar_getgroupudata(lua_State *L, const char *groupname, int objidx) { +void *auxiliar_getgroupudata(lua_State *L, const char *groupname, int objidx) { if (!lua_getmetatable(L, objidx)) return NULL; lua_pushstring(L, groupname); @@ -142,7 +139,7 @@ LUASOCKET_PRIVATE void *auxiliar_getgroupudata(lua_State *L, const char *groupna * Get a userdata pointer if object belongs to a given class. Return NULL * otherwise \*-------------------------------------------------------------------------*/ -LUASOCKET_PRIVATE void *auxiliar_getclassudata(lua_State *L, const char *classname, int objidx) { +void *auxiliar_getclassudata(lua_State *L, const char *classname, int objidx) { return luaL_testudata(L, objidx, classname); } @@ -150,9 +147,8 @@ LUASOCKET_PRIVATE void *auxiliar_getclassudata(lua_State *L, const char *classna * Throws error when argument does not have correct type. * Used to be part of lauxlib in Lua 5.1, was dropped from 5.2. \*-------------------------------------------------------------------------*/ -LUASOCKET_PRIVATE int auxiliar_typeerror (lua_State *L, int narg, const char *tname) { +int auxiliar_typeerror (lua_State *L, int narg, const char *tname) { const char *msg = lua_pushfstring(L, "%s expected, got %s", tname, luaL_typename(L, narg)); return luaL_argerror(L, narg, msg); } - diff --git a/src/auxiliar.h b/src/auxiliar.h index 65511d4..234b00a 100644 --- a/src/auxiliar.h +++ b/src/auxiliar.h @@ -29,20 +29,22 @@ * reverse mapping are done using lauxlib. \*=========================================================================*/ -#include "lua.h" -#include "lauxlib.h" -#include "compat.h" +#include "luasocket.h" + +#pragma GCC visibility push(hidden) int auxiliar_open(lua_State *L); void auxiliar_newclass(lua_State *L, const char *classname, luaL_Reg *func); +int auxiliar_tostring(lua_State *L); void auxiliar_add2group(lua_State *L, const char *classname, const char *group); -void auxiliar_setclass(lua_State *L, const char *classname, int objidx); +int auxiliar_checkboolean(lua_State *L, int objidx); void *auxiliar_checkclass(lua_State *L, const char *classname, int objidx); void *auxiliar_checkgroup(lua_State *L, const char *groupname, int objidx); -void *auxiliar_getclassudata(lua_State *L, const char *groupname, int objidx); +void auxiliar_setclass(lua_State *L, const char *classname, int objidx); void *auxiliar_getgroupudata(lua_State *L, const char *groupname, int objidx); -int auxiliar_checkboolean(lua_State *L, int objidx); -int auxiliar_tostring(lua_State *L); +void *auxiliar_getclassudata(lua_State *L, const char *groupname, int objidx); int auxiliar_typeerror(lua_State *L, int narg, const char *tname); +#pragma GCC visibility pop + #endif /* AUXILIAR_H */ From e3ac49efbda8b432470b57eae6fade7501c3da03 Mon Sep 17 00:00:00 2001 From: "E. Westbrook" Date: Wed, 27 Feb 2019 20:56:01 -0700 Subject: [PATCH 103/194] buffer: pragma visibility --- src/buffer.c | 19 +++++++------------ src/buffer.h | 11 +++++++---- 2 files changed, 14 insertions(+), 16 deletions(-) diff --git a/src/buffer.c b/src/buffer.c index 357730a..ac5c531 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -3,11 +3,6 @@ * LuaSocket toolkit \*=========================================================================*/ #include "luasocket.h" - -#include "lua.h" -#include "lauxlib.h" -#include "compat.h" - #include "buffer.h" /*=========================================================================*\ @@ -34,7 +29,7 @@ static int sendraw(p_buffer buf, const char *data, size_t count, size_t *sent); /*-------------------------------------------------------------------------*\ * Initializes module \*-------------------------------------------------------------------------*/ -LUASOCKET_PRIVATE int buffer_open(lua_State *L) { +int buffer_open(lua_State *L) { (void) L; return 0; } @@ -42,7 +37,7 @@ LUASOCKET_PRIVATE int buffer_open(lua_State *L) { /*-------------------------------------------------------------------------*\ * Initializes C structure \*-------------------------------------------------------------------------*/ -LUASOCKET_PRIVATE void buffer_init(p_buffer buf, p_io io, p_timeout tm) { +void buffer_init(p_buffer buf, p_io io, p_timeout tm) { buf->first = buf->last = 0; buf->io = io; buf->tm = tm; @@ -53,7 +48,7 @@ LUASOCKET_PRIVATE void buffer_init(p_buffer buf, p_io io, p_timeout tm) { /*-------------------------------------------------------------------------*\ * object:getstats() interface \*-------------------------------------------------------------------------*/ -LUASOCKET_PRIVATE int buffer_meth_getstats(lua_State *L, p_buffer buf) { +int buffer_meth_getstats(lua_State *L, p_buffer buf) { lua_pushnumber(L, (lua_Number) buf->received); lua_pushnumber(L, (lua_Number) buf->sent); lua_pushnumber(L, timeout_gettime() - buf->birthday); @@ -63,7 +58,7 @@ LUASOCKET_PRIVATE int buffer_meth_getstats(lua_State *L, p_buffer buf) { /*-------------------------------------------------------------------------*\ * object:setstats() interface \*-------------------------------------------------------------------------*/ -LUASOCKET_PRIVATE int buffer_meth_setstats(lua_State *L, p_buffer buf) { +int buffer_meth_setstats(lua_State *L, p_buffer buf) { buf->received = (long) luaL_optnumber(L, 2, (lua_Number) buf->received); buf->sent = (long) luaL_optnumber(L, 3, (lua_Number) buf->sent); if (lua_isnumber(L, 4)) buf->birthday = timeout_gettime() - lua_tonumber(L, 4); @@ -74,7 +69,7 @@ LUASOCKET_PRIVATE int buffer_meth_setstats(lua_State *L, p_buffer buf) { /*-------------------------------------------------------------------------*\ * object:send() interface \*-------------------------------------------------------------------------*/ -LUASOCKET_PRIVATE int buffer_meth_send(lua_State *L, p_buffer buf) { +int buffer_meth_send(lua_State *L, p_buffer buf) { int top = lua_gettop(L); int err = IO_DONE; size_t size = 0, sent = 0; @@ -107,7 +102,7 @@ LUASOCKET_PRIVATE int buffer_meth_send(lua_State *L, p_buffer buf) { /*-------------------------------------------------------------------------*\ * object:receive() interface \*-------------------------------------------------------------------------*/ -LUASOCKET_PRIVATE int buffer_meth_receive(lua_State *L, p_buffer buf) { +int buffer_meth_receive(lua_State *L, p_buffer buf) { int err = IO_DONE, top = lua_gettop(L); luaL_Buffer b; size_t size; @@ -156,7 +151,7 @@ LUASOCKET_PRIVATE int buffer_meth_receive(lua_State *L, p_buffer buf) { /*-------------------------------------------------------------------------*\ * Determines if there is any data in the read buffer \*-------------------------------------------------------------------------*/ -LUASOCKET_PRIVATE int buffer_isempty(p_buffer buf) { +int buffer_isempty(p_buffer buf) { return buf->first >= buf->last; } diff --git a/src/buffer.h b/src/buffer.h index 1281bb3..4218ea0 100644 --- a/src/buffer.h +++ b/src/buffer.h @@ -15,8 +15,7 @@ * The module is built on top of the I/O abstraction defined in io.h and the * timeout management is done with the timeout.h interface. \*=========================================================================*/ -#include "lua.h" - +#include "luasocket.h" #include "io.h" #include "timeout.h" @@ -34,12 +33,16 @@ typedef struct t_buffer_ { } t_buffer; typedef t_buffer *p_buffer; +#pragma GCC visibility push(hidden) + int buffer_open(lua_State *L); void buffer_init(p_buffer buf, p_io io, p_timeout tm); -int buffer_meth_send(lua_State *L, p_buffer buf); -int buffer_meth_receive(lua_State *L, p_buffer buf); int buffer_meth_getstats(lua_State *L, p_buffer buf); int buffer_meth_setstats(lua_State *L, p_buffer buf); +int buffer_meth_send(lua_State *L, p_buffer buf); +int buffer_meth_receive(lua_State *L, p_buffer buf); int buffer_isempty(p_buffer buf); +#pragma GCC visibility pop + #endif /* BUF_H */ From 133774cd3db0d8ce8ccc1df8538a6d44552fc1f0 Mon Sep 17 00:00:00 2001 From: "E. Westbrook" Date: Wed, 27 Feb 2019 20:56:48 -0700 Subject: [PATCH 104/194] compat: pragma visibility --- src/compat.c | 5 +++-- src/compat.h | 18 +++++++++++------- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/src/compat.c b/src/compat.c index 1290f70..34ffdaf 100644 --- a/src/compat.c +++ b/src/compat.c @@ -2,10 +2,11 @@ #include "compat.h" #if LUA_VERSION_NUM==501 + /* ** Adapted from Lua 5.2 */ -LUASOCKET_PRIVATE void luaL_setfuncs (lua_State *L, const luaL_Reg *l, int nup) { +void luasocket_setfuncs (lua_State *L, const luaL_Reg *l, int nup) { luaL_checkstack(L, nup+1, "too many upvalues"); for (; l->name != NULL; l++) { /* fill the table with given functions */ int i; @@ -21,7 +22,7 @@ LUASOCKET_PRIVATE void luaL_setfuncs (lua_State *L, const luaL_Reg *l, int nup) /* ** Duplicated from Lua 5.2 */ -LUASOCKET_PRIVATE void *luaL_testudata (lua_State *L, int ud, const char *tname) { +void *luasocket_testudata (lua_State *L, int ud, const char *tname) { void *p = lua_touserdata(L, ud); if (p != NULL) { /* value is a userdata? */ if (lua_getmetatable(L, ud)) { /* does it have a metatable? */ diff --git a/src/compat.h b/src/compat.h index 49e83f9..8c32b07 100644 --- a/src/compat.h +++ b/src/compat.h @@ -1,14 +1,18 @@ #ifndef COMPAT_H #define COMPAT_H -#include "lua.h" -#include "lauxlib.h" - #if LUA_VERSION_NUM==501 -#define luaL_setfuncs socket_setfuncs -#define luaL_testudata socket_testudata -void luaL_setfuncs (lua_State *L, const luaL_Reg *l, int nup); -void *luaL_testudata ( lua_State *L, int arg, const char *tname); + +#pragma GCC visibility push(hidden) + +void luasocket_setfuncs (lua_State *L, const luaL_Reg *l, int nup); +void *luasocket_testudata ( lua_State *L, int arg, const char *tname); + +#pragma GCC visibility pop + +#define luaL_setfuncs luasocket_setfuncs +#define luaL_testudata luasocket_testudata + #endif #endif From 4bf3eb6db2315fef8f3d18c8ce742752f7e4fda2 Mon Sep 17 00:00:00 2001 From: "E. Westbrook" Date: Wed, 27 Feb 2019 20:57:00 -0700 Subject: [PATCH 105/194] except: pragma visibility --- src/except.c | 10 ++-------- src/except.h | 6 +++++- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/src/except.c b/src/except.c index dab70e7..9c3317f 100644 --- a/src/except.c +++ b/src/except.c @@ -3,14 +3,8 @@ * LuaSocket toolkit \*=========================================================================*/ #include "luasocket.h" - -#include - -#include "lua.h" -#include "lauxlib.h" -#include "compat.h" - #include "except.h" +#include #if LUA_VERSION_NUM < 502 #define lua_pcallk(L, na, nr, err, ctx, cont) \ @@ -126,7 +120,7 @@ static int global_protect(lua_State *L) { /*-------------------------------------------------------------------------*\ * Init module \*-------------------------------------------------------------------------*/ -LUASOCKET_PRIVATE int except_open(lua_State *L) { +int except_open(lua_State *L) { lua_newtable(L); /* metatable for wrapped exceptions */ lua_pushboolean(L, 0); lua_setfield(L, -2, "__metatable"); diff --git a/src/except.h b/src/except.h index 2497c05..baa7b09 100644 --- a/src/except.h +++ b/src/except.h @@ -31,8 +31,12 @@ * exceptions on error, but that don't interrupt the user script. \*=========================================================================*/ -#include "lua.h" +#include "luasocket.h" + +#pragma GCC visibility push(hidden) int except_open(lua_State *L); +#pragma GCC visibility pop + #endif From 611cdd19cc8cf783f028d558cf23e9397db4fa1f Mon Sep 17 00:00:00 2001 From: "E. Westbrook" Date: Wed, 27 Feb 2019 20:57:14 -0700 Subject: [PATCH 106/194] inet: pragma visibility --- src/inet.c | 34 +++++++++++++--------------------- src/inet.h | 22 ++++++++++++---------- 2 files changed, 25 insertions(+), 31 deletions(-) diff --git a/src/inet.c b/src/inet.c index bed8a7c..ec73fea 100644 --- a/src/inet.c +++ b/src/inet.c @@ -3,17 +3,12 @@ * LuaSocket toolkit \*=========================================================================*/ #include "luasocket.h" +#include "inet.h" #include #include #include -#include "lua.h" -#include "lauxlib.h" -#include "compat.h" - -#include "inet.h" - /*=========================================================================*\ * Internal function prototypes. \*=========================================================================*/ @@ -34,13 +29,10 @@ static luaL_Reg func[] = { { NULL, NULL} }; -/*=========================================================================*\ -* Exported functions -\*=========================================================================*/ /*-------------------------------------------------------------------------*\ * Initializes module \*-------------------------------------------------------------------------*/ -LUASOCKET_PRIVATE int inet_open(lua_State *L) +int inet_open(lua_State *L) { lua_pushstring(L, "dns"); lua_newtable(L); @@ -145,7 +137,7 @@ static int inet_global_toip(lua_State *L) return 2; } -LUASOCKET_PRIVATE int inet_optfamily(lua_State* L, int narg, const char* def) +int inet_optfamily(lua_State* L, int narg, const char* def) { static const char* optname[] = { "unspec", "inet", "inet6", NULL }; static int optvalue[] = { AF_UNSPEC, AF_INET, AF_INET6, 0 }; @@ -153,7 +145,7 @@ LUASOCKET_PRIVATE int inet_optfamily(lua_State* L, int narg, const char* def) return optvalue[luaL_checkoption(L, narg, def, optname)]; } -LUASOCKET_PRIVATE int inet_optsocktype(lua_State* L, int narg, const char* def) +int inet_optsocktype(lua_State* L, int narg, const char* def) { static const char* optname[] = { "stream", "dgram", NULL }; static int optvalue[] = { SOCK_STREAM, SOCK_DGRAM, 0 }; @@ -244,7 +236,7 @@ static int inet_global_gethostname(lua_State *L) /*-------------------------------------------------------------------------*\ * Retrieves socket peer name \*-------------------------------------------------------------------------*/ -LUASOCKET_PRIVATE int inet_meth_getpeername(lua_State *L, p_socket ps, int family) +int inet_meth_getpeername(lua_State *L, p_socket ps, int family) { int err; struct sockaddr_storage peer; @@ -278,7 +270,7 @@ LUASOCKET_PRIVATE int inet_meth_getpeername(lua_State *L, p_socket ps, int famil /*-------------------------------------------------------------------------*\ * Retrieves socket local name \*-------------------------------------------------------------------------*/ -LUASOCKET_PRIVATE int inet_meth_getsockname(lua_State *L, p_socket ps, int family) +int inet_meth_getsockname(lua_State *L, p_socket ps, int family) { int err; struct sockaddr_storage peer; @@ -354,7 +346,7 @@ static void inet_pushresolved(lua_State *L, struct hostent *hp) /*-------------------------------------------------------------------------*\ * Tries to create a new inet socket \*-------------------------------------------------------------------------*/ -LUASOCKET_PRIVATE const char *inet_trycreate(p_socket ps, int family, int type, int protocol) { +const char *inet_trycreate(p_socket ps, int family, int type, int protocol) { const char *err = socket_strerror(socket_create(ps, family, type, protocol)); if (err == NULL && family == AF_INET6) { int yes = 1; @@ -366,7 +358,7 @@ LUASOCKET_PRIVATE const char *inet_trycreate(p_socket ps, int family, int type, /*-------------------------------------------------------------------------*\ * "Disconnects" a DGRAM socket \*-------------------------------------------------------------------------*/ -LUASOCKET_PRIVATE const char *inet_trydisconnect(p_socket ps, int family, p_timeout tm) +const char *inet_trydisconnect(p_socket ps, int family, p_timeout tm) { switch (family) { case AF_INET: { @@ -393,7 +385,7 @@ LUASOCKET_PRIVATE const char *inet_trydisconnect(p_socket ps, int family, p_time /*-------------------------------------------------------------------------*\ * Tries to connect to remote address (address, port) \*-------------------------------------------------------------------------*/ -LUASOCKET_PRIVATE const char *inet_tryconnect(p_socket ps, int *family, const char *address, +const char *inet_tryconnect(p_socket ps, int *family, const char *address, const char *serv, p_timeout tm, struct addrinfo *connecthints) { struct addrinfo *iterator = NULL, *resolved = NULL; @@ -439,7 +431,7 @@ LUASOCKET_PRIVATE const char *inet_tryconnect(p_socket ps, int *family, const ch /*-------------------------------------------------------------------------*\ * Tries to accept a socket \*-------------------------------------------------------------------------*/ -LUASOCKET_PRIVATE const char *inet_tryaccept(p_socket server, int family, p_socket client, +const char *inet_tryaccept(p_socket server, int family, p_socket client, p_timeout tm) { socklen_t len; t_sockaddr_storage addr; @@ -455,7 +447,7 @@ LUASOCKET_PRIVATE const char *inet_tryaccept(p_socket server, int family, p_sock /*-------------------------------------------------------------------------*\ * Tries to bind socket to (address, port) \*-------------------------------------------------------------------------*/ -LUASOCKET_PRIVATE const char *inet_trybind(p_socket ps, int *family, const char *address, +const char *inet_trybind(p_socket ps, int *family, const char *address, const char *serv, struct addrinfo *bindhints) { struct addrinfo *iterator = NULL, *resolved = NULL; const char *err = NULL; @@ -499,7 +491,7 @@ LUASOCKET_PRIVATE const char *inet_trybind(p_socket ps, int *family, const char * Some systems do not provide these so that we provide our own. \*-------------------------------------------------------------------------*/ #ifdef LUASOCKET_INET_ATON -LUASOCKET_PRIVATE int inet_aton(const char *cp, struct in_addr *inp) +int inet_aton(const char *cp, struct in_addr *inp) { unsigned int a = 0, b = 0, c = 0, d = 0; int n = 0, r; @@ -521,7 +513,7 @@ LUASOCKET_PRIVATE int inet_aton(const char *cp, struct in_addr *inp) #endif #ifdef LUASOCKET_INET_PTON -LUASOCKET_PRIVATE int inet_pton(int af, const char *src, void *dst) +int inet_pton(int af, const char *src, void *dst) { struct addrinfo hints, *res; int ret = 1; diff --git a/src/inet.h b/src/inet.h index feb3541..2e00e58 100644 --- a/src/inet.h +++ b/src/inet.h @@ -14,7 +14,7 @@ * * The Lua functions toip and tohostname are also implemented here. \*=========================================================================*/ -#include "lua.h" +#include "luasocket.h" #include "socket.h" #include "timeout.h" @@ -22,21 +22,21 @@ #define LUASOCKET_INET_ATON #endif +#pragma GCC visibility push(hidden) + int inet_open(lua_State *L); -const char *inet_trycreate(p_socket ps, int family, int type, int protocol); -const char *inet_tryconnect(p_socket ps, int *family, const char *address, - const char *serv, p_timeout tm, struct addrinfo *connecthints); -const char *inet_trybind(p_socket ps, int *family, const char *address, - const char *serv, struct addrinfo *bindhints); -const char *inet_trydisconnect(p_socket ps, int family, p_timeout tm); -const char *inet_tryaccept(p_socket server, int family, p_socket client, p_timeout tm); +int inet_optfamily(lua_State* L, int narg, const char* def); +int inet_optsocktype(lua_State* L, int narg, const char* def); int inet_meth_getpeername(lua_State *L, p_socket ps, int family); int inet_meth_getsockname(lua_State *L, p_socket ps, int family); -int inet_optfamily(lua_State* L, int narg, const char* def); -int inet_optsocktype(lua_State* L, int narg, const char* def); +const char *inet_trycreate(p_socket ps, int family, int type, int protocol); +const char *inet_trydisconnect(p_socket ps, int family, p_timeout tm); +const char *inet_tryconnect(p_socket ps, int *family, const char *address, const char *serv, p_timeout tm, struct addrinfo *connecthints); +const char *inet_tryaccept(p_socket server, int family, p_socket client, p_timeout tm); +const char *inet_trybind(p_socket ps, int *family, const char *address, const char *serv, struct addrinfo *bindhints); #ifdef LUASOCKET_INET_ATON int inet_aton(const char *cp, struct in_addr *inp); @@ -47,4 +47,6 @@ const char *inet_ntop(int af, const void *src, char *dst, socklen_t cnt); int inet_pton(int af, const char *src, void *dst); #endif +#pragma GCC visibility pop + #endif /* INET_H */ From ee30e4643d276c82775010534cb4877a31bde2f9 Mon Sep 17 00:00:00 2001 From: "E. Westbrook" Date: Wed, 27 Feb 2019 20:57:25 -0700 Subject: [PATCH 107/194] io: pragma visibility --- src/io.c | 7 ++----- src/io.h | 8 +++++--- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/io.c b/src/io.c index f1a2b9d..5ad4b3a 100644 --- a/src/io.c +++ b/src/io.c @@ -5,13 +5,10 @@ #include "luasocket.h" #include "io.h" -/*=========================================================================*\ -* Exported functions -\*=========================================================================*/ /*-------------------------------------------------------------------------*\ * Initializes C structure \*-------------------------------------------------------------------------*/ -LUASOCKET_PRIVATE void io_init(p_io io, p_send send, p_recv recv, p_error error, void *ctx) { +void io_init(p_io io, p_send send, p_recv recv, p_error error, void *ctx) { io->send = send; io->recv = recv; io->error = error; @@ -21,7 +18,7 @@ LUASOCKET_PRIVATE void io_init(p_io io, p_send send, p_recv recv, p_error error, /*-------------------------------------------------------------------------*\ * I/O error strings \*-------------------------------------------------------------------------*/ -LUASOCKET_PRIVATE const char *io_strerror(int err) { +const char *io_strerror(int err) { switch (err) { case IO_DONE: return NULL; case IO_CLOSED: return "closed"; diff --git a/src/io.h b/src/io.h index 8cca08a..e08eb0e 100644 --- a/src/io.h +++ b/src/io.h @@ -12,9 +12,7 @@ * The module socket.h implements this interface, and thus the module tcp.h * is very simple. \*=========================================================================*/ -#include -#include "lua.h" - +#include "luasocket.h" #include "timeout.h" /* IO error codes */ @@ -58,8 +56,12 @@ typedef struct t_io_ { } t_io; typedef t_io *p_io; +#pragma GCC visibility push(hidden) + void io_init(p_io io, p_send send, p_recv recv, p_error error, void *ctx); const char *io_strerror(int err); +#pragma GCC visibility pop + #endif /* IO_H */ From 2015290cb47a804e098a0bf44d349955e453c23a Mon Sep 17 00:00:00 2001 From: "E. Westbrook" Date: Wed, 27 Feb 2019 20:57:34 -0700 Subject: [PATCH 108/194] luasocket: include centralization --- src/luasocket.c | 10 ---------- src/luasocket.h | 13 ++++--------- 2 files changed, 4 insertions(+), 19 deletions(-) diff --git a/src/luasocket.c b/src/luasocket.c index d2752a7..0fd99f7 100755 --- a/src/luasocket.c +++ b/src/luasocket.c @@ -12,16 +12,6 @@ * standard Lua read and write functions. \*=========================================================================*/ -/*=========================================================================*\ -* Standard include files -\*=========================================================================*/ -#include "lua.h" -#include "lauxlib.h" -#include "compat.h" - -/*=========================================================================*\ -* LuaSocket includes -\*=========================================================================*/ #include "luasocket.h" #include "auxiliar.h" #include "except.h" diff --git a/src/luasocket.h b/src/luasocket.h index 0121a15..d22b1be 100644 --- a/src/luasocket.h +++ b/src/luasocket.h @@ -6,9 +6,8 @@ * Diego Nehab * 9/11/1999 \*=========================================================================*/ -#include "lua.h" -/*-------------------------------------------------------------------------*\ +/*-------------------------------------------------------------------------* \ * Current socket library version \*-------------------------------------------------------------------------*/ #define LUASOCKET_VERSION "LuaSocket 3.0-rc1" @@ -25,13 +24,9 @@ #endif #endif -#ifndef LUASOCKET_PRIVATE -#ifdef _WIN32 -#define LUASOCKET_PRIVATE -#else -#define LUASOCKET_PRIVATE __attribute__ ((visibility ("hidden"))) -#endif -#endif +#include "lua.h" +#include "lauxlib.h" +#include "compat.h" /*-------------------------------------------------------------------------*\ * Initializes the library. From 83648f8df2a6ec6d3061b2642ae8739da94eadbe Mon Sep 17 00:00:00 2001 From: "E. Westbrook" Date: Wed, 27 Feb 2019 20:58:27 -0700 Subject: [PATCH 109/194] mime: include reorg --- src/mime.c | 8 ++------ src/mime.h | 1 - 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/src/mime.c b/src/mime.c index 0e9863b..6c210e4 100755 --- a/src/mime.c +++ b/src/mime.c @@ -2,15 +2,11 @@ * MIME support functions * LuaSocket toolkit \*=========================================================================*/ +#include "luasocket.h" +#include "mime.h" #include #include -#include "lua.h" -#include "lauxlib.h" -#include "compat.h" - -#include "mime.h" - /*=========================================================================*\ * Don't want to trust escape character constants \*=========================================================================*/ diff --git a/src/mime.h b/src/mime.h index e57fc9c..4d938f4 100644 --- a/src/mime.h +++ b/src/mime.h @@ -9,7 +9,6 @@ * provide a higher level interface to this functionality. \*=========================================================================*/ #include "luasocket.h" -#include "lua.h" /*-------------------------------------------------------------------------*\ * Current MIME library version From ce6a08d57de42f8f2a78fd63b1b2bc90b3cc0156 Mon Sep 17 00:00:00 2001 From: "E. Westbrook" Date: Wed, 27 Feb 2019 20:58:46 -0700 Subject: [PATCH 110/194] options: pragma visibility --- src/options.c | 176 +++++++++++++++++++++++++++++--------------------- src/options.h | 134 +++++++++++++++++++++----------------- 2 files changed, 175 insertions(+), 135 deletions(-) diff --git a/src/options.c b/src/options.c index b0bacbf..06ab58d 100644 --- a/src/options.c +++ b/src/options.c @@ -3,7 +3,6 @@ * LuaSocket toolkit \*=========================================================================*/ #include "luasocket.h" -#include "lauxlib.h" #include "auxiliar.h" #include "options.h" #include "inet.h" @@ -29,7 +28,7 @@ static int opt_get(lua_State *L, p_socket ps, int level, int name, /*-------------------------------------------------------------------------*\ * Calls appropriate option handler \*-------------------------------------------------------------------------*/ -LUASOCKET_PRIVATE int opt_meth_setoption(lua_State *L, p_opt opt, p_socket ps) +int opt_meth_setoption(lua_State *L, p_opt opt, p_socket ps) { const char *name = luaL_checkstring(L, 2); /* obj, name, ... */ while (opt->name && strcmp(name, opt->name)) @@ -42,7 +41,7 @@ LUASOCKET_PRIVATE int opt_meth_setoption(lua_State *L, p_opt opt, p_socket ps) return opt->func(L, ps); } -LUASOCKET_PRIVATE int opt_meth_getoption(lua_State *L, p_opt opt, p_socket ps) +int opt_meth_getoption(lua_State *L, p_opt opt, p_socket ps) { const char *name = luaL_checkstring(L, 2); /* obj, name, ... */ while (opt->name && strcmp(name, opt->name)) @@ -55,166 +54,188 @@ LUASOCKET_PRIVATE int opt_meth_getoption(lua_State *L, p_opt opt, p_socket ps) return opt->func(L, ps); } +// ------------------------------------------------------- /* enables reuse of local address */ -LUASOCKET_PRIVATE int opt_set_reuseaddr(lua_State *L, p_socket ps) +int opt_set_reuseaddr(lua_State *L, p_socket ps) { return opt_setboolean(L, ps, SOL_SOCKET, SO_REUSEADDR); } -LUASOCKET_PRIVATE int opt_get_reuseaddr(lua_State *L, p_socket ps) +int opt_get_reuseaddr(lua_State *L, p_socket ps) { return opt_getboolean(L, ps, SOL_SOCKET, SO_REUSEADDR); } +// ------------------------------------------------------- /* enables reuse of local port */ -LUASOCKET_PRIVATE int opt_set_reuseport(lua_State *L, p_socket ps) +int opt_set_reuseport(lua_State *L, p_socket ps) { return opt_setboolean(L, ps, SOL_SOCKET, SO_REUSEPORT); } -LUASOCKET_PRIVATE int opt_get_reuseport(lua_State *L, p_socket ps) +int opt_get_reuseport(lua_State *L, p_socket ps) { return opt_getboolean(L, ps, SOL_SOCKET, SO_REUSEPORT); } -/* disables the Naggle algorithm */ -LUASOCKET_PRIVATE int opt_set_tcp_nodelay(lua_State *L, p_socket ps) +// ------------------------------------------------------- +/* disables the Nagle algorithm */ +int opt_set_tcp_nodelay(lua_State *L, p_socket ps) { return opt_setboolean(L, ps, IPPROTO_TCP, TCP_NODELAY); } -LUASOCKET_PRIVATE int opt_get_tcp_nodelay(lua_State *L, p_socket ps) +int opt_get_tcp_nodelay(lua_State *L, p_socket ps) { return opt_getboolean(L, ps, IPPROTO_TCP, TCP_NODELAY); } +// ------------------------------------------------------- #ifdef TCP_KEEPIDLE -LUASOCKET_PRIVATE int opt_get_tcp_keepidle(lua_State *L, p_socket ps) + +int opt_get_tcp_keepidle(lua_State *L, p_socket ps) { return opt_getint(L, ps, IPPROTO_TCP, TCP_KEEPIDLE); } -LUASOCKET_PRIVATE int opt_set_tcp_keepidle(lua_State *L, p_socket ps) +int opt_set_tcp_keepidle(lua_State *L, p_socket ps) { return opt_setint(L, ps, IPPROTO_TCP, TCP_KEEPIDLE); } + #endif +// ------------------------------------------------------- #ifdef TCP_KEEPCNT -LUASOCKET_PRIVATE int opt_get_tcp_keepcnt(lua_State *L, p_socket ps) + +int opt_get_tcp_keepcnt(lua_State *L, p_socket ps) { return opt_getint(L, ps, IPPROTO_TCP, TCP_KEEPCNT); } -LUASOCKET_PRIVATE int opt_set_tcp_keepcnt(lua_State *L, p_socket ps) +int opt_set_tcp_keepcnt(lua_State *L, p_socket ps) { return opt_setint(L, ps, IPPROTO_TCP, TCP_KEEPCNT); } + #endif +// ------------------------------------------------------- #ifdef TCP_KEEPINTVL -LUASOCKET_PRIVATE int opt_get_tcp_keepintvl(lua_State *L, p_socket ps) + +int opt_get_tcp_keepintvl(lua_State *L, p_socket ps) { return opt_getint(L, ps, IPPROTO_TCP, TCP_KEEPINTVL); } -LUASOCKET_PRIVATE int opt_set_tcp_keepintvl(lua_State *L, p_socket ps) +int opt_set_tcp_keepintvl(lua_State *L, p_socket ps) { return opt_setint(L, ps, IPPROTO_TCP, TCP_KEEPINTVL); } + #endif -LUASOCKET_PRIVATE int opt_set_keepalive(lua_State *L, p_socket ps) +// ------------------------------------------------------- +int opt_set_keepalive(lua_State *L, p_socket ps) { return opt_setboolean(L, ps, SOL_SOCKET, SO_KEEPALIVE); } -LUASOCKET_PRIVATE int opt_get_keepalive(lua_State *L, p_socket ps) +int opt_get_keepalive(lua_State *L, p_socket ps) { return opt_getboolean(L, ps, SOL_SOCKET, SO_KEEPALIVE); } -LUASOCKET_PRIVATE int opt_set_dontroute(lua_State *L, p_socket ps) +// ------------------------------------------------------- +int opt_set_dontroute(lua_State *L, p_socket ps) { return opt_setboolean(L, ps, SOL_SOCKET, SO_DONTROUTE); } -LUASOCKET_PRIVATE int opt_get_dontroute(lua_State *L, p_socket ps) +int opt_get_dontroute(lua_State *L, p_socket ps) { return opt_getboolean(L, ps, SOL_SOCKET, SO_DONTROUTE); } -LUASOCKET_PRIVATE int opt_set_broadcast(lua_State *L, p_socket ps) +// ------------------------------------------------------- +int opt_set_broadcast(lua_State *L, p_socket ps) { return opt_setboolean(L, ps, SOL_SOCKET, SO_BROADCAST); } -LUASOCKET_PRIVATE int opt_set_recv_buf_size(lua_State *L, p_socket ps) -{ - return opt_setint(L, ps, SOL_SOCKET, SO_RCVBUF); -} - -LUASOCKET_PRIVATE int opt_get_recv_buf_size(lua_State *L, p_socket ps) -{ - return opt_getint(L, ps, SOL_SOCKET, SO_RCVBUF); -} - -LUASOCKET_PRIVATE int opt_get_send_buf_size(lua_State *L, p_socket ps) -{ - return opt_getint(L, ps, SOL_SOCKET, SO_SNDBUF); -} - -LUASOCKET_PRIVATE int opt_set_send_buf_size(lua_State *L, p_socket ps) -{ - return opt_setint(L, ps, SOL_SOCKET, SO_SNDBUF); -} - -LUASOCKET_PRIVATE int opt_get_broadcast(lua_State *L, p_socket ps) +int opt_get_broadcast(lua_State *L, p_socket ps) { return opt_getboolean(L, ps, SOL_SOCKET, SO_BROADCAST); } -LUASOCKET_PRIVATE int opt_set_ip6_unicast_hops(lua_State *L, p_socket ps) +// ------------------------------------------------------- +int opt_set_recv_buf_size(lua_State *L, p_socket ps) +{ + return opt_setint(L, ps, SOL_SOCKET, SO_RCVBUF); +} + +int opt_get_recv_buf_size(lua_State *L, p_socket ps) +{ + return opt_getint(L, ps, SOL_SOCKET, SO_RCVBUF); +} + +// ------------------------------------------------------- +int opt_get_send_buf_size(lua_State *L, p_socket ps) +{ + return opt_getint(L, ps, SOL_SOCKET, SO_SNDBUF); +} + +int opt_set_send_buf_size(lua_State *L, p_socket ps) +{ + return opt_setint(L, ps, SOL_SOCKET, SO_SNDBUF); +} + +// ------------------------------------------------------- +int opt_set_ip6_unicast_hops(lua_State *L, p_socket ps) { return opt_setint(L, ps, IPPROTO_IPV6, IPV6_UNICAST_HOPS); } -LUASOCKET_PRIVATE int opt_get_ip6_unicast_hops(lua_State *L, p_socket ps) +int opt_get_ip6_unicast_hops(lua_State *L, p_socket ps) { return opt_getint(L, ps, IPPROTO_IPV6, IPV6_UNICAST_HOPS); } -LUASOCKET_PRIVATE int opt_set_ip6_multicast_hops(lua_State *L, p_socket ps) +// ------------------------------------------------------- +int opt_set_ip6_multicast_hops(lua_State *L, p_socket ps) { return opt_setint(L, ps, IPPROTO_IPV6, IPV6_MULTICAST_HOPS); } -LUASOCKET_PRIVATE int opt_get_ip6_multicast_hops(lua_State *L, p_socket ps) +int opt_get_ip6_multicast_hops(lua_State *L, p_socket ps) { return opt_getint(L, ps, IPPROTO_IPV6, IPV6_MULTICAST_HOPS); } -LUASOCKET_PRIVATE int opt_set_ip_multicast_loop(lua_State *L, p_socket ps) +// ------------------------------------------------------- +int opt_set_ip_multicast_loop(lua_State *L, p_socket ps) { return opt_setboolean(L, ps, IPPROTO_IP, IP_MULTICAST_LOOP); } -LUASOCKET_PRIVATE int opt_get_ip_multicast_loop(lua_State *L, p_socket ps) +int opt_get_ip_multicast_loop(lua_State *L, p_socket ps) { return opt_getboolean(L, ps, IPPROTO_IP, IP_MULTICAST_LOOP); } -LUASOCKET_PRIVATE int opt_set_ip6_multicast_loop(lua_State *L, p_socket ps) +// ------------------------------------------------------- +int opt_set_ip6_multicast_loop(lua_State *L, p_socket ps) { return opt_setboolean(L, ps, IPPROTO_IPV6, IPV6_MULTICAST_LOOP); } -LUASOCKET_PRIVATE int opt_get_ip6_multicast_loop(lua_State *L, p_socket ps) +int opt_get_ip6_multicast_loop(lua_State *L, p_socket ps) { return opt_getboolean(L, ps, IPPROTO_IPV6, IPV6_MULTICAST_LOOP); } -LUASOCKET_PRIVATE int opt_set_linger(lua_State *L, p_socket ps) +// ------------------------------------------------------- +int opt_set_linger(lua_State *L, p_socket ps) { struct linger li; /* obj, name, table */ if (!lua_istable(L, 3)) auxiliar_typeerror(L,3,lua_typename(L, LUA_TTABLE)); @@ -231,7 +252,7 @@ LUASOCKET_PRIVATE int opt_set_linger(lua_State *L, p_socket ps) return opt_set(L, ps, SOL_SOCKET, SO_LINGER, (char *) &li, sizeof(li)); } -LUASOCKET_PRIVATE int opt_get_linger(lua_State *L, p_socket ps) +int opt_get_linger(lua_State *L, p_socket ps) { struct linger li; /* obj, name */ int len = sizeof(li); @@ -246,12 +267,14 @@ LUASOCKET_PRIVATE int opt_get_linger(lua_State *L, p_socket ps) return 1; } -LUASOCKET_PRIVATE int opt_set_ip_multicast_ttl(lua_State *L, p_socket ps) +// ------------------------------------------------------- +int opt_set_ip_multicast_ttl(lua_State *L, p_socket ps) { return opt_setint(L, ps, IPPROTO_IP, IP_MULTICAST_TTL); } -LUASOCKET_PRIVATE int opt_set_ip_multicast_if(lua_State *L, p_socket ps) +// ------------------------------------------------------- +int opt_set_ip_multicast_if(lua_State *L, p_socket ps) { const char *address = luaL_checkstring(L, 3); /* obj, name, ip */ struct in_addr val; @@ -262,7 +285,7 @@ LUASOCKET_PRIVATE int opt_set_ip_multicast_if(lua_State *L, p_socket ps) (char *) &val, sizeof(val)); } -LUASOCKET_PRIVATE int opt_get_ip_multicast_if(lua_State *L, p_socket ps) +int opt_get_ip_multicast_if(lua_State *L, p_socket ps) { struct in_addr val; socklen_t len = sizeof(val); @@ -275,36 +298,52 @@ LUASOCKET_PRIVATE int opt_get_ip_multicast_if(lua_State *L, p_socket ps) return 1; } -LUASOCKET_PRIVATE int opt_set_ip_add_membership(lua_State *L, p_socket ps) +// ------------------------------------------------------- +int opt_set_ip_add_membership(lua_State *L, p_socket ps) { return opt_setmembership(L, ps, IPPROTO_IP, IP_ADD_MEMBERSHIP); } -LUASOCKET_PRIVATE int opt_set_ip_drop_membersip(lua_State *L, p_socket ps) +int opt_set_ip_drop_membersip(lua_State *L, p_socket ps) { return opt_setmembership(L, ps, IPPROTO_IP, IP_DROP_MEMBERSHIP); } -LUASOCKET_PRIVATE int opt_set_ip6_add_membership(lua_State *L, p_socket ps) +// ------------------------------------------------------- +int opt_set_ip6_add_membership(lua_State *L, p_socket ps) { return opt_ip6_setmembership(L, ps, IPPROTO_IPV6, IPV6_ADD_MEMBERSHIP); } -LUASOCKET_PRIVATE int opt_set_ip6_drop_membersip(lua_State *L, p_socket ps) +int opt_set_ip6_drop_membersip(lua_State *L, p_socket ps) { return opt_ip6_setmembership(L, ps, IPPROTO_IPV6, IPV6_DROP_MEMBERSHIP); } - -LUASOCKET_PRIVATE int opt_get_ip6_v6only(lua_State *L, p_socket ps) +// ------------------------------------------------------- +int opt_get_ip6_v6only(lua_State *L, p_socket ps) { return opt_getboolean(L, ps, IPPROTO_IPV6, IPV6_V6ONLY); } -LUASOCKET_PRIVATE int opt_set_ip6_v6only(lua_State *L, p_socket ps) +int opt_set_ip6_v6only(lua_State *L, p_socket ps) { return opt_setboolean(L, ps, IPPROTO_IPV6, IPV6_V6ONLY); } +// ------------------------------------------------------- +int opt_get_error(lua_State *L, p_socket ps) +{ + int val = 0; + socklen_t len = sizeof(val); + if (getsockopt(*ps, SOL_SOCKET, SO_ERROR, (char *) &val, &len) < 0) { + lua_pushnil(L); + lua_pushstring(L, "getsockopt failed"); + return 2; + } + lua_pushstring(L, socket_strerror(val)); + return 1; +} + /*=========================================================================*\ * Auxiliar functions \*=========================================================================*/ @@ -391,19 +430,6 @@ static int opt_getboolean(lua_State *L, p_socket ps, int level, int name) return 1; } -LUASOCKET_PRIVATE int opt_get_error(lua_State *L, p_socket ps) -{ - int val = 0; - socklen_t len = sizeof(val); - if (getsockopt(*ps, SOL_SOCKET, SO_ERROR, (char *) &val, &len) < 0) { - lua_pushnil(L); - lua_pushstring(L, "getsockopt failed"); - return 2; - } - lua_pushstring(L, socket_strerror(val)); - return 1; -} - static int opt_setboolean(lua_State *L, p_socket ps, int level, int name) { int val = auxiliar_checkboolean(L, 3); /* obj, name, bool */ diff --git a/src/options.h b/src/options.h index fb82c4d..1457f43 100644 --- a/src/options.h +++ b/src/options.h @@ -8,7 +8,7 @@ * modules UDP and TCP. \*=========================================================================*/ -#include "lua.h" +#include "luasocket.h" #include "socket.h" /* option registry */ @@ -18,67 +18,81 @@ typedef struct t_opt { } t_opt; typedef t_opt *p_opt; -/* supported options for setoption */ -int opt_set_dontroute(lua_State *L, p_socket ps); -int opt_set_broadcast(lua_State *L, p_socket ps); -int opt_set_tcp_nodelay(lua_State *L, p_socket ps); -#ifdef TCP_KEEPIDLE -int opt_set_tcp_keepidle(lua_State *L, p_socket ps); -#endif -#ifdef TCP_KEEPCNT -int opt_set_tcp_keepcnt(lua_State *L, p_socket ps); -#endif -#ifdef TCP_KEEPINTVL -int opt_set_tcp_keepintvl(lua_State *L, p_socket ps); -#endif -int opt_set_keepalive(lua_State *L, p_socket ps); -int opt_set_linger(lua_State *L, p_socket ps); -int opt_set_reuseaddr(lua_State *L, p_socket ps); -int opt_set_reuseport(lua_State *L, p_socket ps); -int opt_set_ip_multicast_if(lua_State *L, p_socket ps); -int opt_set_ip_multicast_ttl(lua_State *L, p_socket ps); -int opt_set_ip_multicast_loop(lua_State *L, p_socket ps); -int opt_set_ip_add_membership(lua_State *L, p_socket ps); -int opt_set_ip_drop_membersip(lua_State *L, p_socket ps); -int opt_set_ip6_unicast_hops(lua_State *L, p_socket ps); -int opt_set_ip6_multicast_hops(lua_State *L, p_socket ps); -int opt_set_ip6_multicast_loop(lua_State *L, p_socket ps); -int opt_set_ip6_add_membership(lua_State *L, p_socket ps); -int opt_set_ip6_drop_membersip(lua_State *L, p_socket ps); -int opt_set_ip6_v6only(lua_State *L, p_socket ps); -int opt_set_recv_buf_size(lua_State *L, p_socket ps); -int opt_set_send_buf_size(lua_State *L, p_socket ps); +#pragma GCC visibility push(hidden) -/* supported options for getoption */ -int opt_get_dontroute(lua_State *L, p_socket ps); -int opt_get_broadcast(lua_State *L, p_socket ps); -int opt_get_reuseaddr(lua_State *L, p_socket ps); -int opt_get_reuseport(lua_State *L, p_socket ps); -int opt_get_tcp_nodelay(lua_State *L, p_socket ps); -#ifdef TCP_KEEPIDLE -int opt_get_tcp_keepidle(lua_State *L, p_socket ps); -#endif -#ifdef TCP_KEEPCNT -int opt_get_tcp_keepcnt(lua_State *L, p_socket ps); -#endif -#ifdef TCP_KEEPINTVL -int opt_get_tcp_keepintvl(lua_State *L, p_socket ps); -#endif -int opt_get_keepalive(lua_State *L, p_socket ps); -int opt_get_linger(lua_State *L, p_socket ps); -int opt_get_ip_multicast_loop(lua_State *L, p_socket ps); -int opt_get_ip_multicast_if(lua_State *L, p_socket ps); -int opt_get_error(lua_State *L, p_socket ps); -int opt_get_ip6_multicast_loop(lua_State *L, p_socket ps); -int opt_get_ip6_multicast_hops(lua_State *L, p_socket ps); -int opt_get_ip6_unicast_hops(lua_State *L, p_socket ps); -int opt_get_ip6_v6only(lua_State *L, p_socket ps); -int opt_get_reuseport(lua_State *L, p_socket ps); -int opt_get_recv_buf_size(lua_State *L, p_socket ps); -int opt_get_send_buf_size(lua_State *L, p_socket ps); - -/* invokes the appropriate option handler */ int opt_meth_setoption(lua_State *L, p_opt opt, p_socket ps); int opt_meth_getoption(lua_State *L, p_opt opt, p_socket ps); +int opt_set_reuseaddr(lua_State *L, p_socket ps); +int opt_get_reuseaddr(lua_State *L, p_socket ps); + +int opt_set_reuseport(lua_State *L, p_socket ps); +int opt_get_reuseport(lua_State *L, p_socket ps); + +int opt_set_tcp_nodelay(lua_State *L, p_socket ps); +int opt_get_tcp_nodelay(lua_State *L, p_socket ps); + +#ifdef TCP_KEEPIDLE +int opt_set_tcp_keepidle(lua_State *L, p_socket ps); +int opt_get_tcp_keepidle(lua_State *L, p_socket ps); +#endif + +#ifdef TCP_KEEPCNT +int opt_set_tcp_keepcnt(lua_State *L, p_socket ps); +int opt_get_tcp_keepcnt(lua_State *L, p_socket ps); +#endif + +#ifdef TCP_KEEPINTVL +int opt_set_tcp_keepintvl(lua_State *L, p_socket ps); +int opt_get_tcp_keepintvl(lua_State *L, p_socket ps); +#endif + +int opt_set_keepalive(lua_State *L, p_socket ps); +int opt_get_keepalive(lua_State *L, p_socket ps); + +int opt_set_dontroute(lua_State *L, p_socket ps); +int opt_get_dontroute(lua_State *L, p_socket ps); + +int opt_set_broadcast(lua_State *L, p_socket ps); +int opt_get_broadcast(lua_State *L, p_socket ps); + +int opt_set_recv_buf_size(lua_State *L, p_socket ps); +int opt_get_recv_buf_size(lua_State *L, p_socket ps); + +int opt_set_send_buf_size(lua_State *L, p_socket ps); +int opt_get_send_buf_size(lua_State *L, p_socket ps); + +int opt_set_ip6_unicast_hops(lua_State *L, p_socket ps); +int opt_get_ip6_unicast_hops(lua_State *L, p_socket ps); + +int opt_set_ip6_multicast_hops(lua_State *L, p_socket ps); +int opt_get_ip6_multicast_hops(lua_State *L, p_socket ps); + +int opt_set_ip_multicast_loop(lua_State *L, p_socket ps); +int opt_get_ip_multicast_loop(lua_State *L, p_socket ps); + +int opt_set_ip6_multicast_loop(lua_State *L, p_socket ps); +int opt_get_ip6_multicast_loop(lua_State *L, p_socket ps); + +int opt_set_linger(lua_State *L, p_socket ps); +int opt_get_linger(lua_State *L, p_socket ps); + +int opt_set_ip_multicast_ttl(lua_State *L, p_socket ps); + +int opt_set_ip_multicast_if(lua_State *L, p_socket ps); +int opt_get_ip_multicast_if(lua_State *L, p_socket ps); + +int opt_set_ip_add_membership(lua_State *L, p_socket ps); +int opt_set_ip_drop_membersip(lua_State *L, p_socket ps); + +int opt_set_ip6_add_membership(lua_State *L, p_socket ps); +int opt_set_ip6_drop_membersip(lua_State *L, p_socket ps); + +int opt_set_ip6_v6only(lua_State *L, p_socket ps); +int opt_get_ip6_v6only(lua_State *L, p_socket ps); + +int opt_get_error(lua_State *L, p_socket ps); + +#pragma GCC visibility pop + #endif From c2245f35c500b44bde6295f3f47cffd1c7b7e260 Mon Sep 17 00:00:00 2001 From: "E. Westbrook" Date: Wed, 27 Feb 2019 20:59:01 -0700 Subject: [PATCH 111/194] select: pragma visibility --- src/select.c | 10 +--------- src/select.h | 4 ++++ 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/src/select.c b/src/select.c index b615b19..bb47c45 100644 --- a/src/select.c +++ b/src/select.c @@ -4,10 +4,6 @@ \*=========================================================================*/ #include "luasocket.h" -#include "lua.h" -#include "lauxlib.h" -#include "compat.h" - #include "socket.h" #include "timeout.h" #include "select.h" @@ -33,13 +29,10 @@ static luaL_Reg func[] = { {NULL, NULL} }; -/*=========================================================================*\ -* Exported functions -\*=========================================================================*/ /*-------------------------------------------------------------------------*\ * Initializes module \*-------------------------------------------------------------------------*/ -LUASOCKET_PRIVATE int select_open(lua_State *L) { +int select_open(lua_State *L) { lua_pushstring(L, "_SETSIZE"); lua_pushinteger(L, FD_SETSIZE); lua_rawset(L, -3); @@ -219,4 +212,3 @@ static void make_assoc(lua_State *L, int tab) { i = i+1; } } - diff --git a/src/select.h b/src/select.h index 8750200..95272db 100644 --- a/src/select.h +++ b/src/select.h @@ -10,6 +10,10 @@ * true if there is data ready for reading (required for buffered input). \*=========================================================================*/ +#pragma GCC visibility push(hidden) + int select_open(lua_State *L); +#pragma GCC visibility pop + #endif /* SELECT_H */ From c8b9b40eda1325929ce8fae31564e9b29957167c Mon Sep 17 00:00:00 2001 From: "E. Westbrook" Date: Wed, 27 Feb 2019 21:00:38 -0700 Subject: [PATCH 112/194] serial.c: pragma visibiliity --- src/serial.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/serial.c b/src/serial.c index cb46edb..21485d3 100644 --- a/src/serial.c +++ b/src/serial.c @@ -4,15 +4,12 @@ \*=========================================================================*/ #include "luasocket.h" -#include - -#include "lua.h" -#include "lauxlib.h" - #include "auxiliar.h" #include "socket.h" #include "options.h" #include "unix.h" + +#include #include /* From 1fa10673f717a08f9ef51ff9357adf7b8458f9a5 Mon Sep 17 00:00:00 2001 From: "E. Westbrook" Date: Wed, 27 Feb 2019 21:00:54 -0700 Subject: [PATCH 113/194] socket.h: pragma visibility --- src/socket.h | 51 +++++++++++++++++++++------------------------------ 1 file changed, 21 insertions(+), 30 deletions(-) diff --git a/src/socket.h b/src/socket.h index 63573de..4adc562 100644 --- a/src/socket.h +++ b/src/socket.h @@ -28,51 +28,42 @@ \*=========================================================================*/ #include "timeout.h" -/* we are lazy... */ +/* convenient shorthand */ typedef struct sockaddr SA; /*=========================================================================*\ * Functions bellow implement a comfortable platform independent * interface to sockets \*=========================================================================*/ + +#pragma GCC visibility push(hidden) + +int socket_waitfd(p_socket ps, int sw, p_timeout tm); int socket_open(void); int socket_close(void); void socket_destroy(p_socket ps); -void socket_shutdown(p_socket ps, int how); -int socket_sendto(p_socket ps, const char *data, size_t count, - size_t *sent, SA *addr, socklen_t addr_len, p_timeout tm); -int socket_recvfrom(p_socket ps, char *data, size_t count, - size_t *got, SA *addr, socklen_t *addr_len, p_timeout tm); - -void socket_setnonblocking(p_socket ps); -void socket_setblocking(p_socket ps); - -int socket_waitfd(p_socket ps, int sw, p_timeout tm); -int socket_select(t_socket n, fd_set *rfds, fd_set *wfds, fd_set *efds, - p_timeout tm); - -int socket_connect(p_socket ps, SA *addr, socklen_t addr_len, p_timeout tm); +int socket_select(t_socket n, fd_set *rfds, fd_set *wfds, fd_set *efds, p_timeout tm); int socket_create(p_socket ps, int domain, int type, int protocol); int socket_bind(p_socket ps, SA *addr, socklen_t addr_len); int socket_listen(p_socket ps, int backlog); -int socket_accept(p_socket ps, p_socket pa, SA *addr, - socklen_t *addr_len, p_timeout tm); - -const char *socket_hoststrerror(int err); -const char *socket_gaistrerror(int err); -const char *socket_strerror(int err); - -/* these are perfect to use with the io abstraction module - and the buffered input module */ -int socket_send(p_socket ps, const char *data, size_t count, - size_t *sent, p_timeout tm); +void socket_shutdown(p_socket ps, int how); +int socket_connect(p_socket ps, SA *addr, socklen_t addr_len, p_timeout tm); +int socket_accept(p_socket ps, p_socket pa, SA *addr, socklen_t *addr_len, p_timeout tm); +int socket_send(p_socket ps, const char *data, size_t count, size_t *sent, p_timeout tm); +int socket_sendto(p_socket ps, const char *data, size_t count, size_t *sent, SA *addr, socklen_t addr_len, p_timeout tm); int socket_recv(p_socket ps, char *data, size_t count, size_t *got, p_timeout tm); -int socket_write(p_socket ps, const char *data, size_t count, - size_t *sent, p_timeout tm); +int socket_recvfrom(p_socket ps, char *data, size_t count, size_t *got, SA *addr, socklen_t *addr_len, p_timeout tm); +int socket_write(p_socket ps, const char *data, size_t count, size_t *sent, p_timeout tm); int socket_read(p_socket ps, char *data, size_t count, size_t *got, p_timeout tm); -const char *socket_ioerror(p_socket ps, int err); - +void socket_setblocking(p_socket ps); +void socket_setnonblocking(p_socket ps); int socket_gethostbyaddr(const char *addr, socklen_t len, struct hostent **hp); int socket_gethostbyname(const char *addr, struct hostent **hp); +const char *socket_hoststrerror(int err); +const char *socket_strerror(int err); +const char *socket_ioerror(p_socket ps, int err); +const char *socket_gaistrerror(int err); + +#pragma GCC visibility pop #endif /* SOCKET_H */ From 86e1b3f45f57358d6b2a6666043df9a4a2f963c5 Mon Sep 17 00:00:00 2001 From: "E. Westbrook" Date: Wed, 27 Feb 2019 21:01:06 -0700 Subject: [PATCH 114/194] tcp: pragma visibility --- src/tcp.c | 7 +------ src/tcp.h | 6 +++++- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/tcp.c b/src/tcp.c index cc5b6a7..5876bfb 100644 --- a/src/tcp.c +++ b/src/tcp.c @@ -4,12 +4,7 @@ \*=========================================================================*/ #include "luasocket.h" -#include "lua.h" -#include "lauxlib.h" - -#include "compat.h" #include "auxiliar.h" - #include "socket.h" #include "inet.h" #include "options.h" @@ -129,7 +124,7 @@ static luaL_Reg func[] = { /*-------------------------------------------------------------------------*\ * Initializes module \*-------------------------------------------------------------------------*/ -LUASOCKET_PRIVATE int tcp_open(lua_State *L) +int tcp_open(lua_State *L) { /* create classes */ auxiliar_newclass(L, "tcp{master}", tcp_methods); diff --git a/src/tcp.h b/src/tcp.h index eded620..9b12b53 100644 --- a/src/tcp.h +++ b/src/tcp.h @@ -14,7 +14,7 @@ * tcp objects either connected to some address or returned by the accept * method of a server object. \*=========================================================================*/ -#include "lua.h" +#include "luasocket.h" #include "buffer.h" #include "timeout.h" @@ -30,6 +30,10 @@ typedef struct t_tcp_ { typedef t_tcp *p_tcp; +#pragma GCC visibility push(hidden) + int tcp_open(lua_State *L); +#pragma GCC visibility pop + #endif /* TCP_H */ From 42a1a732b79fa6153c61da645b786da883bbd0b5 Mon Sep 17 00:00:00 2001 From: "E. Westbrook" Date: Wed, 27 Feb 2019 21:01:16 -0700 Subject: [PATCH 115/194] timeout: pragma visibility --- src/timeout.c | 36 ++++++++++++++++++++---------------- src/timeout.h | 13 ++++++++++--- 2 files changed, 30 insertions(+), 19 deletions(-) diff --git a/src/timeout.c b/src/timeout.c index 8fb8f55..0e3ee27 100644 --- a/src/timeout.c +++ b/src/timeout.c @@ -4,10 +4,6 @@ \*=========================================================================*/ #include "luasocket.h" -#include "lua.h" -#include "lauxlib.h" -#include "compat.h" - #include "auxiliar.h" #include "timeout.h" @@ -30,6 +26,10 @@ #define MAX(x, y) ((x) > (y) ? x : y) #endif +#ifndef _WIN32 +#pragma GCC visibility push(hidden) +#endif + /*=========================================================================*\ * Internal function prototypes \*=========================================================================*/ @@ -48,7 +48,7 @@ static luaL_Reg func[] = { /*-------------------------------------------------------------------------*\ * Initialize structure \*-------------------------------------------------------------------------*/ -LUASOCKET_PRIVATE void timeout_init(p_timeout tm, double block, double total) { +void timeout_init(p_timeout tm, double block, double total) { tm->block = block; tm->total = total; } @@ -61,7 +61,7 @@ LUASOCKET_PRIVATE void timeout_init(p_timeout tm, double block, double total) { * Returns * the number of ms left or -1 if there is no time limit \*-------------------------------------------------------------------------*/ -LUASOCKET_PRIVATE double timeout_get(p_timeout tm) { +double timeout_get(p_timeout tm) { if (tm->block < 0.0 && tm->total < 0.0) { return -1; } else if (tm->block < 0.0) { @@ -82,7 +82,7 @@ LUASOCKET_PRIVATE double timeout_get(p_timeout tm) { * Returns * start field of structure \*-------------------------------------------------------------------------*/ -LUASOCKET_PRIVATE double timeout_getstart(p_timeout tm) { +double timeout_getstart(p_timeout tm) { return tm->start; } @@ -94,7 +94,7 @@ LUASOCKET_PRIVATE double timeout_getstart(p_timeout tm) { * Returns * the number of ms left or -1 if there is no time limit \*-------------------------------------------------------------------------*/ -LUASOCKET_PRIVATE double timeout_getretry(p_timeout tm) { +double timeout_getretry(p_timeout tm) { if (tm->block < 0.0 && tm->total < 0.0) { return -1; } else if (tm->block < 0.0) { @@ -114,7 +114,7 @@ LUASOCKET_PRIVATE double timeout_getretry(p_timeout tm) { * Input * tm: timeout control structure \*-------------------------------------------------------------------------*/ -LUASOCKET_PRIVATE p_timeout timeout_markstart(p_timeout tm) { +p_timeout timeout_markstart(p_timeout tm) { tm->start = timeout_gettime(); return tm; } @@ -125,7 +125,7 @@ LUASOCKET_PRIVATE p_timeout timeout_markstart(p_timeout tm) { * time in s. \*-------------------------------------------------------------------------*/ #ifdef _WIN32 -LUASOCKET_PRIVATE double timeout_gettime(void) { +double timeout_gettime(void) { FILETIME ft; double t; GetSystemTimeAsFileTime(&ft); @@ -135,7 +135,7 @@ LUASOCKET_PRIVATE double timeout_gettime(void) { return (t - 11644473600.0); } #else -LUASOCKET_PRIVATE double timeout_gettime(void) { +double timeout_gettime(void) { struct timeval v; gettimeofday(&v, (struct timezone *) NULL); /* Unix Epoch time (time since January 1, 1970 (UTC)) */ @@ -146,7 +146,7 @@ LUASOCKET_PRIVATE double timeout_gettime(void) { /*-------------------------------------------------------------------------*\ * Initializes module \*-------------------------------------------------------------------------*/ -LUASOCKET_PRIVATE int timeout_open(lua_State *L) { +int timeout_open(lua_State *L) { luaL_setfuncs(L, func, 0); return 0; } @@ -157,7 +157,7 @@ LUASOCKET_PRIVATE int timeout_open(lua_State *L) { * time: time out value in seconds * mode: "b" for block timeout, "t" for total timeout. (default: b) \*-------------------------------------------------------------------------*/ -LUASOCKET_PRIVATE int timeout_meth_settimeout(lua_State *L, p_timeout tm) { +int timeout_meth_settimeout(lua_State *L, p_timeout tm) { double t = luaL_optnumber(L, 2, -1); const char *mode = luaL_optstring(L, 3, "b"); switch (*mode) { @@ -179,7 +179,7 @@ LUASOCKET_PRIVATE int timeout_meth_settimeout(lua_State *L, p_timeout tm) { * Gets timeout values for IO operations * Lua Output: block, total \*-------------------------------------------------------------------------*/ -LUASOCKET_PRIVATE int timeout_meth_gettimeout(lua_State *L, p_timeout tm) { +int timeout_meth_gettimeout(lua_State *L, p_timeout tm) { lua_pushnumber(L, tm->block); lua_pushnumber(L, tm->total); return 2; @@ -201,7 +201,7 @@ static int timeout_lua_gettime(lua_State *L) * Sleep for n seconds. \*-------------------------------------------------------------------------*/ #ifdef _WIN32 -LUASOCKET_PRIVATE int timeout_lua_sleep(lua_State *L) +int timeout_lua_sleep(lua_State *L) { double n = luaL_checknumber(L, 1); if (n < 0.0) n = 0.0; @@ -211,7 +211,7 @@ LUASOCKET_PRIVATE int timeout_lua_sleep(lua_State *L) return 0; } #else -LUASOCKET_PRIVATE int timeout_lua_sleep(lua_State *L) +int timeout_lua_sleep(lua_State *L) { double n = luaL_checknumber(L, 1); struct timespec t, r; @@ -228,3 +228,7 @@ LUASOCKET_PRIVATE int timeout_lua_sleep(lua_State *L) return 0; } #endif + +#ifndef _WIN32 +#pragma GCC visibility pop +#endif diff --git a/src/timeout.h b/src/timeout.h index af90231..df05eaf 100644 --- a/src/timeout.h +++ b/src/timeout.h @@ -4,7 +4,7 @@ * Timeout management functions * LuaSocket toolkit \*=========================================================================*/ -#include "lua.h" +#include "luasocket.h" /* timeout control structure */ typedef struct t_timeout_ { @@ -14,16 +14,23 @@ typedef struct t_timeout_ { } t_timeout; typedef t_timeout *p_timeout; -int timeout_open(lua_State *L); +#pragma GCC visibility push(hidden) + void timeout_init(p_timeout tm, double block, double total); double timeout_get(p_timeout tm); +double timeout_getstart(p_timeout tm); double timeout_getretry(p_timeout tm); p_timeout timeout_markstart(p_timeout tm); -double timeout_getstart(p_timeout tm); + double timeout_gettime(void); + +int timeout_open(lua_State *L); + int timeout_meth_settimeout(lua_State *L, p_timeout tm); int timeout_meth_gettimeout(lua_State *L, p_timeout tm); +#pragma GCC visibility pop + #define timeout_iszero(tm) ((tm)->block == 0.0) #endif /* TIMEOUT_H */ From d71e6bc459ecb21f0cffc874c29176b762ecbd93 Mon Sep 17 00:00:00 2001 From: "E. Westbrook" Date: Wed, 27 Feb 2019 21:01:25 -0700 Subject: [PATCH 116/194] udp: pragma visibility --- src/udp.c | 6 +----- src/udp.h | 6 +++++- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/udp.c b/src/udp.c index e59fa1b..62b6a20 100644 --- a/src/udp.c +++ b/src/udp.c @@ -4,10 +4,6 @@ \*=========================================================================*/ #include "luasocket.h" -#include "lua.h" -#include "lauxlib.h" -#include "compat.h" - #include "auxiliar.h" #include "socket.h" #include "inet.h" @@ -124,7 +120,7 @@ static luaL_Reg func[] = { /*-------------------------------------------------------------------------*\ * Initializes module \*-------------------------------------------------------------------------*/ -LUASOCKET_PRIVATE int udp_open(lua_State *L) { +int udp_open(lua_State *L) { /* create classes */ auxiliar_newclass(L, "udp{connected}", udp_methods); auxiliar_newclass(L, "udp{unconnected}", udp_methods); diff --git a/src/udp.h b/src/udp.h index be9b6a5..9e80ccd 100644 --- a/src/udp.h +++ b/src/udp.h @@ -12,7 +12,7 @@ * with a call to the setpeername function. The same function can be used to * break the connection. \*=========================================================================*/ -#include "lua.h" +#include "luasocket.h" #include "timeout.h" #include "socket.h" @@ -26,6 +26,10 @@ typedef struct t_udp_ { } t_udp; typedef t_udp *p_udp; +#pragma GCC visibility push(hidden) + int udp_open(lua_State *L); +#pragma GCC visibility pop + #endif /* UDP_H */ From 5d07d9b2275fba742a297acde76636f6054a7906 Mon Sep 17 00:00:00 2001 From: "E. Westbrook" Date: Wed, 27 Feb 2019 21:01:46 -0700 Subject: [PATCH 117/194] unix: include reorg --- src/unix.c | 3 --- src/unix.h | 1 - 2 files changed, 4 deletions(-) diff --git a/src/unix.c b/src/unix.c index c618a20..268d8b2 100644 --- a/src/unix.c +++ b/src/unix.c @@ -4,9 +4,6 @@ \*=========================================================================*/ #include "luasocket.h" -#include "lua.h" -#include "lauxlib.h" - #include "unixstream.h" #include "unixdgram.h" diff --git a/src/unix.h b/src/unix.h index a1674ef..c203561 100644 --- a/src/unix.h +++ b/src/unix.h @@ -8,7 +8,6 @@ * domain. \*=========================================================================*/ #include "luasocket.h" -#include "lua.h" #include "buffer.h" #include "timeout.h" From d27b1a79453dbafe122ca8aa59413a7cb8750c8d Mon Sep 17 00:00:00 2001 From: "E. Westbrook" Date: Wed, 27 Feb 2019 21:02:01 -0700 Subject: [PATCH 118/194] unixdgram: pragma visibility --- src/unixdgram.c | 7 ++----- src/unixdgram.h | 4 ++++ 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/unixdgram.c b/src/unixdgram.c index 840257a..3ac3c5e 100644 --- a/src/unixdgram.c +++ b/src/unixdgram.c @@ -4,10 +4,6 @@ \*=========================================================================*/ #include "luasocket.h" -#include "lua.h" -#include "lauxlib.h" -#include "compat.h" - #include "auxiliar.h" #include "socket.h" #include "options.h" @@ -26,6 +22,7 @@ ((size_t) (((struct sockaddr_un *) 0)->sun_path) \ + strlen ((ptr)->sun_path)) #endif + /*=========================================================================*\ * Internal function prototypes \*=========================================================================*/ @@ -86,7 +83,7 @@ static luaL_Reg func[] = { /*-------------------------------------------------------------------------*\ * Initializes module \*-------------------------------------------------------------------------*/ -LUASOCKET_PRIVATE int unixdgram_open(lua_State *L) +int unixdgram_open(lua_State *L) { /* create classes */ auxiliar_newclass(L, "unixdgram{connected}", unixdgram_methods); diff --git a/src/unixdgram.h b/src/unixdgram.h index 7187966..433fe25 100644 --- a/src/unixdgram.h +++ b/src/unixdgram.h @@ -15,6 +15,10 @@ #include "unix.h" +#pragma GCC visibility push(hidden) + int unixdgram_open(lua_State *L); +#pragma GCC visibility pop + #endif /* UNIXDGRAM_H */ From 4e363330a3b9e6ba082869f87820690e501f0a2d Mon Sep 17 00:00:00 2001 From: "E. Westbrook" Date: Wed, 27 Feb 2019 21:02:13 -0700 Subject: [PATCH 119/194] unixstream: pragma visibility --- src/unixstream.c | 6 +----- src/unixstream.h | 4 ++++ 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/unixstream.c b/src/unixstream.c index ce2d3af..02aced9 100644 --- a/src/unixstream.c +++ b/src/unixstream.c @@ -4,10 +4,6 @@ \*=========================================================================*/ #include "luasocket.h" -#include "lua.h" -#include "lauxlib.h" -#include "compat.h" - #include "auxiliar.h" #include "socket.h" #include "options.h" @@ -82,7 +78,7 @@ static luaL_Reg func[] = { /*-------------------------------------------------------------------------*\ * Initializes module \*-------------------------------------------------------------------------*/ -LUASOCKET_PRIVATE int unixstream_open(lua_State *L) +int unixstream_open(lua_State *L) { /* create classes */ auxiliar_newclass(L, "unixstream{master}", unixstream_methods); diff --git a/src/unixstream.h b/src/unixstream.h index ef1d071..8ffba8f 100644 --- a/src/unixstream.h +++ b/src/unixstream.h @@ -16,6 +16,10 @@ \*=========================================================================*/ #include "unix.h" +#pragma GCC visibility push(hidden) + int unixstream_open(lua_State *L); +#pragma GCC visibility pop + #endif /* UNIXSTREAM_H */ From 8b2dcdcf7d98194e9d501c0a76a048606761983f Mon Sep 17 00:00:00 2001 From: "E. Westbrook" Date: Wed, 27 Feb 2019 21:02:24 -0700 Subject: [PATCH 120/194] usocket: pragma visibility --- src/usocket.c | 53 ++++++++++++++++++++++++------------------------- src/wsocket.c | 55 +++++++++++++++++++++++++++++---------------------- 2 files changed, 57 insertions(+), 51 deletions(-) diff --git a/src/usocket.c b/src/usocket.c index aee876d..acfe186 100644 --- a/src/usocket.c +++ b/src/usocket.c @@ -23,7 +23,7 @@ #define WAITFD_R POLLIN #define WAITFD_W POLLOUT #define WAITFD_C (POLLIN|POLLOUT) -LUASOCKET_PRIVATE int socket_waitfd(p_socket ps, int sw, p_timeout tm) { +int socket_waitfd(p_socket ps, int sw, p_timeout tm) { int ret; struct pollfd pfd; pfd.fd = *ps; @@ -45,7 +45,7 @@ LUASOCKET_PRIVATE int socket_waitfd(p_socket ps, int sw, p_timeout tm) { #define WAITFD_W 2 #define WAITFD_C (WAITFD_R|WAITFD_W) -LUASOCKET_PRIVATE int socket_waitfd(p_socket ps, int sw, p_timeout tm) { +int socket_waitfd(p_socket ps, int sw, p_timeout tm) { int ret; fd_set rfds, wfds, *rp, *wp; struct timeval tv, *tp; @@ -77,7 +77,7 @@ LUASOCKET_PRIVATE int socket_waitfd(p_socket ps, int sw, p_timeout tm) { /*-------------------------------------------------------------------------*\ * Initializes module \*-------------------------------------------------------------------------*/ -LUASOCKET_PRIVATE int socket_open(void) { +int socket_open(void) { /* installs a handler to ignore sigpipe or it will crash us */ signal(SIGPIPE, SIG_IGN); return 1; @@ -86,14 +86,14 @@ LUASOCKET_PRIVATE int socket_open(void) { /*-------------------------------------------------------------------------*\ * Close module \*-------------------------------------------------------------------------*/ -LUASOCKET_PRIVATE int socket_close(void) { +int socket_close(void) { return 1; } /*-------------------------------------------------------------------------*\ * Close and inutilize socket \*-------------------------------------------------------------------------*/ -LUASOCKET_PRIVATE void socket_destroy(p_socket ps) { +void socket_destroy(p_socket ps) { if (*ps != SOCKET_INVALID) { close(*ps); *ps = SOCKET_INVALID; @@ -103,7 +103,7 @@ LUASOCKET_PRIVATE void socket_destroy(p_socket ps) { /*-------------------------------------------------------------------------*\ * Select with timeout control \*-------------------------------------------------------------------------*/ -LUASOCKET_PRIVATE int socket_select(t_socket n, fd_set *rfds, fd_set *wfds, fd_set *efds, +int socket_select(t_socket n, fd_set *rfds, fd_set *wfds, fd_set *efds, p_timeout tm) { int ret; do { @@ -120,7 +120,7 @@ LUASOCKET_PRIVATE int socket_select(t_socket n, fd_set *rfds, fd_set *wfds, fd_s /*-------------------------------------------------------------------------*\ * Creates and sets up a socket \*-------------------------------------------------------------------------*/ -LUASOCKET_PRIVATE int socket_create(p_socket ps, int domain, int type, int protocol) { +int socket_create(p_socket ps, int domain, int type, int protocol) { *ps = socket(domain, type, protocol); if (*ps != SOCKET_INVALID) return IO_DONE; else return errno; @@ -129,7 +129,7 @@ LUASOCKET_PRIVATE int socket_create(p_socket ps, int domain, int type, int proto /*-------------------------------------------------------------------------*\ * Binds or returns error message \*-------------------------------------------------------------------------*/ -LUASOCKET_PRIVATE int socket_bind(p_socket ps, SA *addr, socklen_t len) { +int socket_bind(p_socket ps, SA *addr, socklen_t len) { int err = IO_DONE; socket_setblocking(ps); if (bind(*ps, addr, len) < 0) err = errno; @@ -140,7 +140,7 @@ LUASOCKET_PRIVATE int socket_bind(p_socket ps, SA *addr, socklen_t len) { /*-------------------------------------------------------------------------*\ * \*-------------------------------------------------------------------------*/ -LUASOCKET_PRIVATE int socket_listen(p_socket ps, int backlog) { +int socket_listen(p_socket ps, int backlog) { int err = IO_DONE; if (listen(*ps, backlog)) err = errno; return err; @@ -149,14 +149,14 @@ LUASOCKET_PRIVATE int socket_listen(p_socket ps, int backlog) { /*-------------------------------------------------------------------------*\ * \*-------------------------------------------------------------------------*/ -LUASOCKET_PRIVATE void socket_shutdown(p_socket ps, int how) { +void socket_shutdown(p_socket ps, int how) { shutdown(*ps, how); } /*-------------------------------------------------------------------------*\ * Connects or returns error message \*-------------------------------------------------------------------------*/ -LUASOCKET_PRIVATE int socket_connect(p_socket ps, SA *addr, socklen_t len, p_timeout tm) { +int socket_connect(p_socket ps, SA *addr, socklen_t len, p_timeout tm) { int err; /* avoid calling on closed sockets */ if (*ps == SOCKET_INVALID) return IO_CLOSED; @@ -178,7 +178,7 @@ LUASOCKET_PRIVATE int socket_connect(p_socket ps, SA *addr, socklen_t len, p_tim /*-------------------------------------------------------------------------*\ * Accept with timeout \*-------------------------------------------------------------------------*/ -LUASOCKET_PRIVATE int socket_accept(p_socket ps, p_socket pa, SA *addr, socklen_t *len, p_timeout tm) { +int socket_accept(p_socket ps, p_socket pa, SA *addr, socklen_t *len, p_timeout tm) { if (*ps == SOCKET_INVALID) return IO_CLOSED; for ( ;; ) { int err; @@ -195,7 +195,7 @@ LUASOCKET_PRIVATE int socket_accept(p_socket ps, p_socket pa, SA *addr, socklen_ /*-------------------------------------------------------------------------*\ * Send with timeout \*-------------------------------------------------------------------------*/ -LUASOCKET_PRIVATE int socket_send(p_socket ps, const char *data, size_t count, +int socket_send(p_socket ps, const char *data, size_t count, size_t *sent, p_timeout tm) { int err; @@ -229,7 +229,7 @@ LUASOCKET_PRIVATE int socket_send(p_socket ps, const char *data, size_t count, /*-------------------------------------------------------------------------*\ * Sendto with timeout \*-------------------------------------------------------------------------*/ -LUASOCKET_PRIVATE int socket_sendto(p_socket ps, const char *data, size_t count, size_t *sent, +int socket_sendto(p_socket ps, const char *data, size_t count, size_t *sent, SA *addr, socklen_t len, p_timeout tm) { int err; @@ -254,7 +254,7 @@ LUASOCKET_PRIVATE int socket_sendto(p_socket ps, const char *data, size_t count, /*-------------------------------------------------------------------------*\ * Receive with timeout \*-------------------------------------------------------------------------*/ -LUASOCKET_PRIVATE int socket_recv(p_socket ps, char *data, size_t count, size_t *got, p_timeout tm) { +int socket_recv(p_socket ps, char *data, size_t count, size_t *got, p_timeout tm) { int err; *got = 0; if (*ps == SOCKET_INVALID) return IO_CLOSED; @@ -276,7 +276,7 @@ LUASOCKET_PRIVATE int socket_recv(p_socket ps, char *data, size_t count, size_t /*-------------------------------------------------------------------------*\ * Recvfrom with timeout \*-------------------------------------------------------------------------*/ -LUASOCKET_PRIVATE int socket_recvfrom(p_socket ps, char *data, size_t count, size_t *got, +int socket_recvfrom(p_socket ps, char *data, size_t count, size_t *got, SA *addr, socklen_t *len, p_timeout tm) { int err; *got = 0; @@ -304,7 +304,7 @@ LUASOCKET_PRIVATE int socket_recvfrom(p_socket ps, char *data, size_t count, siz * with send/recv replaced with write/read. We can't just use write/read * in the socket version, because behaviour when size is zero is different. \*-------------------------------------------------------------------------*/ -LUASOCKET_PRIVATE int socket_write(p_socket ps, const char *data, size_t count, +int socket_write(p_socket ps, const char *data, size_t count, size_t *sent, p_timeout tm) { int err; @@ -339,7 +339,7 @@ LUASOCKET_PRIVATE int socket_write(p_socket ps, const char *data, size_t count, * Read with timeout * See note for socket_write \*-------------------------------------------------------------------------*/ -LUASOCKET_PRIVATE int socket_read(p_socket ps, char *data, size_t count, size_t *got, p_timeout tm) { +int socket_read(p_socket ps, char *data, size_t count, size_t *got, p_timeout tm) { int err; *got = 0; if (*ps == SOCKET_INVALID) return IO_CLOSED; @@ -361,7 +361,7 @@ LUASOCKET_PRIVATE int socket_read(p_socket ps, char *data, size_t count, size_t /*-------------------------------------------------------------------------*\ * Put socket into blocking mode \*-------------------------------------------------------------------------*/ -LUASOCKET_PRIVATE void socket_setblocking(p_socket ps) { +void socket_setblocking(p_socket ps) { int flags = fcntl(*ps, F_GETFL, 0); flags &= (~(O_NONBLOCK)); fcntl(*ps, F_SETFL, flags); @@ -370,7 +370,7 @@ LUASOCKET_PRIVATE void socket_setblocking(p_socket ps) { /*-------------------------------------------------------------------------*\ * Put socket into non-blocking mode \*-------------------------------------------------------------------------*/ -LUASOCKET_PRIVATE void socket_setnonblocking(p_socket ps) { +void socket_setnonblocking(p_socket ps) { int flags = fcntl(*ps, F_GETFL, 0); flags |= O_NONBLOCK; fcntl(*ps, F_SETFL, flags); @@ -379,7 +379,7 @@ LUASOCKET_PRIVATE void socket_setnonblocking(p_socket ps) { /*-------------------------------------------------------------------------*\ * DNS helpers \*-------------------------------------------------------------------------*/ -LUASOCKET_PRIVATE int socket_gethostbyaddr(const char *addr, socklen_t len, struct hostent **hp) { +int socket_gethostbyaddr(const char *addr, socklen_t len, struct hostent **hp) { *hp = gethostbyaddr(addr, len, AF_INET); if (*hp) return IO_DONE; else if (h_errno) return h_errno; @@ -387,7 +387,7 @@ LUASOCKET_PRIVATE int socket_gethostbyaddr(const char *addr, socklen_t len, stru else return IO_UNKNOWN; } -LUASOCKET_PRIVATE int socket_gethostbyname(const char *addr, struct hostent **hp) { +int socket_gethostbyname(const char *addr, struct hostent **hp) { *hp = gethostbyname(addr); if (*hp) return IO_DONE; else if (h_errno) return h_errno; @@ -399,7 +399,7 @@ LUASOCKET_PRIVATE int socket_gethostbyname(const char *addr, struct hostent **hp * Error translation functions * Make sure important error messages are standard \*-------------------------------------------------------------------------*/ -LUASOCKET_PRIVATE const char *socket_hoststrerror(int err) { +const char *socket_hoststrerror(int err) { if (err <= 0) return io_strerror(err); switch (err) { case HOST_NOT_FOUND: return PIE_HOST_NOT_FOUND; @@ -407,7 +407,7 @@ LUASOCKET_PRIVATE const char *socket_hoststrerror(int err) { } } -LUASOCKET_PRIVATE const char *socket_strerror(int err) { +const char *socket_strerror(int err) { if (err <= 0) return io_strerror(err); switch (err) { case EADDRINUSE: return PIE_ADDRINUSE; @@ -423,12 +423,12 @@ LUASOCKET_PRIVATE const char *socket_strerror(int err) { } } -LUASOCKET_PRIVATE const char *socket_ioerror(p_socket ps, int err) { +const char *socket_ioerror(p_socket ps, int err) { (void) ps; return socket_strerror(err); } -LUASOCKET_PRIVATE const char *socket_gaistrerror(int err) { +const char *socket_gaistrerror(int err) { if (err == 0) return NULL; switch (err) { case EAI_AGAIN: return PIE_AGAIN; @@ -452,4 +452,3 @@ LUASOCKET_PRIVATE const char *socket_gaistrerror(int err) { default: return gai_strerror(err); } } - diff --git a/src/wsocket.c b/src/wsocket.c index c281058..1da984c 100755 --- a/src/wsocket.c +++ b/src/wsocket.c @@ -12,13 +12,17 @@ #include "socket.h" #include "pierror.h" +#ifndef _WIN32 +#pragma GCC visibility push(hidden) +#endif + /* WinSock doesn't have a strerror... */ static const char *wstrerror(int err); /*-------------------------------------------------------------------------*\ * Initializes module \*-------------------------------------------------------------------------*/ -LUASOCKET_PRIVATE int socket_open(void) { +int socket_open(void) { WSADATA wsaData; WORD wVersionRequested = MAKEWORD(2, 0); int err = WSAStartup(wVersionRequested, &wsaData ); @@ -34,7 +38,7 @@ LUASOCKET_PRIVATE int socket_open(void) { /*-------------------------------------------------------------------------*\ * Close module \*-------------------------------------------------------------------------*/ -LUASOCKET_PRIVATE int socket_close(void) { +int socket_close(void) { WSACleanup(); return 1; } @@ -47,7 +51,7 @@ LUASOCKET_PRIVATE int socket_close(void) { #define WAITFD_E 4 #define WAITFD_C (WAITFD_E|WAITFD_W) -LUASOCKET_PRIVATE int socket_waitfd(p_socket ps, int sw, p_timeout tm) { +int socket_waitfd(p_socket ps, int sw, p_timeout tm) { int ret; fd_set rfds, wfds, efds, *rp = NULL, *wp = NULL, *ep = NULL; struct timeval tv, *tp = NULL; @@ -75,7 +79,7 @@ LUASOCKET_PRIVATE int socket_waitfd(p_socket ps, int sw, p_timeout tm) { /*-------------------------------------------------------------------------*\ * Select with int timeout in ms \*-------------------------------------------------------------------------*/ -LUASOCKET_PRIVATE int socket_select(t_socket n, fd_set *rfds, fd_set *wfds, fd_set *efds, +int socket_select(t_socket n, fd_set *rfds, fd_set *wfds, fd_set *efds, p_timeout tm) { struct timeval tv; double t = timeout_get(tm); @@ -90,7 +94,7 @@ LUASOCKET_PRIVATE int socket_select(t_socket n, fd_set *rfds, fd_set *wfds, fd_s /*-------------------------------------------------------------------------*\ * Close and inutilize socket \*-------------------------------------------------------------------------*/ -LUASOCKET_PRIVATE void socket_destroy(p_socket ps) { +void socket_destroy(p_socket ps) { if (*ps != SOCKET_INVALID) { socket_setblocking(ps); /* close can take a long time on WIN32 */ closesocket(*ps); @@ -101,7 +105,7 @@ LUASOCKET_PRIVATE void socket_destroy(p_socket ps) { /*-------------------------------------------------------------------------*\ * \*-------------------------------------------------------------------------*/ -LUASOCKET_PRIVATE void socket_shutdown(p_socket ps, int how) { +void socket_shutdown(p_socket ps, int how) { socket_setblocking(ps); shutdown(*ps, how); socket_setnonblocking(ps); @@ -110,7 +114,7 @@ LUASOCKET_PRIVATE void socket_shutdown(p_socket ps, int how) { /*-------------------------------------------------------------------------*\ * Creates and sets up a socket \*-------------------------------------------------------------------------*/ -LUASOCKET_PRIVATE int socket_create(p_socket ps, int domain, int type, int protocol) { +int socket_create(p_socket ps, int domain, int type, int protocol) { *ps = socket(domain, type, protocol); if (*ps != SOCKET_INVALID) return IO_DONE; else return WSAGetLastError(); @@ -119,7 +123,7 @@ LUASOCKET_PRIVATE int socket_create(p_socket ps, int domain, int type, int proto /*-------------------------------------------------------------------------*\ * Connects or returns error message \*-------------------------------------------------------------------------*/ -LUASOCKET_PRIVATE int socket_connect(p_socket ps, SA *addr, socklen_t len, p_timeout tm) { +int socket_connect(p_socket ps, SA *addr, socklen_t len, p_timeout tm) { int err; /* don't call on closed socket */ if (*ps == SOCKET_INVALID) return IO_CLOSED; @@ -148,7 +152,7 @@ LUASOCKET_PRIVATE int socket_connect(p_socket ps, SA *addr, socklen_t len, p_tim /*-------------------------------------------------------------------------*\ * Binds or returns error message \*-------------------------------------------------------------------------*/ -LUASOCKET_PRIVATE int socket_bind(p_socket ps, SA *addr, socklen_t len) { +int socket_bind(p_socket ps, SA *addr, socklen_t len) { int err = IO_DONE; socket_setblocking(ps); if (bind(*ps, addr, len) < 0) err = WSAGetLastError(); @@ -159,7 +163,7 @@ LUASOCKET_PRIVATE int socket_bind(p_socket ps, SA *addr, socklen_t len) { /*-------------------------------------------------------------------------*\ * \*-------------------------------------------------------------------------*/ -LUASOCKET_PRIVATE int socket_listen(p_socket ps, int backlog) { +int socket_listen(p_socket ps, int backlog) { int err = IO_DONE; socket_setblocking(ps); if (listen(*ps, backlog) < 0) err = WSAGetLastError(); @@ -170,7 +174,7 @@ LUASOCKET_PRIVATE int socket_listen(p_socket ps, int backlog) { /*-------------------------------------------------------------------------*\ * Accept with timeout \*-------------------------------------------------------------------------*/ -LUASOCKET_PRIVATE int socket_accept(p_socket ps, p_socket pa, SA *addr, socklen_t *len, +int socket_accept(p_socket ps, p_socket pa, SA *addr, socklen_t *len, p_timeout tm) { if (*ps == SOCKET_INVALID) return IO_CLOSED; for ( ;; ) { @@ -192,7 +196,7 @@ LUASOCKET_PRIVATE int socket_accept(p_socket ps, p_socket pa, SA *addr, socklen_ * this can take an awful lot of time and we will end up blocked. * Therefore, whoever calls this function should not pass a huge buffer. \*-------------------------------------------------------------------------*/ -LUASOCKET_PRIVATE int socket_send(p_socket ps, const char *data, size_t count, +int socket_send(p_socket ps, const char *data, size_t count, size_t *sent, p_timeout tm) { int err; @@ -220,7 +224,7 @@ LUASOCKET_PRIVATE int socket_send(p_socket ps, const char *data, size_t count, /*-------------------------------------------------------------------------*\ * Sendto with timeout \*-------------------------------------------------------------------------*/ -LUASOCKET_PRIVATE int socket_sendto(p_socket ps, const char *data, size_t count, size_t *sent, +int socket_sendto(p_socket ps, const char *data, size_t count, size_t *sent, SA *addr, socklen_t len, p_timeout tm) { int err; @@ -241,7 +245,7 @@ LUASOCKET_PRIVATE int socket_sendto(p_socket ps, const char *data, size_t count, /*-------------------------------------------------------------------------*\ * Receive with timeout \*-------------------------------------------------------------------------*/ -LUASOCKET_PRIVATE int socket_recv(p_socket ps, char *data, size_t count, size_t *got, +int socket_recv(p_socket ps, char *data, size_t count, size_t *got, p_timeout tm) { int err, prev = IO_DONE; @@ -270,7 +274,7 @@ LUASOCKET_PRIVATE int socket_recv(p_socket ps, char *data, size_t count, size_t /*-------------------------------------------------------------------------*\ * Recvfrom with timeout \*-------------------------------------------------------------------------*/ -LUASOCKET_PRIVATE int socket_recvfrom(p_socket ps, char *data, size_t count, size_t *got, +int socket_recvfrom(p_socket ps, char *data, size_t count, size_t *got, SA *addr, socklen_t *len, p_timeout tm) { int err, prev = IO_DONE; @@ -299,7 +303,7 @@ LUASOCKET_PRIVATE int socket_recvfrom(p_socket ps, char *data, size_t count, siz /*-------------------------------------------------------------------------*\ * Put socket into blocking mode \*-------------------------------------------------------------------------*/ -LUASOCKET_PRIVATE void socket_setblocking(p_socket ps) { +void socket_setblocking(p_socket ps) { u_long argp = 0; ioctlsocket(*ps, FIONBIO, &argp); } @@ -307,7 +311,7 @@ LUASOCKET_PRIVATE void socket_setblocking(p_socket ps) { /*-------------------------------------------------------------------------*\ * Put socket into non-blocking mode \*-------------------------------------------------------------------------*/ -LUASOCKET_PRIVATE void socket_setnonblocking(p_socket ps) { +void socket_setnonblocking(p_socket ps) { u_long argp = 1; ioctlsocket(*ps, FIONBIO, &argp); } @@ -315,13 +319,13 @@ LUASOCKET_PRIVATE void socket_setnonblocking(p_socket ps) { /*-------------------------------------------------------------------------*\ * DNS helpers \*-------------------------------------------------------------------------*/ -LUASOCKET_PRIVATE int socket_gethostbyaddr(const char *addr, socklen_t len, struct hostent **hp) { +int socket_gethostbyaddr(const char *addr, socklen_t len, struct hostent **hp) { *hp = gethostbyaddr(addr, len, AF_INET); if (*hp) return IO_DONE; else return WSAGetLastError(); } -LUASOCKET_PRIVATE int socket_gethostbyname(const char *addr, struct hostent **hp) { +int socket_gethostbyname(const char *addr, struct hostent **hp) { *hp = gethostbyname(addr); if (*hp) return IO_DONE; else return WSAGetLastError(); @@ -330,7 +334,7 @@ LUASOCKET_PRIVATE int socket_gethostbyname(const char *addr, struct hostent **hp /*-------------------------------------------------------------------------*\ * Error translation functions \*-------------------------------------------------------------------------*/ -LUASOCKET_PRIVATE const char *socket_hoststrerror(int err) { +const char *socket_hoststrerror(int err) { if (err <= 0) return io_strerror(err); switch (err) { case WSAHOST_NOT_FOUND: return PIE_HOST_NOT_FOUND; @@ -338,7 +342,7 @@ LUASOCKET_PRIVATE const char *socket_hoststrerror(int err) { } } -LUASOCKET_PRIVATE const char *socket_strerror(int err) { +const char *socket_strerror(int err) { if (err <= 0) return io_strerror(err); switch (err) { case WSAEADDRINUSE: return PIE_ADDRINUSE; @@ -352,12 +356,12 @@ LUASOCKET_PRIVATE const char *socket_strerror(int err) { } } -LUASOCKET_PRIVATE const char *socket_ioerror(p_socket ps, int err) { +const char *socket_ioerror(p_socket ps, int err) { (void) ps; return socket_strerror(err); } -LUASOCKET_PRIVATE static const char *wstrerror(int err) { +static const char *wstrerror(int err) { switch (err) { case WSAEINTR: return "Interrupted function call"; case WSAEACCES: return PIE_ACCESS; // "Permission denied"; @@ -406,7 +410,7 @@ LUASOCKET_PRIVATE static const char *wstrerror(int err) { } } -LUASOCKET_PRIVATE const char *socket_gaistrerror(int err) { +const char *socket_gaistrerror(int err) { if (err == 0) return NULL; switch (err) { case EAI_AGAIN: return PIE_AGAIN; @@ -433,3 +437,6 @@ LUASOCKET_PRIVATE const char *socket_gaistrerror(int err) { } } +#ifndef _WIN32 +#pragma GCC visibility pop +#endif From c8d0fdda544b32ee0b7bcd38b26933ecc2c8a95b Mon Sep 17 00:00:00 2001 From: "E. Westbrook" Date: Wed, 27 Feb 2019 21:05:38 -0700 Subject: [PATCH 121/194] src/makefile: serial += compat --- src/makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/src/makefile b/src/makefile index b9e2f93..5a9ba97 100755 --- a/src/makefile +++ b/src/makefile @@ -336,6 +336,7 @@ UNIX_OBJS=\ # SERIAL_OBJS=\ buffer.$(O) \ + compat.$(O) \ auxiliar.$(O) \ options.$(O) \ timeout.$(O) \ From 33883e78c82b66c5e044da2257841b54231d51c5 Mon Sep 17 00:00:00 2001 From: "E. Westbrook" Date: Thu, 28 Feb 2019 07:14:57 -0700 Subject: [PATCH 122/194] rockspecs: serial += compat --- luasocket-scm-0.rockspec | 1 + rockspec/luasocket-3.0rc2-1.rockspec | 1 + 2 files changed, 2 insertions(+) diff --git a/luasocket-scm-0.rockspec b/luasocket-scm-0.rockspec index 6cdb0ce..9681a97 100644 --- a/luasocket-scm-0.rockspec +++ b/luasocket-scm-0.rockspec @@ -96,6 +96,7 @@ local function make_plat(plat) modules["socket.serial"] = { sources = { "src/buffer.c" + , "src/compat.c" , "src/auxiliar.c" , "src/options.c" , "src/timeout.c" diff --git a/rockspec/luasocket-3.0rc2-1.rockspec b/rockspec/luasocket-3.0rc2-1.rockspec index 2b299f3..7d0714c 100644 --- a/rockspec/luasocket-3.0rc2-1.rockspec +++ b/rockspec/luasocket-3.0rc2-1.rockspec @@ -96,6 +96,7 @@ local function make_plat(plat) modules["socket.serial"] = { sources = { "src/buffer.c" + , "src/compat.c" , "src/auxiliar.c" , "src/options.c" , "src/timeout.c" From 3a37ab88906bcdbad17051decc0e4c4c141a17c9 Mon Sep 17 00:00:00 2001 From: "E. Westbrook" Date: Thu, 28 Feb 2019 07:23:25 -0700 Subject: [PATCH 123/194] rockspecs: unix += compat --- luasocket-scm-0.rockspec | 1 + rockspec/luasocket-3.0rc2-1.rockspec | 1 + 2 files changed, 2 insertions(+) diff --git a/luasocket-scm-0.rockspec b/luasocket-scm-0.rockspec index 9681a97..b4bf377 100644 --- a/luasocket-scm-0.rockspec +++ b/luasocket-scm-0.rockspec @@ -82,6 +82,7 @@ local function make_plat(plat) modules["socket.unix"] = { sources = { "src/buffer.c" + , "src/compat.c" , "src/auxiliar.c" , "src/options.c" , "src/timeout.c" diff --git a/rockspec/luasocket-3.0rc2-1.rockspec b/rockspec/luasocket-3.0rc2-1.rockspec index 7d0714c..dfe5275 100644 --- a/rockspec/luasocket-3.0rc2-1.rockspec +++ b/rockspec/luasocket-3.0rc2-1.rockspec @@ -82,6 +82,7 @@ local function make_plat(plat) modules["socket.unix"] = { sources = { "src/buffer.c" + , "src/compat.c" , "src/auxiliar.c" , "src/options.c" , "src/timeout.c" From 21514304be9e98a4386cb18542582068a59c5586 Mon Sep 17 00:00:00 2001 From: "E. Westbrook" Date: Thu, 28 Feb 2019 16:32:07 -0700 Subject: [PATCH 124/194] wrap visibility pragmas in #ifndef _WIN32 --- src/auxiliar.h | 4 ++++ src/buffer.h | 4 ++++ src/compat.h | 4 ++++ src/except.h | 4 ++++ src/inet.h | 4 ++++ src/io.h | 5 ++++- src/options.h | 4 ++++ src/select.h | 4 ++++ src/socket.h | 4 ++++ src/tcp.h | 4 ++++ src/timeout.c | 8 -------- src/timeout.h | 4 ++++ src/udp.h | 4 ++++ src/unixdgram.h | 4 ++++ src/unixstream.h | 4 ++++ src/wsocket.c | 8 -------- 16 files changed, 56 insertions(+), 17 deletions(-) diff --git a/src/auxiliar.h b/src/auxiliar.h index 234b00a..e8c3ead 100644 --- a/src/auxiliar.h +++ b/src/auxiliar.h @@ -31,7 +31,9 @@ #include "luasocket.h" +#ifndef _WIN32 #pragma GCC visibility push(hidden) +#endif int auxiliar_open(lua_State *L); void auxiliar_newclass(lua_State *L, const char *classname, luaL_Reg *func); @@ -45,6 +47,8 @@ void *auxiliar_getgroupudata(lua_State *L, const char *groupname, int objidx); void *auxiliar_getclassudata(lua_State *L, const char *groupname, int objidx); int auxiliar_typeerror(lua_State *L, int narg, const char *tname); +#ifndef _WIN32 #pragma GCC visibility pop +#endif #endif /* AUXILIAR_H */ diff --git a/src/buffer.h b/src/buffer.h index 4218ea0..a0901fc 100644 --- a/src/buffer.h +++ b/src/buffer.h @@ -33,7 +33,9 @@ typedef struct t_buffer_ { } t_buffer; typedef t_buffer *p_buffer; +#ifndef _WIN32 #pragma GCC visibility push(hidden) +#endif int buffer_open(lua_State *L); void buffer_init(p_buffer buf, p_io io, p_timeout tm); @@ -43,6 +45,8 @@ int buffer_meth_send(lua_State *L, p_buffer buf); int buffer_meth_receive(lua_State *L, p_buffer buf); int buffer_isempty(p_buffer buf); +#ifndef _WIN32 #pragma GCC visibility pop +#endif #endif /* BUF_H */ diff --git a/src/compat.h b/src/compat.h index 8c32b07..fa2d7d7 100644 --- a/src/compat.h +++ b/src/compat.h @@ -3,12 +3,16 @@ #if LUA_VERSION_NUM==501 +#ifndef _WIN32 #pragma GCC visibility push(hidden) +#endif void luasocket_setfuncs (lua_State *L, const luaL_Reg *l, int nup); void *luasocket_testudata ( lua_State *L, int arg, const char *tname); +#ifndef _WIN32 #pragma GCC visibility pop +#endif #define luaL_setfuncs luasocket_setfuncs #define luaL_testudata luasocket_testudata diff --git a/src/except.h b/src/except.h index baa7b09..71c31fd 100644 --- a/src/except.h +++ b/src/except.h @@ -33,10 +33,14 @@ #include "luasocket.h" +#ifndef _WIN32 #pragma GCC visibility push(hidden) +#endif int except_open(lua_State *L); +#ifndef _WIN32 #pragma GCC visibility pop +#endif #endif diff --git a/src/inet.h b/src/inet.h index 2e00e58..5618b61 100644 --- a/src/inet.h +++ b/src/inet.h @@ -22,7 +22,9 @@ #define LUASOCKET_INET_ATON #endif +#ifndef _WIN32 #pragma GCC visibility push(hidden) +#endif int inet_open(lua_State *L); @@ -47,6 +49,8 @@ const char *inet_ntop(int af, const void *src, char *dst, socklen_t cnt); int inet_pton(int af, const char *src, void *dst); #endif +#ifndef _WIN32 #pragma GCC visibility pop +#endif #endif /* INET_H */ diff --git a/src/io.h b/src/io.h index e08eb0e..b8a54df 100644 --- a/src/io.h +++ b/src/io.h @@ -56,12 +56,15 @@ typedef struct t_io_ { } t_io; typedef t_io *p_io; +#ifndef _WIN32 #pragma GCC visibility push(hidden) +#endif void io_init(p_io io, p_send send, p_recv recv, p_error error, void *ctx); const char *io_strerror(int err); +#ifndef _WIN32 #pragma GCC visibility pop +#endif #endif /* IO_H */ - diff --git a/src/options.h b/src/options.h index 1457f43..41f7337 100644 --- a/src/options.h +++ b/src/options.h @@ -18,7 +18,9 @@ typedef struct t_opt { } t_opt; typedef t_opt *p_opt; +#ifndef _WIN32 #pragma GCC visibility push(hidden) +#endif int opt_meth_setoption(lua_State *L, p_opt opt, p_socket ps); int opt_meth_getoption(lua_State *L, p_opt opt, p_socket ps); @@ -93,6 +95,8 @@ int opt_get_ip6_v6only(lua_State *L, p_socket ps); int opt_get_error(lua_State *L, p_socket ps); +#ifndef _WIN32 #pragma GCC visibility pop +#endif #endif diff --git a/src/select.h b/src/select.h index 95272db..5d45fe7 100644 --- a/src/select.h +++ b/src/select.h @@ -10,10 +10,14 @@ * true if there is data ready for reading (required for buffered input). \*=========================================================================*/ +#ifndef _WIN32 #pragma GCC visibility push(hidden) +#endif int select_open(lua_State *L); +#ifndef _WIN32 #pragma GCC visibility pop +#endif #endif /* SELECT_H */ diff --git a/src/socket.h b/src/socket.h index 4adc562..e541f27 100644 --- a/src/socket.h +++ b/src/socket.h @@ -36,7 +36,9 @@ typedef struct sockaddr SA; * interface to sockets \*=========================================================================*/ +#ifndef _WIN32 #pragma GCC visibility push(hidden) +#endif int socket_waitfd(p_socket ps, int sw, p_timeout tm); int socket_open(void); @@ -64,6 +66,8 @@ const char *socket_strerror(int err); const char *socket_ioerror(p_socket ps, int err); const char *socket_gaistrerror(int err); +#ifndef _WIN32 #pragma GCC visibility pop +#endif #endif /* SOCKET_H */ diff --git a/src/tcp.h b/src/tcp.h index 9b12b53..9b282ef 100644 --- a/src/tcp.h +++ b/src/tcp.h @@ -30,10 +30,14 @@ typedef struct t_tcp_ { typedef t_tcp *p_tcp; +#ifndef _WIN32 #pragma GCC visibility push(hidden) +#endif int tcp_open(lua_State *L); +#ifndef _WIN32 #pragma GCC visibility pop +#endif #endif /* TCP_H */ diff --git a/src/timeout.c b/src/timeout.c index 0e3ee27..2bdc069 100644 --- a/src/timeout.c +++ b/src/timeout.c @@ -26,10 +26,6 @@ #define MAX(x, y) ((x) > (y) ? x : y) #endif -#ifndef _WIN32 -#pragma GCC visibility push(hidden) -#endif - /*=========================================================================*\ * Internal function prototypes \*=========================================================================*/ @@ -228,7 +224,3 @@ int timeout_lua_sleep(lua_State *L) return 0; } #endif - -#ifndef _WIN32 -#pragma GCC visibility pop -#endif diff --git a/src/timeout.h b/src/timeout.h index df05eaf..9e5250d 100644 --- a/src/timeout.h +++ b/src/timeout.h @@ -14,7 +14,9 @@ typedef struct t_timeout_ { } t_timeout; typedef t_timeout *p_timeout; +#ifndef _WIN32 #pragma GCC visibility push(hidden) +#endif void timeout_init(p_timeout tm, double block, double total); double timeout_get(p_timeout tm); @@ -29,7 +31,9 @@ int timeout_open(lua_State *L); int timeout_meth_settimeout(lua_State *L, p_timeout tm); int timeout_meth_gettimeout(lua_State *L, p_timeout tm); +#ifndef _WIN32 #pragma GCC visibility pop +#endif #define timeout_iszero(tm) ((tm)->block == 0.0) diff --git a/src/udp.h b/src/udp.h index 9e80ccd..07d5247 100644 --- a/src/udp.h +++ b/src/udp.h @@ -26,10 +26,14 @@ typedef struct t_udp_ { } t_udp; typedef t_udp *p_udp; +#ifndef _WIN32 #pragma GCC visibility push(hidden) +#endif int udp_open(lua_State *L); +#ifndef _WIN32 #pragma GCC visibility pop +#endif #endif /* UDP_H */ diff --git a/src/unixdgram.h b/src/unixdgram.h index 433fe25..a1a0166 100644 --- a/src/unixdgram.h +++ b/src/unixdgram.h @@ -15,10 +15,14 @@ #include "unix.h" +#ifndef _WIN32 #pragma GCC visibility push(hidden) +#endif int unixdgram_open(lua_State *L); +#ifndef _WIN32 #pragma GCC visibility pop +#endif #endif /* UNIXDGRAM_H */ diff --git a/src/unixstream.h b/src/unixstream.h index 8ffba8f..7916aff 100644 --- a/src/unixstream.h +++ b/src/unixstream.h @@ -16,10 +16,14 @@ \*=========================================================================*/ #include "unix.h" +#ifndef _WIN32 #pragma GCC visibility push(hidden) +#endif int unixstream_open(lua_State *L); +#ifndef _WIN32 #pragma GCC visibility pop +#endif #endif /* UNIXSTREAM_H */ diff --git a/src/wsocket.c b/src/wsocket.c index 1da984c..20da330 100755 --- a/src/wsocket.c +++ b/src/wsocket.c @@ -12,10 +12,6 @@ #include "socket.h" #include "pierror.h" -#ifndef _WIN32 -#pragma GCC visibility push(hidden) -#endif - /* WinSock doesn't have a strerror... */ static const char *wstrerror(int err); @@ -436,7 +432,3 @@ const char *socket_gaistrerror(int err) { default: return gai_strerror(err); } } - -#ifndef _WIN32 -#pragma GCC visibility pop -#endif From 9acb6dc81ab09aa0784f216c96ac4c3a5d50f61e Mon Sep 17 00:00:00 2001 From: "E. Westbrook" Date: Sun, 21 Apr 2019 09:31:08 -0600 Subject: [PATCH 125/194] move SCM rockspec to rockspec folder; rename consistent with luarocks repository --- luasocket-scm-0.rockspec => rockspec/luasocket-scm-1.rockspec | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename luasocket-scm-0.rockspec => rockspec/luasocket-scm-1.rockspec (100%) diff --git a/luasocket-scm-0.rockspec b/rockspec/luasocket-scm-1.rockspec similarity index 100% rename from luasocket-scm-0.rockspec rename to rockspec/luasocket-scm-1.rockspec From ab3b0ef5c945b6736aa0fb42317db3b5b5773dec Mon Sep 17 00:00:00 2001 From: "E. Westbrook" Date: Sun, 21 Apr 2019 09:41:17 -0600 Subject: [PATCH 126/194] rockspec/luasocket-scm-2.rockspec --- rockspec/{luasocket-scm-1.rockspec => luasocket-scm-2.rockspec} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename rockspec/{luasocket-scm-1.rockspec => luasocket-scm-2.rockspec} (99%) diff --git a/rockspec/luasocket-scm-1.rockspec b/rockspec/luasocket-scm-2.rockspec similarity index 99% rename from rockspec/luasocket-scm-1.rockspec rename to rockspec/luasocket-scm-2.rockspec index b4bf377..9a71b07 100644 --- a/rockspec/luasocket-scm-1.rockspec +++ b/rockspec/luasocket-scm-2.rockspec @@ -1,5 +1,5 @@ package = "LuaSocket" -version = "scm-0" +version = "scm-2" source = { url = "git://github.com/diegonehab/luasocket.git" , branch="master" From 78a1657c7db5510ba66f8d4491f1e8e7370c5943 Mon Sep 17 00:00:00 2001 From: "E. Westbrook" Date: Fri, 27 Mar 2020 18:41:57 -0600 Subject: [PATCH 127/194] src/makefile: remove -DLUASOCKET_INET_PTON as current mingw builds don't want it --- src/makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/makefile b/src/makefile index 5a9ba97..522d378 100755 --- a/src/makefile +++ b/src/makefile @@ -212,7 +212,7 @@ SOCKET_solaris=usocket.o SO_mingw=dll O_mingw=o CC_mingw=gcc -DEF_mingw= -DLUASOCKET_INET_PTON -DLUASOCKET_$(DEBUG) \ +DEF_mingw= -DLUASOCKET_$(DEBUG) \ -DWINVER=0x0501 CFLAGS_mingw=$(LUAINC:%=-I%) $(DEF) -Wall -O2 -fno-common LDFLAGS_mingw= $(LUALIB) -shared -Wl,-s -lws2_32 -o From 84e5336e8b9f364e675c3a55a8bb04c1fddb68bc Mon Sep 17 00:00:00 2001 From: "E. Westbrook" Date: Fri, 27 Mar 2020 16:55:04 -0600 Subject: [PATCH 128/194] test/tcp-getoptions: bugfix: missing "socket =" in require"socket" --- test/tcp-getoptions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/tcp-getoptions b/test/tcp-getoptions index 777ccc3..d98b189 100755 --- a/test/tcp-getoptions +++ b/test/tcp-getoptions @@ -1,6 +1,6 @@ #!/usr/bin/env lua -require"socket" +local socket = require"socket" port = 8765 From c8b4fdf85829d98e185256fba10d50f5b35735a8 Mon Sep 17 00:00:00 2001 From: "E. Westbrook" Date: Sat, 28 Mar 2020 15:14:18 -0600 Subject: [PATCH 129/194] test/getoptions: guard calls with pcall(); check result of getoption"linger" --- test/tcp-getoptions | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/test/tcp-getoptions b/test/tcp-getoptions index d98b189..fbcc884 100755 --- a/test/tcp-getoptions +++ b/test/tcp-getoptions @@ -4,18 +4,32 @@ local socket = require"socket" port = 8765 +function pcalltest(msg, o, opt) + local a = { pcall(o.getoption, o, opt) } + if a[1] then + print(msg, opt, unpack(a)) + else + print(msg, opt, 'fail: ' .. a[2]) + end +end + function options(o) print("options for", o) for _, opt in ipairs{ "keepalive", "reuseaddr", "tcp-nodelay", "tcp-keepidle", "tcp-keepcnt", "tcp-keepintvl"} do - print("getoption", opt, o:getoption(opt)) + pcalltest("getoption", o, opt) end - print("getoption", "linger", - "on", o:getoption("linger").on, - "timeout", o:getoption("linger").timeout) + r = o:getoption'linger' + if r then + print("getoption", "linger", + "on", r.on, + "timeout", r.timeout) + else + print("getoption", "linger", "no result") + end end local m = socket.tcp() From a7baf8dc25f5824a7b6f3a051e639c78a3a9cff7 Mon Sep 17 00:00:00 2001 From: "E. Westbrook" Date: Sat, 28 Mar 2020 15:20:24 -0600 Subject: [PATCH 130/194] test/udp-zero-length-send: add missing "socket ="; use shebang "#!/usr/bin/env lua" --- test/udp-zero-length-send | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/udp-zero-length-send b/test/udp-zero-length-send index a594944..9038c99 100755 --- a/test/udp-zero-length-send +++ b/test/udp-zero-length-send @@ -1,4 +1,4 @@ -#!/usr/bin/lua +#!/usr/bin/env lua --[[ Show that luasocket returns an error message on zero-length UDP sends, @@ -12,7 +12,7 @@ listening on lo, link-type EN10MB (Ethernet), capture size 65535 bytes ]] -require"socket" +socket = require"socket" s = assert(socket.udp()) r = assert(socket.udp()) From 743a5f1bcf92e72df8b0ab36c3dee1f53e7d71c5 Mon Sep 17 00:00:00 2001 From: "E. Westbrook" Date: Sat, 28 Mar 2020 15:23:51 -0600 Subject: [PATCH 131/194] test/udp-zero-length-send-recv: add missing "socket ="; use shebang "#!/usr/bin/env lua" --- test/udp-zero-length-send-recv | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/udp-zero-length-send-recv b/test/udp-zero-length-send-recv index 541efd4..064ca52 100755 --- a/test/udp-zero-length-send-recv +++ b/test/udp-zero-length-send-recv @@ -1,4 +1,4 @@ -#!/usr/bin/lua +#!/usr/bin/env lua --[[ Show that luasocket returns an error message on zero-length UDP sends, @@ -12,7 +12,7 @@ listening on lo, link-type EN10MB (Ethernet), capture size 65535 bytes ]] -require"socket" +socket = require"socket" s = assert(socket.udp()) r = assert(socket.udp()) From 5b18e475f38fcf28429b1cc4b17baee3b9793a62 Mon Sep 17 00:00:00 2001 From: "E. Westbrook" Date: Sat, 28 Mar 2020 15:28:26 -0600 Subject: [PATCH 132/194] test/find-connect-limit: add missing "socket =" --- test/find-connect-limit | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/find-connect-limit b/test/find-connect-limit index ad0c3f5..199e515 100755 --- a/test/find-connect-limit +++ b/test/find-connect-limit @@ -10,7 +10,7 @@ ulimit -n You'll probably need to be root to do this. ]] -require "socket" +socket = require "socket" host = arg[1] or "google.com" port = arg[2] or 80 From d9cc531e3bc62cfe7965c8cb3df7b1d510f3f4a2 Mon Sep 17 00:00:00 2001 From: Paul Kulchenko Date: Fri, 18 Mar 2022 02:23:09 -0700 Subject: [PATCH 133/194] Fixe an issue with aux buffer init overwriting optional parameters in receive() (#334) Fixes use on Lua >= 5.4.3 --- src/buffer.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/buffer.c b/src/buffer.c index ac5c531..7148be3 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -103,11 +103,14 @@ int buffer_meth_send(lua_State *L, p_buffer buf) { * object:receive() interface \*-------------------------------------------------------------------------*/ int buffer_meth_receive(lua_State *L, p_buffer buf) { - int err = IO_DONE, top = lua_gettop(L); + int err = IO_DONE, top; luaL_Buffer b; size_t size; const char *part = luaL_optlstring(L, 3, "", &size); timeout_markstart(buf->tm); + /* make sure we don't confuse buffer stuff with arguments */ + lua_settop(L, 3); + top = lua_gettop(L); /* initialize buffer with optional extra prefix * (useful for concatenating previous partial results) */ luaL_buffinit(L, &b); From 6952262e6a1315b14935ddd0ea511c202c0154ba Mon Sep 17 00:00:00 2001 From: Caleb Maclennan Date: Fri, 18 Mar 2022 17:54:11 +0300 Subject: [PATCH 134/194] style: Use C-style comment syntax throughout (#309) Co-authored-by: Denise Cullassnekuff <19711487+BlackCutpoint@users.noreply.github.com> --- src/mime.c | 8 ++++---- src/options.c | 45 +++++++++++++++++++++++---------------------- src/unixdgram.c | 2 +- src/wsocket.c | 20 ++++++++++---------- 4 files changed, 38 insertions(+), 37 deletions(-) diff --git a/src/mime.c b/src/mime.c index 6c210e4..05602f5 100755 --- a/src/mime.c +++ b/src/mime.c @@ -27,12 +27,12 @@ static int mime_global_eol(lua_State *L); static int mime_global_dot(lua_State *L); static size_t dot(int c, size_t state, luaL_Buffer *buffer); -//static void b64setup(UC *base); +/*static void b64setup(UC *base);*/ static size_t b64encode(UC c, UC *input, size_t size, luaL_Buffer *buffer); static size_t b64pad(const UC *input, size_t size, luaL_Buffer *buffer); static size_t b64decode(UC c, UC *input, size_t size, luaL_Buffer *buffer); -//static void qpsetup(UC *class, UC *unbase); +/*static void qpsetup(UC *class, UC *unbase);*/ static void qpquote(UC c, luaL_Buffer *buffer); static size_t qpdecode(UC c, UC *input, size_t size, luaL_Buffer *buffer); static size_t qpencode(UC c, UC *input, size_t size, @@ -176,8 +176,8 @@ LUASOCKET_API int luaopen_mime_core(lua_State *L) lua_pushstring(L, MIME_VERSION); lua_rawset(L, -3); /* initialize lookup tables */ - // qpsetup(qpclass, qpunbase); - // b64setup(b64unbase); + /*qpsetup(qpclass, qpunbase);*/ + /*b64setup(b64unbase);*/ return 1; } diff --git a/src/options.c b/src/options.c index 06ab58d..2b53c67 100644 --- a/src/options.c +++ b/src/options.c @@ -54,7 +54,7 @@ int opt_meth_getoption(lua_State *L, p_opt opt, p_socket ps) return opt->func(L, ps); } -// ------------------------------------------------------- +/*------------------------------------------------------*/ /* enables reuse of local address */ int opt_set_reuseaddr(lua_State *L, p_socket ps) { @@ -66,7 +66,7 @@ int opt_get_reuseaddr(lua_State *L, p_socket ps) return opt_getboolean(L, ps, SOL_SOCKET, SO_REUSEADDR); } -// ------------------------------------------------------- +/*------------------------------------------------------*/ /* enables reuse of local port */ int opt_set_reuseport(lua_State *L, p_socket ps) { @@ -78,7 +78,7 @@ int opt_get_reuseport(lua_State *L, p_socket ps) return opt_getboolean(L, ps, SOL_SOCKET, SO_REUSEPORT); } -// ------------------------------------------------------- +/*------------------------------------------------------*/ /* disables the Nagle algorithm */ int opt_set_tcp_nodelay(lua_State *L, p_socket ps) { @@ -90,7 +90,7 @@ int opt_get_tcp_nodelay(lua_State *L, p_socket ps) return opt_getboolean(L, ps, IPPROTO_TCP, TCP_NODELAY); } -// ------------------------------------------------------- +/*------------------------------------------------------*/ #ifdef TCP_KEEPIDLE int opt_get_tcp_keepidle(lua_State *L, p_socket ps) @@ -105,7 +105,7 @@ int opt_set_tcp_keepidle(lua_State *L, p_socket ps) #endif -// ------------------------------------------------------- +/*------------------------------------------------------*/ #ifdef TCP_KEEPCNT int opt_get_tcp_keepcnt(lua_State *L, p_socket ps) @@ -120,7 +120,7 @@ int opt_set_tcp_keepcnt(lua_State *L, p_socket ps) #endif -// ------------------------------------------------------- +/*------------------------------------------------------*/ #ifdef TCP_KEEPINTVL int opt_get_tcp_keepintvl(lua_State *L, p_socket ps) @@ -135,7 +135,7 @@ int opt_set_tcp_keepintvl(lua_State *L, p_socket ps) #endif -// ------------------------------------------------------- +/*------------------------------------------------------*/ int opt_set_keepalive(lua_State *L, p_socket ps) { return opt_setboolean(L, ps, SOL_SOCKET, SO_KEEPALIVE); @@ -146,7 +146,7 @@ int opt_get_keepalive(lua_State *L, p_socket ps) return opt_getboolean(L, ps, SOL_SOCKET, SO_KEEPALIVE); } -// ------------------------------------------------------- +/*------------------------------------------------------*/ int opt_set_dontroute(lua_State *L, p_socket ps) { return opt_setboolean(L, ps, SOL_SOCKET, SO_DONTROUTE); @@ -157,7 +157,7 @@ int opt_get_dontroute(lua_State *L, p_socket ps) return opt_getboolean(L, ps, SOL_SOCKET, SO_DONTROUTE); } -// ------------------------------------------------------- +/*------------------------------------------------------*/ int opt_set_broadcast(lua_State *L, p_socket ps) { return opt_setboolean(L, ps, SOL_SOCKET, SO_BROADCAST); @@ -168,7 +168,7 @@ int opt_get_broadcast(lua_State *L, p_socket ps) return opt_getboolean(L, ps, SOL_SOCKET, SO_BROADCAST); } -// ------------------------------------------------------- +/*------------------------------------------------------*/ int opt_set_recv_buf_size(lua_State *L, p_socket ps) { return opt_setint(L, ps, SOL_SOCKET, SO_RCVBUF); @@ -179,7 +179,7 @@ int opt_get_recv_buf_size(lua_State *L, p_socket ps) return opt_getint(L, ps, SOL_SOCKET, SO_RCVBUF); } -// ------------------------------------------------------- +/*------------------------------------------------------*/ int opt_get_send_buf_size(lua_State *L, p_socket ps) { return opt_getint(L, ps, SOL_SOCKET, SO_SNDBUF); @@ -190,7 +190,7 @@ int opt_set_send_buf_size(lua_State *L, p_socket ps) return opt_setint(L, ps, SOL_SOCKET, SO_SNDBUF); } -// ------------------------------------------------------- +/*------------------------------------------------------*/ int opt_set_ip6_unicast_hops(lua_State *L, p_socket ps) { return opt_setint(L, ps, IPPROTO_IPV6, IPV6_UNICAST_HOPS); @@ -201,7 +201,7 @@ int opt_get_ip6_unicast_hops(lua_State *L, p_socket ps) return opt_getint(L, ps, IPPROTO_IPV6, IPV6_UNICAST_HOPS); } -// ------------------------------------------------------- +/*------------------------------------------------------*/ int opt_set_ip6_multicast_hops(lua_State *L, p_socket ps) { return opt_setint(L, ps, IPPROTO_IPV6, IPV6_MULTICAST_HOPS); @@ -212,7 +212,7 @@ int opt_get_ip6_multicast_hops(lua_State *L, p_socket ps) return opt_getint(L, ps, IPPROTO_IPV6, IPV6_MULTICAST_HOPS); } -// ------------------------------------------------------- +/*------------------------------------------------------*/ int opt_set_ip_multicast_loop(lua_State *L, p_socket ps) { return opt_setboolean(L, ps, IPPROTO_IP, IP_MULTICAST_LOOP); @@ -223,7 +223,7 @@ int opt_get_ip_multicast_loop(lua_State *L, p_socket ps) return opt_getboolean(L, ps, IPPROTO_IP, IP_MULTICAST_LOOP); } -// ------------------------------------------------------- +/*------------------------------------------------------*/ int opt_set_ip6_multicast_loop(lua_State *L, p_socket ps) { return opt_setboolean(L, ps, IPPROTO_IPV6, IPV6_MULTICAST_LOOP); @@ -234,7 +234,7 @@ int opt_get_ip6_multicast_loop(lua_State *L, p_socket ps) return opt_getboolean(L, ps, IPPROTO_IPV6, IPV6_MULTICAST_LOOP); } -// ------------------------------------------------------- +/*------------------------------------------------------*/ int opt_set_linger(lua_State *L, p_socket ps) { struct linger li; /* obj, name, table */ @@ -267,13 +267,13 @@ int opt_get_linger(lua_State *L, p_socket ps) return 1; } -// ------------------------------------------------------- +/*------------------------------------------------------*/ int opt_set_ip_multicast_ttl(lua_State *L, p_socket ps) { return opt_setint(L, ps, IPPROTO_IP, IP_MULTICAST_TTL); } -// ------------------------------------------------------- +/*------------------------------------------------------*/ int opt_set_ip_multicast_if(lua_State *L, p_socket ps) { const char *address = luaL_checkstring(L, 3); /* obj, name, ip */ @@ -298,7 +298,7 @@ int opt_get_ip_multicast_if(lua_State *L, p_socket ps) return 1; } -// ------------------------------------------------------- +/*------------------------------------------------------*/ int opt_set_ip_add_membership(lua_State *L, p_socket ps) { return opt_setmembership(L, ps, IPPROTO_IP, IP_ADD_MEMBERSHIP); @@ -309,7 +309,7 @@ int opt_set_ip_drop_membersip(lua_State *L, p_socket ps) return opt_setmembership(L, ps, IPPROTO_IP, IP_DROP_MEMBERSHIP); } -// ------------------------------------------------------- +/*------------------------------------------------------*/ int opt_set_ip6_add_membership(lua_State *L, p_socket ps) { return opt_ip6_setmembership(L, ps, IPPROTO_IPV6, IPV6_ADD_MEMBERSHIP); @@ -319,7 +319,8 @@ int opt_set_ip6_drop_membersip(lua_State *L, p_socket ps) { return opt_ip6_setmembership(L, ps, IPPROTO_IPV6, IPV6_DROP_MEMBERSHIP); } -// ------------------------------------------------------- + +/*------------------------------------------------------*/ int opt_get_ip6_v6only(lua_State *L, p_socket ps) { return opt_getboolean(L, ps, IPPROTO_IPV6, IPV6_V6ONLY); @@ -330,7 +331,7 @@ int opt_set_ip6_v6only(lua_State *L, p_socket ps) return opt_setboolean(L, ps, IPPROTO_IPV6, IPV6_V6ONLY); } -// ------------------------------------------------------- +/*------------------------------------------------------*/ int opt_get_error(lua_State *L, p_socket ps) { int val = 0; diff --git a/src/unixdgram.c b/src/unixdgram.c index 3ac3c5e..69093d7 100644 --- a/src/unixdgram.c +++ b/src/unixdgram.c @@ -16,7 +16,7 @@ #define UNIXDGRAM_DATAGRAMSIZE 8192 -// provide a SUN_LEN macro if sys/un.h doesn't (e.g. Android) +/* provide a SUN_LEN macro if sys/un.h doesn't (e.g. Android) */ #ifndef SUN_LEN #define SUN_LEN(ptr) \ ((size_t) (((struct sockaddr_un *) 0)->sun_path) \ diff --git a/src/wsocket.c b/src/wsocket.c index 20da330..7cd4115 100755 --- a/src/wsocket.c +++ b/src/wsocket.c @@ -360,7 +360,7 @@ const char *socket_ioerror(p_socket ps, int err) { static const char *wstrerror(int err) { switch (err) { case WSAEINTR: return "Interrupted function call"; - case WSAEACCES: return PIE_ACCESS; // "Permission denied"; + case WSAEACCES: return PIE_ACCESS; /* "Permission denied"; */ case WSAEFAULT: return "Bad address"; case WSAEINVAL: return "Invalid argument"; case WSAEMFILE: return "Too many open files"; @@ -373,23 +373,23 @@ static const char *wstrerror(int err) { case WSAEPROTOTYPE: return "Protocol wrong type for socket"; case WSAENOPROTOOPT: return "Bad protocol option"; case WSAEPROTONOSUPPORT: return "Protocol not supported"; - case WSAESOCKTNOSUPPORT: return PIE_SOCKTYPE; // "Socket type not supported"; + case WSAESOCKTNOSUPPORT: return PIE_SOCKTYPE; /* "Socket type not supported"; */ case WSAEOPNOTSUPP: return "Operation not supported"; case WSAEPFNOSUPPORT: return "Protocol family not supported"; - case WSAEAFNOSUPPORT: return PIE_FAMILY; // "Address family not supported by protocol family"; - case WSAEADDRINUSE: return PIE_ADDRINUSE; // "Address already in use"; + case WSAEAFNOSUPPORT: return PIE_FAMILY; /* "Address family not supported by protocol family"; */ + case WSAEADDRINUSE: return PIE_ADDRINUSE; /* "Address already in use"; */ case WSAEADDRNOTAVAIL: return "Cannot assign requested address"; case WSAENETDOWN: return "Network is down"; case WSAENETUNREACH: return "Network is unreachable"; case WSAENETRESET: return "Network dropped connection on reset"; case WSAECONNABORTED: return "Software caused connection abort"; - case WSAECONNRESET: return PIE_CONNRESET; // "Connection reset by peer"; + case WSAECONNRESET: return PIE_CONNRESET; /* "Connection reset by peer"; */ case WSAENOBUFS: return "No buffer space available"; - case WSAEISCONN: return PIE_ISCONN; // "Socket is already connected"; + case WSAEISCONN: return PIE_ISCONN; /* "Socket is already connected"; */ case WSAENOTCONN: return "Socket is not connected"; case WSAESHUTDOWN: return "Cannot send after socket shutdown"; - case WSAETIMEDOUT: return PIE_TIMEDOUT; // "Connection timed out"; - case WSAECONNREFUSED: return PIE_CONNREFUSED; // "Connection refused"; + case WSAETIMEDOUT: return PIE_TIMEDOUT; /* "Connection timed out"; */ + case WSAECONNREFUSED: return PIE_CONNREFUSED; /* "Connection refused"; */ case WSAEHOSTDOWN: return "Host is down"; case WSAEHOSTUNREACH: return "No route to host"; case WSAEPROCLIM: return "Too many processes"; @@ -398,9 +398,9 @@ static const char *wstrerror(int err) { case WSANOTINITIALISED: return "Successful WSAStartup not yet performed"; case WSAEDISCON: return "Graceful shutdown in progress"; - case WSAHOST_NOT_FOUND: return PIE_HOST_NOT_FOUND; // "Host not found"; + case WSAHOST_NOT_FOUND: return PIE_HOST_NOT_FOUND; /* "Host not found"; */ case WSATRY_AGAIN: return "Nonauthoritative host not found"; - case WSANO_RECOVERY: return PIE_FAIL; // "Nonrecoverable name lookup error"; + case WSANO_RECOVERY: return PIE_FAIL; /* "Nonrecoverable name lookup error"; */ case WSANO_DATA: return "Valid name, no data record of requested type"; default: return "Unknown error"; } From 52b22da7e3361b6927ef7516851239808d54c673 Mon Sep 17 00:00:00 2001 From: Thijs Schreijer Date: Fri, 18 Mar 2022 12:12:39 +0100 Subject: [PATCH 135/194] chore: Add editorconfig setup file --- .editorconfig | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 .editorconfig diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..edf8aa1 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,23 @@ +root = true + +[*] +end_of_line = lf +insert_final_newline = true +trim_trailing_whitespace = true +charset = utf-8 + +[*.{lua,rockspec}] +indent_style = space +indent_size = 4 + +[Makefile] +indent_style = tab +indent_size = 4 + +[*.html] +indent_style = space +indent_size = 4 + +[*.{c,h}] +indent_style = space +indent_size = 4 From f6509d4fd5dfc0363aada9b1653934356e9abd3f Mon Sep 17 00:00:00 2001 From: Thijs Schreijer Date: Fri, 18 Mar 2022 12:12:39 +0100 Subject: [PATCH 136/194] chore: Add luacheck linter project configuration --- .luacheckrc | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 .luacheckrc diff --git a/.luacheckrc b/.luacheckrc new file mode 100644 index 0000000..fcec7d5 --- /dev/null +++ b/.luacheckrc @@ -0,0 +1,31 @@ +unused_args = false +redefined = false +max_line_length = false + +not_globals = { + "string.len", + "table.getn", +} + +include_files = { + "**/*.lua", + "**/*.rockspec", + ".busted", + ".luacheckrc", +} + +exclude_files = { + "etc/*.lua", + "etc/**/*.lua", + "test/*.lua", + "test/**/*.lua", + "samples/*.lua", + "samples/**/*.lua", + "gem/*.lua", + "gem/**/*.lua", + -- GH Actions Lua Environment + ".lua", + ".luarocks", + ".install", +} + From 480c05257211b3e566f33fdf8cf051233e2dab30 Mon Sep 17 00:00:00 2001 From: Thijs Schreijer Date: Fri, 18 Mar 2022 12:12:39 +0100 Subject: [PATCH 137/194] ci: Add workflow to run luacheck linter --- .github/workflows/luacheck.yml | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 .github/workflows/luacheck.yml diff --git a/.github/workflows/luacheck.yml b/.github/workflows/luacheck.yml new file mode 100644 index 0000000..13993cc --- /dev/null +++ b/.github/workflows/luacheck.yml @@ -0,0 +1,26 @@ +name: Luacheck + +on: [push, pull_request] + +jobs: + luacheck: + runs-on: ubuntu-latest + + steps: + - name: Checkout + uses: actions/checkout@v2 + + - name: Setup Lua + uses: leafo/gh-actions-lua@v8 + with: + luaVersion: 5.4 + + - name: Setup Lua Rocks + uses: leafo/gh-actions-luarocks@v4 + + - name: Setup dependencies + run: luarocks install luacheck + + - name: Run Code Linter + run: | + luacheck . From 601ad8d59f11d7180015d0ecfb9d0a8d67f6f5c1 Mon Sep 17 00:00:00 2001 From: Thijs Schreijer Date: Fri, 18 Mar 2022 12:12:39 +0100 Subject: [PATCH 138/194] refactor: Address issues raised by linter --- etc/cookie.lua | 22 +++---- etc/get.lua | 2 +- gem/ex11.lua | 4 +- gem/ex3.lua | 2 +- gem/ex4.lua | 2 +- samples/cddb.lua | 2 +- src/ftp.lua | 14 ++--- src/http.lua | 11 ++-- src/ltn12.lua | 3 +- src/mbox.lua | 13 +++-- src/mime.lua | 12 +--- src/url.lua | 6 +- test/ltn12test.lua | 24 ++++---- test/mimetest.lua | 46 +++++++-------- test/smtptest.lua | 20 +++---- test/test_socket_error.lua | 2 +- test/testmesg.lua | 14 ++--- test/testsupport.lua | 2 +- test/urltest.lua | 114 ++++++++++++++++++------------------- test/utestclnt.lua | 68 +++++++++++----------- test/utestsrvr.lua | 2 +- 21 files changed, 187 insertions(+), 198 deletions(-) diff --git a/etc/cookie.lua b/etc/cookie.lua index 4adb403..fec10a1 100644 --- a/etc/cookie.lua +++ b/etc/cookie.lua @@ -5,7 +5,7 @@ local ltn12 = require"ltn12" local token_class = '[^%c%s%(%)%<%>%@%,%;%:%\\%"%/%[%]%?%=%{%}]' -local function unquote(t, quoted) +local function unquote(t, quoted) local n = string.match(t, "%$(%d+)$") if n then n = tonumber(n) end if quoted[n] then return quoted[n] @@ -14,19 +14,19 @@ end local function parse_set_cookie(c, quoted, cookie_table) c = c .. ";$last=last;" - local _, __, n, v, i = string.find(c, "(" .. token_class .. + local _, _, n, v, i = string.find(c, "(" .. token_class .. "+)%s*=%s*(.-)%s*;%s*()") local cookie = { - name = n, - value = unquote(v, quoted), + name = n, + value = unquote(v, quoted), attributes = {} } while 1 do - _, __, n, v, i = string.find(c, "(" .. token_class .. + _, _, n, v, i = string.find(c, "(" .. token_class .. "+)%s*=?%s*(.-)%s*;%s*()", i) if not n or n == "$last" then break end cookie.attributes[#cookie.attributes+1] = { - name = n, + name = n, value = unquote(v, quoted) } end @@ -46,8 +46,8 @@ local function split_set_cookie(s, cookie_table) -- split into individual cookies i = 1 while 1 do - local _, __, cookie, next_token - _, __, cookie, i, next_token = string.find(s, "(.-)%s*%,%s*()(" .. + local _, _, cookie, next_token + _, _, cookie, i, next_token = string.find(s, "(.-)%s*%,%s*()(" .. token_class .. "+)%s*=", i) if not next_token then break end parse_set_cookie(cookie, quoted, cookie_table) @@ -62,12 +62,12 @@ local function quote(s) end local _empty = {} -local function build_cookies(cookies) +local function build_cookies(cookies) s = "" for i,v in ipairs(cookies or _empty) do if v.name then s = s .. v.name - if v.value and v.value ~= "" then + if v.value and v.value ~= "" then s = s .. '=' .. quote(v.value) end end @@ -83,6 +83,6 @@ local function build_cookies(cookies) end if i < #cookies then s = s .. ", " end end - return s + return s end diff --git a/etc/get.lua b/etc/get.lua index 9edc235..d53c465 100644 --- a/etc/get.lua +++ b/etc/get.lua @@ -71,7 +71,7 @@ function stats(size) local current = socket.gettime() if chunk then -- total bytes received - got = got + string.len(chunk) + got = got + string.len(chunk) -- not enough time for estimate if current - last > 1 then io.stderr:write("\r", gauge(got, current - start, size)) diff --git a/gem/ex11.lua b/gem/ex11.lua index 1cbf01f..79c99af 100644 --- a/gem/ex11.lua +++ b/gem/ex11.lua @@ -1,7 +1,7 @@ local input = source.chain( - source.file(io.open("input.bin", "rb")), + source.file(io.open("input.bin", "rb")), encode("base64")) local output = sink.chain( - wrap(76), + wrap(76), sink.file(io.open("output.b64", "w"))) pump.all(input, output) diff --git a/gem/ex3.lua b/gem/ex3.lua index a43fefa..60b4423 100644 --- a/gem/ex3.lua +++ b/gem/ex3.lua @@ -7,7 +7,7 @@ local function chainpair(f1, f2) end function filter.chain(...) - local f = select(1, ...) + local f = select(1, ...) for i = 2, select('#', ...) do f = chainpair(f, select(i, ...)) end diff --git a/gem/ex4.lua b/gem/ex4.lua index c670e0e..c48b77e 100644 --- a/gem/ex4.lua +++ b/gem/ex4.lua @@ -1,4 +1,4 @@ -local qp = filter.chain(normalize(CRLF), encode("quoted-printable"), +local qp = filter.chain(normalize(CRLF), encode("quoted-printable"), wrap("quoted-printable")) local input = source.chain(source.file(io.stdin), qp) local output = sink.file(io.stdout) diff --git a/samples/cddb.lua b/samples/cddb.lua index 49a1871..59d5a44 100644 --- a/samples/cddb.lua +++ b/samples/cddb.lua @@ -26,7 +26,7 @@ function parse(body) data[key] = value end end - return data, code, message + return data, code, message end local host = socket.dns.gethostname() diff --git a/src/ftp.lua b/src/ftp.lua index bd528ca..0ebc508 100644 --- a/src/ftp.lua +++ b/src/ftp.lua @@ -56,7 +56,7 @@ end function metat.__index:login(user, password) self.try(self.tp:command("user", user or _M.USER)) - local code, reply = self.try(self.tp:check{"2..", 331}) + local code, _ = self.try(self.tp:check{"2..", 331}) if code == 331 then self.try(self.tp:command("pass", password or _M.PASSWORD)) self.try(self.tp:check("2..")) @@ -66,7 +66,7 @@ end function metat.__index:pasv() self.try(self.tp:command("pasv")) - local code, reply = self.try(self.tp:check("2..")) + local _, reply = self.try(self.tp:check("2..")) local pattern = "(%d+)%D(%d+)%D(%d+)%D(%d+)%D(%d+)%D(%d+)" local a, b, c, d, p1, p2 = socket.skip(2, string.find(reply, pattern)) self.try(a and b and c and d and p1 and p2, reply) @@ -83,9 +83,9 @@ end function metat.__index:epsv() self.try(self.tp:command("epsv")) - local code, reply = self.try(self.tp:check("229")) + local _, reply = self.try(self.tp:check("229")) local pattern = "%((.)(.-)%1(.-)%1(.-)%1%)" - local d, prt, address, port = string.match(reply, pattern) + local _, _, _, port = string.match(reply, pattern) self.try(port, "invalid epsv response") self.pasvt = { address = self.tp:getpeername(), @@ -102,7 +102,7 @@ end function metat.__index:port(address, port) self.pasvt = nil if not address then - address, port = self.try(self.tp:getsockname()) + address = self.try(self.tp:getsockname()) self.server = self.try(socket.bind(address, 0)) address, port = self.try(self.server:getsockname()) self.try(self.server:settimeout(_M.TIMEOUT)) @@ -118,7 +118,7 @@ end function metat.__index:eprt(family, address, port) self.pasvt = nil if not address then - address, port = self.try(self.tp:getsockname()) + address = self.try(self.tp:getsockname()) self.server = self.try(socket.bind(address, 0)) address, port = self.try(self.server:getsockname()) self.try(self.server:settimeout(_M.TIMEOUT)) @@ -142,7 +142,7 @@ function metat.__index:send(sendt) local command = sendt.command or "stor" -- send the transfer command and check the reply self.try(self.tp:command(command, argument)) - local code, reply = self.try(self.tp:check{"2..", "1.."}) + local code, _ = self.try(self.tp:check{"2..", "1.."}) -- if there is not a pasvt table, then there is a server -- and we already sent a PORT command if not self.pasvt then self:portconnect() end diff --git a/src/http.lua b/src/http.lua index 6a3416e..e3a1742 100644 --- a/src/http.lua +++ b/src/http.lua @@ -41,9 +41,6 @@ local SCHEMES = { https.tcp, 'LuaSocket: Function tcp() not available from LuaSec') return tcp(t) end }} --- default scheme and port for document retrieval -local SCHEME = 'http' -local PORT = SCHEMES[SCHEME].port ----------------------------------------------------------------------------- -- Reads MIME headers from a connection, unfolding where needed ----------------------------------------------------------------------------- @@ -92,7 +89,7 @@ socket.sourcet["http-chunked"] = function(sock, headers) -- was it the last chunk? if size > 0 then -- if not, get chunk and skip terminating CRLF - local chunk, err, part = sock:receive(size) + local chunk, err, _ = sock:receive(size) if chunk then sock:receive() end return chunk, err else @@ -166,8 +163,8 @@ function metat.__index:receivestatusline() if status ~= "HTTP/" then if ec == "timeout" then return 408 - end - return nil, status + end + return nil, status end -- otherwise proceed reading a status line status = self.try(self.c:receive("*l", status)) @@ -366,7 +363,7 @@ end local headers -- ignore any 100-continue messages while code == 100 do - headers = h:receiveheaders() + h:receiveheaders() code, status = h:receivestatusline() end headers = h:receiveheaders() diff --git a/src/ltn12.lua b/src/ltn12.lua index afa735d..f1e05e1 100644 --- a/src/ltn12.lua +++ b/src/ltn12.lua @@ -13,7 +13,7 @@ local unpack = unpack or table.unpack local base = _G local _M = {} if module then -- heuristic for exporting a global package table - ltn12 = _M + ltn12 = _M -- luacheck: ignore end local filter,source,sink,pump = {},{},{},{} @@ -23,7 +23,6 @@ _M.sink = sink _M.pump = pump local unpack = unpack or table.unpack -local select = base.select -- 2048 seems to be better in windows... _M.BLOCKSIZE = 2048 diff --git a/src/mbox.lua b/src/mbox.lua index ed9e781..12823b0 100644 --- a/src/mbox.lua +++ b/src/mbox.lua @@ -1,8 +1,8 @@ local _M = {} if module then - mbox = _M -end + mbox = _M -- luacheck: ignore +end function _M.split_message(message_s) local message = {} @@ -29,7 +29,7 @@ end function _M.parse_header(header_s) header_s = string.gsub(header_s, "\n[ ]+", " ") header_s = string.gsub(header_s, "\n+", "") - local _, __, name, value = string.find(header_s, "([^%s:]-):%s*(.*)") + local _, _, name, value = string.find(header_s, "([^%s:]-):%s*(.*)") return name, value end @@ -49,9 +49,9 @@ function _M.parse_headers(headers_s) end function _M.parse_from(from) - local _, __, name, address = string.find(from, "^%s*(.-)%s*%<(.-)%>") + local _, _, name, address = string.find(from, "^%s*(.-)%s*%<(.-)%>") if not address then - _, __, address = string.find(from, "%s*(.+)%s*") + _, _, address = string.find(from, "%s*(.+)%s*") end name = name or "" address = address or "" @@ -63,7 +63,8 @@ end function _M.split_mbox(mbox_s) local mbox = {} mbox_s = string.gsub(mbox_s, "\r\n", "\n") .."\n\nFrom \n" - local nj, i, j = 1, 1, 1 + local nj, i + local j = 1 while 1 do i, nj = string.find(mbox_s, "\n\nFrom .-\n", j) if not i then break end diff --git a/src/mime.lua b/src/mime.lua index d3abac5..93539de 100644 --- a/src/mime.lua +++ b/src/mime.lua @@ -10,7 +10,6 @@ local base = _G local ltn12 = require("ltn12") local mime = require("mime.core") -local string = require("string") local _M = mime -- encode, decode and wrap algorithm tables @@ -18,7 +17,7 @@ local encodet, decodet, wrapt = {},{},{} _M.encodet = encodet _M.decodet = decodet -_M.wrapt = wrapt +_M.wrapt = wrapt -- creates a function that chooses a filter by name from a given table local function choose(table) @@ -27,7 +26,7 @@ local function choose(table) name, opt1, opt2 = "default", name, opt1 end local f = table[name or "nil"] - if not f then + if not f then base.error("unknown key (" .. base.tostring(name) .. ")", 3) else return f(opt1, opt2) end end @@ -52,13 +51,6 @@ decodet['quoted-printable'] = function() return ltn12.filter.cycle(_M.unqp, "") end -local function format(chunk) - if chunk then - if chunk == "" then return "''" - else return string.len(chunk) end - else return "nil" end -end - -- define the line-wrap filters wrapt['text'] = function(length) length = length or 76 diff --git a/src/url.lua b/src/url.lua index 0a3a80a..8e0dc5c 100644 --- a/src/url.lua +++ b/src/url.lua @@ -179,9 +179,9 @@ function _M.parse(url, default) function(u) parsed.userinfo = u; return "" end) authority = string.gsub(authority, ":([^:%]]*)$", function(p) parsed.port = p; return "" end) - if authority ~= "" then + if authority ~= "" then -- IPv6? - parsed.host = string.match(authority, "^%[(.+)%]$") or authority + parsed.host = string.match(authority, "^%[(.+)%]$") or authority end local userinfo = parsed.userinfo if not userinfo then return parsed end @@ -264,7 +264,7 @@ function _M.absolute(base_url, relative_url) relative_parsed.query = base_parsed.query end end - else + else relative_parsed.path = absolute_path(base_parsed.path or "", relative_parsed.path) end diff --git a/test/ltn12test.lua b/test/ltn12test.lua index e7d368d..0cafbc9 100644 --- a/test/ltn12test.lua +++ b/test/ltn12test.lua @@ -38,7 +38,7 @@ local function named(f, name) end -------------------------------- -local function split(size) +local function split(size) local buffer = "" local last_out = "" local last_in = "" @@ -50,12 +50,12 @@ local function split(size) return last_out end return function(chunk, done) - if done then - return not last_in and not last_out + if done then + return not last_in and not last_out end -- check if argument is consistent with state if not chunk then - if last_in and last_in ~= "" and last_out ~= "" then + if last_in and last_in ~= "" and last_out ~= "" then error("nil chunk following data chunk", 2) end if not last_out then error("extra nil chunk", 2) end @@ -67,8 +67,8 @@ local function split(size) return output(chunk) else if not last_in then error("data chunk following nil chunk", 2) end - if last_in ~= "" and last_out ~= "" then - error("data chunk following data chunk", 2) + if last_in ~= "" and last_out ~= "" then + error("data chunk following data chunk", 2) end buffer = chunk return output(chunk) @@ -85,7 +85,7 @@ local function format(chunk) end -------------------------------- -local function merge(size) +local function merge(size) local buffer = "" local last_out = "" local last_in = "" @@ -102,12 +102,12 @@ local function merge(size) return last_out end return function(chunk, done) - if done then - return not last_in and not last_out + if done then + return not last_in and not last_out end -- check if argument is consistent with state if not chunk then - if last_in and last_in ~= "" and last_out ~= "" then + if last_in and last_in ~= "" and last_out ~= "" then error("nil chunk following data chunk", 2) end if not last_out then error("extra nil chunk", 2) end @@ -119,8 +119,8 @@ local function merge(size) return output(chunk) else if not last_in then error("data chunk following nil chunk", 2) end - if last_in ~= "" and last_out ~= "" then - error("data chunk following data chunk", 2) + if last_in ~= "" and last_out ~= "" then + error("data chunk following data chunk", 2) end buffer = buffer .. chunk return output(chunk) diff --git a/test/mimetest.lua b/test/mimetest.lua index f5b3747..a3c89ac 100644 --- a/test/mimetest.lua +++ b/test/mimetest.lua @@ -15,27 +15,27 @@ local eb64test = "b64test.bin2" local db64test = "b64test.bin3" --- from Machado de Assis, "A Mão e a Rosa" +-- from Machado de Assis, "A M�o e a Rosa" local mao = [[ - Cursavam estes dois moços a academia de S. Paulo, estando - Luís Alves no quarto ano e Estêvão no terceiro. - Conheceram-se na academia, e ficaram amigos íntimos, tanto - quanto podiam sê-lo dois espíritos diferentes, ou talvez por - isso mesmo que o eram. Estêvão, dotado de extrema - sensibilidade, e não menor fraqueza de ânimo, afetuoso e - bom, não daquela bondade varonil, que é apanágio de uma alma - forte, mas dessa outra bondade mole e de cera, que vai à - mercê de todas as circunstâncias, tinha, além de tudo isso, - o infortúnio de trazer ainda sobre o nariz os óculos - cor-de-rosa de suas virginais ilusões. Luís Alves via bem - com os olhos da cara. Não era mau rapaz, mas tinha o seu - grão de egoísmo, e se não era incapaz de afeições, sabia - regê-las, moderá-las, e sobretudo guiá-las ao seu próprio + Cursavam estes dois mo�os a academia de S. Paulo, estando + Lu�s Alves no quarto ano e Est�v�o no terceiro. + Conheceram-se na academia, e ficaram amigos �ntimos, tanto + quanto podiam s�-lo dois esp�ritos diferentes, ou talvez por + isso mesmo que o eram. Est�v�o, dotado de extrema + sensibilidade, e n�o menor fraqueza de �nimo, afetuoso e + bom, n�o daquela bondade varonil, que � apan�gio de uma alma + forte, mas dessa outra bondade mole e de cera, que vai � + merc� de todas as circunst�ncias, tinha, al�m de tudo isso, + o infort�nio de trazer ainda sobre o nariz os �culos + cor-de-rosa de suas virginais ilus�es. Lu�s Alves via bem + com os olhos da cara. N�o era mau rapaz, mas tinha o seu + gr�o de ego�smo, e se n�o era incapaz de afei��es, sabia + reg�-las, moder�-las, e sobretudo gui�-las ao seu pr�prio interesse. Entre estes dois homens travara-se amizade - íntima, nascida para um na simpatia, para outro no costume. + �ntima, nascida para um na simpatia, para outro no costume. Eram eles os naturais confidentes um do outro, com a - diferença que Luís Alves dava menos do que recebia, e, ainda - assim, nem tudo o que dava exprimia grande confiança. + diferen�a que Lu�s Alves dava menos do que recebia, e, ainda + assim, nem tudo o que dava exprimia grande confian�a. ]] local function random(handle, io_err) @@ -44,8 +44,8 @@ local function random(handle, io_err) if not handle then error("source is empty!", 2) end local len = math.random(0, 1024) local chunk = handle:read(len) - if not chunk then - handle:close() + if not chunk then + handle:close() handle = nil end return chunk @@ -62,7 +62,7 @@ local what = nil local function transform(input, output, filter) local source = random(io.open(input, "rb")) local sink = ltn12.sink.file(io.open(output, "wb")) - if what then + if what then sink = ltn12.sink.chain(filter, sink) else source = ltn12.source.chain(source, filter) @@ -147,7 +147,7 @@ local function create_qptest() f:write(' ',string.char(32)) end f:write("\r\n") - + f:close() end @@ -157,7 +157,7 @@ local function cleanup_qptest() os.remove(dqptest) end --- create test file +-- create test file local function create_b64test() local f = assert(io.open(b64test, "wb")) local t = {} diff --git a/test/smtptest.lua b/test/smtptest.lua index b5380ff..9d06054 100644 --- a/test/smtptest.lua +++ b/test/smtptest.lua @@ -27,8 +27,8 @@ local total = function() end local similar = function(s1, s2) - return - string.lower(string.gsub(s1, "%s", "")) == + return + string.lower(string.gsub(s1, "%s", "")) == string.lower(string.gsub(s2, "%s", "")) end @@ -40,9 +40,9 @@ end local readfile = function(name) local f = io.open(name, "r") - if not f then + if not f then fail("unable to open file!") - return nil + return nil end local s = f:read("*a") f:close() @@ -52,7 +52,7 @@ end local empty = function() for i,v in ipairs(files) do local f = io.open(v, "w") - if not f then + if not f then fail("unable to open file!") end f:close() @@ -116,8 +116,8 @@ local wait = function(sentinel, n) while 1 do local mbox = parse(get()) if n == #mbox then break end - if socket.time() - sentinel.time > 50 then - to = 1 + if socket.time() - sentinel.time > 50 then + to = 1 break end socket.sleep(1) @@ -132,7 +132,7 @@ local stuffed_body = [[ This message body needs to be stuffed because it has a dot . -by itself on a line. +by itself on a line. Otherwise the mailer would think that the dot . @@ -219,7 +219,7 @@ else print("ok") end io.write("testing invalid from: ") local ret, err = socket.smtp.mail{ - from = ' " " (( _ * ', + from = ' " " (( _ * ', rcpt = rcpt, } if ret or not err then fail("wrong error message") @@ -227,7 +227,7 @@ else print(err) end io.write("testing no rcpt: ") local ret, err = socket.smtp.mail{ - from = from, + from = from, } if ret or not err then fail("wrong error message") else print(err) end diff --git a/test/test_socket_error.lua b/test/test_socket_error.lua index bda6408..1b4b601 100644 --- a/test/test_socket_error.lua +++ b/test/test_socket_error.lua @@ -19,7 +19,7 @@ for i = 1, 10 do assert(ss == sock) else assert('timeout' == err, 'unexpected error :' .. tostring(err)) - end + end err = sock:getoption("error") -- i get 'connection refused' on WinXP if err then print("Passed! Error is '" .. err .. "'.") diff --git a/test/testmesg.lua b/test/testmesg.lua index 135a008..8c086d5 100644 --- a/test/testmesg.lua +++ b/test/testmesg.lua @@ -34,11 +34,11 @@ r, e = smtp.send{ print(r, e) --- creates a source to send a message with two parts. The first part is +-- creates a source to send a message with two parts. The first part is -- plain text, the second part is a PNG image, encoded as base64. source = smtp.message{ headers = { - -- Remember that headers are *ignored* by smtp.send. + -- Remember that headers are *ignored* by smtp.send. from = "Sicrano ", to = "Fulano ", subject = "Here is a message with attachments" @@ -49,18 +49,18 @@ source = smtp.message{ "Preamble might show up even in a MIME enabled client.", -- first part: No headers means plain text, us-ascii. -- The mime.eol low-level filter normalizes end-of-line markers. - [1] = { + [1] = { body = mime.eol(0, [[ - Lines in a message body should always end with CRLF. + Lines in a message body should always end with CRLF. The smtp module will *NOT* perform translation. It will perform necessary stuffing, though. ]]) }, - -- second part: Headers describe content the to be an image, + -- second part: Headers describe content the to be an image, -- sent under the base64 transfer content encoding. - -- Notice that nothing happens until the message is sent. Small + -- Notice that nothing happens until the message is sent. Small -- chunks are loaded into memory and translation happens on the fly. - [2] = { + [2] = { headers = { ["ConTenT-tYpE"] = 'image/png; name="luasocket.png"', ["content-disposition"] = 'attachment; filename="luasocket.png"', diff --git a/test/testsupport.lua b/test/testsupport.lua index b986088..4360b6b 100644 --- a/test/testsupport.lua +++ b/test/testsupport.lua @@ -7,7 +7,7 @@ function readfile(name) end function similar(s1, s2) - return string.lower(string.gsub(s1 or "", "%s", "")) == + return string.lower(string.gsub(s1 or "", "%s", "")) == string.lower(string.gsub(s2 or "", "%s", "")) end diff --git a/test/urltest.lua b/test/urltest.lua index ae8ba75..9a3c470 100644 --- a/test/urltest.lua +++ b/test/urltest.lua @@ -60,8 +60,8 @@ end local check_absolute_url = function(base, relative, absolute) local res = socket.url.absolute(base, relative) - if res ~= absolute then - io.write("absolute: In test for base='", base, "', rel='", relative, "' expected '", + if res ~= absolute then + io.write("absolute: In test for base='", base, "', rel='", relative, "' expected '", absolute, "' but got '", res, "'\n") os.exit() end @@ -73,7 +73,7 @@ local check_parse_url = function(gaba) local parsed = socket.url.parse(url) for i, v in pairs(gaba) do if v ~= parsed[i] then - io.write("parse: In test for '", url, "' expected ", i, " = '", + io.write("parse: In test for '", url, "' expected ", i, " = '", v, "' but got '", tostring(parsed[i]), "'\n") for i,v in pairs(parsed) do print(i,v) end os.exit() @@ -81,7 +81,7 @@ local check_parse_url = function(gaba) end for i, v in pairs(parsed) do if v ~= gaba[i] then - io.write("parse: In test for '", url, "' expected ", i, " = '", + io.write("parse: In test for '", url, "' expected ", i, " = '", tostring(gaba[i]), "' but got '", v, "'\n") for i,v in pairs(parsed) do print(i,v) end os.exit() @@ -92,8 +92,8 @@ end print("testing URL parsing") check_parse_url{ url = "scheme://user:pass$%?#wd@host:port/path;params?query#fragment", - scheme = "scheme", - authority = "user:pass$%?#wd@host:port", + scheme = "scheme", + authority = "user:pass$%?#wd@host:port", host = "host", port = "port", userinfo = "user:pass$%?#wd", @@ -106,8 +106,8 @@ check_parse_url{ } check_parse_url{ url = "scheme://user:pass?#wd@host:port/path;params?query#fragment", - scheme = "scheme", - authority = "user:pass?#wd@host:port", + scheme = "scheme", + authority = "user:pass?#wd@host:port", host = "host", port = "port", userinfo = "user:pass?#wd", @@ -120,8 +120,8 @@ check_parse_url{ } check_parse_url{ url = "scheme://user:pass-wd@host:port/path;params?query#fragment", - scheme = "scheme", - authority = "user:pass-wd@host:port", + scheme = "scheme", + authority = "user:pass-wd@host:port", host = "host", port = "port", userinfo = "user:pass-wd", @@ -134,8 +134,8 @@ check_parse_url{ } check_parse_url{ url = "scheme://user:pass#wd@host:port/path;params?query#fragment", - scheme = "scheme", - authority = "user:pass#wd@host:port", + scheme = "scheme", + authority = "user:pass#wd@host:port", host = "host", port = "port", userinfo = "user:pass#wd", @@ -148,8 +148,8 @@ check_parse_url{ } check_parse_url{ url = "scheme://user:pass#wd@host:port/path;params?query", - scheme = "scheme", - authority = "user:pass#wd@host:port", + scheme = "scheme", + authority = "user:pass#wd@host:port", host = "host", port = "port", userinfo = "user:pass#wd", @@ -161,8 +161,8 @@ check_parse_url{ } check_parse_url{ url = "scheme://userinfo@host:port/path;params?query#fragment", - scheme = "scheme", - authority = "userinfo@host:port", + scheme = "scheme", + authority = "userinfo@host:port", host = "host", port = "port", userinfo = "userinfo", @@ -175,8 +175,8 @@ check_parse_url{ check_parse_url{ url = "scheme://user:password@host:port/path;params?query#fragment", - scheme = "scheme", - authority = "user:password@host:port", + scheme = "scheme", + authority = "user:password@host:port", host = "host", port = "port", userinfo = "user:password", @@ -190,8 +190,8 @@ check_parse_url{ check_parse_url{ url = "scheme://userinfo@host:port/path;params?query#", - scheme = "scheme", - authority = "userinfo@host:port", + scheme = "scheme", + authority = "userinfo@host:port", host = "host", port = "port", userinfo = "userinfo", @@ -204,8 +204,8 @@ check_parse_url{ check_parse_url{ url = "scheme://userinfo@host:port/path;params?#fragment", - scheme = "scheme", - authority = "userinfo@host:port", + scheme = "scheme", + authority = "userinfo@host:port", host = "host", port = "port", userinfo = "userinfo", @@ -218,8 +218,8 @@ check_parse_url{ check_parse_url{ url = "scheme://userinfo@host:port/path;params#fragment", - scheme = "scheme", - authority = "userinfo@host:port", + scheme = "scheme", + authority = "userinfo@host:port", host = "host", port = "port", userinfo = "userinfo", @@ -231,8 +231,8 @@ check_parse_url{ check_parse_url{ url = "scheme://userinfo@host:port/path;?query#fragment", - scheme = "scheme", - authority = "userinfo@host:port", + scheme = "scheme", + authority = "userinfo@host:port", host = "host", port = "port", userinfo = "userinfo", @@ -245,8 +245,8 @@ check_parse_url{ check_parse_url{ url = "scheme://userinfo@host:port/path?query#fragment", - scheme = "scheme", - authority = "userinfo@host:port", + scheme = "scheme", + authority = "userinfo@host:port", host = "host", port = "port", userinfo = "userinfo", @@ -258,8 +258,8 @@ check_parse_url{ check_parse_url{ url = "scheme://userinfo@host:port/;params?query#fragment", - scheme = "scheme", - authority = "userinfo@host:port", + scheme = "scheme", + authority = "userinfo@host:port", host = "host", port = "port", userinfo = "userinfo", @@ -272,8 +272,8 @@ check_parse_url{ check_parse_url{ url = "scheme://userinfo@host:port", - scheme = "scheme", - authority = "userinfo@host:port", + scheme = "scheme", + authority = "userinfo@host:port", host = "host", port = "port", userinfo = "userinfo", @@ -282,7 +282,7 @@ check_parse_url{ check_parse_url{ url = "//userinfo@host:port/path;params?query#fragment", - authority = "userinfo@host:port", + authority = "userinfo@host:port", host = "host", port = "port", userinfo = "userinfo", @@ -295,7 +295,7 @@ check_parse_url{ check_parse_url{ url = "//userinfo@host:port/path", - authority = "userinfo@host:port", + authority = "userinfo@host:port", host = "host", port = "port", userinfo = "userinfo", @@ -305,7 +305,7 @@ check_parse_url{ check_parse_url{ url = "//userinfo@host/path", - authority = "userinfo@host", + authority = "userinfo@host", host = "host", userinfo = "userinfo", user = "userinfo", @@ -314,7 +314,7 @@ check_parse_url{ check_parse_url{ url = "//user:password@host/path", - authority = "user:password@host", + authority = "user:password@host", host = "host", userinfo = "user:password", password = "password", @@ -324,7 +324,7 @@ check_parse_url{ check_parse_url{ url = "//user:@host/path", - authority = "user:@host", + authority = "user:@host", host = "host", userinfo = "user:", password = "", @@ -334,7 +334,7 @@ check_parse_url{ check_parse_url{ url = "//user@host:port/path", - authority = "user@host:port", + authority = "user@host:port", host = "host", userinfo = "user", user = "user", @@ -344,7 +344,7 @@ check_parse_url{ check_parse_url{ url = "//host:port/path", - authority = "host:port", + authority = "host:port", port = "port", host = "host", path = "/path", @@ -352,14 +352,14 @@ check_parse_url{ check_parse_url{ url = "//host/path", - authority = "host", + authority = "host", host = "host", path = "/path", } check_parse_url{ url = "//host", - authority = "host", + authority = "host", host = "host", } @@ -433,7 +433,7 @@ check_parse_url{ check_parse_url{ url = "//userinfo@[::FFFF:129.144.52.38]:port/path;params?query#fragment", - authority = "userinfo@[::FFFF:129.144.52.38]:port", + authority = "userinfo@[::FFFF:129.144.52.38]:port", host = "::FFFF:129.144.52.38", port = "port", userinfo = "userinfo", @@ -447,7 +447,7 @@ check_parse_url{ check_parse_url{ url = "scheme://user:password@[::192.9.5.5]:port/path;params?query#fragment", scheme = "scheme", - authority = "user:password@[::192.9.5.5]:port", + authority = "user:password@[::192.9.5.5]:port", host = "::192.9.5.5", port = "port", userinfo = "user:password", @@ -462,7 +462,7 @@ check_parse_url{ print("testing URL building") check_build_url { url = "scheme://user:password@host:port/path;params?query#fragment", - scheme = "scheme", + scheme = "scheme", host = "host", port = "port", user = "user", @@ -499,7 +499,7 @@ check_build_url{ check_build_url { url = "scheme://user:password@host/path;params?query#fragment", - scheme = "scheme", + scheme = "scheme", host = "host", user = "user", password = "password", @@ -511,7 +511,7 @@ check_build_url { check_build_url { url = "scheme://user@host/path;params?query#fragment", - scheme = "scheme", + scheme = "scheme", host = "host", user = "user", path = "/path", @@ -522,7 +522,7 @@ check_build_url { check_build_url { url = "scheme://host/path;params?query#fragment", - scheme = "scheme", + scheme = "scheme", host = "host", path = "/path", params = "params", @@ -532,7 +532,7 @@ check_build_url { check_build_url { url = "scheme://host/path;params#fragment", - scheme = "scheme", + scheme = "scheme", host = "host", path = "/path", params = "params", @@ -541,7 +541,7 @@ check_build_url { check_build_url { url = "scheme://host/path#fragment", - scheme = "scheme", + scheme = "scheme", host = "host", path = "/path", fragment = "fragment" @@ -549,7 +549,7 @@ check_build_url { check_build_url { url = "scheme://host/path", - scheme = "scheme", + scheme = "scheme", host = "host", path = "/path", } @@ -567,7 +567,7 @@ check_build_url { check_build_url { url = "scheme://user:password@host:port/path;params?query#fragment", - scheme = "scheme", + scheme = "scheme", host = "host", port = "port", user = "user", @@ -581,7 +581,7 @@ check_build_url { check_build_url { url = "scheme://user:password@host:port/path;params?query#fragment", - scheme = "scheme", + scheme = "scheme", host = "host", port = "port", user = "user", @@ -596,7 +596,7 @@ check_build_url { check_build_url { url = "scheme://user:password@host:port/path;params?query#fragment", - scheme = "scheme", + scheme = "scheme", host = "host", port = "port", userinfo = "user:password", @@ -609,7 +609,7 @@ check_build_url { check_build_url { url = "scheme://user:password@host:port/path;params?query#fragment", - scheme = "scheme", + scheme = "scheme", authority = "user:password@host:port", path = "/path", params = "params", @@ -683,7 +683,7 @@ check_absolute_url("//a/b/c/d;p?q#f", "d/e/f", "//a/b/c/d/e/f") check_absolute_url("/a/b/c/d;p?q#f", "d/e/f", "/a/b/c/d/e/f") check_absolute_url("a/b/c/d", "d/e/f", "a/b/c/d/e/f") check_absolute_url("a/b/c/d/../", "d/e/f", "a/b/c/d/e/f") -check_absolute_url("http://velox.telemar.com.br", "/dashboard/index.html", +check_absolute_url("http://velox.telemar.com.br", "/dashboard/index.html", "http://velox.telemar.com.br/dashboard/index.html") check_absolute_url("http://example.com/", "../.badhost.com/", "http://example.com/.badhost.com/") check_absolute_url("http://example.com/", "...badhost.com/", "http://example.com/...badhost.com/") @@ -700,11 +700,11 @@ check_absolute_url("http://example.com/a/b/c/d/", "../x/a/../y/z/../../../../q", print("testing path parsing and composition") check_parse_path("/eu/tu/ele", { "eu", "tu", "ele"; is_absolute = 1 }) check_parse_path("/eu/", { "eu"; is_absolute = 1, is_directory = 1 }) -check_parse_path("eu/tu/ele/nos/vos/eles/", +check_parse_path("eu/tu/ele/nos/vos/eles/", { "eu", "tu", "ele", "nos", "vos", "eles"; is_directory = 1}) check_parse_path("/", { is_absolute = 1, is_directory = 1}) check_parse_path("", { }) -check_parse_path("eu%01/%02tu/e%03l%04e/nos/vos%05/e%12les/", +check_parse_path("eu%01/%02tu/e%03l%04e/nos/vos%05/e%12les/", { "eu\1", "\2tu", "e\3l\4e", "nos", "vos\5", "e\18les"; is_directory = 1}) check_parse_path("eu/tu", { "eu", "tu" }) diff --git a/test/utestclnt.lua b/test/utestclnt.lua index 34a0718..7f10643 100644 --- a/test/utestclnt.lua +++ b/test/utestclnt.lua @@ -54,30 +54,30 @@ function check_timeout(tm, sl, elapsed, err, opp, mode, alldone) if not err then warn("must be buffered") elseif err == "timeout" then pass("proper timeout") else fail("unexpected error '%s'", err) end - else - if err ~= "timeout" then fail("should have timed out") + else + if err ~= "timeout" then fail("should have timed out") else pass("proper timeout") end end else if mode == "total" then - if elapsed > tm then + if elapsed > tm then if err ~= "timeout" then fail("should have timed out") else pass("proper timeout") end elseif elapsed < tm then - if err then fail(err) + if err then fail(err) else pass("ok") end - else - if alldone then - if err then fail("unexpected error '%s'", err) + else + if alldone then + if err then fail("unexpected error '%s'", err) else pass("ok") end else - if err ~= "timeout" then fail(err) + if err ~= "timeout" then fail(err) else pass("proper timeoutk") end end end - else - if err then fail(err) - else pass("ok") end + else + if err then fail(err) + else pass("ok") end end end end @@ -104,7 +104,7 @@ function reconnect() print("done " .. i) ]] data, err = uconnect(host, port) - if not data then fail(err) + if not data then fail(err) else pass("connected!") end end @@ -116,8 +116,8 @@ else pass("connected!") end ------------------------------------------------------------------------ function test_methods(sock, methods) for _, v in pairs(methods) do - if type(sock[v]) ~= "function" then - fail(sock.class .. " method '" .. v .. "' not registered") + if type(sock[v]) ~= "function" then + fail(sock.class .. " method '" .. v .. "' not registered") end end pass(sock.class .. " methods are ok") @@ -132,7 +132,7 @@ function test_mixed(len) local p3 = "raw " .. string.rep("z", inter) .. "bytes" local p4 = "end" .. string.rep("w", inter) .. "bytes" local bp1, bp2, bp3, bp4 -remote (string.format("str = data:receive(%d)", +remote (string.format("str = data:receive(%d)", string.len(p1)+string.len(p2)+string.len(p3)+string.len(p4))) sent, err = data:send(p1..p2..p3..p4) if err then fail(err) end @@ -172,7 +172,7 @@ function test_rawline(len) reconnect() local str, str10, back, err str = string.rep(string.char(47), math.mod(len, 10)) - str10 = string.rep(string.char(120,21,77,4,5,0,7,36,44,100), + str10 = string.rep(string.char(120,21,77,4,5,0,7,36,44,100), math.floor(len/10)) str = str .. str10 remote "str = data:receive()" @@ -221,7 +221,7 @@ function test_totaltimeoutreceive(len, tm, sl) data:settimeout(tm, "total") local t = socket.gettime() str, err, partial, elapsed = data:receive(2*len) - check_timeout(tm, sl, elapsed, err, "receive", "total", + check_timeout(tm, sl, elapsed, err, "receive", "total", string.len(str or partial) == 2*len) end @@ -241,7 +241,7 @@ function test_totaltimeoutsend(len, tm, sl) data:settimeout(tm, "total") str = string.rep("a", 2*len) total, err, partial, elapsed = data:send(str) - check_timeout(tm, sl, elapsed, err, "send", "total", + check_timeout(tm, sl, elapsed, err, "send", "total", total == 2*len) end @@ -261,7 +261,7 @@ function test_blockingtimeoutreceive(len, tm, sl) ]], 2*tm, len, sl, sl)) data:settimeout(tm) str, err, partial, elapsed = data:receive(2*len) - check_timeout(tm, sl, elapsed, err, "receive", "blocking", + check_timeout(tm, sl, elapsed, err, "receive", "blocking", string.len(str or partial) == 2*len) end @@ -294,10 +294,10 @@ function empty_connect() data = server:accept() ]] data, err = socket.connect("", port) - if not data then + if not data then pass("ok") data = socket.connect(host, port) - else + else pass("gethostbyname returns localhost on empty string...") end end @@ -331,7 +331,7 @@ function test_closed() data:close() data = nil ]], str)) - -- try to get a line + -- try to get a line back, err, partial = data:receive() if not err then fail("should have gotten 'closed'.") elseif err ~= "closed" then fail("got '"..err.."' instead of 'closed'.") @@ -344,25 +344,25 @@ function test_closed() data = nil ]] total, err, partial = data:send(string.rep("ugauga", 100000)) - if not err then + if not err then pass("failed: output buffer is at least %d bytes long!", total) - elseif err ~= "closed" then + elseif err ~= "closed" then fail("got '"..err.."' instead of 'closed'.") - else - pass("graceful 'closed' received after %d bytes were sent", partial) + else + pass("graceful 'closed' received after %d bytes were sent", partial) end end ------------------------------------------------------------------------ function test_selectbugs() local r, s, e = socket.select(nil, nil, 0.1) - assert(type(r) == "table" and type(s) == "table" and + assert(type(r) == "table" and type(s) == "table" and (e == "timeout" or e == "error")) pass("both nil: ok") local udp = socket.udp() udp:close() r, s, e = socket.select({ udp }, { udp }, 0.1) - assert(type(r) == "table" and type(s) == "table" and + assert(type(r) == "table" and type(s) == "table" and (e == "timeout" or e == "error")) pass("closed sockets: ok") e = pcall(socket.select, "wrong", 1, 0.1) @@ -380,7 +380,7 @@ function accept_timeout() local t = socket.gettime() s:settimeout(1) local c, e = s:accept() - assert(not c, "should not accept") + assert(not c, "should not accept") assert(e == "timeout", string.format("wrong error message (%s)", e)) t = socket.gettime() - t assert(t < 2, string.format("took to long to give up (%gs)", t)) @@ -398,9 +398,9 @@ function connect_timeout() local t = socket.gettime() local r, e = c:connect("127.0.0.2", 80) assert(not r, "should not connect") - assert(socket.gettime() - t < 2, "took too long to give up.") + assert(socket.gettime() - t < 2, "took too long to give up.") c:close() - print("ok") + print("ok") end ------------------------------------------------------------------------ @@ -463,9 +463,9 @@ function getstats_test() data:receive(c) t = t + c local r, s, a = data:getstats() - assert(r == t, "received count failed" .. tostring(r) + assert(r == t, "received count failed" .. tostring(r) .. "/" .. tostring(t)) - assert(s == t, "sent count failed" .. tostring(s) + assert(s == t, "sent count failed" .. tostring(s) .. "/" .. tostring(t)) end print("ok") @@ -473,7 +473,7 @@ end ------------------------------------------------------------------------ -function test_nonblocking(size) +function test_nonblocking(size) reconnect() print("Testing " .. 2*size .. " bytes") remote(string.format([[ diff --git a/test/utestsrvr.lua b/test/utestsrvr.lua index a96b570..b6e4246 100644 --- a/test/utestsrvr.lua +++ b/test/utestsrvr.lua @@ -9,7 +9,7 @@ ack = "\n"; while 1 do print("server: waiting for client connection..."); control = assert(server:accept()); - while 1 do + while 1 do command = assert(control:receive()); assert(control:send(ack)); ((loadstring or load)(command))(); From 989a5b11310c1c6da900c2f997712405a7986d09 Mon Sep 17 00:00:00 2001 From: Caleb Maclennan Date: Sat, 19 Mar 2022 17:28:25 +0300 Subject: [PATCH 139/194] chore: Include luacheck config in editorconfig setup --- .editorconfig | 2 +- .luacheckrc | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.editorconfig b/.editorconfig index edf8aa1..56ad87d 100644 --- a/.editorconfig +++ b/.editorconfig @@ -6,7 +6,7 @@ insert_final_newline = true trim_trailing_whitespace = true charset = utf-8 -[*.{lua,rockspec}] +[{*.lua,*.rockspec,.luacheckrc}] indent_style = space indent_size = 4 diff --git a/.luacheckrc b/.luacheckrc index fcec7d5..8b25dd7 100644 --- a/.luacheckrc +++ b/.luacheckrc @@ -8,10 +8,10 @@ not_globals = { } include_files = { - "**/*.lua", - "**/*.rockspec", - ".busted", - ".luacheckrc", + "**/*.lua", + "**/*.rockspec", + ".busted", + ".luacheckrc", } exclude_files = { From 8390d07774a1ba1a597d809a1a2562d88ecce19d Mon Sep 17 00:00:00 2001 From: Caleb Maclennan Date: Sat, 19 Mar 2022 17:34:28 +0300 Subject: [PATCH 140/194] chore: Bump Lua version used in linter --- .github/workflows/luacheck.yml | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/.github/workflows/luacheck.yml b/.github/workflows/luacheck.yml index 13993cc..597cd64 100644 --- a/.github/workflows/luacheck.yml +++ b/.github/workflows/luacheck.yml @@ -3,24 +3,17 @@ name: Luacheck on: [push, pull_request] jobs: - luacheck: - runs-on: ubuntu-latest + luacheck: + runs-on: ubuntu-20.04 steps: - name: Checkout - uses: actions/checkout@v2 - - - name: Setup Lua - uses: leafo/gh-actions-lua@v8 - with: - luaVersion: 5.4 - - - name: Setup Lua Rocks + uses: actions/checkout@v3 + - name: Setup ‘lua’ + uses: leafo/gh-actions-lua@v9 + - name: Setup ‘luarocks’ uses: leafo/gh-actions-luarocks@v4 - - - name: Setup dependencies + - name: Setup ‘luacheck’ run: luarocks install luacheck - - - name: Run Code Linter - run: | - luacheck . + - name: Run ‘luacheck’ linter + run: luacheck . From d0f2d132bf4b02ff342b3d87479ec0cf46f7c059 Mon Sep 17 00:00:00 2001 From: Caleb Maclennan Date: Sat, 19 Mar 2022 17:55:12 +0300 Subject: [PATCH 141/194] chore: Move SCM rockspec to root and bump rockrel to 3 --- .../luasocket-scm-2.rockspec => luasocket-scm-3.rockspec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) rename rockspec/luasocket-scm-2.rockspec => luasocket-scm-3.rockspec (95%) diff --git a/rockspec/luasocket-scm-2.rockspec b/luasocket-scm-3.rockspec similarity index 95% rename from rockspec/luasocket-scm-2.rockspec rename to luasocket-scm-3.rockspec index 9a71b07..4e1669c 100644 --- a/rockspec/luasocket-scm-2.rockspec +++ b/luasocket-scm-3.rockspec @@ -1,8 +1,8 @@ package = "LuaSocket" -version = "scm-2" +version = "scm-3" source = { - url = "git://github.com/diegonehab/luasocket.git" - , branch="master" + url = "git+https://github.com/lunarmodules/luasocket.git", + branch = "master" } description = { summary = "Network support for the Lua language", @@ -12,7 +12,7 @@ description = { modules that add support for functionality commonly needed by applications that deal with the Internet. ]], - homepage = "http://luaforge.net/projects/luasocket/", + homepage = "https://github.com/lunarmodules/luasocket", license = "MIT" } dependencies = { From 36428e07cd164c83f71469d1bb84992bd026cbb3 Mon Sep 17 00:00:00 2001 From: Caleb Maclennan Date: Sat, 19 Mar 2022 17:55:12 +0300 Subject: [PATCH 142/194] chore: Rename rockspec dir to be plural --- {rockspec => rockspecs}/luasocket-3.0rc2-1.rockspec | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename {rockspec => rockspecs}/luasocket-3.0rc2-1.rockspec (100%) diff --git a/rockspec/luasocket-3.0rc2-1.rockspec b/rockspecs/luasocket-3.0rc2-1.rockspec similarity index 100% rename from rockspec/luasocket-3.0rc2-1.rockspec rename to rockspecs/luasocket-3.0rc2-1.rockspec From 335f647075fb5e0423039e9a335bbf032e8a8334 Mon Sep 17 00:00:00 2001 From: Caleb Maclennan Date: Sat, 19 Mar 2022 18:20:05 +0300 Subject: [PATCH 143/194] chore: Add current most recent rockspec as published --- rockspecs/luasocket-3.0rc1-2.rockspec | 108 ++++++++++++++++++++++++++ 1 file changed, 108 insertions(+) create mode 100644 rockspecs/luasocket-3.0rc1-2.rockspec diff --git a/rockspecs/luasocket-3.0rc1-2.rockspec b/rockspecs/luasocket-3.0rc1-2.rockspec new file mode 100644 index 0000000..3cb6524 --- /dev/null +++ b/rockspecs/luasocket-3.0rc1-2.rockspec @@ -0,0 +1,108 @@ +package = "LuaSocket" +version = "3.0rc1-2" +source = { + url = "https://github.com/diegonehab/luasocket/archive/v3.0-rc1.zip", + dir = "luasocket-3.0-rc1", +} +description = { + summary = "Network support for the Lua language", + detailed = [[ + LuaSocket is a Lua extension library that is composed by two parts: a C core + that provides support for the TCP and UDP transport layers, and a set of Lua + modules that add support for functionality commonly needed by applications + that deal with the Internet. + ]], + homepage = "http://luaforge.net/projects/luasocket/", + license = "MIT" +} +dependencies = { + "lua >= 5.1" +} + +local function make_plat(plat) + local defines = { + unix = { + "LUA_COMPAT_APIINTCASTS", + "LUASOCKET_DEBUG", + "LUASOCKET_API=__attribute__((visibility(\"default\")))", + "UNIX_API=__attribute__((visibility(\"default\")))", + "MIME_API=__attribute__((visibility(\"default\")))" + }, + macosx = { + "LUA_COMPAT_APIINTCASTS", + "LUASOCKET_DEBUG", + "UNIX_HAS_SUN_LEN", + "LUASOCKET_API=__attribute__((visibility(\"default\")))", + "UNIX_API=__attribute__((visibility(\"default\")))", + "MIME_API=__attribute__((visibility(\"default\")))" + }, + win32 = { + "LUA_COMPAT_APIINTCASTS", + "LUASOCKET_DEBUG", + "NDEBUG", + "LUASOCKET_API=__declspec(dllexport)", + "MIME_API=__declspec(dllexport)" + }, + mingw32 = { + "LUA_COMPAT_APIINTCASTS", + "LUASOCKET_DEBUG", + "LUASOCKET_INET_PTON", + "WINVER=0x0501", + "LUASOCKET_API=__declspec(dllexport)", + "MIME_API=__declspec(dllexport)" + } + } + local modules = { + ["socket.core"] = { + sources = { "src/luasocket.c", "src/timeout.c", "src/buffer.c", "src/io.c", "src/auxiliar.c", + "src/options.c", "src/inet.c", "src/except.c", "src/select.c", "src/tcp.c", "src/udp.c" }, + defines = defines[plat], + incdir = "src" + }, + ["mime.core"] = { + sources = { "src/mime.c" }, + defines = defines[plat], + incdir = "src" + }, + ["socket.http"] = "src/http.lua", + ["socket.url"] = "src/url.lua", + ["socket.tp"] = "src/tp.lua", + ["socket.ftp"] = "src/ftp.lua", + ["socket.headers"] = "src/headers.lua", + ["socket.smtp"] = "src/smtp.lua", + ltn12 = "src/ltn12.lua", + socket = "src/socket.lua", + mime = "src/mime.lua" + } + if plat == "unix" or plat == "macosx" then + modules["socket.core"].sources[#modules["socket.core"].sources+1] = "src/usocket.c" + modules["socket.unix"] = { + sources = { "src/buffer.c", "src/auxiliar.c", "src/options.c", "src/timeout.c", "src/io.c", + "src/usocket.c", "src/unix.c" }, + defines = defines[plat], + incdir = "/src" + } + modules["socket.serial"] = { + sources = { "src/buffer.c", "src/auxiliar.c", "src/options.c", "src/timeout.c", + "src/io.c", "src/usocket.c", "src/serial.c" }, + defines = defines[plat], + incdir = "/src" + } + end + if plat == "win32" or plat == "mingw32" then + modules["socket.core"].sources[#modules["socket.core"].sources+1] = "src/wsocket.c" + modules["socket.core"].libraries = { "ws2_32" } + end + return { modules = modules } +end + +build = { + type = "builtin", + platforms = { + unix = make_plat("unix"), + macosx = make_plat("macosx"), + win32 = make_plat("win32"), + mingw32 = make_plat("mingw32") + }, + copy_directories = { "doc", "samples", "etc", "test" } +} From 91aa6522a0a4d5e24af86524fa68350de40a2667 Mon Sep 17 00:00:00 2001 From: Caleb Maclennan Date: Sat, 19 Mar 2022 18:20:52 +0300 Subject: [PATCH 144/194] chore: Drop rockspec for never-published RC2 release --- rockspecs/luasocket-3.0rc2-1.rockspec | 134 -------------------------- 1 file changed, 134 deletions(-) delete mode 100644 rockspecs/luasocket-3.0rc2-1.rockspec diff --git a/rockspecs/luasocket-3.0rc2-1.rockspec b/rockspecs/luasocket-3.0rc2-1.rockspec deleted file mode 100644 index dfe5275..0000000 --- a/rockspecs/luasocket-3.0rc2-1.rockspec +++ /dev/null @@ -1,134 +0,0 @@ -package = "LuaSocket" -version = "3.0rc2-1" -source = { - url = "git://github.com/diegonehab/luasocket.git", - tag = "v3.0-rc2", -} -description = { - summary = "Network support for the Lua language", - detailed = [[ - LuaSocket is a Lua extension library that is composed by two parts: a C core - that provides support for the TCP and UDP transport layers, and a set of Lua - modules that add support for functionality commonly needed by applications - that deal with the Internet. - ]], - homepage = "http://luaforge.net/projects/luasocket/", - license = "MIT" -} -dependencies = { - "lua >= 5.1" -} - -local function make_plat(plat) - local defines = { - unix = { - "LUASOCKET_DEBUG" - }, - macosx = { - "LUASOCKET_DEBUG", - "UNIX_HAS_SUN_LEN" - }, - win32 = { - "LUASOCKET_DEBUG", - "NDEBUG" - }, - mingw32 = { - "LUASOCKET_DEBUG", - "LUASOCKET_INET_PTON", - "WINVER=0x0501" - } - } - local modules = { - ["socket.core"] = { - sources = { - "src/luasocket.c" - , "src/timeout.c" - , "src/buffer.c" - , "src/io.c" - , "src/auxiliar.c" - , "src/options.c" - , "src/inet.c" - , "src/except.c" - , "src/select.c" - , "src/tcp.c" - , "src/udp.c" - , "src/compat.c" }, - defines = defines[plat], - incdir = "/src" - }, - ["mime.core"] = { - sources = { "src/mime.c", "src/compat.c" }, - defines = defines[plat], - incdir = "/src" - }, - ["socket.http"] = "src/http.lua", - ["socket.url"] = "src/url.lua", - ["socket.tp"] = "src/tp.lua", - ["socket.ftp"] = "src/ftp.lua", - ["socket.headers"] = "src/headers.lua", - ["socket.smtp"] = "src/smtp.lua", - ltn12 = "src/ltn12.lua", - socket = "src/socket.lua", - mime = "src/mime.lua" - } - if plat == "unix" - or plat == "macosx" - or plat == "haiku" - then - modules["socket.core"].sources[#modules["socket.core"].sources+1] = "src/usocket.c" - if plat == "haiku" then - modules["socket.core"].libraries = {"network"} - end - modules["socket.unix"] = { - sources = { - "src/buffer.c" - , "src/compat.c" - , "src/auxiliar.c" - , "src/options.c" - , "src/timeout.c" - , "src/io.c" - , "src/usocket.c" - , "src/unix.c" - , "src/unixdgram.c" - , "src/unixstream.c" }, - defines = defines[plat], - incdir = "/src" - } - modules["socket.serial"] = { - sources = { - "src/buffer.c" - , "src/compat.c" - , "src/auxiliar.c" - , "src/options.c" - , "src/timeout.c" - , "src/io.c" - , "src/usocket.c" - , "src/serial.c" }, - defines = defines[plat], - incdir = "/src" - } - end - if plat == "win32" - or plat == "mingw32" - then - modules["socket.core"].sources[#modules["socket.core"].sources+1] = "src/wsocket.c" - modules["socket.core"].libraries = { "ws2_32" } - end - return { modules = modules } -end - -build = { - type = "builtin", - platforms = { - unix = make_plat("unix"), - macosx = make_plat("macosx"), - haiku = make_plat("haiku"), - win32 = make_plat("win32"), - mingw32 = make_plat("mingw32") - }, - copy_directories = { - "doc" - , "samples" - , "etc" - , "test" } -} From 844165ff89c0ec7bb50ac65ce010200dba1c8d89 Mon Sep 17 00:00:00 2001 From: Caleb Maclennan Date: Sat, 19 Mar 2022 18:11:43 +0300 Subject: [PATCH 145/194] ci: Drop obsolete Travis configs --- .travis.yml | 54 ----------------------------------------------------- 1 file changed, 54 deletions(-) delete mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index fce8a96..0000000 --- a/.travis.yml +++ /dev/null @@ -1,54 +0,0 @@ -language: erlang - -env: - global: - - LUAROCKS_BASE=luarocks-2.0.13 - matrix: - - LUA=lua5.1 LUA_DEV=liblua5.1-dev LUA_VER=5.1 LUA_SFX=5.1 LUA_INCDIR=/usr/include/lua5.1 - - LUA=lua5.2 LUA_DEV=liblua5.2-dev LUA_VER=5.2 LUA_SFX=5.2 LUA_INCDIR=/usr/include/lua5.2 - - LUA=luajit LUA_DEV=libluajit-5.1-dev LUA_VER=5.1 LUA_SFX=jit LUA_INCDIR=/usr/include/luajit-2.0 - -branches: - only: - - master - -before_install: - - if [ $LUA = "luajit" ]; then - sudo add-apt-repository ppa:mwild1/ppa -y && sudo apt-get update -y; - fi - - sudo apt-get install $LUA - - sudo apt-get install $LUA_DEV - - lua$LUA_SFX -v - # Install a recent luarocks release - - wget http://luarocks.org/releases/$LUAROCKS_BASE.tar.gz - - tar zxvpf $LUAROCKS_BASE.tar.gz - - cd $LUAROCKS_BASE - - ./configure - --lua-version=$LUA_VER --lua-suffix=$LUA_SFX --with-lua-include="$LUA_INCDIR" - - sudo make - - sudo make install - - cd $TRAVIS_BUILD_DIR - - -install: - - export DEBUG=DEBUG - - sudo -E luarocks make luasocket-scm-0.rockspec - -script: - - cd test - - lua$LUA_SFX hello.lua - - lua$LUA_SFX testsrvr.lua > /dev/null & - - lua$LUA_SFX testclnt.lua - - lua$LUA_SFX stufftest.lua - - lua$LUA_SFX excepttest.lua - - lua$LUA_SFX test_bind.lua - - lua$LUA_SFX test_getaddrinfo.lua - - lua$LUA_SFX ltn12test.lua - - lua$LUA_SFX mimetest.lua - - lua$LUA_SFX urltest.lua - - lua$LUA_SFX test_socket_error.lua - -notifications: - email: - on_success: change - on_failure: always From 2cc6f8a55c45ec9b5ad165c150259060d4d70a82 Mon Sep 17 00:00:00 2001 From: Caleb Maclennan Date: Sat, 19 Mar 2022 20:55:11 +0300 Subject: [PATCH 146/194] ci: Add workflow to confirm build completes --- .github/workflows/build.yml | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 .github/workflows/build.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 0000000..8265bb1 --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,24 @@ +name: Check build + +on: [ push, pull_request ] + +jobs: + build: + name: Check build + strategy: + fail-fast: false + matrix: + luaVersion: [ "5.4", "5.3", "5.2", "5.1", "luajit", "luajit-openresty"] + runs-on: ubuntu-20.04 + steps: + - name: Checkout + uses: actions/checkout@v3 + - name: Setup ‘lua’ + uses: leafo/gh-actions-lua@v9 + with: + luaVersion: ${{ matrix.luaVersion }} + - name: Setup ‘luarocks’ + uses: leafo/gh-actions-luarocks@v4 + - name: Make with Luarocks + run: | + luarocks make --pack-binary-rock -- luasocket-scm-3.rockspec From 46ecb7e2dc3dd92931c6d9d99fdc9260e83077ff Mon Sep 17 00:00:00 2001 From: david <57832272+jyoui@users.noreply.github.com> Date: Tue, 1 Feb 2022 15:40:35 +0900 Subject: [PATCH 147/194] src/ltn12.lua: remove duplicated codes --- src/ltn12.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/ltn12.lua b/src/ltn12.lua index f1e05e1..4cb17f5 100644 --- a/src/ltn12.lua +++ b/src/ltn12.lua @@ -11,6 +11,8 @@ local string = require("string") local table = require("table") local unpack = unpack or table.unpack local base = _G +local select = select + local _M = {} if module then -- heuristic for exporting a global package table ltn12 = _M -- luacheck: ignore @@ -22,8 +24,6 @@ _M.source = source _M.sink = sink _M.pump = pump -local unpack = unpack or table.unpack - -- 2048 seems to be better in windows... _M.BLOCKSIZE = 2048 _M._VERSION = "LTN12 1.0.3" @@ -45,7 +45,7 @@ end -- (thanks to Wim Couwenberg) function filter.chain(...) local arg = {...} - local n = base.select('#',...) + local n = select('#',...) local top, index = 1, 1 local retry = "" return function(chunk) From e3c17b002ae4747c033c374d39538d4e242dbb22 Mon Sep 17 00:00:00 2001 From: "E. Westbrook" Date: Mon, 11 Mar 2019 02:07:45 -0600 Subject: [PATCH 148/194] Add src\compat.c to mime.vcxproj and socket.vcxproj --- mime.vcxproj | 1 + socket.vcxproj | 1 + 2 files changed, 2 insertions(+) diff --git a/mime.vcxproj b/mime.vcxproj index 43acee9..575f985 100755 --- a/mime.vcxproj +++ b/mime.vcxproj @@ -20,6 +20,7 @@ + {128E8BD0-174A-48F0-8771-92B1E8D18713} diff --git a/socket.vcxproj b/socket.vcxproj index 305c094..51ebc68 100755 --- a/socket.vcxproj +++ b/socket.vcxproj @@ -21,6 +21,7 @@ + From 2a76cb906cb955a83ed76b8e47cc76c77ce8e15f Mon Sep 17 00:00:00 2001 From: Julian Squires Date: Fri, 16 Oct 2020 12:18:46 -0230 Subject: [PATCH 149/194] http.lua: set transfer-encoding if source and no content-length If a source is specified without a content-length header, LuaSocket sends the data in the chunked transfer coding; however, it doesn't set the transfer-encoding header. While I recognize that the user can set this manually, this is a gotcha that has caught me multiple times. RFC7230, section 3.3.3 (https://tools.ietf.org/html/rfc7230#section-3.3.3) is clear about this; if neither content-length nor transfer-encoding chunked are specified, the request message body length is zero. While some servers may ignore this, I have encountered several that follow the RFC in this regard, most recently golang's net/http. --- src/http.lua | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/http.lua b/src/http.lua index e3a1742..1330355 100644 --- a/src/http.lua +++ b/src/http.lua @@ -283,6 +283,13 @@ local function adjustrequest(reqt) nreqt.uri = reqt.uri or adjusturi(nreqt) -- adjust headers in request nreqt.headers = adjustheaders(nreqt) + if nreqt.source + and not nreqt.headers["content-length"] + and not nreqt.headers["transfer-encoding"] + then + nreqt.headers["transfer-encoding"] = "chunked" + end + -- ajust host and port if there is a proxy nreqt.host, nreqt.port = adjustproxy(nreqt) return nreqt From fdd741da5cd0515e69572e564f2d57f336d2466b Mon Sep 17 00:00:00 2001 From: Caleb Maclennan Date: Sat, 19 Mar 2022 20:58:52 +0300 Subject: [PATCH 150/194] Ci: Run regression tests after successful build --- .github/workflows/build.yml | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8265bb1..64393cc 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,10 +1,10 @@ -name: Check build +name: Test build on: [ push, pull_request ] jobs: build: - name: Check build + name: Test build on Linux strategy: fail-fast: false matrix: @@ -19,6 +19,23 @@ jobs: luaVersion: ${{ matrix.luaVersion }} - name: Setup ‘luarocks’ uses: leafo/gh-actions-luarocks@v4 - - name: Make with Luarocks + - name: Make and install locally run: | - luarocks make --pack-binary-rock -- luasocket-scm-3.rockspec + export DEBUG=DEBUG + luarocks --local make -- luasocket-scm-3.rockspec + - name: Run regression tests + run: | + eval $(luarocks --local path) + cd test + lua hello.lua + lua testsrvr.lua > /dev/null & + lua testclnt.lua + lua stufftest.lua + lua excepttest.lua + lua test_bind.lua + lua test_getaddrinfo.lua + lua ltn12test.lua + lua mimetest.lua + lua urltest.lua + lua test_socket_error.lua + kill %1 From 9787c17e589dc1b12c1f96e6bb391a7ff3dd5065 Mon Sep 17 00:00:00 2001 From: Caleb Maclennan Date: Sat, 19 Mar 2022 21:18:54 +0300 Subject: [PATCH 151/194] ci: Expand test matrix to cover Windows and macOS --- .github/workflows/build.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 64393cc..518de63 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -9,7 +9,8 @@ jobs: fail-fast: false matrix: luaVersion: [ "5.4", "5.3", "5.2", "5.1", "luajit", "luajit-openresty"] - runs-on: ubuntu-20.04 + platform: [ "ubuntu-20.04", "windows-2022", "macos-11" ] + runs-on: ${{ matrix.platform }} steps: - name: Checkout uses: actions/checkout@v3 From 52c72694c2989c38fc9df915dcb34995d1e37404 Mon Sep 17 00:00:00 2001 From: Caleb Maclennan Date: Sat, 19 Mar 2022 21:23:58 +0300 Subject: [PATCH 152/194] ci: Disable unsupported Windows and avoid duplicate runs --- .github/workflows/build.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 518de63..d22e67f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,6 +1,10 @@ name: Test build -on: [ push, pull_request ] +on: + push: + branches: + - master + pull_request: jobs: build: @@ -9,7 +13,7 @@ jobs: fail-fast: false matrix: luaVersion: [ "5.4", "5.3", "5.2", "5.1", "luajit", "luajit-openresty"] - platform: [ "ubuntu-20.04", "windows-2022", "macos-11" ] + platform: [ "ubuntu-20.04", "macos-11" ] # "windows-2022" not supported by gh-actions-lua runs-on: ${{ matrix.platform }} steps: - name: Checkout From f9e1d03f3c6c9fc59dd3b91716debc23aebf947f Mon Sep 17 00:00:00 2001 From: Caleb Maclennan Date: Sat, 19 Mar 2022 22:42:25 +0300 Subject: [PATCH 153/194] ci: Don't bother doing user-local install in ephemeral runner --- .github/workflows/build.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d22e67f..17cad49 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -24,13 +24,12 @@ jobs: luaVersion: ${{ matrix.luaVersion }} - name: Setup ‘luarocks’ uses: leafo/gh-actions-luarocks@v4 - - name: Make and install locally + - name: Make and install run: | export DEBUG=DEBUG - luarocks --local make -- luasocket-scm-3.rockspec + luarocks make -- luasocket-scm-3.rockspec - name: Run regression tests run: | - eval $(luarocks --local path) cd test lua hello.lua lua testsrvr.lua > /dev/null & From f97dc8489d58aef2d038288f9a8bc69f907e17bb Mon Sep 17 00:00:00 2001 From: Thijs Schreijer Date: Tue, 22 Mar 2022 19:21:58 +0100 Subject: [PATCH 154/194] fix(docs) fix html linter issues in the docs (#358) --- doc/dns.html | 78 +++++------ doc/ftp.html | 122 ++++++++--------- doc/http.html | 142 ++++++++++---------- doc/index.html | 140 +++++++++---------- doc/ltn12.html | 200 ++++++++++++++-------------- doc/mime.html | 302 ++++++++++++++++++++--------------------- doc/reference.html | 22 +-- doc/smtp.html | 191 +++++++++++++------------- doc/socket.html | 256 +++++++++++++++++------------------ doc/tcp.html | 325 +++++++++++++++++++++++---------------------- doc/udp.html | 94 ++++++------- 11 files changed, 938 insertions(+), 934 deletions(-) diff --git a/doc/dns.html b/doc/dns.html index c4a0472..56ce3ba 100644 --- a/doc/dns.html +++ b/doc/dns.html @@ -1,4 +1,4 @@ - @@ -13,22 +13,22 @@ -
    +
    - -
    -LuaSocket +
    +LuaSocket
    Network support for the Lua language +
    Network support for the Lua language
    -

    +

    home · download · installation · introduction · -reference +reference

    @@ -36,14 +36,14 @@ -

    DNS

    +

    DNS

    -IPv4 name resolution functions -dns.toip +IPv4 name resolution functions +dns.toip and -dns.tohostname -return all information obtained from +dns.tohostname +return all information obtained from the resolver in a table of the form:

    @@ -60,10 +60,10 @@ Note that the alias list can be empty.

    -The more general name resolution function -dns.getaddrinfo, which +The more general name resolution function +dns.getaddrinfo, which supports both IPv6 and IPv4, -returns all information obtained from +returns all information obtained from the resolver in a table of the form:

    @@ -88,82 +88,82 @@ addresses, and "inet6" for IPv6 addresses. -

    +

    socket.dns.getaddrinfo(address)

    -

    -Converts from host name to address. +

    +Converts from host name to address.

    -

    -Address can be an IPv4 or IPv6 address or host name. +

    +Address can be an IPv4 or IPv6 address or host name.

    -

    +

    The function returns a table with all information returned by the resolver. In case of error, the function returns nil -followed by an error message. +followed by an error message.

    -

    +

    socket.dns.gethostname()

    -

    -Returns the standard host name for the machine as a string. +

    +Returns the standard host name for the machine as a string.

    -

    +

    socket.dns.tohostname(address)

    -

    +

    Converts from IPv4 address to host name.

    -

    -Address can be an IP address or host name. +

    +Address can be an IP address or host name.

    -

    +

    The function returns a string with the canonic host name of the given address, followed by a table with all information returned by the resolver. In case of error, the function returns nil -followed by an error message. +followed by an error message.

    -

    +

    socket.dns.toip(address)

    -

    +

    Converts from host name to IPv4 address.

    -

    -Address can be an IP address or host name. +

    +Address can be an IP address or host name.

    -

    +

    Returns a string with the first IP address found for address, followed by a table with all information returned by the resolver. In case of error, the function returns nil followed by an error -message. +message.

    -
    +
    -

    +

    home · download · installation · diff --git a/doc/ftp.html b/doc/ftp.html index 091c88f..7f7da2e 100644 --- a/doc/ftp.html +++ b/doc/ftp.html @@ -1,5 +1,5 @@ - + @@ -13,22 +13,22 @@ -

    +
    - -
    -LuaSocket +
    +LuaSocket
    Network support for the Lua language +
    Network support for the Lua language
    -

    +

    home · download · installation · introduction · -reference +reference

    @@ -36,7 +36,7 @@ -

    FTP

    +

    FTP

    FTP (File Transfer Protocol) is a protocol used to transfer files @@ -50,28 +50,28 @@ High level functions are provided supporting the most common operations. These high level functions are implemented on top of a lower level interface. Using the low-level interface, users can easily create their own functions to access any operation supported by the FTP -protocol. For that, check the implementation. +protocol. For that, check the implementation.

    -To really benefit from this module, a good understanding of +To really benefit from this module, a good understanding of -LTN012, Filters sources and sinks is necessary. +LTN012, Filters sources and sinks is necessary.

    -

    +

    To obtain the ftp namespace, run:

    -
    +
     -- loads the FTP module and any libraries it requires
 local ftp = require("socket.ftp")
 
    
 
 
    
 URLs MUST conform to
-RFC 1738, 
-that is, an URL is a string in the form: 
+RFC 1738,
+that is, an URL is a string in the form:
 
    
 
 
    
@@ -81,19 +81,19 @@ that is, an URL is a string in the form:
 
 
    
 The following constants in the namespace can be set to control the default behavior of
-the FTP module: 
+the FTP module:
 
    
 
 
      
-
    •  PASSWORD: default anonymous password.
-
    •  TIMEOUT: sets the timeout for all I/O operations;
-
    •  USER: default anonymous user;
+
    •  PASSWORD: default anonymous password.
      • 
+
    •  TIMEOUT: sets the timeout for all I/O operations;
      • 
+
    •  USER: default anonymous user;
      • 
 
    
 
 
 
 
-
    
+
    
 ftp.get(url)
    
 ftp.get{
    
   host = string,
    
@@ -109,19 +109,19 @@ ftp.get{
    
 }
 
    
 
-
    
+
    
 The get function has two forms. The simple form has fixed
 functionality: it downloads the contents of a URL and returns it as a
 string. The generic form allows a lot more control, as explained
 below.
 
    
 
-
    
+
    
 If the argument of the get function is a table, the function
-expects at least the fields host, sink, and one of 
+expects at least the fields host, sink, and one of
 argument or path (argument takes
 precedence). Host is the server to connect to. Sink is
-the simple 
+the simple
 LTN12
 sink that will receive the downloaded data. Argument or
 path give the target path to the resource in the server. The
@@ -129,28 +129,28 @@ optional arguments are the following:
 
    
 
      
 
    • user, password: User name and password used for
-authentication. Defaults to "ftp:anonymous@anonymous.org";
+authentication. Defaults to "ftp:anonymous@anonymous.org";
      • 
 
    • command: The FTP command used to obtain data. Defaults to
-"retr", but see example below;
-
    • port: The port to used for the control connection. Defaults to 21;
+"retr", but see example below;
      • 
+
    • port: The port to used for the control connection. Defaults to 21;
      • 
 
    • type: The transfer mode. Can take values "i" or
-"a". Defaults to whatever is the server default;
-
    • step: 
+"a". Defaults to whatever is the server default;
      • 
+
    • step:
 LTN12
 pump step function used to pass data from the
-server to the sink. Defaults to the LTN12 pump.step function;
+server to the sink. Defaults to the LTN12 pump.step function;
      • 
 
    • create: An optional function to be used instead of
-socket.tcp when the communications socket is created. 
+socket.tcp when the communications socket is created.
      • 
 
    
 
-
    
+
    
 If successful, the simple version returns the URL  contents as a
 string, and the generic function returns 1.  In case of error,  both
 functions return nil and an error message describing the
-error.  
+error.
 
    
 
-
    +
     -- load the ftp support
 local ftp = require("socket.ftp")
 
@@ -159,7 +159,7 @@ local ftp = require("socket.ftp")
 f, e = ftp.get("ftp://ftp.tecgraf.puc-rio.br/pub/lua/lua.tar.gz;type=i")
 
    
 
-
    +
     -- load needed modules
 local ftp = require("socket.ftp")
 local ltn12 = require("ltn12")
@@ -178,7 +178,7 @@ end
 
 
 
-
    
+
    
 ftp.put(url, content)
    
 ftp.put{
    
   host = string,
    
@@ -194,57 +194,57 @@ ftp.put{
    
 }
 
    
 
-
    
+
    
 The put function has two forms. The simple form has fixed
 functionality: it uploads a string of content into a URL. The generic form
-allows a lot more control, as explained below.  
+allows a lot more control, as explained below.
 
    
 
-
    
+
    
 If the argument of the put function is a table, the function
-expects at least the fields host, source, and one of 
+expects at least the fields host, source, and one of
 argument or path (argument takes
 precedence). Host is the server to connect to. Source is
-the simple 
-LTN12 
-source that will provide the contents to be uploaded. 
+the simple
+LTN12
+source that will provide the contents to be uploaded.
 Argument or
 path give the target path to the resource in the server. The
 optional arguments are the following:
 
    
 
      
 
    • user, password: User name and password used for
-authentication. Defaults to "ftp:anonymous@anonymous.org";
+authentication. Defaults to "ftp:anonymous@anonymous.org";
      • 
 
    • command: The FTP command used to send data. Defaults to
-"stor", but see example below;
-
    • port: The port to used for the control connection. Defaults to 21;
+"stor", but see example below;
      • 
+
    • port: The port to used for the control connection. Defaults to 21;
      • 
 
    • type: The transfer mode. Can take values "i" or
-"a". Defaults to whatever is the server default;
-
    • step: 
-LTN12 
+"a". Defaults to whatever is the server default;
      • 
+
    • step:
+LTN12
 pump step function used to pass data from the
-server to the sink. Defaults to the LTN12 pump.step function;
+server to the sink. Defaults to the LTN12 pump.step function;
      • 
 
    • create: An optional function to be used instead of
-socket.tcp when the communications socket is created. 
+socket.tcp when the communications socket is created.
      • 
 
    
 
-
    
+
    
 Both functions return 1 if successful, or nil and an error
 message describing the reason for failure.
 
    
 
-
    +
     -- load the ftp support
 local ftp = require("socket.ftp")
 
 -- Log as user "fulano" on server "ftp.example.com",
--- using password "silva", and store a file "README" with contents 
+-- using password "silva", and store a file "README" with contents
 -- "wrong password, of course"
-f, e = ftp.put("ftp://fulano:silva@ftp.example.com/README", 
+f, e = ftp.put("ftp://fulano:silva@ftp.example.com/README",
     "wrong password, of course")
 
    
 
-
    +
     -- load the ftp support
 local ftp = require("socket.ftp")
 local ltn12 = require("ltn12")
@@ -253,7 +253,7 @@ local ltn12 = require("ltn12")
 -- using password "silva", and append to the remote file "LOG", sending the
 -- contents of the local file "LOCAL-LOG"
 f, e = ftp.put{
-  host = "ftp.example.com", 
+  host = "ftp.example.com",
   user = "fulano",
   password = "silva",
   command = "appe",
@@ -265,15 +265,15 @@ f, e = ftp.put{
 
 
 
-
    
+
    
 
    
 
    
-
    
+
    
 home ·
 download ·
 installation ·
 introduction ·
-reference 
+reference
 
    
 
    
 
diff --git a/doc/http.html b/doc/http.html
index 78f785a..52b8a30 100644
--- a/doc/http.html
+++ b/doc/http.html
@@ -1,10 +1,10 @@
-
 
 
 
 
- 
+
 LuaSocket: HTTP support
 
 
@@ -13,22 +13,22 @@
 
 
 
-
    
+
    
 
    
 
    
 
-
-
    
-LuaSocket
+
    
+LuaSocket
 
    Network support for the Lua language
+
    Network support for the Lua language
 
    
 
    
-
    
+
    
 home ·
 download ·
 introduction ·
 introduction ·
-reference 
+reference
 
    
 
    
 
    
@@ -36,12 +36,12 @@
 
 
 
-
    HTTP
     
+
    HTTP
    
 
 
    
 HTTP (Hyper Text  Transfer Protocol) is the protocol  used to exchange
 information  between  web-browsers and  servers.  The  http
-namespace offers  full support for the client  side of the HTTP  
+namespace offers  full support for the client  side of the HTTP
 protocol (i.e.,
 the facilities that would be  used by a web-browser implementation). The
 implementation    conforms     to    the    HTTP/1.1     standard,
@@ -50,16 +50,16 @@ implementation    conforms     to    the    HTTP/1.1     standard,
 
 
    
 The module exports functions that provide HTTP functionality in different
-levels of abstraction. From the simple 
+levels of abstraction. From the simple
 string oriented requests, through generic
 LTN12 based, down to even lower-level if you bother to look through the source code.
 
    
 
-
     
+
    
 To obtain the http namespace, run:
 
    
 
-
    +
     -- loads the HTTP module and any libraries it requires
 local http = require("socket.http")
 
    
@@ -67,12 +67,12 @@ local http = require("socket.http")
 
    
 URLs must conform to
 RFC 1738,
-that is, an URL is a string in the form: 
+that is, an URL is a string in the form:
 
    
 
 
    
 
    -[http://][<user>[:<password>]@]<host>[:<port>][/<path>] 
+[http://][<user>[:<password>]@]<host>[:<port>][/<path>]
 
    
 
    
 
@@ -97,34 +97,34 @@ headers = {
    
 
    
 Field names are case insensitive (as specified by the standard) and all
 functions work with lowercase field names (but see
-socket.headers.canonic).
+socket.headers.canonic).
 Field values are left unmodified.
 
    
 
-
    
+
    
 Note: MIME headers are independent of order. Therefore, there is no problem
-in representing them in a Lua table. 
+in representing them in a Lua table.
 
    
 
 
    
 The following constants can be set to control the default behavior of
-the HTTP module: 
+the HTTP module:
 
    
 
 
      
-
    •  PROXY: default proxy used for connections;
-
    •  TIMEOUT: sets the timeout for all I/O operations;
-
    •  USERAGENT: default user agent reported to server.
+
    •  PROXY: default proxy used for connections;
      • 
+
    •  TIMEOUT: sets the timeout for all I/O operations;
      • 
+
    •  USERAGENT: default user agent reported to server.
      • 
 
    
 
-
    
+
    
 Note: These constants are global. Changing them will also
 change the behavior other code that might be using LuaSocket.
 
    
 
 
 
-
    
+
    
 http.request(url [, body])
    
 http.request{
    
   url = string,
    
@@ -140,26 +140,26 @@ http.request{
    
 }
 
    
 
-
    
-The request function has two forms. The simple form downloads 
-a URL using the GET or POST method and is based 
-on strings. The generic form performs any HTTP method and is 
-LTN12 based.
+
    
+The request function has two forms. The simple form downloads
+a URL using the GET or POST method and is based
+on strings. The generic form performs any HTTP method and is
+LTN12 based.
 
    
 
-
    
+
    
 If the first argument of the request function is a string, it
 should be an url. In that case, if a body
 is provided as a string, the function will perform a POST method
 in the url. Otherwise, it performs a GET in the
-url 
+url
 
    
 
-
    
-If the first argument is instead a table, the most important fields are 
+
    
+If the first argument is instead a table, the most important fields are
 the url and the simple
-LTN12 
-sink that will receive the downloaded content.  
+LTN12
+sink that will receive the downloaded content.
 Any part of the url can be overridden by including
 the appropriate field in the request table.
 If authentication information is provided, the function
@@ -169,49 +169,51 @@ function discards the downloaded data. The optional parameters are the
 following:
 
    
 
      
-
    • method: The HTTP request method. Defaults to "GET"; 
-
    • headers: Any additional HTTP headers to send with the request; 
-
    • source: simple 
-LTN12 
+
    • method: The HTTP request method. Defaults to "GET";
      • 
+
    • headers: Any additional HTTP headers to send with the request;
      • 
+
    • source: simple
+LTN12
 source to provide the request body. If there
 is a body, you need to provide an appropriate "content-length"
 request header field, or the function will attempt to send the body as
-"chunked" (something few servers support). Defaults to the empty source; 
-
    • step: 
-LTN12 
-pump step function used to move data.  
-Defaults to the LTN12 pump.step function.
-
    • proxy: The URL of a proxy server to use. Defaults to no proxy; 
-
    • redirect: Set to false to prevent the 
-function from  automatically following 301 or 302 server redirect messages; 
+"chunked" (something few servers support). Defaults to the empty source;
      • 
+
    • step:
+LTN12
+pump step function used to move data.
+Defaults to the LTN12 pump.step function.
      • 
+
    • proxy: The URL of a proxy server to use. Defaults to no proxy;
      • 
+
    • redirect: Set to false to prevent the
+function from  automatically following 301 or 302 server redirect messages;
      • 
 
    • create: An optional function to be used instead of
-socket.tcp when the communications socket is created. 
-
    • maxredirects: An optional number specifying the maximum number of redirects to follow.  Defaults to 5 if not specified.  A boolean false value means no maximum (unlimited).
+socket.tcp when the communications socket is created.
      • 
+
    • maxredirects: An optional number specifying the maximum number of
+    redirects to follow.  Defaults to 5 if not specified. A boolean
+    false value means no maximum (unlimited).
      • 
 
    
 
-
    
+
    
 In case of failure, the function returns nil followed by an
-error message. If successful, the simple form returns the response 
+error message. If successful, the simple form returns the response
 body as a string, followed by the response status code, the response
 headers and the response status line. The generic function returns the same
 information, except the first return value is just the number 1 (the body
 goes to the sink).
 
    
 
-
    
-Even  when the server fails to provide the contents of the requested URL (URL not  found, for  example), 
+
    
+Even  when the server fails to provide the contents of the requested URL (URL not  found, for  example),
 it usually returns a message body (a web page informing the
 URL  was  not found  or  some  other useless  page).  To  make sure  the
 operation was successful, check  the returned status code. For
 a  list  of  the  possible  values  and  their  meanings,  refer  to  RFC 2616. 
+href="http://www.ietf.org/rfc/rfc2616.txt">RFC 2616.
 
    
 
-
    
+
    
 Here are a few examples with the simple interface:
 
    
 
-
    +
     -- load the http module
 local io = require("io")
 local http = require("socket.http")
@@ -219,15 +221,15 @@ local ltn12 = require("ltn12")
 
 -- connect to server "www.cs.princeton.edu" and retrieves this manual
 -- file from "~diego/professional/luasocket/http.html" and print it to stdout
-http.request{ 
-    url = "http://www.cs.princeton.edu/~diego/professional/luasocket/http.html", 
+http.request{
+    url = "http://www.cs.princeton.edu/~diego/professional/luasocket/http.html",
     sink = ltn12.sink.file(io.stdout)
 }
 
 -- connect to server "www.example.com" and tries to retrieve
 -- "/private/index.html". Fails because authentication is needed.
 b, c, h = http.request("http://www.example.com/private/index.html")
--- b returns some useless page telling about the denied access, 
+-- b returns some useless page telling about the denied access,
 -- h returns authentication information
 -- and c returns with value 401 (Authentication Required)
 
@@ -237,11 +239,11 @@ r, e = http.request("http://wrong.host/")
 -- r is nil, and e returns with value "host not found"
 
    
 
-
    
+
    
 And here is an example using the generic interface:
 
    
 
-
    +
     -- load the http module
 http = require("socket.http")
 
@@ -263,7 +265,7 @@ r, c, h = http.request {
 -- }
 
    
 
-
     
+
    
 Note: When sending a POST request, simple interface adds a
 "Content-type: application/x-www-form-urlencoded"
 header to the request. This is the type used by
@@ -271,21 +273,21 @@ HTML forms. If you need another type, use the generic
 interface.
 
    
 
-
     
+
    
 Note: Some URLs are protected by their
 servers from anonymous download. For those URLs, the server must receive
 some  sort of  authentication along  with the  request or  it will  deny
-download and return status "401 Authentication Required". 
+download and return status "401 Authentication Required".
 
    
 
-
    
+
    
 The  HTTP/1.1 standard  defines  two authentication  methods: the  Basic
 Authentication  Scheme  and  the   Digest  Authentication  Scheme,  both
 explained in detail in
 RFC 2068.
 
    
 
-
    The Basic  Authentication   Scheme  sends   
+
    The Basic  Authentication   Scheme  sends
 <user>  and
 <password>  unencrypted to  the server  and is  therefore
 considered unsafe.  Unfortunately, by  the time of  this implementation,
@@ -294,7 +296,7 @@ Therefore,   this  is   the  method   used  by   the  toolkit   whenever
 authentication is required.
 
    
 
-
    +
     -- load required modules
 http = require("socket.http")
 mime = require("mime")
@@ -314,15 +316,15 @@ r, c = http.request {
 
 
 
-
    
+
    
 
    
 
    
-
    
+
    
 home ·
 download ·
 installation ·
 introduction ·
-reference 
+reference
 
    
 
    
 
diff --git a/doc/index.html b/doc/index.html
index 7d81b41..e92b4d4 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -1,4 +1,4 @@
-
 
 
@@ -13,22 +13,22 @@
 
 
 
-
    
+
    
 
    
 
    
 
-
-
    
-LuaSocket
+
    
+LuaSocket
 
    Network support for the Lua language
+
    Network support for the Lua language
 
    
 
    
-
    
+
    
 home ·
 download ·
 installation ·
 introduction ·
-reference 
+reference
 
    
 
    
 
    
@@ -36,13 +36,13 @@
 
 
 
-
    What is LuaSocket?
    
+
    What is LuaSocket?
    
 
 
    
 LuaSocket  is a  Lua  extension library
 that is composed by two parts: a C core that provides  support for the TCP
 and UDP transport layers, and a set of Lua modules that add support for
-functionality commonly needed by applications that deal with the Internet. 
+functionality commonly needed by applications that deal with the Internet.
 
    
 
 
    
@@ -52,43 +52,43 @@ properly initialized by the interpreter in use. The code has been tested
 and runs well on several Windows and UNIX platforms. 
    
 
 
    
-Among the support modules, the most commonly used implement the 
-SMTP
-(sending  e-mails),  
-HTTP
-(WWW access)  and  
-FTP  
+Among the support modules, the most commonly used implement the
+SMTP
+(sending  e-mails),
+HTTP
+(WWW access)  and
+FTP
 (uploading  and downloading files) client
 protocols. These provide a very natural and generic interface to the
-functionality defined by each protocol. 
-In addition, you will find that the 
-MIME (common encodings), 
-URL 
-(anything you could possible want to do with one) and 
-LTN12 
-(filters, sinks, sources and pumps) modules can be very handy. 
+functionality defined by each protocol.
+In addition, you will find that the
+MIME (common encodings),
+URL
+(anything you could possible want to do with one) and
+LTN12
+(filters, sinks, sources and pumps) modules can be very handy.
 
    
 
 
    
-The library is available under the same  
+The library is available under the same
 
 terms and conditions as the Lua language, the MIT license. The idea is
-that if you can use Lua in a project, you should also be able to use 
+that if you can use Lua in a project, you should also be able to use
 LuaSocket.
 
    
 
 
    
 Copyright © 1999-2013 Diego Nehab. All rights reserved. 
    
-Author: Diego Nehab
+Author: Diego Nehab
 
    
 
 
 
-
    Download
    
+
    Download
    
 
 
    
-LuaSocket version 3.0-rc1 is now available for download! 
-It is compatible with  Lua 5.1 and 5.2, and has    
+LuaSocket version 3.0-rc1 is now available for download!
+It is compatible with  Lua 5.1 and 5.2, and has
 been tested on Windows XP, Linux, and Mac OS X. Chances
 are it works well on most UNIX distributions and Windows flavors.
 
    
@@ -96,19 +96,19 @@ are it works well on most UNIX distributions and Windows flavors.
 
    
 The current version of the library can be found at
 the LuaSocket
-project page on GitHub. Besides the full C and Lua source code 
-for the library, the distribution contains several examples, 
+project page on GitHub. Besides the full C and Lua source code
+for the library, the distribution contains several examples,
 this user's manual and basic test procedures.
 
    
 
 
     Take a look at the installation section of the
+href="installation.html">installation section of the
 manual to find out how to properly install the library.
 
    
 
 
 
-
    Special thanks
    
+
    Special thanks
    
 
 
    
 This marks the first release of LuaSocket that
@@ -118,85 +118,85 @@ convinced me it was time for a release including IPv6 and
 Lua 5.2 support. It was more work than we anticipated.
 Special thanks to Sam Roberts, Florian Zeitz, and Paul
 Aurich, Liam Devine, Alexey Melnichuk, and everybody else
-that has helped bring this library back to life. 
+that has helped bring this library back to life.
 
    
 
 
 
-
    What's New
    
+
    What's New
    
 
 
    
 Main changes for LuaSocket 3.0-rc1 are IPv6 support
-and Lua 5.2 compatibility. 
+and Lua 5.2 compatibility.
 
    
 
 
      
-
    •  Added: Compatible with Lua 5.2 
+
    •  Added: Compatible with Lua 5.2
      • 
 
        
 
      •  Note that unless you define LUA_COMPAT_MODULE,
-package tables will not be exported as globals!
+package tables will not be exported as globals!
        • 
 
      
-
    •  Added: IPv6 support;
+
    •  Added: IPv6 support;
      • 
 
        
-
      •  Socket.connect and socket.bind support IPv6 addresses;
+
      •  Socket.connect and socket.bind support IPv6 addresses;
        • 
 
      •  Getpeername and getsockname support
-IPv6 addresses, and return the socket family as a third value;
-
      •  URL module updated to support IPv6 host names;
-
      •  New socket.tcp6 and socket.udp6 functions;
-
      •  New socket.dns.getaddrinfo and 
-    socket.dns.getnameinfo functions;
+IPv6 addresses, and return the socket family as a third value;
        • 
+
      •  URL module updated to support IPv6 host names;
        • 
+
      •  New socket.tcp6 and socket.udp6 functions;
        • 
+
      •  New socket.dns.getaddrinfo and
+    socket.dns.getnameinfo functions;
        • 
 
      
-
    •  Added: getoption method;
-
    •  Fixed: url.unescape was returning additional values;
-
    •  Fixed: mime.qp, mime.unqp, 
+
    •  Added: getoption method;
      • 
+
    •  Fixed: url.unescape was returning additional values;
      • 
+
    •  Fixed: mime.qp, mime.unqp,
     mime.b64, and mime.unb64 could
-    mistaking their own stack slots for functions arguments;
-
    •  Fixed: Receiving zero-length datagram is now possible;
-
    •  Improved: Hidden all internal library symbols;
-
    •  Improved: Better error messages;
-
    •  Improved: Better documentation of socket options.
+    mistaking their own stack slots for functions arguments;
      • 
+
    •  Fixed: Receiving zero-length datagram is now possible;
      • 
+
    •  Improved: Hidden all internal library symbols;
      • 
+
    •  Improved: Better error messages;
      • 
+
    •  Improved: Better documentation of socket options.
      • 
 
    •  Fixed: manual sample of HTTP authentication now uses correct
-     "authorization" header (Alexandre Ittner);
-
    •  Fixed: failure on bind() was destroying the socket (Sam Roberts);
+     "authorization" header (Alexandre Ittner);
      • 
+
    •  Fixed: failure on bind() was destroying the socket (Sam Roberts);
      • 
 
    •  Fixed: receive() returns immediatelly if prefix can satisfy
-     bytes requested (M Joonas Pihlaja);
+     bytes requested (M Joonas Pihlaja);
      • 
 
    •  Fixed: multicast didn't work on Windows, or anywhere
-     else for that matter (Herbert Leuwer, Adrian Sietsma);
+     else for that matter (Herbert Leuwer, Adrian Sietsma);
      • 
 
    •  Fixed: select() now reports an error when called with more
-     sockets than FD_SETSIZE (Lorenzo Leonini);
+     sockets than FD_SETSIZE (Lorenzo Leonini);
      • 
 
    •  Fixed: manual links to home.html changed to index.html
-(Robert Hahn);
+(Robert Hahn);
      • 
 
    •  Fixed: mime.unb64() would return an empty string on results that started
-     with a null character (Robert Raschke);
-
    •  Fixed: HTTP now automatically redirects on 303 and 307 (Jonathan Gray);
+     with a null character (Robert Raschke);
      • 
+
    •  Fixed: HTTP now automatically redirects on 303 and 307 (Jonathan Gray);
      • 
 
    •  Fixed: calling sleep() with negative numbers could
-     block forever, wasting CPU. Now it returns immediately (MPB);
+     block forever, wasting CPU. Now it returns immediately (MPB);
      • 
 
    •  Improved: FTP commands are now sent in upper case to
-     help buggy servers (Anders Eurenius);
+     help buggy servers (Anders Eurenius);
      • 
 
    •  Improved: known headers now sent in canonic
-     capitalization to help buggy servers (Joseph Stewart);
-
    •  Improved: Clarified tcp:receive() in the manual (MPB);
-
    •  Improved: Decent makefiles (LHF).
-
    •  Fixed: RFC links in documentation now point to IETF (Cosmin Apreutesei).
+     capitalization to help buggy servers (Joseph Stewart);
      • 
+
    •  Improved: Clarified tcp:receive() in the manual (MPB);
      • 
+
    •  Improved: Decent makefiles (LHF).
      • 
+
    •  Fixed: RFC links in documentation now point to IETF (Cosmin Apreutesei).
      • 
 
    
 
 
 
-
    Old Versions
    
+
    Old Versions
    
 
 
    
 All  previous versions  of the  LuaSocket library  can be  downloaded 
 here. Although these  versions are  no longer  supported, they  are
-still available for those that have compatibility issues. 
+still available for those that have compatibility issues.
 
    
 
 
 
-
    
+
    
 
    
 
    
-
    
+
    
 download ·
 installation ·
 introduction ·
diff --git a/doc/ltn12.html b/doc/ltn12.html
index ee2502f..fe3e3a0 100644
--- a/doc/ltn12.html
+++ b/doc/ltn12.html
@@ -1,4 +1,4 @@
-
 
 
@@ -14,22 +14,22 @@ Pump, Support, Library">
 
 
 
-
    
+
    
 
    
 
    
 
-
-
    
-LuaSocket
+
    
+LuaSocket
 
    Network support for the Lua language
+
    Network support for the Lua language
 
    
 
    
-
    
+
    
 home ·
 download ·
 installation ·
 introduction ·
-reference 
+reference
 
    
 
    
 
    
@@ -37,7 +37,7 @@ Pump, Support, Library">
 
 
 
-
    LTN12
     
+
    LTN12
    
 
 
     The ltn12 namespace implements the ideas described in
 
@@ -46,11 +46,11 @@ functions. Please refer to the LTN for a deeper explanation of the
 functionality provided by this module.
 
    
 
-
     
+
    
 To obtain the ltn12 namespace, run:
 
    
 
-
    +
     -- loads the LTN21 module
 local ltn12 = require("ltn12")
 
    
@@ -61,32 +61,32 @@ local ltn12 = require("ltn12")
 
 
 
-
    
-ltn12.filter.chain(filter1, filter2 
+
    
+ltn12.filter.chain(filter1, filter2
 [, ... filterN])
 
    
 
-
    
+
    
 Returns a filter that passes all data it receives through each of a
-series of given filters. 
+series of given filters.
 
    
 
-
    
+
    
 Filter1 to filterN are simple
-filters. 
+filters.
 
    
 
-
    
+
    
 The function returns the chained filter.
 
    
 
-
    
+
    
 The nesting of filters can be arbitrary. For instance, the useless filter
 below doesn't do anything but return the data that was passed to it,
 unaltered.
 
    
 
-
    +
     -- load required modules
 local ltn12 = require("ltn12")
 local mime = require("mime")
@@ -102,26 +102,26 @@ id = ltn12.filter.chain(
 
 
 
-
    
+
    
 ltn12.filter.cycle(low [, ctx, extra])
 
    
 
-
    
+
    
 Returns a high-level filter that cycles though a low-level filter by
-passing it each chunk and updating a context between calls. 
+passing it each chunk and updating a context between calls.
 
    
 
-
    
-Low is the low-level filter to be cycled, 
+
    
+Low is the low-level filter to be cycled,
 ctx is the initial context and extra is any extra
 argument the low-level filter might take.
 
    
 
-
    
-The function returns the high-level filter. 
+
    
+The function returns the high-level filter.
 
    
 
-
    +
     -- load the ltn12 module
 local ltn12 = require("ltn12")
 
@@ -137,15 +137,15 @@ end
 
 
 
-
    
+
    
 ltn12.pump.all(source, sink)
 
    
 
-
    
-Pumps all data from a source to a sink. 
+
    
+Pumps all data from a source to a sink.
 
    
 
-
    
+
    
 If successful, the function returns a value that evaluates to
 true. In case
 of error, the function returns a false value, followed by an error message.
@@ -153,15 +153,15 @@ of error, the function returns a false value, followed by an err
 
 
 
-
    
+
    
 ltn12.pump.step(source, sink)
 
    
 
-
    
-Pumps one chunk of data from a source to a sink. 
+
    
+Pumps one chunk of data from a source to a sink.
 
    
 
-
    
+
    
 If successful, the function returns a value that evaluates to
 true. In case
 of error, the function returns a false value, followed by an error message.
@@ -173,52 +173,52 @@ of error, the function returns a false value, followed by an err
 
 
 
-
    
+
    
 ltn12.sink.chain(filter, sink)
 
    
 
-
    
-Creates and returns a new sink that passes data through a filter before sending it to a given sink. 
+
    
+Creates and returns a new sink that passes data through a filter before sending it to a given sink.
 
    
 
 
 
-
    
+
    
 ltn12.sink.error(message)
 
    
 
-
    
+
    
 Creates and returns a sink that aborts transmission with the error
 message.
 
    
 
 
 
-
    
+
    
 ltn12.sink.file(handle, message)
 
    
 
-
    
-Creates a sink that sends data to a file. 
+
    
+Creates a sink that sends data to a file.
 
    
 
-
    
-Handle is a file handle. If handle is nil, 
-message should give the reason for failure. 
+
    
+Handle is a file handle. If handle is nil,
+message should give the reason for failure.
 
    
 
-
    
+
    
 The function returns a sink that sends all data to the given handle
 and closes the file when done, or a sink that aborts the transmission with
 the error message
 
    
 
-
    
-In the following example, notice how the prototype is designed to 
+
    
+In the following example, notice how the prototype is designed to
 fit nicely with the io.open function.
 
    
 
-
    +
     -- load the ltn12 module
 local ltn12 = require("ltn12")
 
@@ -231,45 +231,45 @@ ltn12.pump.all(
 
 
 
-
    
+
    
 ltn12.sink.null()
 
    
 
-
    
-Returns a sink that ignores all data it receives. 
+
    
+Returns a sink that ignores all data it receives.
 
    
 
 
 
-
    
+
    
 ltn12.sink.simplify(sink)
 
    
 
-
    
-Creates and returns a simple sink given a fancy sink. 
+
    
+Creates and returns a simple sink given a fancy sink.
 
    
 
 
 
-
    
+
    
 ltn12.sink.table([table])
 
    
 
-
    
+
    
 Creates a sink that stores all chunks in a table. The chunks can later be
 efficiently concatenated into a single string.
 
    
 
-
    
+
    
 Table is used to hold the chunks. If
-nil, the function creates its own table. 
+nil, the function creates its own table.
 
    
 
-
    
-The function returns the sink and the table used to store the chunks. 
+
    
+The function returns the sink and the table used to store the chunks.
 
    
 
-
    +
     -- load needed modules
 local http = require("socket.http")
 local ltn12 = require("ltn12")
@@ -291,89 +291,89 @@ end
 
 
 
-
    
+
    
 ltn12.source.cat(source1 [, source2, ...,
 sourceN])
 
    
 
-
    
+
    
 Creates a new source that produces the concatenation of the data produced
-by a number of sources. 
+by a number of sources.
 
    
 
-
    
+
    
 Source1 to sourceN are the original
-sources. 
+sources.
 
    
 
-
    
+
    
 The function returns the new source.
 
    
 
 
 
-
    
+
    
 ltn12.source.chain(source, filter)
 
    
 
-
    
-Creates a new source that passes data through a filter 
-before returning it. 
+
    
+Creates a new source that passes data through a filter
+before returning it.
 
    
 
-
    
+
    
 The function returns the new source.
 
    
 
 
 
-
    
+
    
 ltn12.source.empty()
 
    
 
-
    
-Creates and returns an empty source. 
+
    
+Creates and returns an empty source.
 
    
 
 
 
-
    
+
    
 ltn12.source.error(message)
 
    
 
-
    
+
    
 Creates and returns a source that aborts transmission with the error
 message.
 
    
 
 
 
-
    
+
    
 ltn12.source.file(handle, message)
 
    
 
-
    
-Creates a source that produces the contents of a file. 
+
    
+Creates a source that produces the contents of a file.
 
    
 
-
    
-Handle is a file handle. If handle is nil, 
-message should give the reason for failure. 
+
    
+Handle is a file handle. If handle is nil,
+message should give the reason for failure.
 
    
 
-
    
-The function returns a source that reads chunks of data from 
+
    
+The function returns a source that reads chunks of data from
 given handle and returns it to the user,
 closing the file when done, or a source that aborts the transmission with
 the error message
 
    
 
-
    
-In the following example, notice how the prototype is designed to 
+
    
+In the following example, notice how the prototype is designed to
 fit nicely with the io.open function.
 
    
 
-
    +
     -- load the ltn12 module
 local ltn12 = require("ltn12")
 
@@ -386,41 +386,41 @@ ltn12.pump.all(
 
 
 
-
    
+
    
 ltn12.source.simplify(source)
 
    
 
-
    
-Creates and returns a simple source given a fancy source. 
+
    
+Creates and returns a simple source given a fancy source.
 
    
 
 
 
-
    
+
    
 ltn12.source.string(string)
 
    
 
-
    
+
    
 Creates and returns a source that produces the contents of a
-string, chunk by chunk. 
+string, chunk by chunk.
 
    
 
 
 
-
    
+
    
 ltn12.source.table(table)
 
    
 
-
    
+
    
 Creates and returns a source that produces the numerically-indexed values of a table successively beginning at 1.  The source returns nil (end-of-stream) whenever a nil value is produced by the current index, which proceeds forward regardless.
 
    
 
 
 
-
    
+
    
 
    
 
    
-
    
+
    
 home ·
 download ·
 installation ·
diff --git a/doc/mime.html b/doc/mime.html
index 8cb3507..ff4d8e8 100644
--- a/doc/mime.html
+++ b/doc/mime.html
@@ -1,10 +1,10 @@
-
 
 
 
 
- 
+
 LuaSocket: MIME module
 
 
@@ -13,22 +13,22 @@
 
 
 
-
    
+
    
 
    
 
    
 
-
-
    
-LuaSocket
+
    
+LuaSocket
 
    Network support for the Lua language
+
    Network support for the Lua language
 
    
 
    
-
    
+
    
 home ·
 download ·
 installation ·
 introduction ·
-reference 
+reference
 
    
 
    
 
    
@@ -36,14 +36,14 @@
 
 
 
-
    MIME
     
+
    MIME
    
 
 
    
 The mime namespace offers filters that apply and remove common
 content transfer encodings, such as Base64 and Quoted-Printable.
 It also provides functions to break text into lines and change
 the end-of-line convention.
-MIME is described mainly in 
+MIME is described mainly in
 RFC 2045,
 2046,
 2047,
@@ -52,17 +52,17 @@ MIME is described mainly in
 
    
 
 
    
-All functionality provided by the MIME module 
-follows the ideas presented in 
+All functionality provided by the MIME module
+follows the ideas presented in
 
-LTN012, Filters sources and sinks. 
+LTN012, Filters sources and sinks.
 
    
 
-
     
+
    
 To obtain the mime namespace, run:
 
    
 
-
    +
     -- loads the MIME module and everything it requires
 local mime = require("mime")
 
    
@@ -70,60 +70,60 @@ local mime = require("mime")
 
 
 
-
    High-level filters
    
+
    High-level filters
    
 
 
 
 
-
    
+
    
 mime.decode("base64")
    
 mime.decode("quoted-printable")
 
    
 
-
    
+
    
 Returns a filter that decodes data from a given transfer content
 encoding.
 
    
 
 
 
-
    
+
    
 mime.encode("base64")
    
 mime.encode("quoted-printable" [, mode])
 
    
 
-
    
+
    
 Returns a filter that encodes data according to a given transfer content
 encoding.
 
    
 
-
    
+
    
 In the Quoted-Printable case, the user can specify whether the data is
 textual or binary, by passing the mode strings "text" or
 "binary". Mode defaults to "text".
 
    
 
-
    
+
    
 Although both transfer content encodings specify a limit for the line
 length, the encoding filters do not break text into lines (for
-added flexibility). 
+added flexibility).
 Below is a filter that converts binary data to the Base64 transfer content
 encoding and breaks it into lines of the correct size.
 
    
 
-
    +
     base64 = ltn12.filter.chain(
   mime.encode("base64"),
   mime.wrap("base64")
 )
 
    
 
-
    
+
    
 Note: Text data has to be converted to canonic form
 before being encoded.
 
    
 
-
    +
     base64 = ltn12.filter.chain(
   mime.normalize(),
   mime.encode("base64"),
@@ -133,77 +133,77 @@ base64 = ltn12.filter.chain(
 
 
 
-
    
+
    
 mime.normalize([marker])
 
    
 
-
    
-Converts most common end-of-line markers to a specific given marker. 
+
    
+Converts most common end-of-line markers to a specific given marker.
 
    
 
-
    
-Marker is the new marker. It defaults to CRLF, the canonic 
+
    
+Marker is the new marker. It defaults to CRLF, the canonic
 end-of-line marker defined by the MIME standard.
 
    
 
-
    
-The function returns a filter that performs the conversion. 
+
    
+The function returns a filter that performs the conversion.
 
    
 
-
    
+
    
 Note: There is no perfect solution to this problem. Different end-of-line
-markers are an evil that will probably plague developers forever. 
+markers are an evil that will probably plague developers forever.
 This function, however, will work perfectly for text created with any of
-the most common end-of-line markers, i.e. the Mac OS (CR), the Unix (LF), 
+the most common end-of-line markers, i.e. the Mac OS (CR), the Unix (LF),
 or the DOS (CRLF) conventions. Even if the data has mixed end-of-line
-markers, the function will still work well, although it doesn't 
+markers, the function will still work well, although it doesn't
 guarantee that the number of empty lines will be correct.
 
    
 
 
 
-
    
+
    
 mime.stuff()
    
 
    
 
-
    
+
    
 Creates and returns a filter that performs stuffing of SMTP messages.
 
    
 
-
    
-Note: The smtp.send function 
+
    
+Note: The smtp.send function
 uses this filter automatically. You don't need to chain it with your
-source, or apply it to your message body.  
+source, or apply it to your message body.
 
    
 
 
 
-
    
+
    
 mime.wrap("text" [, length])
    
 mime.wrap("base64")
    
 mime.wrap("quoted-printable")
 
    
 
-
    
-Returns a filter that breaks data into lines. 
+
    
+Returns a filter that breaks data into lines.
 
    
 
-
    
-The "text" line-wrap filter simply breaks text into lines by 
-inserting CRLF end-of-line markers at appropriate positions. 
-Length defaults 76. 
+
    
+The "text" line-wrap filter simply breaks text into lines by
+inserting CRLF end-of-line markers at appropriate positions.
+Length defaults 76.
 The "base64" line-wrap filter works just like the default
-"text" line-wrap filter with default length. 
+"text" line-wrap filter with default length.
 The function can also wrap "quoted-printable" lines, taking care
 not to break lines in the middle of an escaped character. In that case, the
 line length is fixed at 76.
 
    
 
-
    
+
    
 For example, to create an encoding filter for the Quoted-Printable transfer content encoding of text data, do the following:
 
    
 
-
    +
     qp = ltn12.filter.chain(
   mime.normalize(),
   mime.encode("quoted-printable"),
@@ -211,155 +211,155 @@ qp = ltn12.filter.chain(
 )
 
    
 
-
    
+
    
 Note: To break into lines with a different end-of-line convention, apply
-a normalization filter after the line break filter. 
+a normalization filter after the line break filter.
 
    
 
 
 
-
    Low-level filters
    
+
    Low-level filters
    
 
 
 
-
    
+
    
 A, B = mime.b64(C [, D])
 
    
 
-
    
-Low-level filter to perform Base64 encoding. 
+
    
+Low-level filter to perform Base64 encoding.
 
    
 
-
    
-A is the encoded version of the largest prefix of 
-C..D 
-that can be encoded unambiguously. B has the remaining bytes of 
-C..D, before encoding. 
-If D is nil, A is padded with 
-the encoding of the remaining bytes of C. 
+
    
+A is the encoded version of the largest prefix of
+C..D
+that can be encoded unambiguously. B has the remaining bytes of
+C..D, before encoding.
+If D is nil, A is padded with
+the encoding of the remaining bytes of C.
 
    
 
-
    
+
    
 Note: The simplest use of this function is to encode a string into it's
 Base64 transfer content encoding. Notice the extra parenthesis around the
 call to mime.b64, to discard the second return value.
 
    
 
-
    +
     print((mime.b64("diego:password")))
 --> ZGllZ286cGFzc3dvcmQ=
 
    
 
 
-
    
+
    
 A, n = mime.dot(m [, B])
 
    
 
-
    
+
    
 Low-level filter to perform SMTP stuffing and enable transmission of
-messages containing the sequence "CRLF.CRLF". 
+messages containing the sequence "CRLF.CRLF".
 
    
 
-
    
+
    
 A is the stuffed version of B. 'n' gives the
 number of characters from the sequence CRLF seen in the end of B.
 'm' should tell the same, but for the previous chunk.
 
    
 
-
    Note: The message body is defined to begin with 
+
    Note: The message body is defined to begin with
 an implicit CRLF. Therefore, to stuff a message correctly, the
-first m should have the value 2. 
+first m should have the value 2.
 
    
 
-
    +
     print((string.gsub(mime.dot(2, ".\r\nStuffing the message.\r\n.\r\n."), "\r\n", "\\n")))
 --> ..\nStuffing the message.\n..\n..
 
    
 
-
    
-Note: The smtp.send function 
-uses this filter automatically. You don't need to 
-apply it again. 
+
    
+Note: The smtp.send function
+uses this filter automatically. You don't need to
+apply it again.
 
    
 
 
 
-
    
+
    
 A, B = mime.eol(C [, D, marker])
 
    
 
-
    
-Low-level filter to perform end-of-line marker translation. 
+
    
+Low-level filter to perform end-of-line marker translation.
 For each chunk, the function needs to know if the last character of the
 previous chunk could be part of an end-of-line marker or not. This is the
 context the function receives besides the chunk.  An updated version of
-the context is returned after each new chunk. 
+the context is returned after each new chunk.
 
    
 
-
    
+
    
 A is the translated version of D. C is the
 ASCII value of the last character of the previous chunk, if it was a
-candidate for line break, or 0 otherwise. 
+candidate for line break, or 0 otherwise.
 B is the same as C, but for the current
 chunk. Marker gives the new end-of-line marker and defaults to CRLF.
 
    
 
-
    +
     -- translates the end-of-line marker to UNIX
-unix = mime.eol(0, dos, "\n") 
+unix = mime.eol(0, dos, "\n")
 
    
 
 
 
-
    
+
    
 A, B = mime.qp(C [, D, marker])
 
    
 
-
    
-Low-level filter to perform Quoted-Printable encoding. 
+
    
+Low-level filter to perform Quoted-Printable encoding.
 
    
 
-
    
-A is the encoded version of the largest prefix of 
-C..D 
-that can be encoded unambiguously. B has the remaining bytes of 
-C..D, before encoding. 
-If D is nil, A is padded with 
-the encoding of the remaining bytes of C. 
-Throughout encoding, occurrences of CRLF are replaced by the 
+
    
+A is the encoded version of the largest prefix of
+C..D
+that can be encoded unambiguously. B has the remaining bytes of
+C..D, before encoding.
+If D is nil, A is padded with
+the encoding of the remaining bytes of C.
+Throughout encoding, occurrences of CRLF are replaced by the
 marker, which itself defaults to CRLF.
 
    
 
-
    
+
    
 Note: The simplest use of this function is to encode a string into it's
-Quoted-Printable transfer content encoding. 
+Quoted-Printable transfer content encoding.
 Notice the extra parenthesis around the call to mime.qp, to discard the second return value.
 
    
 
-
    -print((mime.qp("maçã")))
+
    +print((mime.qp("ma��")))
 --> ma=E7=E3=
 
    
 
 
 
-
    
+
    
 A, m = mime.qpwrp(n [, B, length])
 
    
 
-
    
-Low-level filter to break Quoted-Printable text into lines. 
+
    
+Low-level filter to break Quoted-Printable text into lines.
 
    
 
-
    
-A is a copy of B, broken into lines of at most 
-length bytes (defaults to 76). 
-'n' should tell how many bytes are left for the first 
-line of B and 'm' returns the number of bytes 
-left in the last line of A. 
+
    
+A is a copy of B, broken into lines of at most
+length bytes (defaults to 76).
+'n' should tell how many bytes are left for the first
+line of B and 'm' returns the number of bytes
+left in the last line of A.
 
    
 
-
    
+
    
 Note: Besides breaking text into lines, this function makes sure the line
 breaks don't fall in the middle of an escaped character combination. Also,
 this function only breaks lines that are bigger than length bytes.
@@ -367,86 +367,86 @@ this function only breaks lines that are bigger than length bytes.
 
 
 
-
    
+
    
 A, B = mime.unb64(C [, D])
 
    
 
-
    
-Low-level filter to perform Base64 decoding. 
+
    
+Low-level filter to perform Base64 decoding.
 
    
 
-
    
-A is the decoded version of the largest prefix of 
-C..D 
-that can be decoded unambiguously. B has the remaining bytes of 
-C..D, before decoding. 
+
    
+A is the decoded version of the largest prefix of
+C..D
+that can be decoded unambiguously. B has the remaining bytes of
+C..D, before decoding.
 If D is nil, A is the empty string
-and B returns whatever couldn't be decoded. 
+and B returns whatever couldn't be decoded.
 
    
 
-
    
+
    
 Note: The simplest use of this function is to decode a string from it's
-Base64 transfer content encoding. 
+Base64 transfer content encoding.
 Notice the extra parenthesis around the call to mime.unqp, to discard the second return value.
 
    
 
-
    +
     print((mime.unb64("ZGllZ286cGFzc3dvcmQ=")))
 --> diego:password
 
    
 
 
 
-
    
+
    
 A, B = mime.unqp(C [, D])
 
    
 
-
    
+
    
 Low-level filter to remove the Quoted-Printable transfer content encoding
-from data. 
+from data.
 
    
 
-
    
-A is the decoded version of the largest prefix of 
-C..D 
-that can be decoded unambiguously. B has the remaining bytes of 
-C..D, before decoding. 
-If D is nil, A is augmented with 
-the encoding of the remaining bytes of C. 
+
    
+A is the decoded version of the largest prefix of
+C..D
+that can be decoded unambiguously. B has the remaining bytes of
+C..D, before decoding.
+If D is nil, A is augmented with
+the encoding of the remaining bytes of C.
 
    
 
-
    
+
    
 Note: The simplest use of this function is to decode a string from it's
-Quoted-Printable transfer content encoding. 
+Quoted-Printable transfer content encoding.
 Notice the extra parenthesis around the call to mime.unqp, to discard the second return value.
 
    
 
-
    +
     print((mime.qp("ma=E7=E3=")))
---> maçã
+--> ma��
 
    
 
 
 
-
    
+
    
 A, m = mime.wrp(n [, B, length])
 
    
 
-
    
-Low-level filter to break text into lines with CRLF marker. 
-Text is assumed to be in the normalize form.
+
    
+Low-level filter to break text into lines with CRLF marker.
+Text is assumed to be in the normalize form.
 
    
 
-
    
-A is a copy of B, broken into lines of at most 
-length bytes (defaults to 76). 
-'n' should tell how many bytes are left for the first 
-line of B and 'm' returns the number of bytes 
-left in the last line of A. 
+
    
+A is a copy of B, broken into lines of at most
+length bytes (defaults to 76).
+'n' should tell how many bytes are left for the first
+line of B and 'm' returns the number of bytes
+left in the last line of A.
 
    
 
-
    
-Note: This function only breaks lines that are bigger than 
+
    
+Note: This function only breaks lines that are bigger than
 length bytes. The resulting line length does not include the CRLF
 marker.
 
    
@@ -454,10 +454,10 @@ marker.
 
 
 
-
    
+
    
 
    
 
    
-
    
+
    
 home ·
 download ·
 installation ·
diff --git a/doc/reference.html b/doc/reference.html
index 163a8a2..2bc5f78 100644
--- a/doc/reference.html
+++ b/doc/reference.html
@@ -1,11 +1,11 @@
-
 
 
 
 
  
+Support, Manual">
 LuaSocket: Index to reference manual
 
 
@@ -14,22 +14,22 @@ Support, Manual">
 
 
 
-
    
+
    
 
    
 
    
 
-
-
    
-LuaSocket
+
    
+LuaSocket
 
    Network support for the Lua language
+
    Network support for the Lua language
 
    
 
    
-
    
+
    
 home ·
 download ·
 installation ·
 introduction ·
-reference 
+reference
 
    
 
    
 
    
@@ -92,7 +92,7 @@ Support, Manual">
 table.
 
    
 
    
-source: 
+source:
 cat,
 chain,
 empty,
@@ -238,10 +238,10 @@ Support, Manual">
 
 
 
-
    
+
    
 
    
 
    
-
    
+
    
 home ·
 download ·
 installation ·
diff --git a/doc/smtp.html b/doc/smtp.html
index 600ec37..787d0b1 100644
--- a/doc/smtp.html
+++ b/doc/smtp.html
@@ -1,11 +1,11 @@
-
 
 
 
 
  
+Library, Support">
 LuaSocket: SMTP support
 
 
@@ -14,22 +14,22 @@ Library, Support">
 
 
 
-
    
+
    
 
    
 
    
 
-
-
    
-LuaSocket
+
    
+LuaSocket
 
    Network support for the Lua language
+
    Network support for the Lua language
 
    
 
    
-
    
+
    
 home ·
 download ·
 installation ·
 introduction ·
-reference 
+reference
 
    
 
    
 
    
@@ -37,14 +37,14 @@ Library, Support">
 
 
 
-
    SMTP
     
+
    SMTP
    
 
 
     The  smtp namespace provides functionality to send e-mail
-messages. The high-level API consists of two functions: one to 
+messages. The high-level API consists of two functions: one to
 define an e-mail message, and another to actually send the message.
 Although almost all users will find that these functions provide more than
 enough functionality, the underlying implementation allows for even more
-control (if you bother to read the code).  
+control (if you bother to read the code).
 
    
 
 
    The implementation conforms to the Simple Mail Transfer Protocol,
@@ -54,19 +54,19 @@ href="http://www.ietf.org/rfc/rfc2822.txt">RFC 2822,
 which governs the Internet Message Format.
 Multipart messages (those that contain attachments) are part
 of the MIME standard, but described mainly
-in RFC 2046
+in RFC 2046.
    
 
 
     In the description below, good understanding of  LTN012, Filters
-sources and sinks and the  MIME module is
-assumed.  In fact, the SMTP module was the main reason for their 
+sources and sinks and the  MIME module is
+assumed.  In fact, the SMTP module was the main reason for their
 creation. 
    
 
-
     
+
    
 To obtain the smtp namespace, run:
 
    
 
-
    +
     -- loads the SMTP module and everything it requires
 local smtp = require("socket.smtp")
 
    
@@ -92,40 +92,40 @@ headers = {
    
 
    
 Field names are case insensitive (as specified by the standard) and all
 functions work with lowercase field names (but see
-socket.headers.canonic).
+socket.headers.canonic).
 Field values are left unmodified.
 
    
 
-
    
+
    
 Note: MIME headers are independent of order. Therefore, there is no problem
-in representing them in a Lua table. 
+in representing them in a Lua table.
 
    
 
 
    
 The following constants can be set to control the default behavior of
-the SMTP module: 
+the SMTP module:
 
    
 
 
      
-
    •  DOMAIN: domain used to greet the server;
-
    •  PORT: default port used for the connection;
-
    •  SERVER: default server used for the connection;
-
    •  TIMEOUT: default timeout for all I/O operations;
-
    •  ZONE: default time zone.
+
    •  DOMAIN: domain used to greet the server;
      • 
+
    •  PORT: default port used for the connection;
      • 
+
    •  SERVER: default server used for the connection;
      • 
+
    •  TIMEOUT: default timeout for all I/O operations;
      • 
+
    •  ZONE: default time zone.
      • 
 
    
 
 
 
-
     
+
    
 smtp.message(mesgt)
 
    
 
-
    
+
    
 Returns a simple
-LTN12 source that sends an SMTP message body, possibly multipart (arbitrarily deep). 
+LTN12 source that sends an SMTP message body, possibly multipart (arbitrarily deep).
 
    
 
-
    
+
    
 The only parameter of the function is a table describing the message.
 Mesgt has the following form (notice the recursive structure):
 
    
@@ -135,7 +135,7 @@ The only parameter of the function is a table describing the message.
 
 mesgt = {
    
   headers = header-table,
    
-  body = LTN12 source or string or 
+  body = LTN12 source or string or
 multipart-mesgt
    
 }
    
  
    
@@ -151,36 +151,36 @@ multipart-mesgt = {
    
 
 
    
 
-
    
+
    
 For a simple message, all that is needed is a set of headers
 and the body. The message body can be given as a string
-or as a simple 
-LTN12 
+or as a simple
+LTN12
 source. For multipart messages, the body is a table that
 recursively defines each part as an independent message, plus an optional
 preamble and epilogue.
 
    
 
-
     
-The function returns a simple 
-LTN12 
+
    
+The function returns a simple
+LTN12
 source that produces the
-message contents as defined by mesgt, chunk by chunk. 
+message contents as defined by mesgt, chunk by chunk.
 Hopefully, the following
 example will make things clear. When in doubt, refer to the appropriate RFC
 as listed in the introduction.  
    
 
-
    +
     -- load the smtp support and its friends
 local smtp = require("socket.smtp")
 local mime = require("mime")
 local ltn12 = require("ltn12")
 
--- creates a source to send a message with two parts. The first part is 
+-- creates a source to send a message with two parts. The first part is
 -- plain text, the second part is a PNG image, encoded as base64.
 source = smtp.message{
   headers = {
-     -- Remember that headers are *ignored* by smtp.send. 
+     -- Remember that headers are *ignored* by smtp.send.
      from = "Sicrano de Oliveira <sicrano@example.com>",
      to = "Fulano da Silva <fulano@example.com>",
      subject = "Here is a message with attachments"
@@ -191,20 +191,20 @@ source = smtp.message{
                "Preamble will probably appear even in a MIME enabled client.",
     -- first part: no headers means plain text, us-ascii.
     -- The mime.eol low-level filter normalizes end-of-line markers.
-    [1] = { 
+    [1] = {
       body = mime.eol(0, [[
-        Lines in a message body should always end with CRLF. 
-        The smtp module will *NOT* perform translation. However, the 
+        Lines in a message body should always end with CRLF.
+        The smtp module will *NOT* perform translation. However, the
         send function *DOES* perform SMTP stuffing, whereas the message
         function does *NOT*.
       ]])
     },
-    -- second part: headers describe content to be a png image, 
+    -- second part: headers describe content to be a png image,
     -- sent under the base64 transfer content encoding.
-    -- notice that nothing happens until the message is actually sent. 
-    -- small chunks are loaded into memory right before transmission and 
+    -- notice that nothing happens until the message is actually sent.
+    -- small chunks are loaded into memory right before transmission and
     -- translation happens on the fly.
-    [2] = { 
+    [2] = {
       headers = {
         ["content-type"] = 'image/png; name="image.png"',
         ["content-disposition"] = 'attachment; filename="image.png"',
@@ -234,7 +234,7 @@ r, e = smtp.send{
 
 
 
-
     
+
    
 smtp.send{
    
   from = string,
    
   rcpt = string or string-table,
    
@@ -249,53 +249,53 @@ smtp.send{
    
 }
 
    
 
-
    
+
    
 Sends a message to a recipient list. Since sending messages is not as
-simple as downloading an URL from a FTP or HTTP server, this function 
-doesn't have a simple interface. However, see the 
-message source factory for 
+simple as downloading an URL from a FTP or HTTP server, this function
+doesn't have a simple interface. However, see the
+message source factory for
 a very powerful way to define the message contents.
 
    
 
 
-
    
-The sender is given by the e-mail address in the from field. 
+
    
+The sender is given by the e-mail address in the from field.
 Rcpt is a Lua table with one entry for each recipient e-mail
 address, or a string
-in case there is just one recipient. 
-The contents of the message are given by a simple 
-LTN12 
+in case there is just one recipient.
+The contents of the message are given by a simple
+LTN12
 source. Several arguments are optional:
 
    
 
      
 
    •  user, password: User and password for
 authentication. The function will attempt LOGIN and PLAIN authentication
-methods if supported by the server (both are unsafe);
-
    •  server: Server to connect to. Defaults to "localhost";
-
    •  port: Port to connect to. Defaults to 25;
+methods if supported by the server (both are unsafe);
      • 
+
    •  server: Server to connect to. Defaults to "localhost";
      • 
+
    •  port: Port to connect to. Defaults to 25;
      • 
 
    •  domain: Domain name used to greet the server; Defaults to the
-local machine host name; 
-
    •  step: 
-LTN12 
+local machine host name;
      • 
+
    •  step:
+LTN12
 pump step function used to pass data from the
-source to the server. Defaults to the LTN12 pump.step function;
+source to the server. Defaults to the LTN12 pump.step function;
      • 
 
    • create: An optional function to be used instead of
-socket.tcp when the communications socket is created. 
+socket.tcp when the communications socket is created.
      • 
 
    
 
-
     
+
    
 If  successful, the function returns 1. Otherwise, the function returns
 nil followed by an error message.
 
    
 
-
    
+
    
 Note: SMTP servers can be very picky with the format of e-mail
 addresses. To be safe, use only addresses of the form
 "<fulano@example.com>" in the from and
 rcpt arguments to the send function. In headers, e-mail
 addresses can take whatever form you like.  
    
 
-
    
+
    
 Big note: There is a good deal of misconception with the use of the
 destination address field headers, i.e., the 'To', 'Cc',
 and, more importantly, the 'Bcc' headers. Do not add a
@@ -303,68 +303,69 @@ and, more importantly, the 'Bcc' headers. Do not add a
 exact opposite of what you expect.
 
    
 
-
    
+
    
 Only recipients specified in the rcpt list will receive a copy of the
 message.  Each recipient of an SMTP mail message receives a copy of the
 message body along with the headers, and nothing more.  The headers
-are part of the message and should be produced by the 
-LTN12 
+are part of the message and should be produced by the
+LTN12
 source function. The rcpt list is not
 part of the message and will not be sent to anyone.
 
    
 
-
    
+
    
 RFC 2822
 has two important and short sections, "3.6.3. Destination address
 fields" and "5. Security considerations",  explaining the proper
-use of these headers. Here is a summary of what it says: 
+use of these headers. Here is a summary of what it says:
 
    
 
 
      
 
    •  To: contains the address(es) of the primary recipient(s)
-of the message;
+of the message;
      • 
 
    •  Cc: (where the "Cc" means "Carbon Copy" in the sense of
 making a copy on a typewriter using carbon paper) contains the
 addresses of others who are to receive the message, though the
-content of the message may not be directed at them;
+content of the message may not be directed at them;
      • 
 
    •  Bcc: (where the "Bcc" means "Blind Carbon
-Copy") contains addresses of recipients of the message whose addresses are not to be revealed to other recipients of the message.
-
     
+Copy") contains addresses of recipients of the message whose addresses are not
+to be revealed to other recipients of the message.
    • + -

    -The LuaSocket send function does not care or interpret the -headers you send, but it gives you full control over what is sent and +

    +The LuaSocket send function does not care or interpret the +headers you send, but it gives you full control over what is sent and to whom it is sent:

    • If someone is to receive the message, the e-mail address has to be in the recipient list. This is the only parameter that controls who -gets a copy of the message; -
    • If there are multiple recipients, none of them will automatically +gets a copy of the message;
      • +
    • If there are multiple recipients, none of them will automatically know that someone else got that message. That is, the default behavior is -similar to the Bcc field of popular e-mail clients; +similar to the Bcc field of popular e-mail clients;
    • It is up to you to add the To header with the list of primary -recipients so that other recipients can see it; -
    • It is also up to you to add the Cc header with the -list of additional recipients so that everyone else sees it; -
    • Adding a header Bcc is nonsense, unless it is +recipients so that other recipients can see it;
      • +
    • It is also up to you to add the Cc header with the +list of additional recipients so that everyone else sees it;
      • +
    • Adding a header Bcc is nonsense, unless it is empty. Otherwise, everyone receiving the message will see it and that is -exactly what you don't want to happen! +exactly what you don't want to happen!
    -

    -I hope this clarifies the issue. Otherwise, please refer to +

    +I hope this clarifies the issue. Otherwise, please refer to RFC 2821 and RFC 2822.

    -
    +
     -- load the smtp support
 local smtp = require("socket.smtp")
 
 -- Connects to server "localhost" and sends a message to users
--- "fulano@example.com",  "beltrano@example.com", 
+-- "fulano@example.com",  "beltrano@example.com",
 -- and "sicrano@example.com".
 -- Note that "fulano" is the primary recipient, "beltrano" receives a
 -- carbon copy and neither of them knows that "sicrano" received a blind
@@ -388,17 +389,17 @@ mesgt = {
 
 r, e = smtp.send{
   from = from,
-  rcpt = rcpt, 
+  rcpt = rcpt,
   source = smtp.message(mesgt)
 }
 
    
 
 
 
-
    
+
    
 
    
 
    
-
    
+
    
 home ·
 download ·
 installation ·
diff --git a/doc/socket.html b/doc/socket.html
index 35f8391..68db7cc 100644
--- a/doc/socket.html
+++ b/doc/socket.html
@@ -1,10 +1,10 @@
-
 
 
 
 
- 
+
 LuaSocket: The socket namespace
 
 
@@ -13,22 +13,22 @@
 
 
 
-
    
+
    
 
    
 
    
 
-
-
    
-LuaSocket
+
    
+LuaSocket
 
    Network support for the Lua language
+
    Network support for the Lua language
 
    
 
    
-
    
+
    
 home ·
 download ·
 installation ·
 introduction ·
-reference 
+reference
 
    
 
    
 
    
@@ -36,71 +36,71 @@
 
 
 
-
    The socket namespace
     
+
    The socket namespace
    
 
 
    
-The socket namespace contains the core functionality of LuaSocket. 
+The socket namespace contains the core functionality of LuaSocket.
 
    
 
-
     
+
    
 To obtain the socket namespace, run:
 
    
 
-
    --- loads the socket module 
+
    +-- loads the socket module
 local socket = require("socket")
 
    
 
 
 
-
    
+
    
 socket.headers.canonic
    
 
-
     The socket.headers.canonic table 
-is used by the HTTP and SMTP modules to translate from 
-lowercase field names back into their canonic 
+
     The socket.headers.canonic table
+is used by the HTTP and SMTP modules to translate from
+lowercase field names back into their canonic
 capitalization. When a lowercase field name exists as a key
 in this table, the associated value is substituted in
 whenever the field name is sent out.
 
    
 
-
     
+
    
 You can obtain the headers namespace if case run-time
 modifications are required by running:
 
    
 
-
    --- loads the headers module 
+
    +-- loads the headers module
 local headers = require("headers")
 
    
 
 
 
 
-
     
+
    
 socket.bind(address, port [, backlog])
 
    
 
-
    
+
    
 This function is a shortcut that creates and returns a TCP server object
-bound to a local address and port, ready to 
+bound to a local address and port, ready to
 accept client connections. Optionally,
-user can also specify the backlog argument to the 
-listen method (defaults to 32). 
+user can also specify the backlog argument to the
+listen method (defaults to 32).
 
    
 
-
    
-Note: The server object returned will have the option "reuseaddr" 
+
    
+Note: The server object returned will have the option "reuseaddr"
 set to true.
 
    
 
 
 
-
     
+
    
 socket.connect[46](address, port [, locaddr] [, locport] [, family])
 
    
 
-
    
+
    
 This function is a shortcut that creates and returns a TCP client object
 connected to a remote address at a given port. Optionally,
 the user can also specify the local address and port to bind
@@ -114,40 +114,40 @@ of connect are defined as simple helper functions that restrict the
 
 
 
-
    
+
    
 socket._DEBUG
 
    
 
-
    
+
    
 This constant is set to true if the library was compiled
 with debug support.
 
    
 
 
 
-
    
+
    
 socket._DATAGRAMSIZE
 
    
 
-
    
+
    
 Default datagram size used by calls to
-receive and
+receive and
 receivefrom.
 (Unless changed in compile time, the value is 8192.)
 
    
 
 
 
-
     
+
    
 socket.gettime()
 
    
 
-
    
+
    
 Returns the UNIX time in seconds. You should subtract the values returned by this function
-to get meaningful values. 
+to get meaningful values.
 
    
 
-
    +
     t = socket.gettime()
 -- do stuff
 print(socket.gettime() - t .. " seconds elapsed")
@@ -155,38 +155,38 @@ print(socket.gettime() - t .. " seconds elapsed")
 
 
 
-
     
+
    
 socket.newtry(finalizer)
 
    
 
-
    
-Creates and returns a clean 
+
    
+Creates and returns a clean
 try
-function that allows for cleanup before the exception 
-is  raised. 
+function that allows for cleanup before the exception
+is  raised.
 
    
 
-
     
+
    
 Finalizer is a function that will be called before
 try throws the exception.
 
    
 
-
     
-The function returns your customized try function. 
+
    
+The function returns your customized try function.
 
    
 
-
    
-Note: This idea saved a lot of work with the 
-implementation of protocols in LuaSocket: 
+
    
+Note: This idea saved a lot of work with the
+implementation of protocols in LuaSocket:
 
    
 
-
    +
     foo = socket.protect(function()
     -- connect somewhere
     local c = socket.try(socket.connect("somewhere", 42))
     -- create a try function that closes 'c' on error
     local try = socket.newtry(function() c:close() end)
-    -- do everything reassured c will be closed 
+    -- do everything reassured c will be closed
     try(c:send("hello there?\r\n"))
     local answer = try(c:receive())
     ...
@@ -198,40 +198,40 @@ end)
 
 
 
-
     
+
    
 socket.protect(func)
 
    
 
-
    
+
    
 Converts a function that throws exceptions into a safe function. This
-function only catches exceptions thrown by the try
-and newtry functions. It does not catch normal 
+function only catches exceptions thrown by the try
+and newtry functions. It does not catch normal
 Lua errors.
 
    
 
-
    
-Func is a function that calls 
-try (or assert, or error) 
-to throw exceptions. 
+
    
+Func is a function that calls
+try (or assert, or error)
+to throw exceptions.
 
    
 
-
    
+
    
 Returns an equivalent function that instead of throwing exceptions in case of
-a failed try call, returns nil
+a failed try call, returns nil
 followed by an error message.
 
    
 
 
 
-
     
+
    
 socket.select(recvt, sendt [, timeout])
 
    
 
-
    
-Waits for a number of sockets to change status. 
+
    
+Waits for a number of sockets to change status.
 
    
 
-
    
+
    
 Recvt is an array with the sockets to test for characters
 available for reading. Sockets in the sendt array are watched to
 see if it is OK to immediately write on them.  Timeout is the
@@ -242,7 +242,7 @@ be empty tables or nil. Non-socket values (or values with
 non-numeric indices) in the arrays will be silently ignored.
 
    
 
-
     The function returns a list with the sockets ready for
+
     The function returns a list with the sockets ready for
 reading, a list with the sockets ready for writing and an error message.
 The error message is "timeout" if a timeout
 condition was met, "select failed" if the call
@@ -250,10 +250,10 @@ to select failed, and
 nil otherwise. The returned tables are
 doubly keyed both by integers and also by the sockets
 themselves, to simplify the test if a specific socket has
-changed status. 
+changed status.
 
    
 
-
    
+
    
 Note: select can monitor a limited number
 of sockets, as defined by the constant socket._SETSIZE. This
 number may be as high as 1024 or as low as 64 by default,
@@ -262,204 +262,204 @@ at compile time. Invoking select with a larger
 number of sockets will raise an error.
 
    
 
-
    
-Important note: a known bug in WinSock causes select to fail 
+
    
+Important note: a known bug in WinSock causes select to fail
 on non-blocking TCP sockets. The function may return a socket as
 writable even though the socket is not ready for sending.
 
    
 
-
    
+
    
 Another important note: calling select with a server socket in the receive parameter before a call to accept does not guarantee
-accept will return immediately. 
-Use the settimeout 
-method or accept might block forever.  
+accept will return immediately.
+Use the settimeout
+method or accept might block forever.
 
    
 
-
    
+
    
 Yet another note: If you close a socket and pass
 it to select, it will be ignored.
 
    
 
-
    
+
    
 Using select with non-socket objects: Any object that implements getfd and dirty can be used with select, allowing objects from other libraries to be used within a socket.select driven loop.
 
    
 
 
 
-
     
+
    
 socket._SETSIZE
 
    
 
-
    
+
    
 The maximum number of sockets that the select function can handle. 
+href="#select">select function can handle.
 
    
 
 
 
 
-
     
+
    
 socket.sink(mode, socket)
 
    
 
-
    
-Creates an 
+
    
+Creates an
 LTN12
-sink from a stream socket object. 
+sink from a stream socket object.
 
    
 
-
    
+
    
 Mode defines the behavior of the sink. The following
 options are available:
 
    
 
      
 
    •  "http-chunked": sends data through socket after applying the
-chunked transfer coding, closing the socket when done;
+chunked transfer coding, closing the socket when done;
      • 
 
    •  "close-when-done": sends all received data through the
-socket, closing the socket when done; 
+socket, closing the socket when done;
      • 
 
    •  "keep-open": sends all received data through the
-socket, leaving it open when done. 
+socket, leaving it open when done.
      • 
 
    
 
    
-Socket is the stream socket object used to send the data. 
+Socket is the stream socket object used to send the data.
 
    
 
-
    
-The function returns a sink with the appropriate behavior. 
+
    
+The function returns a sink with the appropriate behavior.
 
    
 
 
 
-
     
+
    
 socket.skip(d [, ret1, ret2 ...  retN])
 
    
 
-
    
+
    
 Drops a number of arguments and returns the remaining.
 
    
 
-
    
+
    
 D is the number of arguments to drop. Ret1 to
 retN are the arguments.
 
    
 
-
     
+
    
 The function returns retd+1 to retN.
 
    
 
-
    
+
    
 Note: This function is useful to avoid creation of dummy variables:
 
    
 
-
    --- get the status code and separator from SMTP server reply 
+
    +-- get the status code and separator from SMTP server reply
 local code, sep = socket.skip(2, string.find(line, "^(%d%d%d)(.?)"))
 
    
 
 
 
-
     
+
    
 socket.sleep(time)
 
    
 
-
    
+
    
 Freezes the program execution during a given amount of time.
 
    
 
-
     
+
    
 Time is the number of seconds to sleep for. If
 time is negative, the function returns immediately.
 
    
 
 
 
-
     
+
    
 socket.source(mode, socket [, length])
 
    
 
-
    
-Creates an 
+
    
+Creates an
 LTN12
-source from a stream socket object. 
+source from a stream socket object.
 
    
 
-
    
+
    
 Mode defines the behavior of the source. The following
 options are available:
 
    
 
      
 
    •  "http-chunked": receives data from socket and removes the
-chunked transfer coding before returning the data;
+chunked transfer coding before returning the data;
      • 
 
    •  "by-length": receives a fixed number of bytes from the
-socket. This mode requires the extra argument length; 
+socket. This mode requires the extra argument length;
      • 
 
    •  "until-closed": receives data from a socket until the other
-side closes the connection. 
+side closes the connection.
      • 
 
    
 
    
-Socket is the stream socket object used to receive the data. 
+Socket is the stream socket object used to receive the data.
 
    
 
-
    
-The function returns a source with the appropriate behavior. 
+
    
+The function returns a source with the appropriate behavior.
 
    
 
 
 
-
    
+
    
 socket._SOCKETINVALID
 
    
 
-
    
+
    
 The OS value for an invalid socket.
 
    
 
 
 
-
     
+
    
 socket.try(ret1 [, ret2 ... retN])
 
    
 
-
    
+
    
 Throws an exception in case ret1 is falsy, using
-ret2 as the error message. The exception is supposed to be caught 
-by a protected function only.
+ret2 as the error message. The exception is supposed to be caught
+by a protected function only.
 
    
 
-
    
+
    
 Ret1 to retN can be arbitrary
-arguments, but are usually the return values of a function call 
-nested with try. 
+arguments, but are usually the return values of a function call
+nested with try.
 
    
 
-
     
+
    
 The function returns ret1 to retN if
 ret1 is not nil or false.
 Otherwise, it calls error passing ret2 wrapped
-in a table with metatable used by protect to
+in a table with metatable used by protect to
 distinguish exceptions from runtime errors.
 
    
 
-
    +
     -- connects or throws an exception with the appropriate error message
 c = socket.try(socket.connect("localhost", 80))
 
    
 
 
 
-
     
+
    
 socket._VERSION
 
    
 
-
    
-This constant has a string describing the current LuaSocket version. 
+
    
+This constant has a string describing the current LuaSocket version.
 
    
 
 
 
-
    
+
    
 
    
 
    
-
    
+
    
 home ·
 download ·
 installation ·
diff --git a/doc/tcp.html b/doc/tcp.html
index 6050a5f..2d6e327 100644
--- a/doc/tcp.html
+++ b/doc/tcp.html
@@ -13,17 +13,17 @@
 
 
 
-
    
+
    
 
    
 
    
 
-
-
    
-LuaSocket
+
    
+LuaSocket
 
    Network support for the Lua language
+
    Network support for the Lua language
 
    
 
    
-
    
+
    
 home ·
 download ·
 installation ·
@@ -40,42 +40,43 @@
 
 
 
-
    
+
    
 server:accept()
 
    
 
-
    
+
    
 Waits  for  a  remote connection on the server
 object and returns a client object representing that connection.
 
    
 
-
    
+
    
 If a connection is successfully initiated, a client object is returned.
 If a  timeout condition  is  met,  the method  returns nil
 followed by the error string 'timeout'. Other errors are
 reported by nil followed by a message describing the error.
 
    
 
-
    
-Note: calling socket.select
+
    
+Note: calling socket.select
 with   a  server   object   in
 the recvt  parameter  before  a   call  to  accept does
 not guarantee  accept will  return immediately.  Use the settimeout method or accept
+href="#settimeout">settimeout method or accept
 might block until another client shows up.
 
    
 
 
 
-
    
+
    
 master:bind(address, port)
 
    
 
-
    
+
    
 Binds a master object to address and port on the
 local host.
+
    
 
-
    
+
    
 Address can be an IP address or a host name.
 Port must be an integer number in the range [0..64K).
 If address
@@ -86,25 +87,25 @@ If port is 0, the system automatically
 chooses an ephemeral port.
 
    
 
-
    
+
    
 In case of  success, the  method returns  1. In case of error, the
 method returns nil followed by an error message.
 
    
 
-
    
-Note: The function socket.bind
+
    
+Note: The function socket.bind
 is available and is a shortcut for the creation of server sockets.
 
    
 
 
 
-
    
+
    
 master:close()
    
 client:close()
    
 server:close()
 
    
 
-
    
+
    
 Closes  a TCP object. The internal socket used by the object is closed
 and the local  address   to  which the object was
 bound is made  available to other  applications. No further  operations
@@ -112,7 +113,7 @@ bound is made  available to other  applications. No further  operations
 a closed socket.
 
    
 
-
    
+
    
 Note:  It is  important to  close all  used  sockets once  they are  not
 needed,  since, in  many systems,  each socket  uses a  file descriptor,
 which are limited system resources. Garbage-collected objects are
@@ -121,53 +122,53 @@ automatically closed before destruction, though.
 
 
 
-
    
+
    
 master:connect(address, port)
 
    
 
-
    
+
    
 Attempts to connect a master object to a remote host, transforming it into a
 client object.
 Client objects support methods
-send,
-receive,
-getsockname,
-getpeername,
-settimeout,
-and close.
+send,
+receive,
+getsockname,
+getpeername,
+settimeout,
+and close.
 
    
 
-
    
+
    
 Address can be an IP address or a host name.
 Port must be an integer number in the range [1..64K).
 
    
 
-
    
+
    
 In case of error, the method returns nil followed by a string
 describing the error. In case of success, the method returns 1.
 
    
 
-
    
-Note: The function socket.connect
+
    
+Note: The function socket.connect
 is available and is a shortcut for the creation of client sockets.
 
    
 
-
    
+
    
 Note: Starting with LuaSocket 2.0,
-the settimeout
+the settimeout
 method affects the behavior of connect, causing it to return
 with an error in case of a timeout. If that happens, you can still call socket.select with the socket in the
+href="socket.html#select">socket.select with the socket in the
 sendt table. The socket will be writable when the connection is
 established.
 
    
 
-
    
+
    
 Note: Starting with LuaSocket 3.0, the host name resolution
 depends on whether the socket was created by
-socket.tcp,
-socket.tcp4 or
-socket.tcp6. Addresses from
+socket.tcp,
+socket.tcp4 or
+socket.tcp6. Addresses from
 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
@@ -176,42 +177,42 @@ set to zero, only the first address is tried.
 
 
 
-
    
+
    
 master:dirty()
    
 client:dirty()
    
 server:dirty()
 
    
 
-
    
+
    
 Check the read buffer status.
 
    
 
-
    
+
    
 Returns true if there is any data in the read buffer, false otherwise.
 
    
 
-
    
+
    
 Note: This is an internal method, use at your own risk.
 
    
 
 
 
 
-
    
+
    
 master:getfd()
    
 client:getfd()
    
 server:getfd()
 
    
 
-
    
+
    
 Returns the underling socket descriptor or handle associated to the object.
 
    
 
-
    
+
    
 The descriptor or handle. In case the object has been closed, the return will be -1.
 
    
 
-
    
+
    
 Note: This is an internal method. Unlikely to be
 portable. Use at your own risk. 
 
    
@@ -219,28 +220,27 @@ portable. Use at your own risk. 
 
 
 
-
    
-client:getoption(option)
    
-server:getoption(option)
+
    
+client:getoption(option)
    
+server:getoption(option)
 
    
 
-
    
+
    
 Gets options for the TCP object.
-See setoption for description of the
+See setoption for description of the
 option names and values.
 
    
 
-
    
-Option is a string with the option name.
+
    
+Option is a string with the option name.
    
 
      
-
-
    •  'keepalive'
-
    •  'linger'
-
    •  'reuseaddr'
-
    •  'tcp-nodelay'
+
    •  'keepalive'
      • 
+
    •  'linger'
      • 
+
    •  'reuseaddr'
      • 
+
    •  'tcp-nodelay'
      • 
 
    
 
-
    
+
    
 The method returns the option value in case of success, or
 nil followed by an error message otherwise.
 
    
@@ -248,38 +248,38 @@ The method returns the option value in case of success, or
 
 
 
-
    
+
    
 client:getpeername()
 
    
 
-
    
+
    
 Returns information about the remote side of a connected client object.
 
    
 
-
    
+
    
 Returns a string with the IP address of the peer, the
 port number that peer is using for the connection,
 and a string with the family ("inet" or "inet6").
 In case of error, the method returns nil.
 
    
 
-
    
+
    
 Note: It makes no sense to call this method on server objects.
 
    
 
 
 
-
    
+
    
 master:getsockname()
    
 client:getsockname()
    
 server:getsockname()
 
    
 
-
    
+
    
 Returns the local address information associated to the object.
 
    
 
-
    
+
    
 The method returns a string with local IP address, a number with
 the local port,
 and a string with the family ("inet" or "inet6").
@@ -288,31 +288,31 @@ In case of error, the method returns nil.
 
 
 
-
    
+
    
 master:getstats()
    
 client:getstats()
    
 server:getstats()
    
 
    
 
-
    
+
    
 Returns accounting information on the socket, useful for throttling
 of bandwidth.
 
    
 
-
    
+
    
 The method returns the number of bytes received, the number of bytes sent,
 and the age of the socket object in seconds.
 
    
 
 
 
-
    
+
    
 master:gettimeout()
    
 client:gettimeout()
    
 server:gettimeout()
 
    
 
-
    
+
    
 Returns the current block timeout followed by the curent
 total timeout.
 
    
@@ -320,65 +320,65 @@ total timeout.
 
 
 
-
    
+
    
 master:listen(backlog)
 
    
 
-
    
+
    
 Specifies the socket is willing to receive connections, transforming the
 object into a server object.  Server objects support the
-accept,
-getsockname,
-setoption,
-settimeout,
-and close methods.
+accept,
+getsockname,
+setoption,
+settimeout,
+and close methods.
 
    
 
-
    
+
    
 The parameter backlog specifies the  number  of  client
 connections that can
 be queued waiting for service. If the queue is full and another  client
 attempts connection,  the connection is  refused.
 
    
 
-
    
+
    
 In case of  success, the  method returns  1. In case of error, the
 method returns nil followed by an error message.
 
    
 
 
 
-
    
+
    
 client:receive([pattern [, prefix]])
 
    
 
-
    
+
    
 Reads data from a client object, according to the specified read
 pattern.  Patterns follow the Lua file I/O format, and the difference in performance between all patterns is negligible.
 
    
 
-
    
+
    
 Pattern can be any of the following:
 
    
 
 
      
 
    •  '*a':  reads from  the  socket  until the  connection  is
-closed. No end-of-line translation is performed;
+closed. No end-of-line translation is performed;
      • 
 
    •  '*l':  reads a line of  text from the socket.  The line is
 terminated by a  LF character (ASCII 10), optionally  preceded by a
 CR character (ASCII 13). The CR and LF characters are not included in
 the returned line. In fact, all CR characters are
-ignored by the pattern. This is the default pattern;
+ignored by the pattern. This is the default pattern;
      • 
 
    •  number:  causes the  method to read  a specified number
-of bytes from the socket.
+of bytes from the socket.
      • 
 
    
 
-
    
+
    
 Prefix is an optional string to be concatenated to the beginning
 of any received data before return.
 
    
 
-
    
+
    
 If successful, the method returns the received pattern. In case of error,
 the method returns nil followed by an error
 message, followed by a (possibly empty) string containing
@@ -388,7 +388,7 @@ closed  before  the transmission  was completed  or  the string
 'timeout' in  case there was a timeout during  the operation.
 
    
 
-
    
+
    
 Important note: This function was changed severely. It used
 to support multiple patterns (but I have never seen this feature used) and
 now it doesn't anymore.  Partial results used to be returned in the same
@@ -399,22 +399,22 @@ too.
 
 
 
-
    
+
    
 client:send(data [, i [, j]])
 
    
 
-
    
+
    
 Sends data through client object.
 
    
 
-
    
+
    
 Data is the string to be sent. The optional arguments
 i and j work exactly like the standard
 string.sub Lua function to allow the selection of a
 substring to be sent.
 
    
 
-
    
+
    
 If successful, the method returns the index of the last byte
 within [i, j] that has been sent.  Notice that, if
 i is 1 or absent, this is effectively the total
@@ -428,7 +428,7 @@ was  completed or the string  'timeout'  in  case
 there was  a  timeout  during  the operation.
 
    
 
-
    
+
    
 Note: Output is not buffered. For small strings,
 it is always better to concatenate them in Lua
 (with the '..' operator) and send the result in one call
@@ -437,27 +437,27 @@ instead of calling the method several times.
 
 
 
-
    
+
    
 client:setoption(option [, value])
    
 server:setoption(option [, value])
 
    
 
-
    
+
    
 Sets options for the TCP object. Options are only needed by low-level or
 time-critical applications. You should only modify an option if you
 are sure you need it.
 
    
 
-
    
+
    
 Option is a string with the option name, and value
-depends on the option being set:
+depends on the option being set:
    
 
 
      
 
 
    •  'keepalive':  Setting this option to true enables
 the periodic transmission of messages on a connected socket. Should the
 connected party fail to respond to these messages, the connection is
-considered broken and processes using the socket are notified;
+considered broken and processes using the socket are notified;
      • 
 
 
    •  'linger': Controls the action taken when unsent data are
 queued on a socket and a close is performed.  The value is a table with a
@@ -468,79 +468,79 @@ it is able to transmit the data or until 'timeout' has passed. If
 'on' is false and a close is issued, the system will
 process the close in a manner that allows the process to continue as
 quickly as possible. I do not advise you to set this to anything other than
-zero;
+zero;
      • 
 
 
    •  'reuseaddr': Setting this option indicates that the rules
 used in validating addresses supplied in a call to
-bind should allow reuse of local addresses;
+bind should allow reuse of local addresses;
      • 
 
 
    •  'tcp-nodelay': Setting this option to true
-disables the Nagle's algorithm for the connection;
+disables the Nagle's algorithm for the connection;
      • 
 
-
    •  'tcp-keepidle': value in seconds for TCP_KEEPIDLE Linux only!!
+
    •  'tcp-keepidle': value in seconds for TCP_KEEPIDLE Linux only!!
      • 
 
-
    •  'tcp-keepcnt': value for TCP_KEEPCNT Linux only!!
+
    •  'tcp-keepcnt': value for TCP_KEEPCNT Linux only!!
      • 
 
-
    •  'tcp-keepintvl': value for TCP_KEEPINTVL Linux only!!
+
    •  'tcp-keepintvl': value for TCP_KEEPINTVL Linux only!!
      • 
 
 
    •  'ipv6-v6only':
 Setting this option to true restricts an inet6 socket to
-sending and receiving only IPv6 packets.
+sending and receiving only IPv6 packets.
      • 
 
    
 
-
    
+
    
 The method returns 1 in case of success, or nil
 followed by an error message otherwise.
 
    
 
-
    
+
    
 Note: The descriptions above come from the man pages.
 
    
 
 
 
-
    
+
    
 master:setstats(received, sent, age)
    
 client:setstats(received, sent, age)
    
 server:setstats(received, sent, age)
    
 
    
 
-
    
+
    
 Resets accounting information on the socket, useful for throttling
 of bandwidth.
 
    
 
-
    
+
    
 Received is a number with the new number of bytes received.
 Sent is a number with the new number of bytes sent.
 Age is the new age in seconds.
 
    
 
-
    
+
    
 The method returns 1 in case of success and nil otherwise.
 
    
 
 
 
-
    
+
    
 master:settimeout(value [, mode])
    
 client:settimeout(value [, mode])
    
 server:settimeout(value [, mode])
 
    
 
-
    
+
    
 Changes the timeout  values for the object. By default,
 all I/O  operations are  blocking. That  is, any  call to  the methods
-send,
-receive, and
-accept
+send,
+receive, and
+accept
 will  block indefinitely,  until the operation completes.  The
 settimeout  method defines a  limit on the  amount  of   time  the
 I/O methods can  block. When a timeout is set and the specified amount of
 time has elapsed, the affected methods give up and fail with an error code.
 
    
 
-
    
+
    
 The amount of time to wait is specified  as  the
 value parameter, in seconds. There  are two timeout  modes and
 both can be used together for fine tuning:
@@ -557,12 +557,12 @@ the amount of  time LuaSocket can block a Lua  script before returning from
 a call.
 
 
-
    
+
    
 The  nil  timeout  value allows  operations  to  block
 indefinitely. Negative timeout values have the same effect.
 
    
 
-
    
+
    
 Note: although  timeout values  have millisecond  precision in LuaSocket,
 large  blocks can cause I/O functions not to  respect timeout values due
 to the time the library takes to  transfer blocks to and from the  OS
@@ -571,7 +571,7 @@ and perform automatic name resolution might be blocked by the resolver for
 longer than the specified timeout value.
 
    
 
-
    
+
    
 Note: The old timeout method is deprecated. The name has been
 changed for sake of uniformity, since all other method names already
 contained verbs making their imperative nature obvious.
@@ -579,123 +579,124 @@ contained verbs making their imperative nature obvious.
 
 
 
-
    
+
    
 client:shutdown(mode)
    
 
    
 
-
    
+
    
 Shuts down part of a full-duplex connection.
 
    
 
-
    
+
    
 Mode tells which way of the connection should be shut down and can
 take the value:
 
      
 
    • "both": disallow further sends and receives on the object.
-This is the default mode;
-
    • "send": disallow further sends on the object;
-
    • "receive": disallow further receives on the object.
+This is the default mode;
      • 
+
    • "send": disallow further sends on the object;
      • 
+
    • "receive": disallow further receives on the object.
      • 
 
    
+
    
 
-
    
+
    
 This function returns 1.
 
    
 
 
 
-
    
+
    
 master:setfd(fd)
    
 client:setfd(fd)
    
 server:setfd(fd)
 
    
 
-
    
+
    
 Sets the underling socket descriptor or handle associated to the object. The current one is simply replaced, not closed, and no other change to the object state is made.
 
    
 
-
    
+
    
 No return value.
 
    
 
-
    
+
    
 Note: This is an internal method. Unlikely to be
 portable. Use at your own risk. 
 
    
 
 
 
-
    
+
    
 socket.tcp()
 
    
 
-
    
+
    
 Creates and returns an TCP master object. A master object can
 be transformed into a server object with the method
-listen (after a call to bind) or into a client object with
-the method connect. The only other
+listen (after a call to bind) or into a client object with
+the method connect. The only other
 method supported by a master object is the
-close method.
    
+close method.
    
 
-
    
+
    
 In case of success, a new master object is returned. In case of error,
 nil is returned, followed by an error message.
 
    
 
-
    
+
    
 Note: The choice between IPv4 and IPv6 happens during a call to
-bind or connect, depending on the address
+bind or connect, depending on the address
 family obtained from the resolver.
 
    
 
-
    
+
    
 Note: Before the choice between IPv4 and IPv6 happens,
 the internal socket object is invalid and therefore setoption will fail.
+href="#setoption">setoption will fail.
 
    
 
 
 
-
    
+
    
 socket.tcp4()
 
    
 
-
    
+
    
 Creates and returns an IPv4 TCP master object. A master object can
 be transformed into a server object with the method
-listen (after a call to bind) or into a client object with
-the method connect. The only other
+listen (after a call to bind) or into a client object with
+the method connect. The only other
 method supported by a master object is the
-close method.
    
+close method.
    
 
-
    
+
    
 In case of success, a new master object is returned. In case of error,
 nil is returned, followed by an error message.
 
    
 
 
 
-
    
+
    
 socket.tcp6()
 
    
 
-
    
+
    
 Creates and returns an IPv6 TCP master object. A master object can
 be transformed into a server object with the method
-listen (after a call to bind) or into a client object with
-the method connect. The only other
+listen (after a call to bind) or into a client object with
+the method connect. The only other
 method supported by a master object is the
-close method.
    
+close method.
    
 
-
    
+
    
 In case of success, a new master object is returned. In case of error,
 nil is returned, followed by an error message.
 
    
 
-
    
+
    
 Note: The TCP object returned will have the option
 "ipv6-v6only" set to true.
 
    
@@ -704,10 +705,10 @@ Note: The TCP object returned will have the option
 
 
 
-
    
+
    
 
    
 
    
-
    
+
    
 home ·
 download ·
 installation ·
diff --git a/doc/udp.html b/doc/udp.html
index 4618aad..db711cb 100644
--- a/doc/udp.html
+++ b/doc/udp.html
@@ -13,17 +13,17 @@
 
 
 
-
    
+
    
 
    
 
    
 
-
-
    
-LuaSocket
+
    
+LuaSocket
 
    Network support for the Lua language
+
    Network support for the Lua language
 
    
 
    
-
    
+
    
 home ·
 download ·
 installation ·
@@ -71,26 +71,26 @@ unconnected:getoption()
 
 
    
 Gets an option value from the UDP object.
-See setoption for
+See setoption for
 description of the option names and values.
 
    
 
 
    Option is a string with the option name.
 
      
-
    •  'dontroute'
-
    •  'broadcast'
-
    •  'reuseaddr'
-
    •  'reuseport'
-
    •  'ip-multicast-loop'
-
    •  'ipv6-v6only'
-
    •  'ip-multicast-if'
-
    •  'ip-multicast-ttl'
-
    •  'ip-add-membership'
-
    •  'ip-drop-membership'
+
    •  'dontroute'
      • 
+
    •  'broadcast'
      • 
+
    •  'reuseaddr'
      • 
+
    •  'reuseport'
      • 
+
    •  'ip-multicast-loop'
      • 
+
    •  'ipv6-v6only'
      • 
+
    •  'ip-multicast-if'
      • 
+
    •  'ip-multicast-ttl'
      • 
+
    •  'ip-add-membership'
      • 
+
    •  'ip-drop-membership'
      • 
 
    
 
    
 
-
    
+
    
 The method returns the option value in case of
 success, or
 nil followed by an error message otherwise.
@@ -108,7 +108,7 @@ associated with a connected UDP object.
 
    
 
 
-
    
+
    
 Returns a string with the IP address of the peer, the
 port number that peer is using for the connection,
 and a string with the family ("inet" or "inet6").
@@ -131,7 +131,7 @@ Returns the local address information associated to the object.
 
    
 
 
-
    
+
    
 The method returns a string with local IP address, a number with
 the local port,
 and a string with the family ("inet" or "inet6").
@@ -148,12 +148,12 @@ wild-card address).
 
 
 
-
    
+
    
 connected:settimeout(value)
    
 unconnected:settimeout(value)
 
    
 
-
    
+
    
 Returns the current timeout value.
 
    
 
@@ -180,8 +180,8 @@ the excess bytes are discarded. If there are less then
 size bytes available in the current datagram, the
 available bytes are returned.
 If size is omitted, the
-compile-time constant socket._DATAGRAMSIZE is used
+compile-time constant 
+socket._DATAGRAMSIZE is used
 (it defaults to 8192 bytes). Larger sizes will cause a
 temporary buffer to be allocated for the operation.
 
    
@@ -286,45 +286,45 @@ name, and value depends on the option being set:
 
      
 
    •  'dontroute': Indicates that outgoing
 messages should bypass the standard routing facilities.
-Receives a boolean value;
+Receives a boolean value;
      • 
 
    •  'broadcast': Requests permission to send
 broadcast datagrams on the socket.
-Receives a boolean value;
+Receives a boolean value;
      • 
 
    •  'reuseaddr': Indicates that the rules used in
 validating addresses supplied in a bind() call
 should allow reuse of local addresses.
-Receives a boolean value;
+Receives a boolean value;
      • 
 
    •  'reuseport': Allows completely duplicate
 bindings by multiple processes if they all set
 'reuseport' before binding the port.
-Receives a boolean value;
+Receives a boolean value;
      • 
 
    •  'ip-multicast-loop':
 Specifies whether or not a copy of an outgoing multicast
 datagram is delivered to the sending host as long as it is a
 member of the multicast group.
-Receives a boolean value;
+Receives a boolean value;
      • 
 
    •  'ipv6-v6only':
 Specifies whether to restrict inet6 sockets to
 sending and receiving only IPv6 packets.
-Receive a boolean value;
+Receive a boolean value;
      • 
 
    •  'ip-multicast-if':
 Sets the interface over which outgoing multicast datagrams
 are sent.
-Receives an IP address;
+Receives an IP address;
      • 
 
    •  'ip-multicast-ttl':
 Sets the Time To Live in the IP header for outgoing
 multicast datagrams.
-Receives a number;
+Receives a number;
      • 
 
    •  'ip-add-membership':
 Joins the multicast group specified.
 Receives a table with fields
 multiaddr and interface, each containing an
-IP address;
+IP address;
      • 
 
    •  'ip-drop-membership': Leaves the multicast
 group specified.
 Receives a table with fields
 multiaddr and interface, each containing an
-IP address.
+IP address.
      • 
 
    
 
 
    
@@ -332,7 +332,7 @@ The method returns 1 in case of success, or
 nil followed by an error message otherwise.
 
    
 
-
    
+
    
 Note: The descriptions above come from the man pages.
 
    
 
@@ -381,11 +381,11 @@ is recommended when the same peer is used for several transmissions
 and can result in up to 30% performance gains.
 
    
 
-
    
+
    
 Note: Starting with LuaSocket 3.0, the host name resolution
 depends on whether the socket was created by socket.udp or socket.udp6. Addresses from
+href="#socket.udp">socket.udp or socket.udp6. Addresses from
 the appropriate family are tried in succession until the
 first success or until the last failure.
 
    
@@ -492,23 +492,23 @@ returned. In case of error, nil is returned, followed by
 an error message.
 
    
 
-
    
+
    
 Note: The choice between IPv4 and IPv6 happens during a call to
-sendto, setpeername, or sockname, depending on the address
+sendto, setpeername, or sockname, depending on the address
 family obtained from the resolver.
 
    
 
-
    
+
    
 Note: Before the choice between IPv4 and IPv6 happens,
 the internal socket object is invalid and therefore setoption will fail.
+href="#setoption">setoption will fail.
 
    
 
 
 
-
    
+
    
 socket.udp4()
 
    
 
@@ -564,7 +564,7 @@ returned. In case of error, nil is returned, followed by
 an error message.
 
    
 
-
    
+
    
 Note: The TCP object returned will have the option
 "ipv6-v6only" set to true.
 
    
@@ -573,10 +573,10 @@ Note: The TCP object returned will have the option
 
 
 
-
    
+
    
 
    
 
    
-
    
+
    
 home ·
 download ·
 installation ·

From c1eacfa6d24dc15476f5f9befa8370e2244931d4 Mon Sep 17 00:00:00 2001
From: Thijs Schreijer 
Date: Tue, 22 Mar 2022 19:24:38 +0100
Subject: [PATCH 155/194] fix(docs) references to some constants added (#359)

---
 doc/socket.html | 6 ++++--
 doc/tcp.html    | 8 ++++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/doc/socket.html b/doc/socket.html
index 68db7cc..c148114 100644
--- a/doc/socket.html
+++ b/doc/socket.html
@@ -255,7 +255,8 @@ changed status.
 
 
    
 Note: select can monitor a limited number
-of sockets, as defined by the constant socket._SETSIZE. This
+of sockets, as defined by the constant 
+socket._SETSIZE. This
 number may be as high as 1024 or as low as 64 by default,
 depending on the system. It is usually possible to change this
 at compile time. Invoking select with a larger
@@ -410,7 +411,8 @@ socket._SOCKETINVALID
 
    
 
 
    
-The OS value for an invalid socket.
+The OS value for an invalid socket. This can be used with 
+tcp:getfd and tcp:setfd methods.
 
    
 
 
diff --git a/doc/tcp.html b/doc/tcp.html
index 2d6e327..9cc173e 100644
--- a/doc/tcp.html
+++ b/doc/tcp.html
@@ -209,7 +209,9 @@ Returns the underling socket descriptor or handle associated to the object.
 
    
 
 
    
-The descriptor or handle. In case the object has been closed, the return will be -1.
+The descriptor or handle. In case the object has been closed, the return value
+will be -1. For an invalid socket it will be 
+_SOCKETINVALID.
 
    
 
 
    
@@ -611,7 +613,9 @@ server:setfd(fd)
 
    
 
 
    
-Sets the underling socket descriptor or handle associated to the object. The current one is simply replaced, not closed, and no other change to the object state is made.
+Sets the underling socket descriptor or handle associated to the object. The current one
+is simply replaced, not closed, and no other change to the object state is made.
+To set it as invalid use _SOCKETINVALID.
 
    
 
 
    

From f98977b2dac48fc66822402b095336e683715126 Mon Sep 17 00:00:00 2001
From: Caleb Maclennan 
Date: Wed, 23 Mar 2022 00:09:53 +0300
Subject: [PATCH 156/194] =?UTF-8?q?Move=20doc=E2=86=92docs=20so=20we=20can?=
 =?UTF-8?q?=20serve=20it=20with=20GitHub=20Pages?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 {doc => docs}/dns.html          |   0
 {doc => docs}/ftp.html          |   0
 {doc => docs}/http.html         |   0
 {doc => docs}/index.html        |   0
 {doc => docs}/installation.html |   0
 {doc => docs}/introduction.html |   0
 {doc => docs}/ltn12.html        |   0
 {doc => docs}/lua05.ppt         | Bin
 {doc => docs}/luasocket.png     | Bin
 {doc => docs}/mime.html         |   0
 {doc => docs}/reference.css     |   0
 {doc => docs}/reference.html    |   0
 {doc => docs}/smtp.html         |   0
 {doc => docs}/socket.html       |   0
 {doc => docs}/tcp.html          |   0
 {doc => docs}/udp.html          |   0
 {doc => docs}/url.html          |   0
 luasocket-scm-3.rockspec        |   2 +-
 makefile.dist                   |  38 ++++++++++++++++----------------
 19 files changed, 20 insertions(+), 20 deletions(-)
 rename {doc => docs}/dns.html (100%)
 rename {doc => docs}/ftp.html (100%)
 rename {doc => docs}/http.html (100%)
 rename {doc => docs}/index.html (100%)
 rename {doc => docs}/installation.html (100%)
 rename {doc => docs}/introduction.html (100%)
 rename {doc => docs}/ltn12.html (100%)
 rename {doc => docs}/lua05.ppt (100%)
 rename {doc => docs}/luasocket.png (100%)
 rename {doc => docs}/mime.html (100%)
 rename {doc => docs}/reference.css (100%)
 rename {doc => docs}/reference.html (100%)
 rename {doc => docs}/smtp.html (100%)
 rename {doc => docs}/socket.html (100%)
 rename {doc => docs}/tcp.html (100%)
 rename {doc => docs}/udp.html (100%)
 rename {doc => docs}/url.html (100%)

diff --git a/doc/dns.html b/docs/dns.html
similarity index 100%
rename from doc/dns.html
rename to docs/dns.html
diff --git a/doc/ftp.html b/docs/ftp.html
similarity index 100%
rename from doc/ftp.html
rename to docs/ftp.html
diff --git a/doc/http.html b/docs/http.html
similarity index 100%
rename from doc/http.html
rename to docs/http.html
diff --git a/doc/index.html b/docs/index.html
similarity index 100%
rename from doc/index.html
rename to docs/index.html
diff --git a/doc/installation.html b/docs/installation.html
similarity index 100%
rename from doc/installation.html
rename to docs/installation.html
diff --git a/doc/introduction.html b/docs/introduction.html
similarity index 100%
rename from doc/introduction.html
rename to docs/introduction.html
diff --git a/doc/ltn12.html b/docs/ltn12.html
similarity index 100%
rename from doc/ltn12.html
rename to docs/ltn12.html
diff --git a/doc/lua05.ppt b/docs/lua05.ppt
similarity index 100%
rename from doc/lua05.ppt
rename to docs/lua05.ppt
diff --git a/doc/luasocket.png b/docs/luasocket.png
similarity index 100%
rename from doc/luasocket.png
rename to docs/luasocket.png
diff --git a/doc/mime.html b/docs/mime.html
similarity index 100%
rename from doc/mime.html
rename to docs/mime.html
diff --git a/doc/reference.css b/docs/reference.css
similarity index 100%
rename from doc/reference.css
rename to docs/reference.css
diff --git a/doc/reference.html b/docs/reference.html
similarity index 100%
rename from doc/reference.html
rename to docs/reference.html
diff --git a/doc/smtp.html b/docs/smtp.html
similarity index 100%
rename from doc/smtp.html
rename to docs/smtp.html
diff --git a/doc/socket.html b/docs/socket.html
similarity index 100%
rename from doc/socket.html
rename to docs/socket.html
diff --git a/doc/tcp.html b/docs/tcp.html
similarity index 100%
rename from doc/tcp.html
rename to docs/tcp.html
diff --git a/doc/udp.html b/docs/udp.html
similarity index 100%
rename from doc/udp.html
rename to docs/udp.html
diff --git a/doc/url.html b/docs/url.html
similarity index 100%
rename from doc/url.html
rename to docs/url.html
diff --git a/luasocket-scm-3.rockspec b/luasocket-scm-3.rockspec
index 4e1669c..0e1b0f9 100644
--- a/luasocket-scm-3.rockspec
+++ b/luasocket-scm-3.rockspec
@@ -127,7 +127,7 @@ build = {
     mingw32 = make_plat("mingw32")
   },
   copy_directories = {
-    "doc"
+    "docs"
     , "samples"
     , "etc"
     , "test" }
diff --git a/makefile.dist b/makefile.dist
index 45a8866..83c303e 100644
--- a/makefile.dist
+++ b/makefile.dist
@@ -92,23 +92,23 @@ MAKE = \
 	socket.vcxproj \
 	mime.vcxproj
 
-DOC = \
-	doc/dns.html \
-	doc/ftp.html \
-	doc/index.html \
-	doc/http.html \
-	doc/installation.html \
-	doc/introduction.html \
-	doc/ltn12.html \
-	doc/luasocket.png \
-	doc/mime.html \
-	doc/reference.css \
-	doc/reference.html \
-	doc/smtp.html \
-	doc/socket.html \
-	doc/tcp.html \
-	doc/udp.html \
-	doc/url.html
+DOCS = \
+	docs/dns.html \
+	docs/ftp.html \
+	docs/index.html \
+	docs/http.html \
+	docs/installation.html \
+	docs/introduction.html \
+	docs/ltn12.html \
+	docs/luasocket.png \
+	docs/mime.html \
+	docs/reference.css \
+	docs/reference.html \
+	docs/smtp.html \
+	docs/socket.html \
+	docs/tcp.html \
+	docs/udp.html \
+	docs/url.html
 
 dist:
 	mkdir -p $(DIST)
@@ -123,8 +123,8 @@ dist:
 	mkdir -p $(DIST)/src
 	cp -vf $(SRC) $(DIST)/src
 
-	mkdir -p $(DIST)/doc
-	cp -vf $(DOC) $(DIST)/doc
+	mkdir -p $(DIST)/docs
+	cp -vf $(DOCS) $(DIST)/docs
 
 	mkdir -p $(DIST)/samples
 	cp -vf $(SAMPLES) $(DIST)/samples

From 2eac8950396247b412c4089c23a46015c8cc12bb Mon Sep 17 00:00:00 2001
From: Caleb Maclennan 
Date: Wed, 23 Mar 2022 00:16:23 +0300
Subject: [PATCH 157/194] Update URL references to source repository

---
 README          | 8 ++++----
 docs/index.html | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/README b/README
index cd8ee59..7354ea0 100644
--- a/README
+++ b/README
@@ -1,11 +1,11 @@
 This is the LuaSocket 3.0-rc1. It has been tested on Windows 7, Mac OS X,
-and Linux. 
+and Linux.
 
-Please use the project page at GitHub 
+Please use the project page at GitHub
 
-    https://github.com/diegonehab/luasocket
+    https://github.com/lunarmodules/luasocket
 
-to file bug reports or propose changes. 
+to file bug reports or propose changes.
 
 Have fun,
 Diego Nehab.
diff --git a/docs/index.html b/docs/index.html
index e92b4d4..0364070 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -95,7 +95,7 @@ are it works well on most UNIX distributions and Windows flavors.
 
 
    
 The current version of the library can be found at
-the LuaSocket
+the LuaSocket
 project page on GitHub. Besides the full C and Lua source code
 for the library, the distribution contains several examples,
 this user's manual and basic test procedures.

From 58f94e47d2f7a7cfc0aa2034a1b9ce679ce2731c Mon Sep 17 00:00:00 2001
From: Thijs Schreijer 
Date: Wed, 23 Mar 2022 13:12:49 +0100
Subject: [PATCH 158/194] Update LICENSE to be recognizable as MIT (#363)

---
 LICENSE | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/LICENSE b/LICENSE
index b635451..a8ed03e 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,5 +1,4 @@
-LuaSocket 3.0 license
-Copyright © 2004-2013 Diego Nehab
+Copyright (C) 2004-2022 Diego Nehab
 
 Permission is hereby granted, free of charge, to any person obtaining a
 copy of this software and associated documentation files (the "Software"),

From d9c08114da2ec8950498f71939f92a6dc0d237c1 Mon Sep 17 00:00:00 2001
From: Thijs Schreijer 
Date: Wed, 23 Mar 2022 17:11:43 +0100
Subject: [PATCH 159/194] chore; add Lua 5.4 to make files

---
 makefile     |  6 ++++++
 src/makefile | 12 ++++++------
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/makefile b/makefile
index f766a25..63d9985 100755
--- a/makefile
+++ b/makefile
@@ -33,6 +33,9 @@ install-both:
 	$(MAKE) clean
 	@cd src; $(MAKE) $(PLAT) LUAV=5.3
 	@cd src; $(MAKE) install LUAV=5.3
+	$(MAKE) clean
+	@cd src; $(MAKE) $(PLAT) LUAV=5.4
+	@cd src; $(MAKE) install LUAV=5.4
 
 install-both-unix:
 	$(MAKE) clean
@@ -44,6 +47,9 @@ install-both-unix:
 	$(MAKE) clean
 	@cd src; $(MAKE) $(PLAT) LUAV=5.3
 	@cd src; $(MAKE) install-unix LUAV=5.3
+	$(MAKE) clean
+	@cd src; $(MAKE) $(PLAT) LUAV=5.4
+	@cd src; $(MAKE) install-unix LUAV=5.4
 
 .PHONY: test
 
diff --git a/src/makefile b/src/makefile
index 522d378..f95498a 100755
--- a/src/makefile
+++ b/src/makefile
@@ -16,7 +16,7 @@
 # platform to build for
 PLAT?=linux
 
-# LUAV: 5.1 5.2
+# LUAV: 5.1 5.2 5.3 5.4
 # lua version to build against
 LUAV?=5.1
 
@@ -163,7 +163,7 @@ O_macosx=o
 CC_macosx=gcc
 DEF_macosx= -DLUASOCKET_$(DEBUG) -DUNIX_HAS_SUN_LEN
 CFLAGS_macosx=$(LUAINC:%=-I%) $(DEF) -Wall -O2 -fno-common
-LDFLAGS_macosx= -bundle -undefined dynamic_lookup -o 
+LDFLAGS_macosx= -bundle -undefined dynamic_lookup -o
 LD_macosx=gcc
 SOCKET_macosx=usocket.o
 
@@ -176,7 +176,7 @@ CC_linux=gcc
 DEF_linux=-DLUASOCKET_$(DEBUG)
 CFLAGS_linux=$(LUAINC:%=-I%) $(DEF) -Wall -Wshadow -Wextra \
 	-Wimplicit -O2 -ggdb3 -fpic
-LDFLAGS_linux=-O -shared -fpic -o 
+LDFLAGS_linux=-O -shared -fpic -o
 LD_linux=gcc
 SOCKET_linux=usocket.o
 
@@ -189,7 +189,7 @@ CC_freebsd=gcc
 DEF_freebsd=-DLUASOCKET_$(DEBUG) -DUNIX_HAS_SUN_LEN
 CFLAGS_freebsd=$(LUAINC:%=-I%) $(DEF) -Wall -Wshadow -Wextra \
 	-Wimplicit -O2 -ggdb3 -fpic
-LDFLAGS_freebsd=-O -shared -fpic -o 
+LDFLAGS_freebsd=-O -shared -fpic -o
 LD_freebsd=gcc
 SOCKET_freebsd=usocket.o
 
@@ -202,7 +202,7 @@ CC_solaris=gcc
 DEF_solaris=-DLUASOCKET_$(DEBUG)
 CFLAGS_solaris=$(LUAINC:%=-I%) $(DEF) -Wall -Wshadow -Wextra \
 	-Wimplicit -O2 -ggdb3 -fpic
-LDFLAGS_solaris=-lnsl -lsocket -lresolv -O -shared -fpic -o 
+LDFLAGS_solaris=-lnsl -lsocket -lresolv -O -shared -fpic -o
 LD_solaris=gcc
 SOCKET_solaris=usocket.o
 
@@ -215,7 +215,7 @@ CC_mingw=gcc
 DEF_mingw= -DLUASOCKET_$(DEBUG) \
 	-DWINVER=0x0501
 CFLAGS_mingw=$(LUAINC:%=-I%) $(DEF) -Wall -O2 -fno-common
-LDFLAGS_mingw= $(LUALIB) -shared -Wl,-s -lws2_32 -o 
+LDFLAGS_mingw= $(LUALIB) -shared -Wl,-s -lws2_32 -o
 LD_mingw=gcc
 SOCKET_mingw=wsocket.o
 

From 5ed8b66e6d0c295f95fade159ada0f97f482b2ac Mon Sep 17 00:00:00 2001
From: Caleb Maclennan 
Date: Thu, 24 Mar 2022 15:22:31 +0300
Subject: [PATCH 160/194] ci: Utilize new upstream Luacheck Action (#367)

---
 .github/workflows/luacheck.yml | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/luacheck.yml b/.github/workflows/luacheck.yml
index 597cd64..2f20456 100644
--- a/.github/workflows/luacheck.yml
+++ b/.github/workflows/luacheck.yml
@@ -7,13 +7,7 @@ jobs:
   luacheck:
     runs-on: ubuntu-20.04
     steps:
-    - name: Checkout
-      uses: actions/checkout@v3
-    - name: Setup ‘lua’
-      uses: leafo/gh-actions-lua@v9
-    - name: Setup ‘luarocks’
-      uses: leafo/gh-actions-luarocks@v4
-    - name: Setup ‘luacheck’
-      run: luarocks install luacheck
-    - name: Run ‘luacheck’ linter
-      run: luacheck .
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Luacheck
+        uses: lunarmodules/luacheck@v0

From bac0b8dc274b46cf37bea02aa7edca8f1011a4b8 Mon Sep 17 00:00:00 2001
From: Caleb Maclennan 
Date: Thu, 24 Mar 2022 18:14:43 +0300
Subject: [PATCH 161/194] ci: Use reusable workflow for luarocks deploy

---
 .github/workflows/deploy.yml | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 .github/workflows/deploy.yml

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
new file mode 100644
index 0000000..acd66ea
--- /dev/null
+++ b/.github/workflows/deploy.yml
@@ -0,0 +1,34 @@
+name: Deploy
+
+on: [ push, workflow_dispatch ]
+
+jobs:
+
+  affected:
+    uses: lunarmodules/.github/.github/workflows/list_affected_rockspecs.yml@main
+
+  build:
+    needs: affected
+    if: ${{ needs.affected.outputs.rockspecs }}
+    uses: lunarmodules/.github/.github/workflows/test_build_rock.yml@main
+    with:
+      rockspecs: ${{ needs.affected.outputs.rockspecs }}
+
+  upload:
+    needs: [ affected, build ]
+    # Only run upload if:
+    # 1. We are on the canonical repository (no uploads from forks)
+    # 2. The current commit is either tagged or on the default branch (the workflow will upload dev/scm rockspecs any
+    #    time they are touched, tagged ones whenever the edited rockspec and tag match)
+    # 3. Some rockspecs were changed — this implies the commit changing the rockspec is the same one that gets tagged
+    if: >-
+      ${{
+        github.repository == 'lunarmodules/luasocket' &&
+        ( github.ref_name == 'master' || startsWith(github.ref, 'refs/tags/') ) &&
+        needs.affected.outputs.rockspecs
+      }}
+    uses: lunarmodules/.github/.github/workflows/upload_to_luarocks.yml@main
+    with:
+      rockspecs: ${{ needs.affected.outputs.rockspecs }}
+    secrets:
+      apikey: ${{ secrets.LUAROCKS_APIKEY }}

From b5b60f9d6fd116c377475b3f7431e297ce0e553c Mon Sep 17 00:00:00 2001
From: Caleb Maclennan 
Date: Thu, 24 Mar 2022 21:52:12 +0300
Subject: [PATCH 162/194] chore: Refactor existing news file as a changelog

---
 CHANGELOG.md  | 35 +++++++++++++++++++++++++++++++++++
 NEW           | 44 --------------------------------------------
 makefile.dist |  2 +-
 3 files changed, 36 insertions(+), 45 deletions(-)
 create mode 100644 CHANGELOG.md
 delete mode 100644 NEW

diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 0000000..5db13cb
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,35 @@
+# Changelog
+
+## [v3.0-rc1](https://github.com/lunarmodules/luasocket/releases/v3.0-rc1) — 2013-06-14
+
+Main changes for LuaSocket 3.0-rc1 are IPv6 support and Lua 5.2 compatibility.
+
+* Added: Compatible with Lua 5.2
+  - Note that unless you define LUA_COMPAT_MODULE, package tables will not be exported as globals!
+* Added: IPv6 support;
+  - Socket.connect and socket.bind support IPv6 addresses;
+  - Getpeername and getsockname support IPv6 addresses, and return the socket family as a third value;
+  - URL module updated to support IPv6 host names;
+  - New socket.tcp6 and socket.udp6 functions;
+  - New socket.dns.getaddrinfo and socket.dns.getnameinfo functions;
+* Added: getoption method;
+* Fixed: url.unescape was returning additional values;
+* Fixed: mime.qp, mime.unqp, mime.b64, and mime.unb64 could mistaking their own stack slots for functions arguments;
+* Fixed: Receiving zero-length datagram is now possible;
+* Improved: Hidden all internal library symbols;
+* Improved: Better error messages;
+* Improved: Better documentation of socket options.
+* Fixed: manual sample of HTTP authentication now uses correct "authorization" header (Alexandre Ittner);
+* Fixed: failure on bind() was destroying the socket (Sam Roberts);
+* Fixed: receive() returns immediatelly if prefix can satisfy bytes requested (M Joonas Pihlaja);
+* Fixed: multicast didn't work on Windows, or anywhere else for that matter (Herbert Leuwer, Adrian Sietsma);
+* Fixed: select() now reports an error when called with more sockets than FD_SETSIZE (Lorenzo Leonini);
+* Fixed: manual links to home.html changed to index.html (Robert Hahn);
+* Fixed: mime.unb64() would return an empty string on results that started with a null character (Robert Raschke);
+* Fixed: HTTP now automatically redirects on 303 and 307 (Jonathan Gray);
+* Fixed: calling sleep() with negative numbers could block forever, wasting CPU. Now it returns immediately (MPB);
+* Improved: FTP commands are now sent in upper case to help buggy servers (Anders Eurenius);
+* Improved: known headers now sent in canonic capitalization to help buggy servers (Joseph Stewart);
+* Improved: Clarified tcp:receive() in the manual (MPB);
+* Improved: Decent makefiles (LHF).
+* Fixed: RFC links in documentation now point to IETF (Cosmin Apreutesei).
diff --git a/NEW b/NEW
deleted file mode 100644
index 0bff64c..0000000
--- a/NEW
+++ /dev/null
@@ -1,44 +0,0 @@
-What's New
-
-Main changes for LuaSocket 3.0-rc1 are IPv6 support and Lua 5.2 compatibility. 
-
-    * Added: Compatible with Lua 5.2
-        - Note that unless you define LUA_COMPAT_MODULE, package
-          tables will not be exported as globals! 
-    * Added: IPv6 support;
-        - Socket.connect and socket.bind support IPv6 addresses;
-        - Getpeername and getsockname support IPv6 addresses, and
-          return the socket family as a third value;
-        - URL module updated to support IPv6 host names;
-        - New socket.tcp6 and socket.udp6 functions;
-        - New socket.dns.getaddrinfo and socket.dns.getnameinfo functions; 
-    * Added: getoption method;
-    * Fixed: url.unescape was returning additional values;
-    * Fixed: mime.qp, mime.unqp, mime.b64, and mime.unb64 could
-      mistaking their own stack slots for functions arguments;
-    * Fixed: Receiving zero-length datagram is now possible;
-    * Improved: Hidden all internal library symbols;
-    * Improved: Better error messages;
-    * Improved: Better documentation of socket options. 
-    * Fixed: manual sample of HTTP authentication now uses correct
-      "authorization" header (Alexandre Ittner);
-    * Fixed: failure on bind() was destroying the socket (Sam Roberts); 
-    * Fixed: receive() returns immediatelly if prefix can satisfy
-      bytes requested (M Joonas Pihlaja);
-    * Fixed: multicast didn't work on Windows, or anywhere
-      else for that matter (Herbert Leuwer, Adrian Sietsma);
-    * Fixed: select() now reports an error when called with more
-      sockets than FD_SETSIZE (Lorenzo Leonini);
-    * Fixed: manual links to home.html changed to index.html (Robert Hahn);
-    * Fixed: mime.unb64() would return an empty string on results that started
-      with a null character (Robert Raschke);
-    * Fixed: HTTP now automatically redirects on 303 and 307 (Jonathan Gray);
-    * Fixed: calling sleep() with negative numbers could
-      block forever, wasting CPU. Now it returns immediately (MPB);
-    * Improved: FTP commands are now sent in upper case to
-      help buggy servers (Anders Eurenius);
-    * Improved: known headers now sent in canonic
-      capitalization to help buggy servers (Joseph Stewart);
-    * Improved: Clarified tcp:receive() in the manual (MPB);
-    * Improved: Decent makefiles (LHF).
-    * Fixed: RFC links in documentation now point to IETF (Cosmin Apreutesei).
diff --git a/makefile.dist b/makefile.dist
index 83c303e..34914c3 100644
--- a/makefile.dist
+++ b/makefile.dist
@@ -112,7 +112,7 @@ DOCS = \
 
 dist:
 	mkdir -p $(DIST)
-	cp -vf NEW $(DIST)
+	cp -vf CHANGELOG.md $(DIST)
 	cp -vf LICENSE $(DIST)
 	cp -vf README $(DIST)
 	cp -vf $(MAKE) $(DIST)

From e8633157298eff538da3cb514cf2e2ad65f45d9c Mon Sep 17 00:00:00 2001
From: Caleb Maclennan 
Date: Thu, 24 Mar 2022 22:39:18 +0300
Subject: [PATCH 163/194] chore: Draft v3 release notes

---
 CHANGELOG.md | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5db13cb..931bfa4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,26 @@
 # Changelog
 
+## [v3.0.0](https://github.com/lunarmodules/luasocket/releases/v3.0.0) — unreleased
+
+The last time LuaSocket had a stable release tag was 14 years ago when 2.0.2 was tagged.
+A v3 release candidate was tagged 9 years ago.
+Since then it has been downloaded over 3 million times.
+Additionally the Git repository regularly gets several hundred clones a day.
+But 9 years is a long time and even the release candidate has grown a bit long in the tooth.
+Many Linux distros have packaged the current Git HEAD or some specific tested point as dated or otherwise labeled releases.
+256 commits later and having been migrated to the @lunarmodules org namespace on GitHub, please welcome v3.
+
+This release is a "safe-harbor" tag that represents a minimal amount of changes to get a release tagged.
+Beyond some CI tooling, very little code has changed since migration to @lunarmodules ([5b18e47..e47d98f](https://github.com/lunarmodules/luasocket/compare/5b18e47..e47d98f?w=1)):
+
+* Lua 5.4.3+ support – @pkulchenko, @Zash
+* Cleanup minor issues to get a code linter to pass – @Tieske, @jyoui, @alerque
+* Update Visual Studio build rules for Lua 5.1 – @ewestbrook
+* Set http transfer-encoding even without content-length – @tokenrove
+
+Prior to migration to @lunarmodules ([v3.0-rc1..5b18e47](https://github.com/lunarmodules/luasocket/compare/v3.0-rc1..5b18e47?w=1)) many things happened of which the author of this changelog is not fully apprised.
+Your best bet if it affects your project somehow is to read the commit log & diffs yourself.
+
 ## [v3.0-rc1](https://github.com/lunarmodules/luasocket/releases/v3.0-rc1) — 2013-06-14
 
 Main changes for LuaSocket 3.0-rc1 are IPv6 support and Lua 5.2 compatibility.
@@ -33,3 +54,5 @@ Main changes for LuaSocket 3.0-rc1 are IPv6 support and Lua 5.2 compatibility.
 * Improved: Clarified tcp:receive() in the manual (MPB);
 * Improved: Decent makefiles (LHF).
 * Fixed: RFC links in documentation now point to IETF (Cosmin Apreutesei).
+
+## [v2.0.2](https://github.com/lunarmodules/luasocket/releases/v2.0.2) — 2007-09-11

From d3777f9d06df58732e6f87c8fb94efc984652c63 Mon Sep 17 00:00:00 2001
From: Caleb Maclennan 
Date: Thu, 24 Mar 2022 23:32:57 +0300
Subject: [PATCH 164/194] chore: Start a Markdown era readme

---
 .github/workflows/build.yml |  2 +-
 README                      | 11 -----------
 README.md                   | 12 ++++++++++++
 makefile.dist               |  2 +-
 4 files changed, 14 insertions(+), 13 deletions(-)
 delete mode 100644 README
 create mode 100644 README.md

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 17cad49..d6fe214 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,4 +1,4 @@
-name: Test build
+name: Build
 
 on:
   push:
diff --git a/README b/README
deleted file mode 100644
index 7354ea0..0000000
--- a/README
+++ /dev/null
@@ -1,11 +0,0 @@
-This is the LuaSocket 3.0-rc1. It has been tested on Windows 7, Mac OS X,
-and Linux.
-
-Please use the project page at GitHub
-
-    https://github.com/lunarmodules/luasocket
-
-to file bug reports or propose changes.
-
-Have fun,
-Diego Nehab.
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..af722be
--- /dev/null
+++ b/README.md
@@ -0,0 +1,12 @@
+# LuaSocket
+
+
+[![Build](https://img.shields.io/github/workflow/status/lunarmodules/luasocket/Build?label=Build=Lua)](https://github.com/lunarmodules/luasocket/actions?workflow=Build)
+[![Luacheck](https://img.shields.io/github/workflow/status/lunarmodules/luasocket/Luacheck?label=Luacheck&logo=Lua)](https://github.com/lunarmodules/luasocket/actions?workflow=Luacheck)
+[![GitHub tag (latest SemVer)](https://img.shields.io/github/v/tag/lunarmodules/luasocket?label=Tag&logo=GitHub)](https://github.com/lunarmodules/luasocket/releases)
+[![Luarocks](https://img.shields.io/luarocks/v/lunarmodules/luasocket?label=Luarocks&logo=Lua)](https://luarocks.org/modules/lunarmodules/luasocket)
+
+LuaSocket is a Lua extension library composed of two parts:
+
+1. a set of C modules that provide support for the TCP and UDP transport layers, and
+2. a set of Lua modules that provide functions commonly needed by applications that deal with the Internet.
diff --git a/makefile.dist b/makefile.dist
index 34914c3..3a2e100 100644
--- a/makefile.dist
+++ b/makefile.dist
@@ -114,7 +114,7 @@ dist:
 	mkdir -p $(DIST)
 	cp -vf CHANGELOG.md $(DIST)
 	cp -vf LICENSE $(DIST)
-	cp -vf README $(DIST)
+	cp -vf README.md $(DIST)
 	cp -vf $(MAKE) $(DIST)
 
 	mkdir -p $(DIST)/etc

From f7f0a77a3dbcd066c2f228ada63ee78546a01f78 Mon Sep 17 00:00:00 2001
From: Caleb Maclennan 
Date: Fri, 25 Mar 2022 10:09:13 +0300
Subject: [PATCH 165/194] docs: Drop obsolete changelog from docs index

---
 docs/index.html | 76 -------------------------------------------------
 1 file changed, 76 deletions(-)

diff --git a/docs/index.html b/docs/index.html
index 0364070..5982071 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -121,76 +121,6 @@ Aurich, Liam Devine, Alexey Melnichuk, and everybody else
 that has helped bring this library back to life.
 
    
 
-
-
-
    What's New
    
-
-
    
-Main changes for LuaSocket 3.0-rc1 are IPv6 support
-and Lua 5.2 compatibility.
-
    
-
-
      
-
    •  Added: Compatible with Lua 5.2
      • 
-
        
-
      •  Note that unless you define LUA_COMPAT_MODULE,
-package tables will not be exported as globals!
        • 
-
      
-
    •  Added: IPv6 support;
      • 
-
        
-
      •  Socket.connect and socket.bind support IPv6 addresses;
        • 
-
      •  Getpeername and getsockname support
-IPv6 addresses, and return the socket family as a third value;
        • 
-
      •  URL module updated to support IPv6 host names;
        • 
-
      •  New socket.tcp6 and socket.udp6 functions;
        • 
-
      •  New socket.dns.getaddrinfo and
-    socket.dns.getnameinfo functions;
        • 
-
      
-
    •  Added: getoption method;
      • 
-
    •  Fixed: url.unescape was returning additional values;
      • 
-
    •  Fixed: mime.qp, mime.unqp,
-    mime.b64, and mime.unb64 could
-    mistaking their own stack slots for functions arguments;
      • 
-
    •  Fixed: Receiving zero-length datagram is now possible;
      • 
-
    •  Improved: Hidden all internal library symbols;
      • 
-
    •  Improved: Better error messages;
      • 
-
    •  Improved: Better documentation of socket options.
      • 
-
    •  Fixed: manual sample of HTTP authentication now uses correct
-     "authorization" header (Alexandre Ittner);
      • 
-
    •  Fixed: failure on bind() was destroying the socket (Sam Roberts);
      • 
-
    •  Fixed: receive() returns immediatelly if prefix can satisfy
-     bytes requested (M Joonas Pihlaja);
      • 
-
    •  Fixed: multicast didn't work on Windows, or anywhere
-     else for that matter (Herbert Leuwer, Adrian Sietsma);
      • 
-
    •  Fixed: select() now reports an error when called with more
-     sockets than FD_SETSIZE (Lorenzo Leonini);
      • 
-
    •  Fixed: manual links to home.html changed to index.html
-(Robert Hahn);
      • 
-
    •  Fixed: mime.unb64() would return an empty string on results that started
-     with a null character (Robert Raschke);
      • 
-
    •  Fixed: HTTP now automatically redirects on 303 and 307 (Jonathan Gray);
      • 
-
    •  Fixed: calling sleep() with negative numbers could
-     block forever, wasting CPU. Now it returns immediately (MPB);
      • 
-
    •  Improved: FTP commands are now sent in upper case to
-     help buggy servers (Anders Eurenius);
      • 
-
    •  Improved: known headers now sent in canonic
-     capitalization to help buggy servers (Joseph Stewart);
      • 
-
    •  Improved: Clarified tcp:receive() in the manual (MPB);
      • 
-
    •  Improved: Decent makefiles (LHF).
      • 
-
    •  Fixed: RFC links in documentation now point to IETF (Cosmin Apreutesei).
      • 
-
    
-
-
-
-
    Old Versions
    
-
-
    
-All  previous versions  of the  LuaSocket library  can be  downloaded 
-here. Although these  versions are  no longer  supported, they  are
-still available for those that have compatibility issues.
-
    
-
 
 
 
    
@@ -202,12 +132,6 @@ still available for those that have compatibility issues.
 introduction ·
 reference
 
    
-
    
-
-Last modified by Diego Nehab on 
    
-Tue Jun 11 18:50:23 HKT 2013
-    
-
    
 
    
 
    
 

From 020c2c746b5a82871e9b7d0c65742f15fa420289 Mon Sep 17 00:00:00 2001
From: Caleb Maclennan 
Date: Fri, 25 Mar 2022 09:52:38 +0300
Subject: [PATCH 166/194] chore: Copy-edit description in dev rockspec

---
 luasocket-scm-3.rockspec | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/luasocket-scm-3.rockspec b/luasocket-scm-3.rockspec
index 0e1b0f9..71f335c 100644
--- a/luasocket-scm-3.rockspec
+++ b/luasocket-scm-3.rockspec
@@ -7,9 +7,9 @@ source = {
 description = {
   summary = "Network support for the Lua language",
   detailed = [[
-      LuaSocket is a Lua extension library that is composed by two parts: a C core
-      that provides support for the TCP and UDP transport layers, and a set of Lua
-      modules that add support for functionality commonly needed by applications
+      LuaSocket is a Lua extension library composed of two parts: a set of C
+      modules that provide support for the TCP and UDP transport layers, and a
+      set of Lua modules that provide functions commonly needed by applications
       that deal with the Internet.
    ]],
   homepage = "https://github.com/lunarmodules/luasocket",

From 88c8a85cb6528232288ec590910b7a966aace52b Mon Sep 17 00:00:00 2001
From: Caleb Maclennan 
Date: Fri, 25 Mar 2022 09:56:50 +0300
Subject: [PATCH 167/194] chore: Release v3.0.0

---
 CHANGELOG.md                         |   2 +-
 docs/index.html                      |   7 +-
 rockspecs/luasocket-3.0.0-1.rockspec | 134 +++++++++++++++++++++++++++
 3 files changed, 138 insertions(+), 5 deletions(-)
 create mode 100644 rockspecs/luasocket-3.0.0-1.rockspec

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 931bfa4..0de05f3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Changelog
 
-## [v3.0.0](https://github.com/lunarmodules/luasocket/releases/v3.0.0) — unreleased
+## [v3.0.0](https://github.com/lunarmodules/luasocket/releases/v3.0.0) — 2022-03-25
 
 The last time LuaSocket had a stable release tag was 14 years ago when 2.0.2 was tagged.
 A v3 release candidate was tagged 9 years ago.
diff --git a/docs/index.html b/docs/index.html
index 5982071..31e18ad 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -87,10 +87,9 @@ Author: Diego Nehab
 
    Download
    
 
 
    
-LuaSocket version 3.0-rc1 is now available for download!
-It is compatible with  Lua 5.1 and 5.2, and has
-been tested on Windows XP, Linux, and Mac OS X. Chances
-are it works well on most UNIX distributions and Windows flavors.
+LuaSocket version 3.0.0 is now available for download!
+It is compatible with Lua 5.1 through 5.4.
+Chances are it works well on most UNIX distributions and Windows flavors.
 
    
 
 
    
diff --git a/rockspecs/luasocket-3.0.0-1.rockspec b/rockspecs/luasocket-3.0.0-1.rockspec
new file mode 100644
index 0000000..4cf4acf
--- /dev/null
+++ b/rockspecs/luasocket-3.0.0-1.rockspec
@@ -0,0 +1,134 @@
+package = "LuaSocket"
+version = "3.0.0-1"
+source = {
+  url = "git+https://github.com/lunarmodules/luasocket.git",
+  tag = "v3.0.0"
+}
+description = {
+  summary = "Network support for the Lua language",
+  detailed = [[
+      LuaSocket is a Lua extension library composed of two parts: a set of C
+      modules that provide support for the TCP and UDP transport layers, and a
+      set of Lua modules that provide functions commonly needed by applications
+      that deal with the Internet.
+   ]],
+  homepage = "https://github.com/lunarmodules/luasocket",
+  license = "MIT"
+}
+dependencies = {
+  "lua >= 5.1"
+}
+
+local function make_plat(plat)
+  local defines = {
+    unix = {
+      "LUASOCKET_DEBUG"
+    },
+    macosx = {
+      "LUASOCKET_DEBUG",
+      "UNIX_HAS_SUN_LEN"
+    },
+    win32 = {
+      "LUASOCKET_DEBUG",
+      "NDEBUG"
+    },
+    mingw32 = {
+      "LUASOCKET_DEBUG",
+      "LUASOCKET_INET_PTON",
+      "WINVER=0x0501"
+    }
+  }
+  local modules = {
+    ["socket.core"] = {
+      sources = {
+        "src/luasocket.c"
+        , "src/timeout.c"
+        , "src/buffer.c"
+        , "src/io.c"
+        , "src/auxiliar.c"
+        , "src/options.c"
+        , "src/inet.c"
+        , "src/except.c"
+        , "src/select.c"
+        , "src/tcp.c"
+        , "src/udp.c"
+        , "src/compat.c" },
+      defines = defines[plat],
+      incdir = "/src"
+    },
+    ["mime.core"] = {
+      sources = { "src/mime.c", "src/compat.c" },
+      defines = defines[plat],
+      incdir = "/src"
+    },
+    ["socket.http"]    = "src/http.lua",
+    ["socket.url"]     = "src/url.lua",
+    ["socket.tp"]      = "src/tp.lua",
+    ["socket.ftp"]     = "src/ftp.lua",
+    ["socket.headers"] = "src/headers.lua",
+    ["socket.smtp"]    = "src/smtp.lua",
+    ltn12              = "src/ltn12.lua",
+    socket             = "src/socket.lua",
+    mime               = "src/mime.lua"
+  }
+  if plat == "unix"
+    or plat == "macosx"
+    or plat == "haiku"
+  then
+    modules["socket.core"].sources[#modules["socket.core"].sources+1] = "src/usocket.c"
+    if plat == "haiku" then
+      modules["socket.core"].libraries = {"network"}
+    end
+    modules["socket.unix"] = {
+      sources = {
+        "src/buffer.c"
+        , "src/compat.c"
+        , "src/auxiliar.c"
+        , "src/options.c"
+        , "src/timeout.c"
+        , "src/io.c"
+        , "src/usocket.c"
+        , "src/unix.c"
+        , "src/unixdgram.c"
+        , "src/unixstream.c" },
+      defines = defines[plat],
+      incdir = "/src"
+    }
+    modules["socket.serial"] = {
+      sources = {
+        "src/buffer.c"
+        , "src/compat.c"
+        , "src/auxiliar.c"
+        , "src/options.c"
+        , "src/timeout.c"
+        , "src/io.c"
+        , "src/usocket.c"
+        , "src/serial.c" },
+      defines = defines[plat],
+      incdir = "/src"
+    }
+  end
+  if  plat == "win32"
+    or plat == "mingw32"
+  then
+    modules["socket.core"].sources[#modules["socket.core"].sources+1] = "src/wsocket.c"
+    modules["socket.core"].libraries = { "ws2_32" }
+  end
+  return { modules = modules }
+end
+
+build = {
+  type = "builtin",
+  platforms = {
+    unix = make_plat("unix"),
+    macosx = make_plat("macosx"),
+    haiku = make_plat("haiku"),
+    win32 = make_plat("win32"),
+    mingw32 = make_plat("mingw32")
+  },
+  copy_directories = {
+    "docs"
+    , "samples"
+    , "etc"
+    , "test" }
+}

From 1d61853ab84f0724502205f45849c2347d6a49ac Mon Sep 17 00:00:00 2001
From: Robert Scheck 
Date: Mon, 28 Mar 2022 13:53:32 +0200
Subject: [PATCH 168/194] chore: Update internal version references to match
 release (#370)

---
 docs/installation.html | 2 +-
 makefile.dist          | 2 +-
 src/luasocket.h        | 2 +-
 src/makefile           | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/installation.html b/docs/installation.html
index 28a9fbb..dcf9d36 100644
--- a/docs/installation.html
+++ b/docs/installation.html
@@ -89,7 +89,7 @@ it should be easy to use LuaSocket. Just fire the interpreter and use the
 Lua 5.2.2  Copyright (C) 1994-2013 Lua.org, PUC-Rio
 > socket = require("socket")
 > print(socket._VERSION)
---> LuaSocket 3.0-rc1
+--> LuaSocket 3.0.0
 
    
 
 
     Each module loads their dependencies automatically, so you only need to
diff --git a/makefile.dist b/makefile.dist
index 3a2e100..a27ba57 100644
--- a/makefile.dist
+++ b/makefile.dist
@@ -1,7 +1,7 @@
 #--------------------------------------------------------------------------
 # Distribution makefile
 #--------------------------------------------------------------------------
-DIST = luasocket-3.0-rc1
+DIST = luasocket-3.0.0
 
 TEST = \
 	test/README \
diff --git a/src/luasocket.h b/src/luasocket.h
index d22b1be..1017fba 100644
--- a/src/luasocket.h
+++ b/src/luasocket.h
@@ -10,7 +10,7 @@
 /*-------------------------------------------------------------------------* \
 * Current socket library version
 \*-------------------------------------------------------------------------*/
-#define LUASOCKET_VERSION    "LuaSocket 3.0-rc1"
+#define LUASOCKET_VERSION    "LuaSocket 3.0.0"
 #define LUASOCKET_COPYRIGHT  "Copyright (C) 1999-2013 Diego Nehab"
 
 /*-------------------------------------------------------------------------*\
diff --git a/src/makefile b/src/makefile
index f95498a..06f4d19 100755
--- a/src/makefile
+++ b/src/makefile
@@ -272,7 +272,7 @@ SOCKET_win64=wsocket.obj
 #
 SO=$(SO_$(PLAT))
 O=$(O_$(PLAT))
-SOCKET_V=3.0-rc1
+SOCKET_V=3.0.0
 MIME_V=1.0.3
 SOCKET_SO=socket-$(SOCKET_V).$(SO)
 MIME_SO=mime-$(MIME_V).$(SO)

From ec7d7a2b8feead992f0f9197ae299fe410ec16a0 Mon Sep 17 00:00:00 2001
From: Thijs Schreijer 
Date: Wed, 23 Mar 2022 15:57:45 +0100
Subject: [PATCH 169/194] cleanup; delete unreferenced powerpoint file from
 docs

---
 docs/lua05.ppt | Bin 304128 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 docs/lua05.ppt

diff --git a/docs/lua05.ppt b/docs/lua05.ppt
deleted file mode 100644
index e2b7ab4b304505811d6f481ac1ab7147af3e8ebc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 304128
zcmeFYc|6qL`#=1eF)@~yL6)+NF=%>Ag9>FC4B0{?Te8GdWX~Rk1|za1nTV7nWXZlH
z>pNsiLYARH)+`y4{hoP$d*8qB{rTO$KYsW9&;7@Jd0d|7y3RS*xn9>Fp(9`3fKMEKCOwrQ}@!;_AkfHrX7bfXEL1zk`_vlQ|
z`v2+w!w~@Tx!CAk$3kZ?zzP8XEbxlUjV>Jl4)@jQh(rK@BOL*H7ypBdG=K#&{xfPF
z9$3*k)(G!y*hvZAsDHD(pd0+)nMrDnCzGsYDSs>A<)|d04{(X@`9e?0)VyD
ze>BW%3G`Cn4iMl;&!3^Q0;3?E=p*kRV))IVe~Qx)`i}(spF>vQkNj^wqfv%KJpZBR
z_#^*2)LH*S=KK$t?&Cl7Z~6ah_djKZpA6ssSLOfp?|+4iX~&>{>;JFH{om;s*DUc*
z?f(&{qkm+EpA6d!WYqo7`v11~-;r@GGIVCdj8UEu8-|Y2@Bj2Y9T|G|Kgei{Av0pe
zKt}8t$RLJYUONA0y#H;FQSKO>8OTRxhMv)<|2?0dE;I54{~#UyFZTbHkJA$;{xGAw
z5S>lXu2e`HBIGRiTC
zp=ZPnL1zXr>M`hFWW-O7&WtuNe~>ZF7;VVYnNbcwXNDayIy2<6e^C4nO8h~oKX~R3
z%KpJ~bY#>&|3^MaM}~jsKeF^6`Sc(8)F1ro52^v6H6lF?23Xcmbo`&`pF6>SQ#bu@
zm38=ImzlZY0@mWkiR%ZF;)YhCtZzRb0-~*qcK@X&-~qtC#)wlGh#m>(1IE;bMyfON
z8$mGoD$xX@tDt}Xqd5dY>Ej#(rq_ph0LOna`u~s&0E>%@0EI$fRH74s&L8P~2w(w`
zpMS;xlwpOjf^X569#LS8i%}N_wF_7UN7qG*0i%|(UU}DVGe`ueH(XEdE!9b}Sy~2Odr@q5RMyiyP
z3zR^2jX-CH>;ddDF@`FGJm`skWky9TeNKu3JP_r7a{q0E3z%nGm}M-C3rvi`K%mdG
zZ}cl?FeA+v9E=Ihn23x?|HlOo7qHHxO~2wZKnE8?j{!b&F#^HJ=K=;%O?-Txt*zr}*C8{bI0F2)Ek
z4EQfwSLv2q0Vlxw|Aj5YA6uG$JK*z=Z%*|82*8kT_kY(f%pY6kbidqyTl8N0FJ$=l
zzhetbzeemITc;1@4-o+7umV$!`F|2G0^Jq>WdCzxCjfTzG-LPzK+ZosMHiurWr(q?
z(8*0?jh{ZT{-@~{ZESeyDBE#H-yhZ0!I{vpgU%nI^iBr^Fc!6RVD-?kq+cjI4}(F#
zvvkJt%yLinvKGrA3meZx4*!W9FUF#!i&MYqKl-D=@-b@IN7BD4s3ZtCWAYc<33X|d
z4k;NYu61R+B7qluWhyuE?5mWXz5amIs*uzu@@$DV1vLF!%0D(XP2ypQs
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
z
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®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[~2ha~#t@A)Fl3
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
    q3K#UGuE*q~9)O#l@#|#4d9-E2eW2P*||?
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
Date: Wed, 23 Mar 2022 15:58:50 +0100
Subject: [PATCH 170/194] cleanup; move logo file into docs, more appropriate

---
 logo.ps => docs/logo.ps | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename logo.ps => docs/logo.ps (100%)

diff --git a/logo.ps b/docs/logo.ps
similarity index 100%
rename from logo.ps
rename to docs/logo.ps

From 7187be8b76452aa968726180af24deaaa545431d Mon Sep 17 00:00:00 2001
From: Thijs Schreijer 
Date: Wed, 23 Mar 2022 16:01:50 +0100
Subject: [PATCH 171/194] cleanup; delete the ./gem folder

---
 gem/ex1.lua       |   4 -
 gem/ex10.lua      |  17 --
 gem/ex11.lua      |   7 -
 gem/ex12.lua      |  34 ---
 gem/ex2.lua       |  11 -
 gem/ex3.lua       |  15 -
 gem/ex4.lua       |   5 -
 gem/ex5.lua       |  15 -
 gem/ex6.lua       |  14 -
 gem/ex7.lua       |  16 --
 gem/ex8.lua       |   5 -
 gem/ex9.lua       |   3 -
 gem/gem.c         |  54 ----
 gem/gt.b64        | 206 --------------
 gem/input.bin     | Bin 11732 -> 0 bytes
 gem/ltn012.tex    | 695 ----------------------------------------------
 gem/luasocket.png | Bin 11732 -> 0 bytes
 gem/makefile      |  14 -
 gem/myps2pdf      | 113 --------
 gem/t1.lua        |  25 --
 gem/t1lf.txt      |   5 -
 gem/t2.lua        |  36 ---
 gem/t2.txt        |   4 -
 gem/t2gt.qp       |   5 -
 gem/t3.lua        |  25 --
 gem/t4.lua        |  10 -
 gem/t5.lua        |  30 --
 gem/test.lua      |  46 ---
 28 files changed, 1414 deletions(-)
 delete mode 100644 gem/ex1.lua
 delete mode 100644 gem/ex10.lua
 delete mode 100644 gem/ex11.lua
 delete mode 100644 gem/ex12.lua
 delete mode 100644 gem/ex2.lua
 delete mode 100644 gem/ex3.lua
 delete mode 100644 gem/ex4.lua
 delete mode 100644 gem/ex5.lua
 delete mode 100644 gem/ex6.lua
 delete mode 100644 gem/ex7.lua
 delete mode 100644 gem/ex8.lua
 delete mode 100644 gem/ex9.lua
 delete mode 100644 gem/gem.c
 delete mode 100644 gem/gt.b64
 delete mode 100644 gem/input.bin
 delete mode 100644 gem/ltn012.tex
 delete mode 100644 gem/luasocket.png
 delete mode 100644 gem/makefile
 delete mode 100755 gem/myps2pdf
 delete mode 100644 gem/t1.lua
 delete mode 100644 gem/t1lf.txt
 delete mode 100644 gem/t2.lua
 delete mode 100644 gem/t2.txt
 delete mode 100644 gem/t2gt.qp
 delete mode 100644 gem/t3.lua
 delete mode 100644 gem/t4.lua
 delete mode 100644 gem/t5.lua
 delete mode 100644 gem/test.lua

diff --git a/gem/ex1.lua b/gem/ex1.lua
deleted file mode 100644
index 327a542..0000000
--- a/gem/ex1.lua
+++ /dev/null
@@ -1,4 +0,0 @@
-local CRLF = "\013\010"
-local input = source.chain(source.file(io.stdin), normalize(CRLF))
-local output = sink.file(io.stdout)
-pump.all(input, output)
diff --git a/gem/ex10.lua b/gem/ex10.lua
deleted file mode 100644
index 2b1b98f..0000000
--- a/gem/ex10.lua
+++ /dev/null
@@ -1,17 +0,0 @@
-function pump.step(src, snk)
-  local chunk, src_err = src()
-  local ret, snk_err = snk(chunk, src_err)
-  if chunk and ret then return 1
-  else return nil, src_err or snk_err end
-end
-
-function pump.all(src, snk, step)
-    step = step or pump.step
-    while true do
-        local ret, err = step(src, snk)
-        if not ret then
-            if err then return nil, err
-            else return 1 end
-        end
-    end
-end
diff --git a/gem/ex11.lua b/gem/ex11.lua
deleted file mode 100644
index 79c99af..0000000
--- a/gem/ex11.lua
+++ /dev/null
@@ -1,7 +0,0 @@
-local input = source.chain(
-  source.file(io.open("input.bin", "rb")),
-  encode("base64"))
-local output = sink.chain(
-  wrap(76),
-  sink.file(io.open("output.b64", "w")))
-pump.all(input, output)
diff --git a/gem/ex12.lua b/gem/ex12.lua
deleted file mode 100644
index de17d76..0000000
--- a/gem/ex12.lua
+++ /dev/null
@@ -1,34 +0,0 @@
-local smtp = require"socket.smtp"
-local mime = require"mime"
-local ltn12 = require"ltn12"
-
-CRLF = "\013\010"
-
-local message = smtp.message{
-  headers = {
-    from = "Sicrano ",
-    to = "Fulano ",
-    subject = "A message with an attachment"},
-  body = {
-    preamble = "Hope you can see the attachment" .. CRLF,
-    [1] = {
-      body = "Here is our logo" .. CRLF},
-    [2] = {
-      headers = {
-        ["content-type"] = 'image/png; name="luasocket.png"',
-        ["content-disposition"] =
-          'attachment; filename="luasocket.png"',
-        ["content-description"] = 'LuaSocket logo',
-        ["content-transfer-encoding"] = "BASE64"},
-      body = ltn12.source.chain(
-        ltn12.source.file(io.open("luasocket.png", "rb")),
-        ltn12.filter.chain(
-          mime.encode("base64"),
-          mime.wrap()))}}}
-
-assert(smtp.send{
-  rcpt = "",
-  from = "",
-  server = "localhost",
-  port = 2525,
-  source = message})
diff --git a/gem/ex2.lua b/gem/ex2.lua
deleted file mode 100644
index 94bde66..0000000
--- a/gem/ex2.lua
+++ /dev/null
@@ -1,11 +0,0 @@
-function filter.cycle(lowlevel, context, extra)
-  return function(chunk)
-    local ret
-    ret, context = lowlevel(context, chunk, extra)
-    return ret
-  end
-end
-
-function normalize(marker)
-  return filter.cycle(eol, 0, marker)
-end
diff --git a/gem/ex3.lua b/gem/ex3.lua
deleted file mode 100644
index 60b4423..0000000
--- a/gem/ex3.lua
+++ /dev/null
@@ -1,15 +0,0 @@
-local function chainpair(f1, f2)
-  return function(chunk)
-    local ret = f2(f1(chunk))
-    if chunk then return ret
-    else return (ret or "") .. (f2() or "") end
-  end
-end
-
-function filter.chain(...)
-  local f = select(1, ...)
-  for i = 2, select('#', ...) do
-    f = chainpair(f, select(i, ...))
-  end
-  return f
-end
diff --git a/gem/ex4.lua b/gem/ex4.lua
deleted file mode 100644
index c48b77e..0000000
--- a/gem/ex4.lua
+++ /dev/null
@@ -1,5 +0,0 @@
-local qp = filter.chain(normalize(CRLF), encode("quoted-printable"),
-  wrap("quoted-printable"))
-local input = source.chain(source.file(io.stdin), qp)
-local output = sink.file(io.stdout)
-pump.all(input, output)
diff --git a/gem/ex5.lua b/gem/ex5.lua
deleted file mode 100644
index 196b30a..0000000
--- a/gem/ex5.lua
+++ /dev/null
@@ -1,15 +0,0 @@
-function source.empty(err)
-  return function()
-    return nil, err
-  end
-end
-
-function source.file(handle, io_err)
-  if handle then
-    return function()
-      local chunk = handle:read(20)
-      if not chunk then handle:close() end
-      return chunk
-    end
-  else return source.empty(io_err or "unable to open file") end
-end
diff --git a/gem/ex6.lua b/gem/ex6.lua
deleted file mode 100644
index a3fdca0..0000000
--- a/gem/ex6.lua
+++ /dev/null
@@ -1,14 +0,0 @@
-function source.chain(src, f)
-  return function()
-    if not src then
-      return nil
-    end
-    local chunk, err = src()
-    if not chunk then
-      src = nil
-      return f(nil)
-    else
-      return f(chunk)
-    end
-  end
-end
diff --git a/gem/ex7.lua b/gem/ex7.lua
deleted file mode 100644
index c766988..0000000
--- a/gem/ex7.lua
+++ /dev/null
@@ -1,16 +0,0 @@
-function sink.table(t)
-  t = t or {}
-  local f = function(chunk, err)
-    if chunk then table.insert(t, chunk) end
-    return 1
-  end
-  return f, t
-end
-
-local function null()
-  return 1
-end
-
-function sink.null()
-  return null
-end
diff --git a/gem/ex8.lua b/gem/ex8.lua
deleted file mode 100644
index 81e288c..0000000
--- a/gem/ex8.lua
+++ /dev/null
@@ -1,5 +0,0 @@
-local input = source.file(io.stdin)
-local output, t = sink.table()
-output = sink.chain(normalize(CRLF), output)
-pump.all(input, output)
-io.write(table.concat(t))
diff --git a/gem/ex9.lua b/gem/ex9.lua
deleted file mode 100644
index b857698..0000000
--- a/gem/ex9.lua
+++ /dev/null
@@ -1,3 +0,0 @@
-for chunk in source.file(io.stdin) do
-  io.write(chunk)
-end
diff --git a/gem/gem.c b/gem/gem.c
deleted file mode 100644
index 976f74d..0000000
--- a/gem/gem.c
+++ /dev/null
@@ -1,54 +0,0 @@
-#include "lua.h"
-#include "lauxlib.h"
-
-#define CR '\xD'
-#define LF '\xA'
-#define CRLF "\xD\xA"
-
-#define candidate(c) (c == CR || c == LF)
-static int pushchar(int c, int last, const char *marker, 
-    luaL_Buffer *buffer) {
-  if (candidate(c)) {
-    if (candidate(last)) {
-      if (c == last) 
-        luaL_addstring(buffer, marker);
-      return 0;
-    } else {
-      luaL_addstring(buffer, marker);
-      return c;
-    }
-  } else {
-    luaL_putchar(buffer, c);
-    return 0;
-  }
-}
-
-static int eol(lua_State *L) {
-  int context = luaL_checkint(L, 1);
-  size_t isize = 0;
-  const char *input = luaL_optlstring(L, 2, NULL, &isize);
-  const char *last = input + isize;
-  const char *marker = luaL_optstring(L, 3, CRLF);
-  luaL_Buffer buffer;
-  luaL_buffinit(L, &buffer);
-  if (!input) {
-    lua_pushnil(L);
-    lua_pushnumber(L, 0);
-    return 2;
-  }
-  while (input < last)
-    context = pushchar(*input++, context, marker, &buffer);
-  luaL_pushresult(&buffer);
-  lua_pushnumber(L, context);
-  return 2;
-}
-
-static luaL_reg func[] = {
-    { "eol", eol },
-    { NULL, NULL }
-};
-
-int luaopen_gem(lua_State *L) {
-    luaL_openlib(L, "gem", func, 0);
-	return 0;
-}
diff --git a/gem/gt.b64 b/gem/gt.b64
deleted file mode 100644
index a74c0b3..0000000
--- a/gem/gt.b64
+++ /dev/null
@@ -1,206 +0,0 @@
-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
diff --git a/gem/input.bin b/gem/input.bin
deleted file mode 100644
index d24a95495b55894b96aec1b01d0b7c02cc43f168..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 11732
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 /dev/null`
-   then
-      ofilename=`echo $1 | sed 's/\..*$/.pdf/'`
-   else
-      echo "$usage" 1>&2
-      exit 1
-   fi ;;
-*) echo "$usage" 1>&2 ; exit 1 ;;
-esac
-
-if [ $best == 1 ]
-then
-	options="-dPDFSETTINGS=/prepress \
-	-r1200 \
-	-dMonoImageResolution=1200 \
-	-dGrayImageResolution=1200 \
-	-dColorImageResolution=1200 \
-	-dDownsampleMonoImages=false \
-	-dDownsampleGrayImages=false \
-	-dDownsampleColorImages=false \
-	-dAutoFilterMonoImages=false \
-	-dAutoFilterGrayImages=false \
-	-dAutoFilterColorImages=false \
-	-dMonoImageFilter=/FlateEncode \
-	-dGrayImageFilter=/FlateEncode \
-	-dColorImageFilter=/FlateEncode"
-else
-	options="-dPDFSETTINGS=/prepress \
-	-r600 \
-	-dDownsampleMonoImages=true \
-	-dDownsampleGrayImages=true \
-	-dDownsampleColorImages=true \
-	-dMonoImageDownsampleThreshold=2.0 \
-	-dGrayImageDownsampleThreshold=1.5 \
-	-dColorImageDownsampleThreshold=1.5 \
-	-dMonoImageResolution=600 \
-	-dGrayImageResolution=600 \
-	-dColorImageResolution=600 \
-	-dAutoFilterMonoImages=false \
-	-dMonoImageFilter=/FlateEncode \
-	-dAutoFilterGrayImages=true \
-	-dAutoFilterColorImages=true"
-fi
-
-if [ $rot == 1 ]
-then
-	options="$options -dAutoRotatePages=/PageByPage"
-fi
-
-if [ $eps == 1 ]
-then
-	options="$options -dEPSCrop"
-fi
-
-set -x
-
-if [ $a4 == 1 ]
-then
-	# Resize from A4 to letter size
-	psresize -Pa4 -pletter "$ifilename" myps2pdf.temp.ps
-	ifilename=myps2pdf.temp.ps
-fi
-
-gs -q -dSAFER -dNOPAUSE -dBATCH  \
-	-sDEVICE=pdfwrite -sPAPERSIZE=letter -sOutputFile=myps2pdf.temp.pdf \
-	-dCompatibilityLevel=1.3 \
-	$options \
-	-dMaxSubsetPct=100 \
-	-dSubsetFonts=true \
-	-dEmbedAllFonts=true \
-	-dColorConversionStrategy=/LeaveColorUnchanged \
-	-dDoThumbnails=true \
-	-dPreserveEPSInfo=true \
-	-c .setpdfwrite -f "$ifilename"
-
-if [ $do_opt == 1 ]
-then
-	pdfopt myps2pdf.temp.pdf $ofilename
-else
-	mv myps2pdf.temp.pdf $ofilename
-fi
-rm -f myps2pdf.temp.pdf myps2pdf.temp.ps
diff --git a/gem/t1.lua b/gem/t1.lua
deleted file mode 100644
index 0c054c9..0000000
--- a/gem/t1.lua
+++ /dev/null
@@ -1,25 +0,0 @@
-source = {}
-sink = {}
-pump = {}
-filter = {}
-
--- source.chain
-dofile("ex6.lua")
-
--- source.file
-dofile("ex5.lua")
-
--- normalize
-require"gem"
-eol = gem.eol
-dofile("ex2.lua")
-
--- sink.file
-require"ltn12"
-sink.file = ltn12.sink.file
-
--- pump.all
-dofile("ex10.lua")
-
--- run test
-dofile("ex1.lua")
diff --git a/gem/t1lf.txt b/gem/t1lf.txt
deleted file mode 100644
index 8cddd1b..0000000
--- a/gem/t1lf.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-this is a test file
-it should have been saved as lf eol
-but t1.lua will convert it to crlf eol
-otherwise it is broken!
-
diff --git a/gem/t2.lua b/gem/t2.lua
deleted file mode 100644
index a81ed73..0000000
--- a/gem/t2.lua
+++ /dev/null
@@ -1,36 +0,0 @@
-source = {}
-sink = {}
-pump = {}
-filter = {}
-
--- filter.chain
-dofile("ex3.lua")
-
--- normalize
-require"gem"
-eol = gem.eol
-dofile("ex2.lua")
-
--- encode
-require"mime"
-encode = mime.encode
-
--- wrap
-wrap = mime.wrap
-
--- source.chain
-dofile("ex6.lua")
-
--- source.file
-dofile("ex5.lua")
-
--- sink.file
-require"ltn12"
-sink.file = ltn12.sink.file
-
--- pump.all
-dofile("ex10.lua")
-
--- run test
-CRLF = "\013\010"
-dofile("ex4.lua")
diff --git a/gem/t2.txt b/gem/t2.txt
deleted file mode 100644
index f484fe8..0000000
--- a/gem/t2.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-esse é um texto com acentos
-quoted-printable tem que quebrar linhas longas, com mais que 76 linhas de texto
-fora que as quebras de linhas têm que ser normalizadas
-vamos ver o que dá isso aqui
diff --git a/gem/t2gt.qp b/gem/t2gt.qp
deleted file mode 100644
index 355a845..0000000
--- a/gem/t2gt.qp
+++ /dev/null
@@ -1,5 +0,0 @@
-esse =E9 um texto com acentos
-quoted-printable tem que quebrar linhas longas, com mais que 76 linhas de t=
-exto
-fora que as quebras de linhas t=EAm que ser normalizadas
-vamos ver o que d=E1 isso aqui
diff --git a/gem/t3.lua b/gem/t3.lua
deleted file mode 100644
index 4bb98ba..0000000
--- a/gem/t3.lua
+++ /dev/null
@@ -1,25 +0,0 @@
-source = {}
-sink = {}
-pump = {}
-filter = {}
-
--- source.file
-dofile("ex5.lua")
-
--- sink.table
-dofile("ex7.lua")
-
--- sink.chain
-require"ltn12"
-sink.chain = ltn12.sink.chain
-
--- normalize
-require"gem"
-eol = gem.eol
-dofile("ex2.lua")
-
--- pump.all
-dofile("ex10.lua")
-
--- run test
-dofile("ex8.lua")
diff --git a/gem/t4.lua b/gem/t4.lua
deleted file mode 100644
index 8b8071c..0000000
--- a/gem/t4.lua
+++ /dev/null
@@ -1,10 +0,0 @@
-source = {}
-sink = {}
-pump = {}
-filter = {}
-
--- source.file
-dofile("ex5.lua")
-
--- run test
-dofile("ex9.lua")
diff --git a/gem/t5.lua b/gem/t5.lua
deleted file mode 100644
index 7c569ea..0000000
--- a/gem/t5.lua
+++ /dev/null
@@ -1,30 +0,0 @@
-source = {}
-sink = {}
-pump = {}
-filter = {}
-
--- source.chain
-dofile("ex6.lua")
-
--- source.file
-dofile("ex5.lua")
-
--- encode
-require"mime"
-encode = mime.encode
-
--- sink.chain
-require"ltn12"
-sink.chain = ltn12.sink.chain
-
--- wrap
-wrap = mime.wrap
-
--- sink.file
-sink.file = ltn12.sink.file
-
--- pump.all
-dofile("ex10.lua")
-
--- run test
-dofile("ex11.lua")
diff --git a/gem/test.lua b/gem/test.lua
deleted file mode 100644
index a937b9a..0000000
--- a/gem/test.lua
+++ /dev/null
@@ -1,46 +0,0 @@
-function readfile(n)
-    local f = io.open(n, "rb")
-    local s = f:read("*a")
-    f:close()
-    return s
-end
-
-lf = readfile("t1lf.txt")
-os.remove("t1crlf.txt")
-os.execute("lua t1.lua < t1lf.txt > t1crlf.txt")
-crlf = readfile("t1crlf.txt")
-assert(crlf == string.gsub(lf, "\010", "\013\010"), "broken")
-
-gt = readfile("t2gt.qp")
-os.remove("t2.qp")
-os.execute("lua t2.lua < t2.txt > t2.qp")
-t2 = readfile("t2.qp")
-assert(gt == t2, "broken")
-
-os.remove("t1crlf.txt")
-os.execute("lua t3.lua < t1lf.txt > t1crlf.txt")
-crlf = readfile("t1crlf.txt")
-assert(crlf == string.gsub(lf, "\010", "\013\010"), "broken")
-
-t = readfile("test.lua")
-os.execute("lua t4.lua < test.lua > t")
-t2 = readfile("t")
-assert(t == t2, "broken")
-
-os.remove("output.b64")
-gt = readfile("gt.b64")
-os.execute("lua t5.lua")
-t5 = readfile("output.b64")
-assert(gt == t5, "failed")
-
-print("1 2 5 6 10 passed")
-print("2 3 4 5 6 10 passed")
-print("2 5 6 7 8 10 passed")
-print("5 9 passed")
-print("5 6 10 11 passed")
-
-os.remove("t")
-os.remove("t2.qp")
-os.remove("t1crlf.txt")
-os.remove("t11.b64")
-os.remove("output.b64")

From 86de838eb5ed49711be8d62e01255cc2ccd3342e Mon Sep 17 00:00:00 2001
From: Thijs Schreijer 
Date: Wed, 23 Mar 2022 16:05:11 +0100
Subject: [PATCH 172/194] cleanup; move ./etc into ./samples and mark
 'unsupported'

---
 .luacheckrc                       |  2 -
 etc/README                        | 89 ------------------------------
 luasocket-scm-3.rockspec          |  1 -
 makefile.dist                     | 28 ++++------
 samples/README                    | 90 +++++++++++++++++++++++++++++--
 {etc => samples}/b64.lua          |  0
 {etc => samples}/check-links.lua  |  0
 {etc => samples}/check-memory.lua |  0
 {etc => samples}/cookie.lua       |  0
 {etc => samples}/dict.lua         |  0
 {etc => samples}/dispatch.lua     |  0
 {etc => samples}/eol.lua          |  0
 {etc => samples}/forward.lua      |  0
 {etc => samples}/get.lua          |  0
 {etc => samples}/links            |  0
 {etc => samples}/lp.lua           |  0
 {etc => samples}/qp.lua           |  0
 {etc => samples}/tftp.lua         |  0
 18 files changed, 98 insertions(+), 112 deletions(-)
 delete mode 100644 etc/README
 rename {etc => samples}/b64.lua (100%)
 rename {etc => samples}/check-links.lua (100%)
 rename {etc => samples}/check-memory.lua (100%)
 rename {etc => samples}/cookie.lua (100%)
 rename {etc => samples}/dict.lua (100%)
 rename {etc => samples}/dispatch.lua (100%)
 rename {etc => samples}/eol.lua (100%)
 rename {etc => samples}/forward.lua (100%)
 rename {etc => samples}/get.lua (100%)
 rename {etc => samples}/links (100%)
 rename {etc => samples}/lp.lua (100%)
 rename {etc => samples}/qp.lua (100%)
 rename {etc => samples}/tftp.lua (100%)

diff --git a/.luacheckrc b/.luacheckrc
index 8b25dd7..a3b4f63 100644
--- a/.luacheckrc
+++ b/.luacheckrc
@@ -15,8 +15,6 @@ include_files = {
 }
 
 exclude_files = {
-    "etc/*.lua",
-    "etc/**/*.lua",
     "test/*.lua",
     "test/**/*.lua",
     "samples/*.lua",
diff --git a/etc/README b/etc/README
deleted file mode 100644
index cfd3e37..0000000
--- a/etc/README
+++ /dev/null
@@ -1,89 +0,0 @@
-This directory contains code that is more useful than the
-samples. This code *is* supported.
-
-    tftp.lua                -- Trivial FTP client
-
-This module implements file retrieval by the TFTP protocol.
-Its main use was to test the UDP code, but since someone
-found it usefull, I turned it into a module that is almost
-official (no uploads, yet).
-
-    dict.lua                -- Dict client
-
-The dict.lua  module started with  a cool  simple client
-for the  DICT protocol, written by Luiz Henrique Figueiredo.
-This new version has been converted into a library, similar
-to the HTTP  and FTP libraries, that can be used from within
-any luasocket application. Take  a look on the  source code
-and you will be able to figure out how to use it.
-
-    lp.lua                  -- LPD client library
-
-The lp.lua module implements the client part of the Line
-Printer Daemon protocol, used to print files on Unix
-machines. It is courtesy of David Burgess!  See the source
-code and the lpr.lua in the examples directory.
-
-    b64.lua
-    qp.lua
-    eol.lua
-
-These are tiny programs that perform Base64,
-Quoted-Printable and end-of-line marker conversions.
-
-    get.lua                 -- file retriever
-
-This little  program is  a client  that uses  the FTP  and
-HTTP  code to implement a  command line  file graber. Just
-run 
-
-	lua get.lua  []
-
-to download  a remote file (either  ftp:// or http://) to
-the specified local file.  The program  also prints  the
-download  throughput, elapsed time, bytes already downloaded
-etc during download.
-
-    check-memory.lua        -- checks memory consumption
-
-This is just to see how much memory each module uses.
-
-    dispatch.lua            -- coroutine based dispatcher
-
-This is a first try at a coroutine based non-blocking
-dispatcher for LuaSocket. Take a look at 'check-links.lua'
-and at 'forward.lua' to see how to use it.
-
-	check-links.lua			-- HTML link checker program
-
-This little program scans a HTML file and checks for broken
-links. It is similar to check-links.pl by Jamie Zawinski,
-but uses all facilities of the LuaSocket library and the Lua
-language. It has not been thoroughly tested, but it should
-work. Just run
-
-	lua check-links.lua [-n] {} > output
-
-and open the result to see a list of broken links. Make sure
-you check the '-n' switch. It runs in non-blocking mode,
-using coroutines, and is MUCH faster!
-
-    forward.lua             -- coroutine based forward server
-
-This is a forward server that can accept several connections
-and transfers simultaneously using non-blocking I/O and the
-coroutine-based dispatcher. You can run, for example
-
-    lua forward.lua 8080:proxy.com:3128 
-
-to redirect all local conections to port 8080 to the host 
-'proxy.com' at port 3128.
-
-    unix.c and unix.h
-
-This is an implementation of Unix local domain sockets and
-demonstrates how to extend LuaSocket with a new type of
-transport. It has been tested on Linux and on Mac OS X.
-
-Good luck,
-Diego.
diff --git a/luasocket-scm-3.rockspec b/luasocket-scm-3.rockspec
index 71f335c..f3d24e3 100644
--- a/luasocket-scm-3.rockspec
+++ b/luasocket-scm-3.rockspec
@@ -129,6 +129,5 @@ build = {
   copy_directories = {
     "docs"
     , "samples"
-    , "etc"
     , "test" }
 }
diff --git a/makefile.dist b/makefile.dist
index a27ba57..5ef44d3 100644
--- a/makefile.dist
+++ b/makefile.dist
@@ -22,20 +22,17 @@ SAMPLES = \
 	samples/lpr.lua \
 	samples/talker.lua \
 	samples/tinyirc.lua
-
-ETC = \
-	etc/README \
-	etc/b64.lua \
-	etc/check-links.lua \
-	etc/check-memory.lua \
-	etc/dict.lua \
-	etc/dispatch.lua \
-	etc/eol.lua \
-	etc/forward.lua \
-	etc/get.lua \
-	etc/lp.lua \
-	etc/qp.lua \
-	etc/tftp.lua
+	samples/b64.lua \
+	samples/check-links.lua \
+	samples/check-memory.lua \
+	samples/dict.lua \
+	samples/dispatch.lua \
+	samples/eol.lua \
+	samples/forward.lua \
+	samples/get.lua \
+	samples/lp.lua \
+	samples/qp.lua \
+	samples/tftp.lua
 
 SRC = \
 	src/makefile \
@@ -117,9 +114,6 @@ dist:
 	cp -vf README.md $(DIST)
 	cp -vf $(MAKE) $(DIST)
 
-	mkdir -p $(DIST)/etc
-	cp -vf $(ETC) $(DIST)/etc
-
 	mkdir -p $(DIST)/src
 	cp -vf $(SRC) $(DIST)/src
 
diff --git a/samples/README b/samples/README
index e63a6f5..4ee06b6 100644
--- a/samples/README
+++ b/samples/README
@@ -1,11 +1,95 @@
 This directory contains some sample programs using
 LuaSocket. This code is not supported.
 
+    tftp.lua                -- Trivial FTP client
+
+This module implements file retrieval by the TFTP protocol.
+Its main use was to test the UDP code, but since someone
+found it usefull, I turned it into a module that is almost
+official (no uploads, yet).
+
+    dict.lua                -- Dict client
+
+The dict.lua  module started with  a cool  simple client
+for the  DICT protocol, written by Luiz Henrique Figueiredo.
+This new version has been converted into a library, similar
+to the HTTP  and FTP libraries, that can be used from within
+any luasocket application. Take  a look on the  source code
+and you will be able to figure out how to use it.
+
+    lp.lua                  -- LPD client library
+
+The lp.lua module implements the client part of the Line
+Printer Daemon protocol, used to print files on Unix
+machines. It is courtesy of David Burgess!  See the source
+code and the lpr.lua in the examples directory.
+
+    b64.lua
+    qp.lua
+    eol.lua
+
+These are tiny programs that perform Base64,
+Quoted-Printable and end-of-line marker conversions.
+
+    get.lua                 -- file retriever
+
+This little  program is  a client  that uses  the FTP  and
+HTTP  code to implement a  command line  file graber. Just
+run
+
+	lua get.lua  []
+
+to download  a remote file (either  ftp:// or http://) to
+the specified local file.  The program  also prints  the
+download  throughput, elapsed time, bytes already downloaded
+etc during download.
+
+    check-memory.lua        -- checks memory consumption
+
+This is just to see how much memory each module uses.
+
+    dispatch.lua            -- coroutine based dispatcher
+
+This is a first try at a coroutine based non-blocking
+dispatcher for LuaSocket. Take a look at 'check-links.lua'
+and at 'forward.lua' to see how to use it.
+
+	check-links.lua			-- HTML link checker program
+
+This little program scans a HTML file and checks for broken
+links. It is similar to check-links.pl by Jamie Zawinski,
+but uses all facilities of the LuaSocket library and the Lua
+language. It has not been thoroughly tested, but it should
+work. Just run
+
+	lua check-links.lua [-n] {} > output
+
+and open the result to see a list of broken links. Make sure
+you check the '-n' switch. It runs in non-blocking mode,
+using coroutines, and is MUCH faster!
+
+    forward.lua             -- coroutine based forward server
+
+This is a forward server that can accept several connections
+and transfers simultaneously using non-blocking I/O and the
+coroutine-based dispatcher. You can run, for example
+
+    lua forward.lua 8080:proxy.com:3128
+
+to redirect all local conections to port 8080 to the host
+'proxy.com' at port 3128.
+
+    unix.c and unix.h
+
+This is an implementation of Unix local domain sockets and
+demonstrates how to extend LuaSocket with a new type of
+transport. It has been tested on Linux and on Mac OS X.
+
     listener.lua            -- socket to stdout
     talker.lua              -- stdin to socket
 
 listener.lua and talker.lua are about  the simplest
-applications you can write  using  LuaSocket.  Run   
+applications you can write  using  LuaSocket.  Run
 
 	'lua listener.lua'  and  'lua talker.lua'
 
@@ -17,13 +101,13 @@ be printed by listen.lua.
 This is a cool program written by David Burgess to print
 files using the Line Printer Daemon protocol, widely used in
 Unix machines.  It uses the lp.lua implementation, in the
-etc directory.  Just run 'lua lpr.lua 
+samples directory.  Just run 'lua lpr.lua 
 queue=' and the file will print!
 
     cddb.lua                -- CDDB client
 
 This is the first try on a simple CDDB client. Not really
-useful, but one day it might become a module. 
+useful, but one day it might become a module.
 
     daytimeclnt.lua         -- day time client
 
diff --git a/etc/b64.lua b/samples/b64.lua
similarity index 100%
rename from etc/b64.lua
rename to samples/b64.lua
diff --git a/etc/check-links.lua b/samples/check-links.lua
similarity index 100%
rename from etc/check-links.lua
rename to samples/check-links.lua
diff --git a/etc/check-memory.lua b/samples/check-memory.lua
similarity index 100%
rename from etc/check-memory.lua
rename to samples/check-memory.lua
diff --git a/etc/cookie.lua b/samples/cookie.lua
similarity index 100%
rename from etc/cookie.lua
rename to samples/cookie.lua
diff --git a/etc/dict.lua b/samples/dict.lua
similarity index 100%
rename from etc/dict.lua
rename to samples/dict.lua
diff --git a/etc/dispatch.lua b/samples/dispatch.lua
similarity index 100%
rename from etc/dispatch.lua
rename to samples/dispatch.lua
diff --git a/etc/eol.lua b/samples/eol.lua
similarity index 100%
rename from etc/eol.lua
rename to samples/eol.lua
diff --git a/etc/forward.lua b/samples/forward.lua
similarity index 100%
rename from etc/forward.lua
rename to samples/forward.lua
diff --git a/etc/get.lua b/samples/get.lua
similarity index 100%
rename from etc/get.lua
rename to samples/get.lua
diff --git a/etc/links b/samples/links
similarity index 100%
rename from etc/links
rename to samples/links
diff --git a/etc/lp.lua b/samples/lp.lua
similarity index 100%
rename from etc/lp.lua
rename to samples/lp.lua
diff --git a/etc/qp.lua b/samples/qp.lua
similarity index 100%
rename from etc/qp.lua
rename to samples/qp.lua
diff --git a/etc/tftp.lua b/samples/tftp.lua
similarity index 100%
rename from etc/tftp.lua
rename to samples/tftp.lua

From 3adf252b45401b4b97e63668c6ee530e7b3936ad Mon Sep 17 00:00:00 2001
From: Thijs Schreijer 
Date: Wed, 23 Mar 2022 16:15:52 +0100
Subject: [PATCH 173/194] cleanup; move FIX, TODO, WISH into TODO.md

---
 FIX     |  28 ------------
 TODO    |  81 ----------------------------------
 TODO.md | 135 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 WISH    |  22 ---------
 4 files changed, 135 insertions(+), 131 deletions(-)
 delete mode 100644 FIX
 delete mode 100644 TODO
 create mode 100644 TODO.md
 delete mode 100644 WISH

diff --git a/FIX b/FIX
deleted file mode 100644
index 40f30a1..0000000
--- a/FIX
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-
-
-
-
-http was preserving old host header during redirects
-fix smtp.send hang on source error
-add create field to FTP and SMTP and fix HTTP ugliness
-clean timeout argument to open functions in SMTP, HTTP and FTP
-eliminate globals from namespaces created by module().
-url.absolute was not working when base_url was already parsed
-http.request was redirecting even when the location header was empty
-tcp{client}:shutdown() was checking for group instead of class.
-tcp{client}:send() now returns i+sent-1...
-get rid of a = socket.try() in the manual, except for protected cases. replace it with assert.
-get rid of "base." kludge in package.loaded
-check all "require("http")" etc in the manual.
-make sure sock_gethostname.*  only return success if the hp is not null!
-change 'l' prefix in C libraries to 'c' to avoid clash with LHF libraries
-    don't forget the declarations in luasocket.h and mime.h!!!
-setpeername was using udp{unconnected}
-fixed a bug in http.lua that caused some requests to fail (Florian Berger)
-fixed a bug in select.c that prevented sockets with descriptor 0 from working (Renato Maia)
-fixed a "bug" that caused dns.toip to crash under uLinux
-fixed a "bug" that caused a crash in gethostbyname under VMS
-DEBUG and VERSION became _DEBUG and _VERSION
-send returns the right value if input is "". Alexander Marinov
diff --git a/TODO b/TODO
deleted file mode 100644
index a838fc0..0000000
--- a/TODO
+++ /dev/null
@@ -1,81 +0,0 @@
-- bizarre default values for getnameinfo should throw error instead!
-
-> It's just too bad it can't talk to gmail -
-> reason 1: they absolutely want TLS
-> reason 2: unlike all the other SMTP implementations, they
-> don't
-> tolerate missing < > around adresses
-
-- document the new bind and connect behavior.
-- shouldn't we instead make the code compatible to Lua 5.2
-  without any compat stuff, and use a compatibility layer to
-  make it work on 5.1?
-- add what's new to manual
-- should there be an equivalent to tohostname for IPv6?
-- should we add service name resolution as well to getaddrinfo?
-- Maybe the sockaddr to presentation conversion should be done with getnameinfo()? 
-
-- add http POST sample to manual
-  people keep asking stupid questions
-- documentation of dirty/getfd/setfd is problematic because of portability
-  same for unix and serial.
-  what to do about this? add a stronger disclaimer?
-- fix makefile with decent defaults?
-
-Done:
-
-- added IPv6 support to getsockname
-- simplified getpeername implementation 
-- added family to return of getsockname and getpeername
-  and added modification to the manual to describe
-
-- connect and bind try all adresses returned by getaddrinfo
-- document headers.lua?
-- update copyright date everywhere? 
-- remove RCSID from files?
-- move version to 2.1 rather than 2.1.1?
-- fixed url package to support ipv6 hosts 
-- changed domain to family
-- implement getfamily methods.
-
-- remove references to Lua 5.0 from documentation, add 5.2?
-- update lua and luasocket version in samples in documentation
-- document ipv5_v6only default option being set?
-- document tcp6 and udp6
-- document dns.getaddrinfo 
-- documented zero-sized datagram change?
-  no.
-- document unix socket and serial socket? add raw support?
-  no.
-- document getoption
-- merge luaL_typeerror into auxiliar to avoid using luaL prefix? 
-
-
-
-
-
-
-
-
-
-
-replace \r\n with \0xD\0xA in everything
-New mime support
-
-ftp send should return server replies?
-make sure there are no object files in the distribution tarball
-http handling of 100-continue, see DB patch
-DB ftp.lua bug.
-test unix.c to return just a function and works with require"unix"
-get rid of setmetatable(, nil) since packages don't need this anymore in 5.1
-compat-5.1 novo
-ajeitar pra lua-5.1
-
-adicionar exemplos de expansão: pipe, local, named pipe
-testar os options!
-
-
-- Thread-unsafe functions to protect
-    gethostbyname(), gethostbyaddr(), gethostent(),
-inet_ntoa(), strerror(), 
-    
diff --git a/TODO.md b/TODO.md
new file mode 100644
index 0000000..d265694
--- /dev/null
+++ b/TODO.md
@@ -0,0 +1,135 @@
+## FIX
+
+http was preserving old host header during redirects
+fix smtp.send hang on source error
+add create field to FTP and SMTP and fix HTTP ugliness
+clean timeout argument to open functions in SMTP, HTTP and FTP
+eliminate globals from namespaces created by module().
+url.absolute was not working when base_url was already parsed
+http.request was redirecting even when the location header was empty
+tcp{client}:shutdown() was checking for group instead of class.
+tcp{client}:send() now returns i+sent-1...
+get rid of a = socket.try() in the manual, except for protected cases. replace it with assert.
+get rid of "base." kludge in package.loaded
+check all "require("http")" etc in the manual.
+make sure sock_gethostname.*  only return success if the hp is not null!
+change 'l' prefix in C libraries to 'c' to avoid clash with LHF libraries
+    don't forget the declarations in luasocket.h and mime.h!!!
+setpeername was using udp{unconnected}
+fixed a bug in http.lua that caused some requests to fail (Florian Berger)
+fixed a bug in select.c that prevented sockets with descriptor 0 from working (Renato Maia)
+fixed a "bug" that caused dns.toip to crash under uLinux
+fixed a "bug" that caused a crash in gethostbyname under VMS
+DEBUG and VERSION became _DEBUG and _VERSION
+send returns the right value if input is "". Alexander Marinov
+
+
+## WISH
+
+... as an l-value to get all results of a function call?
+at least ...[i] and #...
+extend to full tuples?
+
+__and __or __not metamethods
+
+lua_tostring, lua_tonumber, lua_touseradta etc push values in stack
+__tostring,__tonumber, __touserdata metamethods are checked
+and expected to push an object of correct type on stack
+
+lua_rawtostring, lua_rawtonumber, lua_rawtouserdata don't
+push anything on stack, return data of appropriate type,
+skip metamethods and throw error if object not of exact type
+
+package.findfile exported
+module not polluting the global namespace
+
+coxpcall with a coroutine pool for efficiency (reusing coroutines)
+
+exception mechanism formalized? just like the package system was.
+
+a nice bitlib in the core
+
+
+## TODO
+
+- bizarre default values for getnameinfo should throw error instead!
+
+> It's just too bad it can't talk to gmail -
+> reason 1: they absolutely want TLS
+> reason 2: unlike all the other SMTP implementations, they
+> don't
+> tolerate missing < > around adresses
+
+- document the new bind and connect behavior.
+- shouldn't we instead make the code compatible to Lua 5.2
+  without any compat stuff, and use a compatibility layer to
+  make it work on 5.1?
+- add what's new to manual
+- should there be an equivalent to tohostname for IPv6?
+- should we add service name resolution as well to getaddrinfo?
+- Maybe the sockaddr to presentation conversion should be done with getnameinfo()?
+
+- add http POST sample to manual
+  people keep asking stupid questions
+- documentation of dirty/getfd/setfd is problematic because of portability
+  same for unix and serial.
+  what to do about this? add a stronger disclaimer?
+- fix makefile with decent defaults?
+
+## Done:
+
+- added IPv6 support to getsockname
+- simplified getpeername implementation
+- added family to return of getsockname and getpeername
+  and added modification to the manual to describe
+
+- connect and bind try all adresses returned by getaddrinfo
+- document headers.lua?
+- update copyright date everywhere?
+- remove RCSID from files?
+- move version to 2.1 rather than 2.1.1?
+- fixed url package to support ipv6 hosts
+- changed domain to family
+- implement getfamily methods.
+
+- remove references to Lua 5.0 from documentation, add 5.2?
+- update lua and luasocket version in samples in documentation
+- document ipv5_v6only default option being set?
+- document tcp6 and udp6
+- document dns.getaddrinfo
+- documented zero-sized datagram change?
+  no.
+- document unix socket and serial socket? add raw support?
+  no.
+- document getoption
+- merge luaL_typeerror into auxiliar to avoid using luaL prefix?
+
+
+
+
+
+
+
+
+
+
+replace \r\n with \0xD\0xA in everything
+New mime support
+
+ftp send should return server replies?
+make sure there are no object files in the distribution tarball
+http handling of 100-continue, see DB patch
+DB ftp.lua bug.
+test unix.c to return just a function and works with require"unix"
+get rid of setmetatable(, nil) since packages don't need this anymore in 5.1
+compat-5.1 novo
+ajeitar pra lua-5.1
+
+adicionar exemplos de expans�o: pipe, local, named pipe
+testar os options!
+
+
+- Thread-unsafe functions to protect
+    gethostbyname(), gethostbyaddr(), gethostent(),
+inet_ntoa(), strerror(),
+
diff --git a/WISH b/WISH
deleted file mode 100644
index e7e9c07..0000000
--- a/WISH
+++ /dev/null
@@ -1,22 +0,0 @@
-... as an l-value to get all results of a function call?
-at least ...[i] and #...
-extend to full tuples?
-
-__and __or __not metamethods
-
-lua_tostring, lua_tonumber, lua_touseradta etc push values in stack
-__tostring,__tonumber, __touserdata metamethods are checked
-and expected to push an object of correct type on stack
-
-lua_rawtostring, lua_rawtonumber, lua_rawtouserdata don't
-push anything on stack, return data of appropriate type, 
-skip metamethods and throw error if object not of exact type
-
-package.findfile exported
-module not polluting the global namespace
-
-coxpcall with a coroutine pool for efficiency (reusing coroutines)
-
-exception mechanism formalized? just like the package system was.
-
-a nice bitlib in the core

From db2f1c9598c63a721fad4b8ae0e0121eccc86248 Mon Sep 17 00:00:00 2001
From: Thijs Schreijer 
Date: Tue, 29 Mar 2022 14:09:10 +0200
Subject: [PATCH 174/194] chore(ltn) update file contents from wiki to markdown

---
 ltn012.wiki | 205 ++++++++++++++++++++++++++--------------------------
 ltn013.wiki | 127 ++++++++++++++++----------------
 2 files changed, 163 insertions(+), 169 deletions(-)

diff --git a/ltn012.wiki b/ltn012.wiki
index 96b13ae..fa26b4a 100644
--- a/ltn012.wiki
+++ b/ltn012.wiki
@@ -1,51 +1,48 @@
-===Filters, sources and sinks: design, motivation and examples===
-==or Functional programming for the rest of us==
+# Filters, sources and sinks: design, motivation and examples
+### or Functional programming for the rest of us
 by DiegoNehab
 
-{{{
+## Abstract
 
-}}}
+Certain operations can be implemented in the form of filters. A filter is a function that processes data received in consecutive function calls, returning partial results chunk by chunk. Examples of operations that can be implemented as filters include the end-of-line normalization for text, Base64 and Quoted-Printable transfer content encodings, the breaking of text into lines, SMTP byte stuffing, and there are many others. Filters become even more powerful when we allow them to be chained together to create composite filters. Filters can be seen as middle nodes in a chain of data transformations. Sources an sinks are the corresponding end points of these chains. A source is a function that produces data, chunk by chunk, and a sink is a function that takes data, chunk by chunk. In this technical note, we define an elegant interface for filters, sources, sinks and chaining. We evolve our interface progressively, until we reach a high degree of generality. We discuss difficulties that arise during the implementation of this interface and we provide solutions and examples.
 
-===Abstract===
-Certain operations can be implemented in the form of filters. A filter is a function that processes data received in consecutive function calls, returning partial results chunk by chunk.  Examples of operations that can be implemented as filters include the end-of-line normalization for text, Base64 and Quoted-Printable transfer content encodings, the breaking of text into lines, SMTP byte stuffing, and there are many others.  Filters become even more powerful when we allow them to be chained together to create composite filters. Filters can be seen as middle nodes in a chain of data transformations. Sources an sinks are the corresponding end points of these chains. A source is a function that produces data, chunk by chunk, and a sink is a function that takes data, chunk by chunk. In this technical note, we define an elegant interface for filters, sources, sinks and chaining. We evolve our interface progressively, until we reach a high degree of generality. We discuss difficulties that arise during the implementation of this interface and we provide solutions and examples. 
+## Introduction
 
-===Introduction===
+Applications sometimes have too much information to process to fit in memory and are thus forced to process data in smaller parts. Even when there is enough memory, processing all the data atomically may take long enough to frustrate a user that wants to interact with the application. Furthermore, complex transformations can often be defined as series of simpler operations. Several different complex transformations might share the same simpler operations, so that an uniform interface to combine them is desirable. The following concepts constitute our solution to these problems.
 
-Applications sometimes have too much information to process to fit in memory and are thus forced to process data in smaller parts.  Even when there is enough memory, processing all the data atomically may take long enough to frustrate a user that wants to interact with the application.  Furthermore, complex transformations can often be defined as series of simpler operations. Several different complex transformations might share the same simpler operations, so that an uniform interface to combine them is desirable. The following concepts constitute our solution to these problems. 
+"Filters" are functions that accept successive chunks of input, and produce successive chunks of output. Furthermore, the result of concatenating all the output data is the same as the result of applying the filter over the concatenation of the input data. As a consequence, boundaries are irrelevant: filters have to handle input data split arbitrarily by the user.
 
-''Filters'' are functions that accept successive chunks of input, and produce successive chunks of output. Furthermore, the result of concatenating all the output data is the same as the result of applying the filter over the concatenation of the input data. As a consequence, boundaries are irrelevant: filters have to handle input data split arbitrarily by the user. 
+A "chain" is a function that combines the effect of two (or more) other functions, but whose interface is indistinguishable from the interface of one of its components. Thus, a chained filter can be used wherever an atomic filter can be used. However, its effect on data is the combined effect of its component filters. Note that, as a consequence, chains can be chained themselves to create arbitrarily complex operations that can be used just like atomic operations.
 
-A ''chain'' is a function that combines the effect of two (or more) other functions, but whose interface is indistinguishable from the interface of one of its components.  Thus, a chained filter can be used wherever an atomic filter can be used.  However, its effect on data is the combined effect of its component filters. Note that, as a consequence, chains can be chained themselves to create arbitrarily complex operations that can be used just like atomic operations.
+Filters can be seen as internal nodes in a network through which data flows, potentially being transformed along its way. Chains connect these nodes together. To complete the picture, we need "sources" and "sinks" as initial and final nodes of the network, respectively. Less abstractly, a source is a function that produces new data every time it is called. On the other hand, sinks are functions that give a final destination to the data they receive. Naturally, sources and sinks can be chained with filters.
 
-Filters can be seen as internal nodes in a network through which data flows, potentially being transformed along its way.  Chains connect these nodes together. To complete the picture, we need ''sources'' and ''sinks'' as initial and final nodes of the network, respectively.  Less abstractly, a source is a function that produces new data every time it is called.  On the other hand, sinks are functions that give a final destination to the data they receive.  Naturally, sources and sinks can be chained with filters.
+Finally, filters, chains, sources, and sinks are all passive entities: they need to be repeatedly called in order for something to happen. "Pumps" provide the driving force that pushes data through the network, from a source to a sink.
 
-Finally, filters, chains, sources, and sinks are all passive entities: they need to be repeatedly called in order for something to happen.  ''Pumps'' provide the driving force that pushes data through the network, from a source to a sink.
+ Hopefully, these concepts will become clear with examples. In the following sections, we start with simplified interfaces, which we improve several times until we can find no obvious shortcomings. The evolution we present is not contrived: it follows the steps we followed ourselves as we consolidated our understanding of these concepts.
 
- Hopefully, these concepts will become clear with examples. In the following sections, we start with simplified interfaces, which we improve several times until we can find no obvious shortcomings. The evolution we present is not contrived: it follows the steps we followed ourselves as we consolidated our understanding of these concepts. 
+### A concrete example
 
-== A concrete example ==
-
-Some data transformations are easier to implement as filters than others.  Examples of operations that can be implemented as filters include the end-of-line normalization for text, the Base64 and Quoted-Printable transfer content encodings, the breaking of text into lines, SMTP byte stuffing, and many others. Let's use the end-of-line normalization as an example to define our initial filter interface. We later discuss why the implementation might not be trivial.
+Some data transformations are easier to implement as filters than others. Examples of operations that can be implemented as filters include the end-of-line normalization for text, the Base64 and Quoted-Printable transfer content encodings, the breaking of text into lines, SMTP byte stuffing, and many others. Let's use the end-of-line normalization as an example to define our initial filter interface. We later discuss why the implementation might not be trivial.
 
 Assume we are given text in an unknown end-of-line convention (including possibly mixed conventions) out of the commonly found Unix (LF), Mac OS (CR), and DOS (CRLF) conventions. We would like to be able to write code like the following:
-        {{{
+```lua
 input = source.chain(source.file(io.stdin), normalize("\r\n"))
 output = sink.file(io.stdout)
 pump(input, output)
-}}}
+```
 
-This program should read data from the standard input stream and normalize the end-of-line markers to the canonic CRLF marker defined by the MIME standard, finally sending the results to the standard output stream.  For that, we use a ''file source'' to produce data from standard input, and chain it with a filter that normalizes the data. The pump then repeatedly gets data from the source, and moves it to the ''file sink'' that sends it to standard output.
+This program should read data from the standard input stream and normalize the end-of-line markers to the canonic CRLF marker defined by the MIME standard, finally sending the results to the standard output stream. For that, we use a "file source" to produce data from standard input, and chain it with a filter that normalizes the data. The pump then repeatedly gets data from the source, and moves it to the "file sink" that sends it to standard output.
 
-To make the discussion even more concrete, we start by discussing the implementation of the normalization filter. The {{normalize}} ''factory'' is a function that creates such a filter. Our initial filter interface is as follows: the filter receives a chunk of input data, and returns a chunk of processed data. When there is no more input data, the user notifies the filter by invoking it with a {{nil}} chunk. The filter then returns the final chunk of processed data.
+To make the discussion even more concrete, we start by discussing the implementation of the normalization filter. The `normalize` "factory" is a function that creates such a filter. Our initial filter interface is as follows: the filter receives a chunk of input data, and returns a chunk of processed data. When there is no more input data, the user notifies the filter by invoking it with a `nil` chunk. The filter then returns the final chunk of processed data.
 
-Although the interface is extremely simple, the implementation doesn't seem so obvious. Any filter respecting this interface needs to keep some kind of context between calls. This is because chunks can be broken between the CR and LF characters marking the end of a line.  This need for context storage is what motivates the use of factories: each time the factory is called, it returns a filter with its own context so that we can have several independent filters being used at the same time.  For the normalization filter, we know that the obvious solution (i.e.  concatenating all the input into the context before producing any output) is not good enough, so we will have to find another way.
+Although the interface is extremely simple, the implementation doesn't seem so obvious. Any filter respecting this interface needs to keep some kind of context between calls. This is because chunks can be broken between the CR and LF characters marking the end of a line. This need for context storage is what motivates the use of factories: each time the factory is called, it returns a filter with its own context so that we can have several independent filters being used at the same time. For the normalization filter, we know that the obvious solution (i.e. concatenating all the input into the context before producing any output) is not good enough, so we will have to find another way.
 
 We will break the implementation in two parts: a low-level filter, and a factory of high-level filters. The low-level filter will be implemented in C and will not carry any context between function calls. The high-level filter factory, implemented in Lua, will create and return a high-level filter that keeps whatever context the low-level filter needs, but isolates the user from its internal details. That way, we take advantage of C's efficiency to perform the dirty work, and take advantage of Lua's simplicity for the bookkeeping.
 
-==The Lua part of the implementation==
+### The Lua part of the implementation
 
 Below is the implementation of the factory of high-level end-of-line normalization filters:
-        {{{
+```lua
 function filter.cycle(low, ctx, extra)
     return function(chunk)
         local ret
@@ -57,18 +54,18 @@ end
 function normalize(marker)
     return cycle(eol, 0, marker)
 end
-}}}
+```
 
-The {{normalize}} factory simply calls a more generic factory, the {{cycle}} factory. This factory receives a low-level filter, an initial context and some extra value and returns the corresponding high-level filter. Each time the high level filer is called with a new chunk, it calls the low-level filter passing the previous context, the new chunk and the extra argument. The low-level filter produces the chunk of processed data and a new context. Finally, the high-level filter updates its internal context and returns the processed chunk of data to the user.  It is the low-level filter that does all the work.  Notice that this implementation takes advantage of the Lua 5.0 lexical scoping rules to store the context locally, between function calls.  
+The `normalize` factory simply calls a more generic factory, the `cycle` factory. This factory receives a low-level filter, an initial context and some extra value and returns the corresponding high-level filter. Each time the high level filer is called with a new chunk, it calls the low-level filter passing the previous context, the new chunk and the extra argument. The low-level filter produces the chunk of processed data and a new context. Finally, the high-level filter updates its internal context and returns the processed chunk of data to the user. It is the low-level filter that does all the work. Notice that this implementation takes advantage of the Lua 5.0 lexical scoping rules to store the context locally, between function calls.
 
 Moving to the low-level filter, we notice there is no perfect solution to the end-of-line marker normalization problem itself. The difficulty comes from an inherent ambiguity on the definition of empty lines within mixed input. However, the following solution works well for any consistent input, as well as for non-empty lines in mixed input. It also does a reasonable job with empty lines and serves as a good example of how to implement a low-level filter.
 
-Here is what we do: CR and LF are considered candidates for line break.  We issue ''one'' end-of-line line marker if one of the candidates is seen alone, or followed by a ''different'' candidate.  That is, CR CR and LF LF issue two end of line markers each, but CR LF and LF CR issue only one marker.  This idea takes care of Mac OS, Mac OS X, VMS and Unix, DOS and MIME, as well as probably other more obscure conventions.
+Here is what we do: CR and LF are considered candidates for line break. We issue "one" end-of-line line marker if one of the candidates is seen alone, or followed by a "different" candidate. That is, CR CR and LF LF issue two end of line markers each, but CR LF and LF CR issue only one marker. This idea takes care of Mac OS, Mac OS X, VMS and Unix, DOS and MIME, as well as probably other more obscure conventions.
 
-==The C part of the implementation==
+### The C part of the implementation
 
 The low-level filter is divided into two simple functions. The inner function actually does the conversion. It takes each input character in turn, deciding what to output and how to modify the context. The context tells if the last character seen was a candidate and, if so, which candidate it was.
-        {{{
+```c
 #define candidate(c) (c == CR || c == LF)
 static int process(int c, int last, const char *marker, luaL_Buffer *buffer) {
     if (candidate(c)) {
@@ -84,10 +81,10 @@ static int process(int c, int last, const char *marker, luaL_Buffer *buffer) {
         return 0;
     }
 }
-}}}
+```
 
-The inner function makes use of Lua's auxiliary library's buffer interface for its efficiency and ease of use. The outer function simply interfaces with Lua.  It receives the context and the input chunk (as well as an optional end-of-line marker), and returns the transformed output and the new context.
-        {{{
+The inner function makes use of Lua's auxiliary library's buffer interface for its efficiency and ease of use. The outer function simply interfaces with Lua. It receives the context and the input chunk (as well as an optional end-of-line marker), and returns the transformed output and the new context.
+```c
 static int eol(lua_State *L) {
     int ctx = luaL_checkint(L, 1);
     size_t isize = 0;
@@ -107,16 +104,16 @@ static int eol(lua_State *L) {
     lua_pushnumber(L, ctx);
     return 2;
 }
-}}}
+```
 
-Notice that if the input chunk is {{nil}}, the operation is considered to be finished. In that case, the loop will not execute a single time and the context is reset to the initial state.  This allows the filter to be reused indefinitely. It is a good idea to write filters like this, when possible. 
+Notice that if the input chunk is `nil`, the operation is considered to be finished. In that case, the loop will not execute a single time and the context is reset to the initial state. This allows the filter to be reused indefinitely. It is a good idea to write filters like this, when possible.
 
-Besides the end-of-line normalization filter shown above, many other filters can be implemented with the same ideas. Examples include Base64 and Quoted-Printable transfer content encodings, the breaking of text into lines, SMTP byte stuffing etc. The challenging part is to decide what will be the context. For line breaking, for instance, it could be the number of bytes left in the current line.  For Base64 encoding, it could be the bytes that remain in the division of the input into 3-byte atoms. 
+Besides the end-of-line normalization filter shown above, many other filters can be implemented with the same ideas. Examples include Base64 and Quoted-Printable transfer content encodings, the breaking of text into lines, SMTP byte stuffing etc. The challenging part is to decide what will be the context. For line breaking, for instance, it could be the number of bytes left in the current line. For Base64 encoding, it could be the bytes that remain in the division of the input into 3-byte atoms.
 
-===Chaining===
+## Chaining
 
-Filters become more powerful when the concept of chaining is introduced. Suppose you have a filter for Quoted-Printable encoding and you want to encode some text. According to the standard, the text has to be normalized into its canonic form prior to encoding.  A nice interface that simplifies this task is a factory that creates a composite filter that passes data through multiple filters, but that can be used wherever a primitive filter is used.
-        {{{
+Filters become more powerful when the concept of chaining is introduced. Suppose you have a filter for Quoted-Printable encoding and you want to encode some text. According to the standard, the text has to be normalized into its canonic form prior to encoding. A nice interface that simplifies this task is a factory that creates a composite filter that passes data through multiple filters, but that can be used wherever a primitive filter is used.
+```lua
 local function chain2(f1, f2)
     return function(chunk)
         local ret = f2(f1(chunk))
@@ -140,18 +137,18 @@ while 1 do
     io.write(chain(chunk))
     if not chunk then break end
 end
-}}}
+```
 
-The chaining factory is very simple. All it does is return a function that passes data through all filters and returns the result to the user.  It uses the simpler auxiliary function that knows how to chain two filters together. In the auxiliary function, special care must be taken if the chunk is final. This is because the final chunk notification has to be pushed through both filters in turn. Thanks to the chain factory, it is easy to perform the Quoted-Printable conversion, as the above example shows.
+The chaining factory is very simple. All it does is return a function that passes data through all filters and returns the result to the user. It uses the simpler auxiliary function that knows how to chain two filters together. In the auxiliary function, special care must be taken if the chunk is final. This is because the final chunk notification has to be pushed through both filters in turn. Thanks to the chain factory, it is easy to perform the Quoted-Printable conversion, as the above example shows.
 
-===Sources, sinks, and pumps===
+## Sources, sinks, and pumps
 
 As we noted in the introduction, the filters we introduced so far act as the internal nodes in a network of transformations. Information flows from node to node (or rather from one filter to the next) and is transformed on its way out. Chaining filters together is the way we found to connect nodes in the network. But what about the end nodes?  In the beginning of the network, we need a node that provides the data, a source. In the end of the network, we need a node that takes in the data, a sink.
 
-==Sources==
+### Sources
 
-We start with two simple sources. The first is the {{empty}} source: It simply returns no data, possibly returning an error message. The second is the {{file}} source, which produces the contents of a file in a chunk by chunk fashion, closing the file handle when done.
-        {{{
+We start with two simple sources. The first is the `empty` source: It simply returns no data, possibly returning an error message. The second is the `file` source, which produces the contents of a file in a chunk by chunk fashion, closing the file handle when done.
+```lua
 function source.empty(err)
     return function()
         return nil, err
@@ -159,7 +156,7 @@ function source.empty(err)
 end
 
 function source.file(handle, io_err)
-    if handle then 
+    if handle then
         return function()
             local chunk = handle:read(2048)
             if not chunk then handle:close() end
@@ -167,44 +164,44 @@ function source.file(handle, io_err)
         end
     else return source.empty(io_err or "unable to open file") end
 end
-}}}
+```
 
-A source returns the next chunk of data each time it is called. When there is no more data, it just returns {{nil}}.  If there is an error, the source can inform the caller by returning {{nil}} followed by an error message. Adrian Sietsma noticed that, although not on purpose, the interface for sources is compatible with the idea of iterators in Lua 5.0. That is, a data source can be nicely used in conjunction with {{for}} loops.  Using our file source as an iterator, we can rewrite our first example:
-        {{{
+A source returns the next chunk of data each time it is called. When there is no more data, it just returns `nil`. If there is an error, the source can inform the caller by returning `nil` followed by an error message. Adrian Sietsma noticed that, although not on purpose, the interface for sources is compatible with the idea of iterators in Lua 5.0. That is, a data source can be nicely used in conjunction with `for` loops. Using our file source as an iterator, we can rewrite our first example:
+```lua
 local process = normalize("\r\n")
 for chunk in source.file(io.stdin) do
     io.write(process(chunk))
 end
 io.write(process(nil))
-}}}
+```
 
-Notice that the last call to the filter obtains the last chunk of processed data. The loop terminates when the source returns {{nil}} and therefore we need that final call outside of the loop.
+Notice that the last call to the filter obtains the last chunk of processed data. The loop terminates when the source returns `nil` and therefore we need that final call outside of the loop.
 
-==Maintaining state between calls==
+### Maintaining state between calls
 
-It is often the case that a source needs to change its behavior after some event. One simple example would be a file source that wants to make sure it returns {{nil}} regardless of how many times it is called after the end of file, avoiding attempts to read past the end of the file.  Another example would be a source that returns the contents of several files, as if they were concatenated, moving from one file to the next until the end of the last file is reached.
+It is often the case that a source needs to change its behavior after some event. One simple example would be a file source that wants to make sure it returns `nil` regardless of how many times it is called after the end of file, avoiding attempts to read past the end of the file. Another example would be a source that returns the contents of several files, as if they were concatenated, moving from one file to the next until the end of the last file is reached.
 
-One way to implement this kind of source is to have the factory declare extra state variables that the source can use via lexical scoping. Our file source could set the file handle itself to {{nil}} when it detects the end-of-file.  Then, every time the source is called, it could check if the handle is still valid and act accordingly:
-        {{{
+One way to implement this kind of source is to have the factory declare extra state variables that the source can use via lexical scoping. Our file source could set the file handle itself to `nil` when it detects the end-of-file. Then, every time the source is called, it could check if the handle is still valid and act accordingly:
+```lua
 function source.file(handle, io_err)
-    if handle then 
+    if handle then
         return function()
             if not handle then return nil end
             local chunk = handle:read(2048)
-            if not chunk then 
-                handle:close() 
+            if not chunk then
+                handle:close()
                 handle = nil
             end
             return chunk
         end
     else return source.empty(io_err or "unable to open file") end
 end
-}}}
+```
 
-Another way to implement this behavior involves a change in the source interface to makes it more flexible. Let's allow a source to return a second value, besides the next chunk of data.  If the returned chunk is {{nil}}, the extra return value tells us what happened. A second {{nil}} means that there is just no more data and the source is empty.  Any other value is considered to be an error message.  On the other hand, if the chunk was ''not'' {{nil}}, the second return value tells us whether the source wants to be replaced. If it is {{nil}}, we should proceed using the same source.  Otherwise it has to be another source, which we have to use from then on, to get the remaining data. 
+Another way to implement this behavior involves a change in the source interface to makes it more flexible. Let's allow a source to return a second value, besides the next chunk of data. If the returned chunk is `nil`, the extra return value tells us what happened. A second `nil` means that there is just no more data and the source is empty. Any other value is considered to be an error message. On the other hand, if the chunk was "not" `nil`, the second return value tells us whether the source wants to be replaced. If it is `nil`, we should proceed using the same source. Otherwise it has to be another source, which we have to use from then on, to get the remaining data.
 
-This extra freedom is good for someone writing a source function, but it is a pain for those that have to use it.  Fortunately, given one of these ''fancy'' sources, we can transform it into a simple source that never needs to be replaced, using the following factory.
-        {{{
+This extra freedom is good for someone writing a source function, but it is a pain for those that have to use it. Fortunately, given one of these "fancy" sources, we can transform it into a simple source that never needs to be replaced, using the following factory.
+```lua
 function source.simplify(src)
     return function()
         local chunk, err_or_new = src()
@@ -213,28 +210,28 @@ function source.simplify(src)
         else return chunk end
     end
 end
-}}}
+```
 
 The simplification factory allows us to write fancy sources and use them as if they were simple. Therefore, our next functions will only produce simple sources, and functions that take sources will assume they are simple.
 
 Going back to our file source, the extended interface allows for a more elegant implementation. The new source just asks to be replaced by an empty source as soon as there is no more data. There is no repeated checking of the handle. To make things simpler to the user, the factory itself simplifies the the fancy file source before returning it to the user:
-        {{{
+```lua
 function source.file(handle, io_err)
-    if handle then 
+    if handle then
         return source.simplify(function()
             local chunk = handle:read(2048)
-            if not chunk then 
+            if not chunk then
                 handle:close()
-                return "", source.empty() 
+                return "", source.empty()
             end
             return chunk
         end)
     else return source.empty(io_err or "unable to open file") end
 end
-}}}
+```
 
-We can make these ideas even more powerful if we use a new feature of Lua 5.0: coroutines.  Coroutines suffer from a great lack of advertisement, and I am going to play my part here.  Just like lexical scoping, coroutines taste odd at first, but once you get used with the concept, it can save your day. I have to admit that using coroutines to implement our file source would be overkill, so let's implement a concatenated source factory instead.
-        {{{
+We can make these ideas even more powerful if we use a new feature of Lua 5.0: coroutines. Coroutines suffer from a great lack of advertisement, and I am going to play my part here. Just like lexical scoping, coroutines taste odd at first, but once you get used with the concept, it can save your day. I have to admit that using coroutines to implement our file source would be overkill, so let's implement a concatenated source factory instead.
+```lua
 function source.cat(...)
     local arg = {...}
     local co = coroutine.create(function()
@@ -242,22 +239,22 @@ function source.cat(...)
         while i <= #arg do
             local chunk, err = arg[i]()
             if chunk then coroutine.yield(chunk)
-            elseif err then return nil, err 
-            else i = i + 1 end 
+            elseif err then return nil, err
+            else i = i + 1 end
         end
     end)
     return function()
         return shift(coroutine.resume(co))
     end
 end
-}}}
+```
 
-The factory creates two functions. The first is an auxiliary that does all the work, in the form of a coroutine. It reads a chunk from one of the sources. If the chunk is {{nil}}, it moves to the next source, otherwise it just yields returning the chunk. When it is resumed, it continues from where it stopped and tries to read the next chunk.  The second function is the source itself, and just resumes the execution of the auxiliary coroutine, returning to the user whatever chunks it returns (skipping the first result that tells us if the coroutine terminated). Imagine writing the same function without coroutines and you will notice the simplicity of this implementation. We will use coroutines again when we make the filter interface more powerful. 
+The factory creates two functions. The first is an auxiliary that does all the work, in the form of a coroutine. It reads a chunk from one of the sources. If the chunk is `nil`, it moves to the next source, otherwise it just yields returning the chunk. When it is resumed, it continues from where it stopped and tries to read the next chunk. The second function is the source itself, and just resumes the execution of the auxiliary coroutine, returning to the user whatever chunks it returns (skipping the first result that tells us if the coroutine terminated). Imagine writing the same function without coroutines and you will notice the simplicity of this implementation. We will use coroutines again when we make the filter interface more powerful.
 
-==Chaining Sources==
+### Chaining Sources
 
 What does it mean to chain a source with a filter?  The most useful interpretation is that the combined source-filter is a new source that produces data and passes it through the filter before returning it. Here is a factory that does it:
-        {{{
+```lua
 function source.chain(src, f)
     return source.simplify(function()
         local chunk, err = src()
@@ -265,14 +262,14 @@ function source.chain(src, f)
         else return f(chunk) end
     end)
 end
-}}}
+```
 
 Our motivating example in the introduction chains a source with a filter. The idea of chaining a source with a filter is useful when one thinks about functions that might get their input data from a source. By chaining a simple source with one or more filters, the same function can be provided with filtered data even though it is unaware of the filtering that is happening behind its back.
 
-==Sinks==
+### Sinks
 
-Just as we defined an interface for an initial source of data, we can also define an interface for a final destination of data. We call any function respecting that interface a ''sink''. Below are two simple factories that return sinks. The table factory creates a sink that stores all obtained data into a table. The data can later be efficiently concatenated into a single string with the {{table.concat}} library function. As another example, we introduce the {{null}} sink: A sink that simply discards the data it receives.
-        {{{
+Just as we defined an interface for an initial source of data, we can also define an interface for a final destination of data. We call any function respecting that interface a "sink". Below are two simple factories that return sinks. The table factory creates a sink that stores all obtained data into a table. The data can later be efficiently concatenated into a single string with the `table.concat` library function. As another example, we introduce the `null` sink: A sink that simply discards the data it receives.
+```lua
 function sink.table(t)
     t = t or {}
     local f = function(chunk, err)
@@ -289,12 +286,12 @@ end
 function sink.null()
     return null
 end
-}}}
+```
 
-Sinks receive consecutive chunks of data, until the end of data is notified with a {{nil}} chunk. An error is notified by an extra argument giving an error message after the {{nil}} chunk.  If a sink detects an error itself and wishes not to be called again, it should return {{nil}}, optionally followed by an error message. A return value that is not {{nil}} means the source will accept more data. Finally, just as sources can choose to be replaced, so can sinks, following the same interface. Once again, it is easy to implement a {{sink.simplify}} factory that transforms a fancy sink into a simple sink.
+Sinks receive consecutive chunks of data, until the end of data is notified with a `nil` chunk. An error is notified by an extra argument giving an error message after the `nil` chunk. If a sink detects an error itself and wishes not to be called again, it should return `nil`, optionally followed by an error message. A return value that is not `nil` means the source will accept more data. Finally, just as sources can choose to be replaced, so can sinks, following the same interface. Once again, it is easy to implement a `sink.simplify` factory that transforms a fancy sink into a simple sink.
 
 As an example, let's create a source that reads from the standard input, then chain it with a filter that normalizes the end-of-line convention and let's use a sink to place all data into a table, printing the result in the end.
-        {{{
+```lua
 local load = source.chain(source.file(io.stdin), normalize("\r\n"))
 local store, t = sink.table()
 while 1 do
@@ -303,10 +300,10 @@ while 1 do
     if not chunk then break end
 end
 print(table.concat(t))
-}}}
+```
 
-Again, just as we created a factory that produces a chained source-filter from a source and a filter, it is easy to create a factory that produces a new sink given a sink and a filter.  The new sink passes all data it receives through the filter before handing it in to the original sink. Here is the implementation: 
-        {{{
+Again, just as we created a factory that produces a chained source-filter from a source and a filter, it is easy to create a factory that produces a new sink given a sink and a filter. The new sink passes all data it receives through the filter before handing it in to the original sink. Here is the implementation:
+```lua
 function sink.chain(f, snk)
     return function(chunk, err)
         local r, e = snk(f(chunk))
@@ -315,12 +312,12 @@ function sink.chain(f, snk)
         return 1
     end
 end
-}}}
+```
 
-==Pumps==
+### Pumps
 
-There is a while loop that has been around for too long in our examples.  It's always there because everything that we designed so far is passive.  Sources, sinks, filters: None of them will do anything on their own. The operation of pumping all data a source can provide into a sink is so common that we will provide a couple helper functions to do that for us.
-        {{{
+There is a while loop that has been around for too long in our examples. It's always there because everything that we designed so far is passive. Sources, sinks, filters: None of them will do anything on their own. The operation of pumping all data a source can provide into a sink is so common that we will provide a couple helper functions to do that for us.
+```lua
 function pump.step(src, snk)
     local chunk, src_err = src()
     local ret, snk_err = snk(chunk, src_err)
@@ -334,31 +331,31 @@ function pump.all(src, snk, step)
         if not ret then return not err, err end
     end
 end
-}}}
+```
 
-The {{pump.step}} function moves one chunk of data from the source to the sink. The {{pump.all}} function takes an optional {{step}} function and uses it to pump all the data from the source to the sink. We can now use everything we have to write a program that reads a binary file from disk and stores it in another file, after encoding it to the Base64 transfer content encoding:
-        {{{
+The `pump.step` function moves one chunk of data from the source to the sink. The `pump.all` function takes an optional `step` function and uses it to pump all the data from the source to the sink. We can now use everything we have to write a program that reads a binary file from disk and stores it in another file, after encoding it to the Base64 transfer content encoding:
+```lua
 local load = source.chain(
-    source.file(io.open("input.bin", "rb")), 
+    source.file(io.open("input.bin", "rb")),
     encode("base64")
 )
 local store = sink.chain(
     wrap(76),
-    sink.file(io.open("output.b64", "w")), 
+    sink.file(io.open("output.b64", "w")),
 )
 pump.all(load, store)
-}}}
+```
 
-The way we split the filters here is not intuitive, on purpose.  Alternatively, we could have chained the Base64 encode filter and the line-wrap filter together, and then chain the resulting filter with either the file source or the file sink. It doesn't really matter.
+The way we split the filters here is not intuitive, on purpose. Alternatively, we could have chained the Base64 encode filter and the line-wrap filter together, and then chain the resulting filter with either the file source or the file sink. It doesn't really matter.
 
-===One last important change===
+## One last important change
 
-Turns out we still have a problem. When David Burgess was writing his gzip filter, he noticed that the decompression filter can explode a small input chunk into a huge amount of data. Although we wished we could ignore this problem, we soon agreed we couldn't. The only solution is to allow filters to return partial results, and that is what we chose to do.  After invoking the filter to pass input data, the user now has to loop invoking the filter to find out if it has more output data to return.  Note that these extra calls can't pass more data to the filter. 
+Turns out we still have a problem. When David Burgess was writing his gzip filter, he noticed that the decompression filter can explode a small input chunk into a huge amount of data. Although we wished we could ignore this problem, we soon agreed we couldn't. The only solution is to allow filters to return partial results, and that is what we chose to do. After invoking the filter to pass input data, the user now has to loop invoking the filter to find out if it has more output data to return. Note that these extra calls can't pass more data to the filter.
 
-More specifically, after passing a chunk of input data to a filter and collecting the first chunk of output data, the user invokes the filter repeatedly, passing the empty string, to get extra output chunks. When the filter itself returns an empty string, the user knows there is no more output data, and can proceed to pass the next input chunk. In the end, after the user passes a {{nil}} notifying the filter that there is no more input data, the filter might still have produced too much output data to return in a single chunk. The user has to loop again, this time passing {{nil}} each time, until the filter itself returns {{nil}} to notify the user it is finally done.
+More specifically, after passing a chunk of input data to a filter and collecting the first chunk of output data, the user invokes the filter repeatedly, passing the empty string, to get extra output chunks. When the filter itself returns an empty string, the user knows there is no more output data, and can proceed to pass the next input chunk. In the end, after the user passes a `nil` notifying the filter that there is no more input data, the filter might still have produced too much output data to return in a single chunk. The user has to loop again, this time passing `nil` each time, until the filter itself returns `nil` to notify the user it is finally done.
 
 Most filters won't need this extra freedom. Fortunately, the new filter interface is easy to implement. In fact, the end-of-line translation filter we created in the introduction already conforms to it. On the other hand, the chaining function becomes much more complicated. If it wasn't for coroutines, I wouldn't be happy to implement it. Let me know if you can find a simpler implementation that does not use coroutines!
-        {{{
+```lua
 local function chain2(f1, f2)
     local co = coroutine.create(function(chunk)
         while true do
@@ -380,14 +377,14 @@ local function chain2(f1, f2)
         return res
     end
 end
-}}}
+```
 
 Chaining sources also becomes more complicated, but a similar solution is possible with coroutines. Chaining sinks is just as simple as it has always been. Interestingly, these modifications do not have a measurable negative impact in the the performance of filters that didn't need the added flexibility. They do severely improve the efficiency of filters like the gzip filter, though, and that is why we are keeping them.
 
-===Final considerations===
+## Final considerations
 
-These ideas were created during the development of {{LuaSocket}}[http://www.tecgraf.puc-rio.br/luasocket] 2.0, and are available as the LTN12 module.  As a result, {{LuaSocket}}[http://www.tecgraf.puc-rio.br/luasocket] implementation was greatly simplified and became much more powerful.  The MIME module is especially integrated to LTN12 and provides many other filters. We felt these concepts deserved to be made public even to those that don't care about {{LuaSocket}}[http://www.tecgraf.puc-rio.br/luasocket], hence the LTN. 
+These ideas were created during the development of [LuaSocket](https://github.com/lunarmodules/luasocket) 2.0, and are available as the LTN12 module. As a result, [LuaSocket](https://github.com/lunarmodules/luasocket) implementation was greatly simplified and became much more powerful. The MIME module is especially integrated to LTN12 and provides many other filters. We felt these concepts deserved to be made public even to those that don't care about [LuaSocket](https://github.com/lunarmodules/luasocket), hence the LTN.
 
-One extra application that deserves mentioning makes use of an identity filter.  Suppose you want to provide some feedback to the user while a file is being downloaded into a sink. Chaining the sink with an identity filter (a filter that simply returns the received data unaltered), you can update a progress counter on the fly. The original sink doesn't have to be modified.  Another interesting idea is that of a T sink: A sink that sends data to two other sinks. In summary, there appears to be enough room for many other interesting ideas.
+One extra application that deserves mentioning makes use of an identity filter. Suppose you want to provide some feedback to the user while a file is being downloaded into a sink. Chaining the sink with an identity filter (a filter that simply returns the received data unaltered), you can update a progress counter on the fly. The original sink doesn't have to be modified. Another interesting idea is that of a T sink: A sink that sends data to two other sinks. In summary, there appears to be enough room for many other interesting ideas.
 
-In this technical note we introduced filters, sources, sinks, and pumps.  These are useful tools for data processing in general. Sources provide a simple abstraction for data acquisition. Sinks provide an abstraction for final data destinations. Filters define an interface for data transformations.  The chaining of filters, sources and sinks provides an elegant way to create arbitrarily complex data transformation from simpler transformations. Pumps just put the machinery to work.  
+In this technical note we introduced filters, sources, sinks, and pumps. These are useful tools for data processing in general. Sources provide a simple abstraction for data acquisition. Sinks provide an abstraction for final data destinations. Filters define an interface for data transformations. The chaining of filters, sources and sinks provides an elegant way to create arbitrarily complex data transformation from simpler transformations. Pumps just put the machinery to work.
diff --git a/ltn013.wiki b/ltn013.wiki
index a622424..9c56805 100644
--- a/ltn013.wiki
+++ b/ltn013.wiki
@@ -1,50 +1,47 @@
-===Using finalized exceptions===
-==or How to get rid of all those if statements==
+# Using finalized exceptions
+### or How to get rid of all those if statements
 by DiegoNehab
 
-{{{
 
-}}}
+## Abstract
+This little LTN describes a simple exception scheme that greatly simplifies error checking in Lua programs. All the needed functionality ships standard with Lua, but is hidden between the `assert` and `pcall` functions. To make it more evident, we stick to a convenient standard (you probably already use anyways) for Lua function return values, and define two very simple helper functions (either in C or in Lua itself).
 
-===Abstract===
-This little LTN describes a simple exception scheme that greatly simplifies error checking in Lua programs. All the needed functionality ships standard with Lua, but is hidden between the {{assert}} and {{pcall}} functions.  To make it more evident, we stick to a convenient standard (you probably already use anyways) for Lua function return values, and define two very simple helper functions (either in C or in Lua itself). 
+## Introduction
 
-===Introduction===
+Most Lua functions return `nil` in case of error, followed by a message describing the error. If you don't use this convention, you probably have good reasons. Hopefully, after reading on, you will realize your reasons are not good enough.
 
-Most Lua functions return {{nil}} in case of error, followed by a message describing the error. If you don't use this convention, you probably have good reasons. Hopefully, after reading on, you will realize your reasons are not good enough. 
+If you are like me, you hate error checking. Most nice little code snippets that look beautiful when you first write them lose some of their charm when you add all that error checking code. Yet, error checking is as important as  the rest of the code. How sad.
 
-If you are like me, you hate error checking. Most nice little code snippets that look beautiful when you first write them lose some of their charm when you add all that error checking code.  Yet, error checking is as important as  the rest of the code. How sad.
-
-Even if you stick to a return convention, any complex task involving several function calls makes error checking both boring and error-prone (do you see the ''error'' below?)
-        {{{
+Even if you stick to a return convention, any complex task involving several function calls makes error checking both boring and error-prone (do you see the "error" below?)
+```lua
 function task(arg1, arg2, ...)
     local ret1, err = task1(arg1)
-    if not ret1 then 
+    if not ret1 then
         cleanup1()
-        return nil, error 
+        return nil, error
     end
     local ret2, err = task2(arg2)
-    if not ret then 
+    if not ret then
         cleanup2()
-        return nil, error 
+        return nil, error
     end
     ...
 end
-}}}
+```
 
-The standard {{assert}} function provides an interesting alternative.  To use it, simply nest every function call to  be error checked with a call to {{assert}}. The {{assert}} function checks the value of its first argument.  If it is {{nil}}, {{assert}} throws the second argument as an error message. Otherwise, {{assert}} lets all arguments through as if had not been there. The idea greatly simplifies error checking: 
-        {{{
+The standard `assert` function provides an interesting alternative. To use it, simply nest every function call to  be error checked with a call to `assert`. The `assert` function checks the value of its first argument. If it is `nil`, `assert` throws the second argument as an error message. Otherwise, `assert` lets all arguments through as if had not been there. The idea greatly simplifies error checking:
+```lua
 function task(arg1, arg2, ...)
     local ret1 = assert(task1(arg1))
     local ret2 = assert(task2(arg2))
     ...
 end
-}}}
+```
 
-If any task fails, the execution is aborted by {{assert}} and the error message is displayed to the user as the cause of the problem.  If no error happens, the task completes as before. There isn't a single {{if}} statement and this is great. However, there are some problems with the idea.
+If any task fails, the execution is aborted by `assert` and the error message is displayed to the user as the cause of the problem. If no error happens, the task completes as before. There isn't a single `if` statement and this is great. However, there are some problems with the idea.
 
-First, the topmost {{task}} function doesn't respect the protocol followed by the lower-level tasks: It raises an error instead of returning {{nil}} followed by the error messages. Here is where the standard {{pcall}} comes in handy. 
-        {{{
+First, the topmost `task` function doesn't respect the protocol followed by the lower-level tasks: It raises an error instead of returning `nil` followed by the error messages. Here is where the standard `pcall` comes in handy.
+```lua
 function xtask(arg1, arg2, ...)
     local ret1 = assert(task1(arg1))
     local ret2 = assert(task2(arg2))
@@ -56,22 +53,22 @@ function task(arg1, arg2, ...)
     if ok then return ret_or_err
     else return nil, ret_or_err end
 end
-}}}
+```
 
-Our new {{task}} function is well behaved. {{Pcall}} catches any error raised by the calls to {{assert}} and returns it after the status code. That way, errors don't get propagated to the user of the high level {{task}} function. 
+Our new `task` function is well behaved. `Pcall` catches any error raised by the calls to `assert` and returns it after the status code. That way, errors don't get propagated to the user of the high level `task` function.
 
-These are the main ideas for our exception scheme, but there are still a few glitches to fix: 
+These are the main ideas for our exception scheme, but there are still a few glitches to fix:
 
-        * Directly using {{pcall}} ruined the simplicity of the code;
-        * What happened to the cleanup function calls? What if we have to, say, close a file?
-        * {{Assert}} messes with the error message before raising the error (it adds line number information).
+* Directly using `pcall` ruined the simplicity of the code;
+* What happened to the cleanup function calls? What if we have to, say, close a file?
+* `Assert` messes with the error message before raising the error (it adds line number information).
 
-Fortunately, all these problems are very easy to solve and that's what we do in the following sections. 
+Fortunately, all these problems are very easy to solve and that's what we do in the following sections.
 
-== Introducing the {{protect}} factory ==
+## Introducing the `protect` factory
 
-We used the {{pcall}} function to shield the user from errors that could be raised by the underlying implementation.  Instead of directly using {{pcall}} (and thus duplicating code) every time we prefer a factory that does the same job:
-        {{{
+We used the `pcall` function to shield the user from errors that could be raised by the underlying implementation. Instead of directly using `pcall` (and thus duplicating code) every time we prefer a factory that does the same job:
+```lua
 local function pack(ok, ...)
     return ok, {...}
 end
@@ -83,19 +80,19 @@ function protect(f)
         else return nil, ret[1] end
     end
 end
-}}}
+```
 
-The {{protect}} factory receives a function that might raise exceptions and returns a function that respects our return value convention. Now we can rewrite the top-level {{task}} function in a much cleaner way:
-        {{{
+The `protect` factory receives a function that might raise exceptions and returns a function that respects our return value convention. Now we can rewrite the top-level `task` function in a much cleaner way:
+```lua
 task = protect(function(arg1, arg2, ...)
     local ret1 = assert(task1(arg1))
     local ret2 = assert(task2(arg2))
     ...
 end)
-}}}
+```
 
-The Lua implementation of the {{protect}} factory suffers with the creation of tables to hold multiple arguments and return values.  It is possible (and easy) to implement the same function in C, without any table creation. 
-        {{{
+The Lua implementation of the `protect` factory suffers with the creation of tables to hold multiple arguments and return values. It is possible (and easy) to implement the same function in C, without any table creation.
+```c
 static int safecall(lua_State *L) {
     lua_pushvalue(L, lua_upvalueindex(1));
     lua_insert(L, 1);
@@ -110,17 +107,17 @@ static int protect(lua_State *L) {
     lua_pushcclosure(L, safecall, 1);
     return 1;
 }
-}}}
+```
 
-===The {{newtry}} factory===
+## The `newtry` factory
 
 Let's solve the two remaining issues with a single shot and use a concrete example to illustrate the proposed solution. Suppose you want to write a function to download an HTTP document. You have to connect, send the request and read the reply. Each of these tasks can fail, but if something goes wrong after you connected, you have to close the connection before returning the error message.
-        {{{
+```lua
 get = protect(function(host, path)
     local c
     -- create a try function with a finalizer to close the socket
-    local try = newtry(function() 
-        if c then c:close() end 
+    local try = newtry(function()
+        if c then c:close() end
     end)
     -- connect and send request
     c = try(connect(host, 80))
@@ -137,34 +134,34 @@ get = protect(function(host, path)
     c:close()
     return b, h
 end)
-}}}
+```
 
-The {{newtry}} factory returns a function that works just like {{assert}}. The differences are that the {{try}} function doesn't mess with the error message and it calls an optional ''finalizer'' before raising the error. In our example, the finalizer simply closes the socket.
+The `newtry` factory returns a function that works just like `assert`. The differences are that the `try` function doesn't mess with the error message and it calls an optional "finalizer" before raising the error. In our example, the finalizer simply closes the socket.
 
-Even with a simple example like this, we see that the finalized exceptions simplified our life. Let's see what we gain in general, not just in this example: 
+Even with a simple example like this, we see that the finalized exceptions simplified our life. Let's see what we gain in general, not just in this example:
 
-        * We don't need to declare dummy variables to hold error messages in case any ever shows up; 
-        * We avoid using a variable to hold something that could either be a return value or an error message; 
-        * We didn't have to use several ''if'' statements to check for errors;
-        * If an error happens, we know our finalizer is going to be invoked automatically;
-        * Exceptions get propagated, so we don't repeat these ''if'' statements until the error reaches the user.
+* We don't need to declare dummy variables to hold error messages in case any ever shows up;
+* We avoid using a variable to hold something that could either be a return value or an error message;
+* We didn't have to use several "if" statements to check for errors;
+* If an error happens, we know our finalizer is going to be invoked automatically;
+* Exceptions get propagated, so we don't repeat these "if" statements until the error reaches the user.
 
-Try writing the same function without the tricks we used above and you will see that the code gets ugly. Longer sequences of operations with error checking would get even uglier. So let's implement the {{newtry}} function in Lua:
-        {{{
+Try writing the same function without the tricks we used above and you will see that the code gets ugly. Longer sequences of operations with error checking would get even uglier. So let's implement the `newtry` function in Lua:
+```lua
 function newtry(f)
-    return function(...) 
-        if not arg[1] then 
-            if f then f() end 
-            error(arg[2], 0)  
-        else 
+    return function(...)
+        if not arg[1] then
+            if f then f() end
+            error(arg[2], 0)
+        else
             return ...
         end
     end
 end
-}}}
+```
 
 Again, the implementation suffers from the creation of tables at each function call, so we prefer the C version:
-        {{{
+```lua
 static int finalize(lua_State *L) {
     if (!lua_toboolean(L, 1)) {
         lua_pushvalue(L, lua_upvalueindex(1));
@@ -182,13 +179,13 @@ static int do_nothing(lua_State *L) {
 
 static int newtry(lua_State *L) {
     lua_settop(L, 1);
-    if (lua_isnil(L, 1)) 
+    if (lua_isnil(L, 1))
         lua_pushcfunction(L, do_nothing);
     lua_pushcclosure(L, finalize, 1);
     return 1;
 }
-}}}
+```
 
-===Final considerations===
+## Final considerations
 
-The {{protect}} and {{newtry}} functions saved a ''lot'' of work in the implementation of {{LuaSocket}}[http://www.tecgraf.puc-rio.br/luasocket].  The size of some modules was cut in half by the these ideas.  It's true the scheme is not as generic as the exception mechanism of programming languages like C++ or Java, but the power/simplicity ratio is favorable and I hope it serves you as well as it served {{LuaSocket}}.
+The `protect` and `newtry` functions saved a "lot" of work in the implementation of [LuaSocket](https://github.com/lunarmodules/luasocket). The size of some modules was cut in half by the these ideas. It's true the scheme is not as generic as the exception mechanism of programming languages like C++ or Java, but the power/simplicity ratio is favorable and I hope it serves you as well as it served [LuaSocket](https://github.com/lunarmodules/luasocket).

From 97d5194f302d3fb9fe27874d9b5f73004a208d01 Mon Sep 17 00:00:00 2001
From: Thijs Schreijer 
Date: Tue, 29 Mar 2022 14:10:30 +0200
Subject: [PATCH 175/194] chore(ltn) rename files to markdown

---
 ltn012.wiki => ltn012.md | 0
 ltn013.wiki => ltn013.md | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename ltn012.wiki => ltn012.md (100%)
 rename ltn013.wiki => ltn013.md (100%)

diff --git a/ltn012.wiki b/ltn012.md
similarity index 100%
rename from ltn012.wiki
rename to ltn012.md
diff --git a/ltn013.wiki b/ltn013.md
similarity index 100%
rename from ltn013.wiki
rename to ltn013.md

From 38c7b5161b0c174050a0869a556e39bc499b1fa0 Mon Sep 17 00:00:00 2001
From: goldenstein64 
Date: Tue, 26 Jul 2022 16:24:25 -0400
Subject: [PATCH 176/194] fix(rockspec): Fixup Windows (mingw32) builds (#383)

---
 rockspecs/luasocket-3.0.0-1.rockspec | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/rockspecs/luasocket-3.0.0-1.rockspec b/rockspecs/luasocket-3.0.0-1.rockspec
index 4cf4acf..d64731a 100644
--- a/rockspecs/luasocket-3.0.0-1.rockspec
+++ b/rockspecs/luasocket-3.0.0-1.rockspec
@@ -34,7 +34,7 @@ local function make_plat(plat)
     },
     mingw32 = {
       "LUASOCKET_DEBUG",
-      "LUASOCKET_INET_PTON",
+      -- "LUASOCKET_INET_PTON",
       "WINVER=0x0501"
     }
   }
@@ -113,6 +113,7 @@ local function make_plat(plat)
   then
     modules["socket.core"].sources[#modules["socket.core"].sources+1] = "src/wsocket.c"
     modules["socket.core"].libraries = { "ws2_32" }
+    modules["socket.core"].libdirs = {}
   end
   return { modules = modules }
 end

From cff09ffb326237fd2edd848b6911521fe3e3d3fc Mon Sep 17 00:00:00 2001
From: Caleb Maclennan 
Date: Tue, 26 Jul 2022 23:39:17 +0300
Subject: [PATCH 177/194] chore(rockspec): Move recent PR change to proper
 rockspec (#384)

---
 luasocket-scm-3.rockspec             | 3 ++-
 rockspecs/luasocket-3.0.0-1.rockspec | 3 +--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/luasocket-scm-3.rockspec b/luasocket-scm-3.rockspec
index 71f335c..1045251 100644
--- a/luasocket-scm-3.rockspec
+++ b/luasocket-scm-3.rockspec
@@ -34,7 +34,7 @@ local function make_plat(plat)
     },
     mingw32 = {
       "LUASOCKET_DEBUG",
-      "LUASOCKET_INET_PTON",
+      -- "LUASOCKET_INET_PTON",
       "WINVER=0x0501"
     }
   }
@@ -113,6 +113,7 @@ local function make_plat(plat)
   then
     modules["socket.core"].sources[#modules["socket.core"].sources+1] = "src/wsocket.c"
     modules["socket.core"].libraries = { "ws2_32" }
+    modules["socket.core"].libdirs = {}
   end
   return { modules = modules }
 end
diff --git a/rockspecs/luasocket-3.0.0-1.rockspec b/rockspecs/luasocket-3.0.0-1.rockspec
index d64731a..4cf4acf 100644
--- a/rockspecs/luasocket-3.0.0-1.rockspec
+++ b/rockspecs/luasocket-3.0.0-1.rockspec
@@ -34,7 +34,7 @@ local function make_plat(plat)
     },
     mingw32 = {
       "LUASOCKET_DEBUG",
-      -- "LUASOCKET_INET_PTON",
+      "LUASOCKET_INET_PTON",
       "WINVER=0x0501"
     }
   }
@@ -113,7 +113,6 @@ local function make_plat(plat)
   then
     modules["socket.core"].sources[#modules["socket.core"].sources+1] = "src/wsocket.c"
     modules["socket.core"].libraries = { "ws2_32" }
-    modules["socket.core"].libdirs = {}
   end
   return { modules = modules }
 end

From 0c7df119c2b71bed814db7b3da8fc379131433fe Mon Sep 17 00:00:00 2001
From: Kim Alvefur 
Date: Wed, 27 Jul 2022 08:16:43 +0200
Subject: [PATCH 178/194] feat(tcp): Add support for TCP Fast Open

---
 docs/tcp.html |  4 ++++
 src/options.c | 16 ++++++++++++++++
 src/options.h |  7 +++++++
 src/tcp.c     |  6 ++++++
 4 files changed, 33 insertions(+)

diff --git a/docs/tcp.html b/docs/tcp.html
index 9cc173e..f15196c 100644
--- a/docs/tcp.html
+++ b/docs/tcp.html
@@ -485,6 +485,10 @@ disables the Nagle's algorithm for the connection;
 
 
  •  'tcp-keepintvl': value for TCP_KEEPINTVL Linux only!!
    • 
 
+
  •  'tcp-fastopen': value for TCP_FASTOPEN Linux only!!
    • 
+
+
  •  'tcp-fastopen-connect': value for TCP_FASTOPEN_CONNECT Linux only!!
    • 
+
 
  •  'ipv6-v6only':
 Setting this option to true restricts an inet6 socket to
 sending and receiving only IPv6 packets.
    • 
diff --git a/src/options.c b/src/options.c
index 2b53c67..51ea351 100644
--- a/src/options.c
+++ b/src/options.c
@@ -190,6 +190,22 @@ int opt_set_send_buf_size(lua_State *L, p_socket ps)
 	return opt_setint(L, ps, SOL_SOCKET, SO_SNDBUF);
 }
 
+// /*------------------------------------------------------*/
+
+#ifdef TCP_FASTOPEN
+int opt_set_tcp_fastopen(lua_State *L, p_socket ps)
+{
+    return opt_setint(L, ps, IPPROTO_TCP, TCP_FASTOPEN);
+}
+#endif
+
+#ifdef TCP_FASTOPEN_CONNECT
+int opt_set_tcp_fastopen_connect(lua_State *L, p_socket ps)
+{
+    return opt_setint(L, ps, IPPROTO_TCP, TCP_FASTOPEN_CONNECT);
+}
+#endif
+
 /*------------------------------------------------------*/
 int opt_set_ip6_unicast_hops(lua_State *L, p_socket ps)
 {
diff --git a/src/options.h b/src/options.h
index 41f7337..a4d5d75 100644
--- a/src/options.h
+++ b/src/options.h
@@ -64,6 +64,13 @@ int opt_get_recv_buf_size(lua_State *L, p_socket ps);
 int opt_set_send_buf_size(lua_State *L, p_socket ps);
 int opt_get_send_buf_size(lua_State *L, p_socket ps);
 
+#ifdef TCP_FASTOPEN
+int opt_set_tcp_fastopen(lua_State *L, p_socket ps);
+#endif
+#ifdef TCP_FASTOPEN_CONNECT
+int opt_set_tcp_fastopen_connect(lua_State *L, p_socket ps);
+#endif
+
 int opt_set_ip6_unicast_hops(lua_State *L, p_socket ps);
 int opt_get_ip6_unicast_hops(lua_State *L, p_socket ps);
 
diff --git a/src/tcp.c b/src/tcp.c
index 5876bfb..e24cb0c 100644
--- a/src/tcp.c
+++ b/src/tcp.c
@@ -109,6 +109,12 @@ static t_opt optset[] = {
     {"linger",      opt_set_linger},
 	{"recv-buffer-size",     opt_set_recv_buf_size},
 	{"send-buffer-size",     opt_set_send_buf_size},
+#ifdef TCP_FASTOPEN
+    {"tcp-fastopen", opt_set_tcp_fastopen},
+#endif
+#ifdef TCP_FASTOPEN_CONNECT
+    {"tcp-fastopen-connect", opt_set_tcp_fastopen_connect},
+#endif
     {NULL,          NULL}
 };
 

From d1ad8160cba9e504c9d17665492044a93efdc3ab Mon Sep 17 00:00:00 2001
From: Kim Alvefur 
Date: Wed, 27 Jul 2022 08:40:18 +0200
Subject: [PATCH 179/194] feat(tcp): Add support for TCP Defer Accept

This makes it so that a listening socket does not become readable for
accept() until a connection has been fully established *and* started
sending something, thus the program doesn't have to wait for the first
data. This only makes sense for client-speaks-first protocols.

Co-authored-by: Caleb Maclennan 
---
 docs/tcp.html | 2 ++
 src/options.c | 9 +++++++++
 src/options.h | 4 ++++
 src/tcp.c     | 3 +++
 4 files changed, 18 insertions(+)

diff --git a/docs/tcp.html b/docs/tcp.html
index f15196c..a26228d 100644
--- a/docs/tcp.html
+++ b/docs/tcp.html
@@ -485,6 +485,8 @@ disables the Nagle's algorithm for the connection;
 
 
  •  'tcp-keepintvl': value for TCP_KEEPINTVL Linux only!!
    • 
 
+
  •  'tcp-defer-accept': value for TCP_DEFER_ACCEPT Linux only!!
    • 
+
 
  •  'tcp-fastopen': value for TCP_FASTOPEN Linux only!!
    • 
 
 
  •  'tcp-fastopen-connect': value for TCP_FASTOPEN_CONNECT Linux only!!
    • 
diff --git a/src/options.c b/src/options.c
index 51ea351..3280c51 100644
--- a/src/options.c
+++ b/src/options.c
@@ -206,6 +206,15 @@ int opt_set_tcp_fastopen_connect(lua_State *L, p_socket ps)
 }
 #endif
 
+/*------------------------------------------------------*/
+
+#ifdef TCP_DEFER_ACCEPT
+int opt_set_tcp_defer_accept(lua_State *L, p_socket ps)
+{
+    return opt_setint(L, ps, IPPROTO_TCP, TCP_DEFER_ACCEPT);
+}
+#endif
+
 /*------------------------------------------------------*/
 int opt_set_ip6_unicast_hops(lua_State *L, p_socket ps)
 {
diff --git a/src/options.h b/src/options.h
index a4d5d75..456eeb5 100644
--- a/src/options.h
+++ b/src/options.h
@@ -49,6 +49,10 @@ int opt_set_tcp_keepintvl(lua_State *L, p_socket ps);
 int opt_get_tcp_keepintvl(lua_State *L, p_socket ps);
 #endif
 
+#ifdef TCP_DEFER_ACCEPT
+int opt_set_tcp_defer_accept(lua_State *L, p_socket ps);
+#endif
+
 int opt_set_keepalive(lua_State *L, p_socket ps);
 int opt_get_keepalive(lua_State *L, p_socket ps);
 
diff --git a/src/tcp.c b/src/tcp.c
index e24cb0c..e84db84 100644
--- a/src/tcp.c
+++ b/src/tcp.c
@@ -109,6 +109,9 @@ static t_opt optset[] = {
     {"linger",      opt_set_linger},
 	{"recv-buffer-size",     opt_set_recv_buf_size},
 	{"send-buffer-size",     opt_set_send_buf_size},
+#ifdef TCP_DEFER_ACCEPT
+    {"tcp-defer-accept", opt_set_tcp_defer_accept},
+#endif
 #ifdef TCP_FASTOPEN
     {"tcp-fastopen", opt_set_tcp_fastopen},
 #endif

From 5a7e3f08886ef2893148c1342fb6021291cf1307 Mon Sep 17 00:00:00 2001
From: rpatters1 
Date: Wed, 27 Jul 2022 01:51:35 -0500
Subject: [PATCH 180/194] fix(build): Use gai_strerrorA not gai_strerror on
 Windows

* Explicitly call gai_strerrorA (for Windows builds), so that the code work correctly in 32bit or 64bit builds.

* Implement GAI_STRERROR macro to deal with Windows vs. Non-Windows compiles for 64-bit.

* make usocket.c consistent with other modules that call macro GAI_STRERROR

* Use different name not just different case for macro wrapping function

Co-authored-by: Caleb Maclennan 
---
 src/inet.c    | 4 ++--
 src/socket.h  | 2 ++
 src/udp.c     | 4 ++--
 src/usocket.c | 2 +-
 src/wsocket.c | 2 +-
 5 files changed, 8 insertions(+), 6 deletions(-)
 mode change 100644 => 100755 src/inet.c
 mode change 100644 => 100755 src/socket.h
 mode change 100644 => 100755 src/udp.c

diff --git a/src/inet.c b/src/inet.c
old mode 100644
new mode 100755
index ec73fea..138c9ab
--- a/src/inet.c
+++ b/src/inet.c
@@ -253,7 +253,7 @@ int inet_meth_getpeername(lua_State *L, p_socket ps, int family)
         port, sizeof(port), NI_NUMERICHOST | NI_NUMERICSERV);
     if (err) {
         lua_pushnil(L);
-        lua_pushstring(L, gai_strerror(err));
+        lua_pushstring(L, LUA_GAI_STRERROR(err));
         return 2;
     }
     lua_pushstring(L, name);
@@ -286,7 +286,7 @@ int inet_meth_getsockname(lua_State *L, p_socket ps, int family)
 		name, INET6_ADDRSTRLEN, port, 6, NI_NUMERICHOST | NI_NUMERICSERV);
     if (err) {
         lua_pushnil(L);
-        lua_pushstring(L, gai_strerror(err));
+        lua_pushstring(L, LUA_GAI_STRERROR(err));
         return 2;
     }
     lua_pushstring(L, name);
diff --git a/src/socket.h b/src/socket.h
old mode 100644
new mode 100755
index e541f27..2555bab
--- a/src/socket.h
+++ b/src/socket.h
@@ -16,8 +16,10 @@
 \*=========================================================================*/
 #ifdef _WIN32
 #include "wsocket.h"
+#define LUA_GAI_STRERROR gai_strerrorA
 #else
 #include "usocket.h"
+#define LUA_GAI_STRERROR gai_strerror
 #endif
 
 /*=========================================================================*\
diff --git a/src/udp.c b/src/udp.c
old mode 100644
new mode 100755
index 62b6a20..712ad50
--- a/src/udp.c
+++ b/src/udp.c
@@ -191,7 +191,7 @@ static int meth_sendto(lua_State *L) {
     err = getaddrinfo(ip, port, &aihint, &ai);
 	if (err) {
         lua_pushnil(L);
-        lua_pushstring(L, gai_strerror(err));
+        lua_pushstring(L, LUA_GAI_STRERROR(err));
         return 2;
     }
 
@@ -290,7 +290,7 @@ static int meth_receivefrom(lua_State *L) {
         INET6_ADDRSTRLEN, portstr, 6, NI_NUMERICHOST | NI_NUMERICSERV);
 	if (err) {
         lua_pushnil(L);
-        lua_pushstring(L, gai_strerror(err));
+        lua_pushstring(L, LUA_GAI_STRERROR(err));
         if (wanted > sizeof(buf)) free(dgram);
         return 2;
     }
diff --git a/src/usocket.c b/src/usocket.c
index acfe186..69635da 100644
--- a/src/usocket.c
+++ b/src/usocket.c
@@ -449,6 +449,6 @@ const char *socket_gaistrerror(int err) {
         case EAI_SERVICE: return PIE_SERVICE;
         case EAI_SOCKTYPE: return PIE_SOCKTYPE;
         case EAI_SYSTEM: return strerror(errno);
-        default: return gai_strerror(err);
+        default: return LUA_GAI_STRERROR(err);
     }
 }
diff --git a/src/wsocket.c b/src/wsocket.c
index 7cd4115..6cb1e41 100755
--- a/src/wsocket.c
+++ b/src/wsocket.c
@@ -429,6 +429,6 @@ const char *socket_gaistrerror(int err) {
 #ifdef EAI_SYSTEM
         case EAI_SYSTEM: return strerror(errno);
 #endif
-        default: return gai_strerror(err);
+        default: return LUA_GAI_STRERROR(err);
     }
 }

From 80503077dbb8428e4e99410d31ab42dd0438eef9 Mon Sep 17 00:00:00 2001
From: Caleb Maclennan 
Date: Wed, 27 Jul 2022 09:55:54 +0300
Subject: [PATCH 181/194] ci: Echo correct platform in job title

---
 .github/workflows/build.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index d6fe214..ee6e1d4 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -8,11 +8,11 @@ on:
 
 jobs:
   build:
-    name: Test build on Linux
+    name: Test build on ${{ matrix.platform }}
     strategy:
       fail-fast: false
       matrix:
-        luaVersion: [ "5.4", "5.3", "5.2", "5.1", "luajit", "luajit-openresty"]
+        luaVersion: [ "5.4", "5.3", "5.2", "5.1", "luajit", "luajit-openresty" ]
         platform: [ "ubuntu-20.04", "macos-11" ] # "windows-2022" not supported by gh-actions-lua
     runs-on: ${{ matrix.platform }}
     steps:

From 95b7efa9da506ef968c1347edf3fc56370f0deed Mon Sep 17 00:00:00 2001
From: Caleb Maclennan 
Date: Wed, 27 Jul 2022 10:06:54 +0300
Subject: [PATCH 182/194] chore: Release v3.1.0

---
 CHANGELOG.md                         |   7 ++
 docs/index.html                      |   2 +-
 rockspecs/luasocket-3.1.0-1.rockspec | 135 +++++++++++++++++++++++++++
 3 files changed, 143 insertions(+), 1 deletion(-)
 create mode 100644 rockspecs/luasocket-3.1.0-1.rockspec

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0de05f3..3a25186 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## [v3.1.0](https://github.com/lunarmodules/luasocket/releases/v3.1.0) — 2022-07-27
+
+* Add support for TCP Defer Accept – @Zash
+* Add support for TCP Fast Open – @Zash
+* Fix Windows (mingw32) builds – @goldenstein64
+* Avoid build warnings on 64-bit Windows – @rpatters1
+
 ## [v3.0.0](https://github.com/lunarmodules/luasocket/releases/v3.0.0) — 2022-03-25
 
 The last time LuaSocket had a stable release tag was 14 years ago when 2.0.2 was tagged.
diff --git a/docs/index.html b/docs/index.html
index 31e18ad..ad92687 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -87,7 +87,7 @@ Author: Diego Nehab
 
    Download
    
 
 
    
-LuaSocket version 3.0.0 is now available for download!
+LuaSocket version 3.1.0 is now available for download!
 It is compatible with Lua 5.1 through 5.4.
 Chances are it works well on most UNIX distributions and Windows flavors.
 
    
diff --git a/rockspecs/luasocket-3.1.0-1.rockspec b/rockspecs/luasocket-3.1.0-1.rockspec
new file mode 100644
index 0000000..2d724ac
--- /dev/null
+++ b/rockspecs/luasocket-3.1.0-1.rockspec
@@ -0,0 +1,135 @@
+package = "LuaSocket"
+version = "3.1.0-1"
+source = {
+  url = "git+https://github.com/lunarmodules/luasocket.git",
+  tag = "v3.1.0"
+}
+description = {
+  summary = "Network support for the Lua language",
+  detailed = [[
+      LuaSocket is a Lua extension library composed of two parts: a set of C
+      modules that provide support for the TCP and UDP transport layers, and a
+      set of Lua modules that provide functions commonly needed by applications
+      that deal with the Internet.
+   ]],
+  homepage = "https://github.com/lunarmodules/luasocket",
+  license = "MIT"
+}
+dependencies = {
+  "lua >= 5.1"
+}
+
+local function make_plat(plat)
+  local defines = {
+    unix = {
+      "LUASOCKET_DEBUG"
+    },
+    macosx = {
+      "LUASOCKET_DEBUG",
+      "UNIX_HAS_SUN_LEN"
+    },
+    win32 = {
+      "LUASOCKET_DEBUG",
+      "NDEBUG"
+    },
+    mingw32 = {
+      "LUASOCKET_DEBUG",
+      -- "LUASOCKET_INET_PTON",
+      "WINVER=0x0501"
+    }
+  }
+  local modules = {
+    ["socket.core"] = {
+      sources = {
+        "src/luasocket.c"
+        , "src/timeout.c"
+        , "src/buffer.c"
+        , "src/io.c"
+        , "src/auxiliar.c"
+        , "src/options.c"
+        , "src/inet.c"
+        , "src/except.c"
+        , "src/select.c"
+        , "src/tcp.c"
+        , "src/udp.c"
+        , "src/compat.c" },
+      defines = defines[plat],
+      incdir = "/src"
+    },
+    ["mime.core"] = {
+      sources = { "src/mime.c", "src/compat.c" },
+      defines = defines[plat],
+      incdir = "/src"
+    },
+    ["socket.http"]    = "src/http.lua",
+    ["socket.url"]     = "src/url.lua",
+    ["socket.tp"]      = "src/tp.lua",
+    ["socket.ftp"]     = "src/ftp.lua",
+    ["socket.headers"] = "src/headers.lua",
+    ["socket.smtp"]    = "src/smtp.lua",
+    ltn12              = "src/ltn12.lua",
+    socket             = "src/socket.lua",
+    mime               = "src/mime.lua"
+  }
+  if plat == "unix"
+    or plat == "macosx"
+    or plat == "haiku"
+  then
+    modules["socket.core"].sources[#modules["socket.core"].sources+1] = "src/usocket.c"
+    if plat == "haiku" then
+      modules["socket.core"].libraries = {"network"}
+    end
+    modules["socket.unix"] = {
+      sources = {
+        "src/buffer.c"
+        , "src/compat.c"
+        , "src/auxiliar.c"
+        , "src/options.c"
+        , "src/timeout.c"
+        , "src/io.c"
+        , "src/usocket.c"
+        , "src/unix.c"
+        , "src/unixdgram.c"
+        , "src/unixstream.c" },
+      defines = defines[plat],
+      incdir = "/src"
+    }
+    modules["socket.serial"] = {
+      sources = {
+        "src/buffer.c"
+        , "src/compat.c"
+        , "src/auxiliar.c"
+        , "src/options.c"
+        , "src/timeout.c"
+        , "src/io.c"
+        , "src/usocket.c"
+        , "src/serial.c" },
+      defines = defines[plat],
+      incdir = "/src"
+    }
+  end
+  if  plat == "win32"
+    or plat == "mingw32"
+  then
+    modules["socket.core"].sources[#modules["socket.core"].sources+1] = "src/wsocket.c"
+    modules["socket.core"].libraries = { "ws2_32" }
+    modules["socket.core"].libdirs = {}
+  end
+  return { modules = modules }
+end
+
+build = {
+  type = "builtin",
+  platforms = {
+    unix = make_plat("unix"),
+    macosx = make_plat("macosx"),
+    haiku = make_plat("haiku"),
+    win32 = make_plat("win32"),
+    mingw32 = make_plat("mingw32")
+  },
+  copy_directories = {
+    "docs"
+    , "samples"
+    , "etc"
+    , "test" }
+}

From 30ddf0eaea2de526acdd3236d27f6788af3576e2 Mon Sep 17 00:00:00 2001
From: George  Zhao 
Date: Sun, 28 Aug 2022 02:31:54 +0800
Subject: [PATCH 183/194] style(core) Remove lingering c-style comment (#388)

---
 src/options.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/options.c b/src/options.c
index 3280c51..657947c 100644
--- a/src/options.c
+++ b/src/options.c
@@ -190,7 +190,7 @@ int opt_set_send_buf_size(lua_State *L, p_socket ps)
 	return opt_setint(L, ps, SOL_SOCKET, SO_SNDBUF);
 }
 
-// /*------------------------------------------------------*/
+/*------------------------------------------------------*/
 
 #ifdef TCP_FASTOPEN
 int opt_set_tcp_fastopen(lua_State *L, p_socket ps)

From 88c72acd771ac6c96ea7f4e57293307e282ad49f Mon Sep 17 00:00:00 2001
From: zhaozg 
Date: Tue, 30 Aug 2022 15:19:44 +0800
Subject: [PATCH 184/194] fix(usocket): Fix typo in return value function name

---
 src/usocket.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/usocket.c b/src/usocket.c
index 69635da..bd18926 100644
--- a/src/usocket.c
+++ b/src/usocket.c
@@ -403,7 +403,7 @@ const char *socket_hoststrerror(int err) {
     if (err <= 0) return io_strerror(err);
     switch (err) {
         case HOST_NOT_FOUND: return PIE_HOST_NOT_FOUND;
-        default: return hstrerror(err);
+        default: return strerror(err);
     }
 }
 

From 159890c3662976dc027f2fe6bb94074ff62f15e7 Mon Sep 17 00:00:00 2001
From: zhaozg 
Date: Tue, 30 Aug 2022 15:20:24 +0800
Subject: [PATCH 185/194] style(usocket): Remove trailing space at EOL

---
 src/usocket.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/usocket.c b/src/usocket.c
index bd18926..df19f78 100644
--- a/src/usocket.c
+++ b/src/usocket.c
@@ -236,7 +236,7 @@ int socket_sendto(p_socket ps, const char *data, size_t count, size_t *sent,
     *sent = 0;
     if (*ps == SOCKET_INVALID) return IO_CLOSED;
     for ( ;; ) {
-        long put = (long) sendto(*ps, data, count, 0, addr, len); 
+        long put = (long) sendto(*ps, data, count, 0, addr, len);
         if (put >= 0) {
             *sent = put;
             return IO_DONE;

From 26b524e1d7b9a00045882d3c0f25486485b1d6a8 Mon Sep 17 00:00:00 2001
From: Caleb Maclennan 
Date: Wed, 31 Aug 2022 00:34:39 +0300
Subject: [PATCH 186/194] Revert "fix(usocket): Fix typo in return value
 function name"

This reverts commit 88c72acd771ac6c96ea7f4e57293307e282ad49f.

See discussion on #390
---
 src/usocket.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/usocket.c b/src/usocket.c
index df19f78..7965db6 100644
--- a/src/usocket.c
+++ b/src/usocket.c
@@ -403,7 +403,7 @@ const char *socket_hoststrerror(int err) {
     if (err <= 0) return io_strerror(err);
     switch (err) {
         case HOST_NOT_FOUND: return PIE_HOST_NOT_FOUND;
-        default: return strerror(err);
+        default: return hstrerror(err);
     }
 }
 

From 8c2ff7217e2a205eb107a6f48b04ff1b2b3090a1 Mon Sep 17 00:00:00 2001
From: Henri D 
Date: Sat, 8 Oct 2022 08:42:36 +0200
Subject: [PATCH 187/194] fix(http): Allow relative redirect on https (#395)

Location header can now be relative: https://httpwg.org/specs/rfc9110.html#field.location
---
 src/http.lua      |  5 +++--
 test/httptest.lua | 31 +++++++++++++++++++++++++++++++
 2 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/src/http.lua b/src/http.lua
index 1330355..fbd5ff6 100644
--- a/src/http.lua
+++ b/src/http.lua
@@ -300,6 +300,8 @@ local function shouldredirect(reqt, code, headers)
     if not location then return false end
     location = string.gsub(location, "%s", "")
     if location == "" then return false end
+    -- the RFC says the redirect URL may be relative
+    location = url.absolute(reqt.url, location)
     local scheme = url.parse(location).scheme
     if scheme and (not SCHEMES[scheme]) then return false end
     -- avoid https downgrades
@@ -323,8 +325,7 @@ end
 local trequest, tredirect
 
 --[[local]] function tredirect(reqt, location)
-    -- the RFC says the redirect URL has to be absolute, but some
-    -- servers do not respect that
+    -- the RFC says the redirect URL may be relative
     local newurl = url.absolute(reqt.url, location)
     -- if switching schemes, reset port and create function
     if url.parse(newurl).scheme ~= reqt.scheme then
diff --git a/test/httptest.lua b/test/httptest.lua
index 63ff921..3457b07 100644
--- a/test/httptest.lua
+++ b/test/httptest.lua
@@ -265,6 +265,37 @@ ignore = {
 }
 check_request(request, expect, ignore)
 
+-- Use https://httpbin.org/#/Dynamic_data/get_base64__value_ for testing
+-----------------------------------------------------
+io.write("testing absolute https redirection: ")
+request = {
+    url = "https://httpbin.org/redirect-to?url=https://httpbin.org/base64/THVhIFNvY2tldA=="
+}
+expect = {
+    code = 200,
+    body = "Lua Socket"
+}
+ignore = {
+    status = 1,
+    headers = 1
+}
+check_request(request, expect, ignore)
+
+-----------------------------------------------------
+io.write("testing relative https redirection: ")
+request = {
+    url = "https://httpbin.org/redirect-to?url=/base64/THVhIFNvY2tldA=="
+}
+expect = {
+    code = 200,
+    body = "Lua Socket"
+}
+ignore = {
+    status = 1,
+    headers = 1
+}
+check_request(request, expect, ignore)
+
 ------------------------------------------------------------------------
 --[[
 io.write("testing proxy with redirection: ")

From 9100f7e3abf3511009fa21de1e0b304cac5489d3 Mon Sep 17 00:00:00 2001
From: Caleb Maclennan 
Date: Tue, 17 Oct 2023 09:06:10 +0300
Subject: [PATCH 188/194] docs: Fixup badge URLs with current GH API

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index af722be..6f5657c 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,8 @@
 # LuaSocket
 
 
-[![Build](https://img.shields.io/github/workflow/status/lunarmodules/luasocket/Build?label=Build=Lua)](https://github.com/lunarmodules/luasocket/actions?workflow=Build)
-[![Luacheck](https://img.shields.io/github/workflow/status/lunarmodules/luasocket/Luacheck?label=Luacheck&logo=Lua)](https://github.com/lunarmodules/luasocket/actions?workflow=Luacheck)
+[![Build](https://img.shields.io/github/actions/workflow/status/lunarmodules/luasocket/build.yml?branch=master&label=Build&logo=Lua)](https://github.com/lunarmodules/luasocket/actions?workflow=Build)
+[![Luacheck](https://img.shields.io/github/actions/workflow/status/lunarmodules/luasocket/luacheck.yml?branch=master&label=Luacheck&logo=Lua)](https://github.com/lunarmodules/luasocket/actions?workflow=Luacheck)
 [![GitHub tag (latest SemVer)](https://img.shields.io/github/v/tag/lunarmodules/luasocket?label=Tag&logo=GitHub)](https://github.com/lunarmodules/luasocket/releases)
 [![Luarocks](https://img.shields.io/luarocks/v/lunarmodules/luasocket?label=Luarocks&logo=Lua)](https://luarocks.org/modules/lunarmodules/luasocket)
 

From f741a88b80ffcf4de65b91ff82fc9f7865cbad0e Mon Sep 17 00:00:00 2001
From: Leso_KN 
Date: Mon, 23 Oct 2023 20:27:01 +0200
Subject: [PATCH 189/194] feat(tcp): Add 'bindtodevice' option (#408)

---
 src/options.c | 27 +++++++++++++++++++++++++++
 src/options.h |  3 +++
 src/tcp.c     |  2 ++
 3 files changed, 32 insertions(+)

diff --git a/src/options.c b/src/options.c
index 657947c..3856797 100644
--- a/src/options.c
+++ b/src/options.c
@@ -54,6 +54,33 @@ int opt_meth_getoption(lua_State *L, p_opt opt, p_socket ps)
     return opt->func(L, ps);
 }
 
+/*------------------------------------------------------*/
+/* binds socket to network interface */
+int opt_set_bindtodevice(lua_State *L, p_socket ps)
+{
+#ifdef __APPLE__
+    return luaL_error(L, "SO_BINDTODEVICE is not supported on this operating system");
+#else
+    const char *dev = luaL_checkstring(L, 3);
+    return opt_set(L, ps, SOL_SOCKET, SO_BINDTODEVICE, (char*)dev, strlen(dev)+1);
+#endif
+}
+
+int opt_get_bindtodevice(lua_State *L, p_socket ps)
+{
+#ifdef __APPLE__
+    return luaL_error(L, "SO_BINDTODEVICE is not supported on this operating system");
+#else
+    char dev[IFNAMSIZ];
+    int len = sizeof(dev);
+    int err = opt_get(L, ps, SOL_SOCKET, SO_BINDTODEVICE, &dev, &len);
+    if (err)
+        return err;
+    lua_pushstring(L, dev);
+    return 1;
+#endif
+}
+
 /*------------------------------------------------------*/
 /* enables reuse of local address */
 int opt_set_reuseaddr(lua_State *L, p_socket ps)
diff --git a/src/options.h b/src/options.h
index 456eeb5..26d6f02 100644
--- a/src/options.h
+++ b/src/options.h
@@ -53,6 +53,9 @@ int opt_get_tcp_keepintvl(lua_State *L, p_socket ps);
 int opt_set_tcp_defer_accept(lua_State *L, p_socket ps);
 #endif
 
+int opt_set_bindtodevice(lua_State *L, p_socket ps);
+int opt_get_bindtodevice(lua_State *L, p_socket ps);
+
 int opt_set_keepalive(lua_State *L, p_socket ps);
 int opt_get_keepalive(lua_State *L, p_socket ps);
 
diff --git a/src/tcp.c b/src/tcp.c
index e84db84..f001206 100644
--- a/src/tcp.c
+++ b/src/tcp.c
@@ -71,6 +71,7 @@ static luaL_Reg tcp_methods[] = {
 
 /* socket option handlers */
 static t_opt optget[] = {
+    {"bindtodevice", opt_get_bindtodevice},
     {"keepalive",   opt_get_keepalive},
     {"reuseaddr",   opt_get_reuseaddr},
     {"reuseport",   opt_get_reuseport},
@@ -92,6 +93,7 @@ static t_opt optget[] = {
 };
 
 static t_opt optset[] = {
+    {"bindtodevice", opt_set_bindtodevice},
     {"keepalive",   opt_set_keepalive},
     {"reuseaddr",   opt_set_reuseaddr},
     {"reuseport",   opt_set_reuseport},

From 0bc8c56043e9fee5403516c62618b7d3acc5508a Mon Sep 17 00:00:00 2001
From: leso-kn 
Date: Mon, 23 Oct 2023 21:35:10 +0200
Subject: [PATCH 190/194] fix(core): Disable SO_BINDTODEVICE on windows

Co-authored-by: Sewbacca 
---
 src/options.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/options.c b/src/options.c
index 3856797..6581cae 100644
--- a/src/options.c
+++ b/src/options.c
@@ -58,7 +58,7 @@ int opt_meth_getoption(lua_State *L, p_opt opt, p_socket ps)
 /* binds socket to network interface */
 int opt_set_bindtodevice(lua_State *L, p_socket ps)
 {
-#ifdef __APPLE__
+#if defined(__APPLE__) || defined(__WIN32__) || defined(_MSC_VER)
     return luaL_error(L, "SO_BINDTODEVICE is not supported on this operating system");
 #else
     const char *dev = luaL_checkstring(L, 3);
@@ -68,7 +68,7 @@ int opt_set_bindtodevice(lua_State *L, p_socket ps)
 
 int opt_get_bindtodevice(lua_State *L, p_socket ps)
 {
-#ifdef __APPLE__
+#if defined(__APPLE__) || defined(__WIN32__) || defined(_MSC_VER)
     return luaL_error(L, "SO_BINDTODEVICE is not supported on this operating system");
 #else
     char dev[IFNAMSIZ];

From 708e50f8e640540198a24798b1bacd349f3c11dd Mon Sep 17 00:00:00 2001
From: leso-kn 
Date: Fri, 27 Oct 2023 11:34:39 +0200
Subject: [PATCH 191/194] refactor(core): Replace check for SO_BINDTODEVICE
 support with platform independent version

---
 src/options.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/options.c b/src/options.c
index 6581cae..9dea6bd 100644
--- a/src/options.c
+++ b/src/options.c
@@ -58,7 +58,7 @@ int opt_meth_getoption(lua_State *L, p_opt opt, p_socket ps)
 /* binds socket to network interface */
 int opt_set_bindtodevice(lua_State *L, p_socket ps)
 {
-#if defined(__APPLE__) || defined(__WIN32__) || defined(_MSC_VER)
+#ifndef SO_BINDTODEVICE
     return luaL_error(L, "SO_BINDTODEVICE is not supported on this operating system");
 #else
     const char *dev = luaL_checkstring(L, 3);
@@ -68,7 +68,7 @@ int opt_set_bindtodevice(lua_State *L, p_socket ps)
 
 int opt_get_bindtodevice(lua_State *L, p_socket ps)
 {
-#if defined(__APPLE__) || defined(__WIN32__) || defined(_MSC_VER)
+#ifndef SO_BINDTODEVICE
     return luaL_error(L, "SO_BINDTODEVICE is not supported on this operating system");
 #else
     char dev[IFNAMSIZ];

From 9c6195ea629077bd7f6bf73e3e9991c89ec5ba7e Mon Sep 17 00:00:00 2001
From: leso-kn 
Date: Fri, 27 Oct 2023 19:31:18 +0200
Subject: [PATCH 192/194] ci: Enable windows build

---
 .github/workflows/build.yml | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index ee6e1d4..432bafb 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -13,22 +13,27 @@ jobs:
       fail-fast: false
       matrix:
         luaVersion: [ "5.4", "5.3", "5.2", "5.1", "luajit", "luajit-openresty" ]
-        platform: [ "ubuntu-20.04", "macos-11" ] # "windows-2022" not supported by gh-actions-lua
+        platform: [ "ubuntu-20.04", "macos-11", "windows-2022" ]
     runs-on: ${{ matrix.platform }}
     steps:
       - name: Checkout
         uses: actions/checkout@v3
+      - name: Setup ’msvc’
+        uses: ilammy/msvc-dev-cmd@v1
+        if: ${{ !startsWith(matrix.luaVersion, 'luajit') }}
       - name: Setup ‘lua’
-        uses: leafo/gh-actions-lua@v9
+        uses: leso-kn/gh-actions-lua@v11-staging
         with:
           luaVersion: ${{ matrix.luaVersion }}
       - name: Setup ‘luarocks’
-        uses: leafo/gh-actions-luarocks@v4
+        uses: hishamhm/gh-actions-luarocks@master
       - name: Make and install
         run: |
-          export DEBUG=DEBUG
           luarocks make -- luasocket-scm-3.rockspec
+        env:
+          DEBUG: DEBUG
       - name: Run regression tests
+        shell: bash
         run: |
           cd test
           lua hello.lua

From 64c9d531df0efc3f4e85be6d69e5695831993430 Mon Sep 17 00:00:00 2001
From: Caleb Maclennan 
Date: Wed, 8 Nov 2023 13:08:10 +0300
Subject: [PATCH 193/194] ci: Identify CI jobs better and skip irrelevant
 platform specific steps

---
 .github/workflows/build.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 432bafb..6d119d0 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -8,7 +8,7 @@ on:
 
 jobs:
   build:
-    name: Test build on ${{ matrix.platform }}
+    name: Test ${{ matrix.luaVersion }} on ${{ matrix.platform }}
     strategy:
       fail-fast: false
       matrix:
@@ -17,10 +17,10 @@ jobs:
     runs-on: ${{ matrix.platform }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Setup ’msvc’
+        if: ${{ startsWith(matrix.platform, 'windows') && !startsWith(matrix.luaVersion, 'luajit') }}
         uses: ilammy/msvc-dev-cmd@v1
-        if: ${{ !startsWith(matrix.luaVersion, 'luajit') }}
       - name: Setup ‘lua’
         uses: leso-kn/gh-actions-lua@v11-staging
         with:

From 43a97b7f0053313b43906371dbdc226271e6c8ab Mon Sep 17 00:00:00 2001
From: Caleb Maclennan 
Date: Wed, 8 Nov 2023 13:14:04 +0300
Subject: [PATCH 194/194] ci: Update Luacheck to v1+, use newer Ubuntu runner
 images

---
 .github/workflows/build.yml    | 2 +-
 .github/workflows/luacheck.yml | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 6d119d0..49c2c73 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -13,7 +13,7 @@ jobs:
       fail-fast: false
       matrix:
         luaVersion: [ "5.4", "5.3", "5.2", "5.1", "luajit", "luajit-openresty" ]
-        platform: [ "ubuntu-20.04", "macos-11", "windows-2022" ]
+        platform: [ "ubuntu-22.04", "macos-11", "windows-2022" ]
     runs-on: ${{ matrix.platform }}
     steps:
       - name: Checkout
diff --git a/.github/workflows/luacheck.yml b/.github/workflows/luacheck.yml
index 2f20456..9cb784c 100644
--- a/.github/workflows/luacheck.yml
+++ b/.github/workflows/luacheck.yml
@@ -5,9 +5,9 @@ on: [push, pull_request]
 jobs:
 
   luacheck:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Luacheck
-        uses: lunarmodules/luacheck@v0
+        uses: lunarmodules/luacheck@v1