-
+
|
| Network support for the Lua language
|
@@ -48,6 +48,27 @@ To obtain the socket namespace, run:
local socket = require("socket")
+
+
+
+socket.bind(address, port [, backlog])
+
+
+
+
+
+
+
+
+socket.connect(address, port [, locaddr, locport])
+
+
+
+This function is a shortcut that creates and returns a TCP socket object
+connected to a remote host at a given port. Optionally,
+the use can also specify the local address and port to bind
+(locaddr and locport).
+
@@ -289,8 +310,8 @@ The function returns a source with the appropriate behavior.
-
-socket.time()
+
+socket.gettime()
@@ -304,9 +325,9 @@ The function returns the time as a number.
-t = socket.time()
+t = socket.gettime()
-- do stuff
-print(socket.time() - t .. " seconds elapsed")
+print(socket.gettime() - t .. " seconds elapsed")
diff --git a/doc/tcp.html b/doc/tcp.html
index cd417a5..37b0b56 100644
--- a/doc/tcp.html
+++ b/doc/tcp.html
@@ -16,7 +16,7 @@
|
-
+
|
| Network support for the Lua language
|
@@ -74,7 +74,7 @@ reported by nil followed by a message describing the error.
-Note: calling socket.select
+Note: calling socket.select
with a server object in
the receive parameter before a call to accept does
not guarantee accept will return immediately. Use the
Address can be an IP address or a host name.
-Port must be an integer number in the range [0..64K].
+Port must be an integer number in the range [0..64K).
If address
is '*', the system binds to all local interfaces
using the INADDR_ANY constant. If port is 0, the system automatically
@@ -154,7 +154,7 @@ and close.
Address can be an IP address or a host name.
-Port must be an integer number in the range [1..64K].
+Port must be an integer number in the range [1..64K).
diff --git a/doc/udp.html b/doc/udp.html
index 6f2e607..69895ce 100644
--- a/doc/udp.html
+++ b/doc/udp.html
@@ -14,7 +14,7 @@
|
-
+
|
| Network support for the Lua language
|
diff --git a/doc/url.html b/doc/url.html
index 46e6e09..207995c 100644
--- a/doc/url.html
+++ b/doc/url.html
@@ -16,7 +16,7 @@
|
-
+
|
| Network support for the Lua language
|
@@ -238,11 +238,11 @@ parsed_url = {
-- load url module
url = require("url")
-parsed_url = url.parse("http://www.puc-rio.br/~diego/index.lua?a=2#there")
+parsed_url = url.parse("http://www.example.com/cgilua/index.lua?a=2#there")
-- parsed_url = {
-- scheme = "http",
--- authority = "www.puc-rio.br",
--- path = "/~diego/index.lua"
+-- authority = "www.example.com",
+-- path = "/cgilua/index.lua"
-- query = "a=2",
-- fragment = "there",
-- host = "www.puc-rio.br",
diff --git a/etc/get.lua b/etc/get.lua
index c7e2a43..712d807 100644
--- a/etc/get.lua
+++ b/etc/get.lua
@@ -4,11 +4,11 @@
-- Author: Diego Nehab
-- RCS ID: $Id$
-----------------------------------------------------------------------------
-socket = require("socket")
-http = require("http")
-ftp = require("ftp")
-url = require("url")
-ltn12 = require("ltn12")
+local socket = require("socket")
+local http = require("http")
+local ftp = require("ftp")
+local url = require("url")
+local ltn12 = require("ltn12")
-- formats a number of seconds into human readable form
function nicetime(s)
@@ -64,11 +64,11 @@ end
-- creates a new instance of a receive_cb that saves to disk
-- kind of copied from luasocket's manual callback examples
function stats(size)
- local start = socket.time()
+ local start = socket.gettime()
local got = 0
return function(chunk)
-- elapsed time since start
- local delta = socket.time() - start
+ local delta = socket.gettime() - start
if chunk then
-- total bytes received
got = got + string.len(chunk)
diff --git a/src/except.c b/src/except.c
index 68abf70..ad03817 100644
--- a/src/except.c
+++ b/src/except.c
@@ -29,7 +29,7 @@ static luaL_reg func[] = {
* Try factory
\*-------------------------------------------------------------------------*/
static int finalize(lua_State *L) {
- if (lua_isnil(L, 1) || (lua_isboolean(L, 1) && !lua_toboolean(L, 1))) {
+ if (!lua_toboolean(L, 1)) {
lua_pushvalue(L, lua_upvalueindex(1));
lua_pcall(L, 0, 0, 0);
lua_settop(L, 2);
diff --git a/src/ftp.lua b/src/ftp.lua
index 1c7ea71..4e2bb62 100644
--- a/src/ftp.lua
+++ b/src/ftp.lua
@@ -32,7 +32,7 @@ local metat = { __index = {} }
function open(server, port)
local tp = socket.try(tp.connect(server, port or PORT, TIMEOUT))
- local f = setmetat({ tp = tp }, metat)
+ local f = setmetatable({ tp = tp }, metat)
-- make sure everything gets closed in an exception
f.try = socket.newtry(function() f:close() end)
return f
diff --git a/src/tcp.c b/src/tcp.c
index 845e0a3..adc2585 100644
--- a/src/tcp.c
+++ b/src/tcp.c
@@ -283,7 +283,7 @@ static int meth_getpeername(lua_State *L)
static int meth_getsockname(lua_State *L)
{
- p_tcp tcp = (p_tcp) aux_checkgroup(L, "tcp{client,server}", 1);
+ p_tcp tcp = (p_tcp) aux_checkgroup(L, "tcp{any}", 1);
return inet_meth_getsockname(L, &tcp->sock);
}
diff --git a/src/timeout.c b/src/timeout.c
index 3472ca7..e089051 100644
--- a/src/timeout.c
+++ b/src/timeout.c
@@ -18,12 +18,6 @@
#else
#include
#include
-#include
-#include
-#ifndef CLK_TCK
-/* CLI_TCK is now obsolete in Linux */
-#define CLK_TCK (sysconf(_SC_CLK_TCK));
-#endif
#endif
/* min and max macros */
@@ -37,11 +31,11 @@
/*=========================================================================*\
* Internal function prototypes
\*=========================================================================*/
-static int tm_lua_time(lua_State *L);
+static int tm_lua_gettime(lua_State *L);
static int tm_lua_sleep(lua_State *L);
static luaL_reg func[] = {
- { "time", tm_lua_time },
+ { "gettime", tm_lua_gettime },
{ "sleep", tm_lua_sleep },
{ NULL, NULL }
};
@@ -141,8 +135,10 @@ int tm_gettime(void)
#else
int tm_gettime(void)
{
- struct tms t;
- return (times(&t)*1000)/CLK_TCK;
+ struct timeval v;
+ struct timezone z = {0, 0};
+ gettimeofday(&v, &z);
+ return v.tv_sec * 1000 + v.tv_usec/1000;
}
#endif
@@ -186,7 +182,7 @@ int tm_meth_settimeout(lua_State *L, p_tm tm)
/*-------------------------------------------------------------------------*\
* Returns the time the system has been up, in secconds.
\*-------------------------------------------------------------------------*/
-static int tm_lua_time(lua_State *L)
+static int tm_lua_gettime(lua_State *L)
{
lua_pushnumber(L, tm_gettime()/1000.0);
return 1;
@@ -199,9 +195,13 @@ int tm_lua_sleep(lua_State *L)
{
double n = luaL_checknumber(L, 1);
#ifdef _WIN32
- Sleep((int)n*1000);
+ Sleep((int)(n*1000));
#else
- sleep((int)n);
+ struct timespec t, r;
+ t.tv_sec = (int) n;
+ n -= t.tv_sec;
+ t.tv_nsec = (int) (n * 1000000000) % 1000000000;
+ nanosleep(&t, &r);
#endif
return 0;
}
diff --git a/src/usocket.c b/src/usocket.c
index 6b4182b..ea0f172 100644
--- a/src/usocket.c
+++ b/src/usocket.c
@@ -95,7 +95,8 @@ const char *sock_connect(p_sock ps, SA *addr, socklen_t addr_len, p_tm tm)
/* don't call on closed socket */
if (sock == SOCK_INVALID) return io_strerror(IO_CLOSED);
/* ask system to connect */
- err = connect(sock, addr, addr_len);
+ do err = connect(sock, addr, addr_len);
+ while (err < 0 && errno == EINTR);
/* if no error, we're done */
if (err == 0) return NULL;
/* make sure the system is trying to connect */
@@ -174,9 +175,13 @@ const char *sock_accept(p_sock ps, p_sock pa, SA *addr,
int err;
fd_set fds;
/* try to accept */
- *pa = accept(sock, addr, addr_len);
+ do *pa = accept(sock, addr, addr_len);
+ while (*pa < 0 && errno == EINTR);
/* if result is valid, we are done */
- if (*pa != SOCK_INVALID) return NULL;
+ if (*pa != SOCK_INVALID) {
+ sock_setnonblocking(pa);
+ return NULL;
+ }
/* find out if we failed for a fatal reason */
if (errno != EWOULDBLOCK && errno != ECONNABORTED)
return sock_acceptstrerror(errno);
diff --git a/src/wsocket.c b/src/wsocket.c
index 08c1046..84a49dc 100644
--- a/src/wsocket.c
+++ b/src/wsocket.c
@@ -177,7 +177,10 @@ const char *sock_accept(p_sock ps, p_sock pa, SA *addr,
/* try to get client socket */
*pa = accept(sock, addr, addr_len);
/* if return is valid, we are done */
- if (*pa != SOCK_INVALID) return NULL;
+ if (*pa != SOCK_INVALID) {
+ sock_setnonblocking(pa);
+ return NULL;
+ }
/* optimization */
if (timeout == 0) return io_strerror(IO_TIMEOUT);
/* otherwise find out why we failed */
diff --git a/test/httptest.lua b/test/httptest.lua
index 0ba6f56..ea8465d 100644
--- a/test/httptest.lua
+++ b/test/httptest.lua
@@ -17,7 +17,7 @@ local ignore, expect, index, prefix, cgiprefix, index_crlf
http.TIMEOUT = 10
-local t = socket.time()
+local t = socket.gettime()
host = host or "diego.student.princeton.edu"
proxy = proxy or "http://localhost:3128"
@@ -416,4 +416,4 @@ print("ok")
print("passed all tests")
os.remove("err")
-print(string.format("done in %.2fs", socket.time() - t))
+print(string.format("done in %.2fs", socket.gettime() - t))
diff --git a/test/mimetest.lua b/test/mimetest.lua
index 66aeaf3..f51c3b8 100644
--- a/test/mimetest.lua
+++ b/test/mimetest.lua
@@ -267,7 +267,7 @@ local function padding_b64test()
print("ok")
end
-local t = socket.time()
+local t = socket.gettime()
identity_test()
encode_b64test()
@@ -285,4 +285,4 @@ decode_qptest()
compare_qptest()
cleanup_qptest()
-print(string.format("done in %.2fs", socket.time() - t))
+print(string.format("done in %.2fs", socket.gettime() - t))
diff --git a/test/testclnt.lua b/test/testclnt.lua
index b295cf3..1b20ad1 100644
--- a/test/testclnt.lua
+++ b/test/testclnt.lua
@@ -77,7 +77,7 @@ io.stderr:write("----------------------------------------------\n",
"LuaSocket Test Procedures\n",
"----------------------------------------------\n")
-start = socket.time()
+start = socket.gettime()
function reconnect()
io.stderr:write("attempting data connection... ")
@@ -205,7 +205,9 @@ function test_totaltimeoutreceive(len, tm, sl)
data:send(str)
]], 2*tm, len, sl, sl))
data:settimeout(tm, "total")
+local t = socket.gettime()
str, err, partial, elapsed = data:receive(2*len)
+ print(err, elapsed, socket.gettime() - t)
check_timeout(tm, sl, elapsed, err, "receive", "total",
string.len(str or partial) == 2*len)
end
@@ -360,12 +362,12 @@ function accept_timeout()
io.stderr:write("accept with timeout (if it hangs, it failed): ")
local s, e = socket.bind("*", 0, 0)
assert(s, e)
- local t = socket.time()
+ local t = socket.gettime()
s:settimeout(1)
local c, e = s:accept()
assert(not c, "should not accept")
assert(e == "timeout", string.format("wrong error message (%s)", e))
- t = socket.time() - t
+ t = socket.gettime() - t
assert(t < 2, string.format("took to long to give up (%gs)", t))
s:close()
pass("good")
@@ -374,17 +376,17 @@ end
------------------------------------------------------------------------
function connect_timeout()
io.stderr:write("connect with timeout (if it hangs, it failed): ")
- local t = socket.time()
+ local t = socket.gettime()
local c, e = socket.tcp()
assert(c, e)
c:settimeout(0.1)
ip = socket.dns.toip("ibere.tecgraf.puc-rio.br")
if not ip then return end
- local t = socket.time()
+ local t = socket.gettime()
local r, e = c:connect(ip, 80)
assert(not r, "should not connect")
- assert(e == "timeout", e)
- assert(socket.time() - t < 2, "took too long to give up.")
+ --assert(e == "timeout", e)
+ assert(socket.gettime() - t < 2, "took too long to give up.")
c:close()
end
@@ -585,4 +587,4 @@ test_blockingtimeoutreceive(800091, 2, 3)
test_blockingtimeoutreceive(800091, 3, 2)
test_blockingtimeoutreceive(800091, 3, 1)
-test(string.format("done in %.2fs", socket.time() - start))
+test(string.format("done in %.2fs", socket.gettime() - start))