Added support for unix stream sockets.

6 files changed, 457 insertions, 3 deletions

diff --git a/FIX b/FIX
new file mode 100644
index 0000000..6a8913e
--- /dev/null
+++ b/FIX
@@ -0,0 +1,6 @@
+accept/connect interrupt safe
+accepted sockets are nonblocking
+new timming functions. better sleep/gettime
+bug fixes in the manual
+getfd missing cast
+added unix domain support example
diff --git a/src/ssl.c b/src/ssl.c
new file mode 100644
index 0000000..8e2ce00
--- /dev/null
+++ b/src/ssl.c
@@ -0,0 +1,70 @@
+/*=========================================================================*\
+* Simple client SSL support
+* LuaSocket toolkit
+*
+* RCS ID: $Id$
+\*=========================================================================*/
+#include <lua.h>
+#include <lauxlib.h>
+
+#include "ssl.h"
+
+/*=========================================================================*\
+* Internal function prototypes
+\*=========================================================================*/
+static int global_wrap(lua_State *L);
+
+/* functions in library namespace */
+static luaL_reg func[] = {
+    {"wrap", global_create},
+    {NULL, NULL}
+};
+
+static luaL_reg wrap[] = {
+    {"__tostring",  aux_tostring},
+    {"__gc",        meth_close},
+    {"close",       meth_close},
+    {"receive",     meth_receive},
+    {"send",        meth_send},
+    {NULL,          NULL}
+};
+
+static luaL_reg owned[] = {
+    {"__tostring",  aux_tostring},
+    {NULL,          NULL}
+};
+
+/*-------------------------------------------------------------------------*\
+* Initializes module
+\*-------------------------------------------------------------------------*/
+int ssl_open(lua_State *L)
+{
+    aux_newclass(L, "ssl{wraper}", wrap);
+    aux_newclass(L, "ssl{owned}",  owned);
+    lua_pushstring(L, "ssl")
+    lua_newtable(L);
+    luaL_openlib(L, NULL, func, 0);
+    lua_settable(L, -3);
+    return 0;
+}
+
+/*=========================================================================*\
+* Library functions
+\*=========================================================================*/
+/*-------------------------------------------------------------------------*\
+* Wraps a tcp object into an SSL object
+\*-------------------------------------------------------------------------*/
+static int global_wrap(lua_State *L) {
+    p_tcp tcp = (p_tcp) aux_checkclass(L, "tcp{client}", 1);
+    /* change class of tcp object */
+    aux_setclass(L, "ssl{owned}", 1);
+    /* create wrapper */
+    p_wrap wrap = (p_wrap) lua_newuserdata(L, sizeof(t_wrap));
+    /* lock reference */
+    lua_pushvalue(L, 1);
+    wrap->ref = lua_ref(L, 1);
+    /* initialize wrapper */
+    wrap->tcp = tcp;
+    io_init(&tcp->io, wrap_send, wrap_recv, wrap);
+    return 1;
+}
diff --git a/src/ssl.h b/src/ssl.h
new file mode 100644
index 0000000..13ce97b
--- /dev/null
+++ b/src/ssl.h
@@ -0,0 +1,29 @@
+#ifndef SSL_H
+#define SSL_H
+/*=========================================================================*\
+* Simple client SSL support
+* LuaSocket toolkit
+*
+* This is just a simple example to show how to extend LuaSocket
+*
+* RCS ID: $Id$
+\*=========================================================================*/
+#include <lua.h>
+#include <openssl/ssl.h>
+
+#include "buffer.h"
+#include "timeout.h"
+#include "socket.h"
+#include "tcp.h"
+
+typedef struct t_wrap_ {
+    p_tcp tcp;
+    SSL* ssl;
+    int ref;
+} t_wrap;
+
+typedef t_wrap *p_wrap;
+
+int ssl_open(lua_State *L);
+
+#endif /* SSL_H */
diff --git a/src/tcp.c b/src/tcp.c
index 1f51b22..6c58494 100644
--- a/src/tcp.c
+++ b/src/tcp.c
@@ -89,9 +89,6 @@ int tcp_open(lua_State *L)
     aux_add2group(L, "tcp{server}", "tcp{any}");
     aux_add2group(L, "tcp{client}", "tcp{client,server}");
     aux_add2group(L, "tcp{server}", "tcp{client,server}");
-    /* both server and client objects are selectable */
-    aux_add2group(L, "tcp{client}", "select{able}");
-    aux_add2group(L, "tcp{server}", "select{able}");
     /* define library functions */
     luaL_openlib(L, NULL, func, 0); 
     return 0;
diff --git a/src/unix.c b/src/unix.c
new file mode 100644
index 0000000..b2c4659
--- /dev/null
+++ b/src/unix.c
@@ -0,0 +1,324 @@
+/*=========================================================================*\
+* Unix domain socket 
+* LuaSocket toolkit
+*
+* RCS ID: $Id$
+\*=========================================================================*/
+#include <string.h> 
+
+#include <lua.h>
+#include <lauxlib.h>
+
+#include "auxiliar.h"
+#include "socket.h"
+#include "options.h"
+#include "unix.h"
+#include <sys/un.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 const char *unix_tryconnect(p_unix unix, const char *path);
+static const char *unix_trybind(p_unix unix, const char *path);
+
+/* unix object methods */
+static luaL_reg unix[] = {
+    {"__gc",        meth_close},
+    {"__tostring",  aux_tostring},
+    {"accept",      meth_accept},
+    {"bind",        meth_bind},
+    {"close",       meth_close},
+    {"connect",     meth_connect},
+    {"dirty",       meth_dirty},
+    {"getfd",       meth_getfd},
+    {"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 opt[] = {
+    {"keepalive",   opt_keepalive},
+    {"reuseaddr",   opt_reuseaddr},
+    {"linger",      opt_linger},
+    {NULL,          NULL}
+};
+
+/* functions in library namespace */
+static luaL_reg func[] = {
+    {"unix", global_create},
+    {NULL, NULL}
+};
+
+/*-------------------------------------------------------------------------*\
+* Initializes module
+\*-------------------------------------------------------------------------*/
+int unix_open(lua_State *L) {
+    /* create classes */
+    aux_newclass(L, "unix{master}", unix);
+    aux_newclass(L, "unix{client}", unix);
+    aux_newclass(L, "unix{server}", unix);
+    /* create class groups */
+    aux_add2group(L, "unix{master}", "unix{any}");
+    aux_add2group(L, "unix{client}", "unix{any}");
+    aux_add2group(L, "unix{server}", "unix{any}");
+    aux_add2group(L, "unix{client}", "unix{client,server}");
+    aux_add2group(L, "unix{server}", "unix{client,server}");
+    /* define library functions */
+    luaL_openlib(L, NULL, func, 0); 
+    return 0;
+}
+
+/*=========================================================================*\
+* Lua methods
+\*=========================================================================*/
+/*-------------------------------------------------------------------------*\
+* Just call buffered IO methods
+\*-------------------------------------------------------------------------*/
+static int meth_send(lua_State *L) {
+    p_unix unix = (p_unix) aux_checkclass(L, "unix{client}", 1);
+    return buf_meth_send(L, &unix->buf);
+}
+
+static int meth_receive(lua_State *L) {
+    p_unix unix = (p_unix) aux_checkclass(L, "unix{client}", 1);
+    return buf_meth_receive(L, &unix->buf);
+}
+
+/*-------------------------------------------------------------------------*\
+* Just call option handler
+\*-------------------------------------------------------------------------*/
+static int meth_setoption(lua_State *L) {
+    p_unix unix = aux_checkgroup(L, "unix{any}", 1);
+    return opt_meth_setoption(L, opt, &unix->sock);
+}
+
+/*-------------------------------------------------------------------------*\
+* Select support methods
+\*-------------------------------------------------------------------------*/
+static int meth_getfd(lua_State *L) {
+    p_unix unix = (p_unix) aux_checkgroup(L, "unix{any}", 1);
+    lua_pushnumber(L, (int) unix->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 unix = (p_unix) aux_checkgroup(L, "unix{any}", 1);
+    unix->sock = (t_sock) luaL_checknumber(L, 2); 
+    return 0;
+}
+
+static int meth_dirty(lua_State *L) {
+    p_unix unix = (p_unix) aux_checkgroup(L, "unix{any}", 1);
+    lua_pushboolean(L, !buf_isempty(&unix->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) aux_checkclass(L, "unix{server}", 1);
+    p_tm tm = tm_markstart(&server->tm);
+    t_sock sock;
+    const char *err = sock_accept(&server->sock, &sock, NULL, NULL, tm);
+    /* if successful, push client socket */
+    if (!err) {
+        p_unix clnt = lua_newuserdata(L, sizeof(t_unix));
+        aux_setclass(L, "unix{client}", -1);
+        /* initialize structure fields */
+        sock_setnonblocking(&sock);
+        clnt->sock = sock;
+        io_init(&clnt->io, (p_send)sock_send, (p_recv)sock_recv, &clnt->sock);
+        tm_init(&clnt->tm, -1, -1);
+        buf_init(&clnt->buf, &clnt->io, &clnt->tm);
+        return 1;
+    } else {
+        lua_pushnil(L); 
+        lua_pushstring(L, err);
+        return 2;
+    }
+}
+
+/*-------------------------------------------------------------------------*\
+* Binds an object to an address 
+\*-------------------------------------------------------------------------*/
+static const char *unix_trybind(p_unix unix, const char *path) {
+    struct sockaddr_un local;
+    int len = strlen(path);
+    const char *err;
+    if (len >= 92) return "path too long";
+    memset(&local, 0, sizeof(local));
+    strcpy(local.sun_path, path);
+    local.sun_family = AF_UNIX;
+    err = sock_bind(&unix->sock, (SA *) &local, 
+            sizeof(local.sun_family) + len);
+    if (err) sock_destroy(&unix->sock);
+    return err; 
+}
+
+static int meth_bind(lua_State *L) {
+    p_unix unix = (p_unix) aux_checkclass(L, "unix{master}", 1);
+    const char *path =  luaL_checkstring(L, 2);
+    const char *err = unix_trybind(unix, 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 unix, const char *path)
+{
+    struct sockaddr_un remote;
+    const char *err;
+    int len = strlen(path);
+    if (len >= 92) return "path too long";
+    memset(&remote, 0, sizeof(remote));
+    strcpy(remote.sun_path, path);
+    remote.sun_family = AF_UNIX;
+    tm_markstart(&unix->tm);
+    err = sock_connect(&unix->sock, (SA *) &remote, 
+            sizeof(remote.sun_family) + len, &unix->tm);
+    if (err) sock_destroy(&unix->sock);
+    return err;
+}
+
+static int meth_connect(lua_State *L)
+{
+    p_unix unix = (p_unix) aux_checkclass(L, "unix{master}", 1);
+    const char *path =  luaL_checkstring(L, 2);
+    const char *err = unix_tryconnect(unix, path);
+    if (err) {
+        lua_pushnil(L);
+        lua_pushstring(L, err);
+        return 2;
+    }
+    /* turn master object into a client object */
+    aux_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 unix = (p_unix) aux_checkgroup(L, "unix{any}", 1);
+    sock_destroy(&unix->sock);
+    return 0;
+}
+
+/*-------------------------------------------------------------------------*\
+* Puts the sockt in listen mode
+\*-------------------------------------------------------------------------*/
+static int meth_listen(lua_State *L)
+{
+    p_unix unix = (p_unix) aux_checkclass(L, "unix{master}", 1);
+    int backlog = (int) luaL_optnumber(L, 2, 32);
+    const char *err = sock_listen(&unix->sock, backlog);
+    if (err) {
+        lua_pushnil(L);
+        lua_pushstring(L, err);
+        return 2;
+    }
+    /* turn master object into a server object */
+    aux_setclass(L, "unix{server}", 1);
+    lua_pushnumber(L, 1);
+    return 1;
+}
+
+/*-------------------------------------------------------------------------*\
+* Shuts the connection down partially
+\*-------------------------------------------------------------------------*/
+static int meth_shutdown(lua_State *L)
+{
+    p_unix unix = (p_unix) aux_checkgroup(L, "unix{client}", 1);
+    const char *how = luaL_optstring(L, 2, "both");
+    switch (how[0]) {
+        case 'b':
+            if (strcmp(how, "both")) goto error;
+            sock_shutdown(&unix->sock, 2);
+            break;
+        case 's':
+            if (strcmp(how, "send")) goto error;
+            sock_shutdown(&unix->sock, 1);
+            break;
+        case 'r':
+            if (strcmp(how, "receive")) goto error;
+            sock_shutdown(&unix->sock, 0);
+            break;
+    }
+    lua_pushnumber(L, 1);
+    return 1;
+error:
+    luaL_argerror(L, 2, "invalid shutdown method");
+    return 0;
+}
+
+/*-------------------------------------------------------------------------*\
+* Just call tm methods
+\*-------------------------------------------------------------------------*/
+static int meth_settimeout(lua_State *L) {
+    p_unix unix = (p_unix) aux_checkgroup(L, "unix{any}", 1);
+    return tm_meth_settimeout(L, &unix->tm);
+}
+
+/*=========================================================================*\
+* Library functions
+\*=========================================================================*/
+/*-------------------------------------------------------------------------*\
+* Creates a master unix object 
+\*-------------------------------------------------------------------------*/
+static int global_create(lua_State *L) {
+    t_sock sock;
+    const char *err = sock_create(&sock, AF_UNIX, SOCK_STREAM, 0);
+    /* try to allocate a system socket */
+    if (!err) { 
+        /* allocate unix object */
+        p_unix unix = (p_unix) lua_newuserdata(L, sizeof(t_unix));
+        /* set its type as master object */
+        aux_setclass(L, "unix{master}", -1);
+        /* initialize remaining structure fields */
+        sock_setnonblocking(&sock);
+        unix->sock = sock;
+        io_init(&unix->io, (p_send) sock_send, (p_recv) sock_recv, &unix->sock);
+        tm_init(&unix->tm, -1, -1);
+        buf_init(&unix->buf, &unix->io, &unix->tm);
+        return 1;
+    } else {
+        lua_pushnil(L);
+        lua_pushstring(L, err);
+        return 2;
+    }
+}
diff --git a/src/unix.h b/src/unix.h
new file mode 100644
index 0000000..7b2a5c5
--- /dev/null
+++ b/src/unix.h
@@ -0,0 +1,28 @@
+#ifndef UNIX_H
+#define UNIX_H
+/*=========================================================================*\
+* Unix domain object
+* LuaSocket toolkit
+*
+* This module is just an example of how to extend LuaSocket with a new 
+* domain.
+*
+* RCS ID: $Id$
+\*=========================================================================*/
+#include <lua.h>
+
+#include "buffer.h"
+#include "timeout.h"
+#include "socket.h"
+
+typedef struct t_unix_ {
+    t_sock sock;
+    t_io io;
+    t_buf buf;
+    t_tm tm;
+} t_unix;
+typedef t_unix *p_unix;
+
+int unix_open(lua_State *L);
+
+#endif /* UNIX_H */