1 files changed, 57 insertions, 57 deletions

diff --git a/src/tcp.c b/src/tcp.c
index 8b4c7e3..539ad5e 100644
--- a/src/tcp.c
+++ b/src/tcp.c
@@ -40,7 +40,7 @@ static int meth_dirty(lua_State *L);
 /* tcp object methods */
 static luaL_reg tcp[] = {
     {"__gc",        meth_close},
-    {"__tostring",  aux_tostring},
+    {"__tostring",  auxiliar_tostring},
     {"accept",      meth_accept},
     {"bind",        meth_bind},
     {"close",       meth_close},
@@ -84,13 +84,13 @@ static luaL_reg func[] = {
 int tcp_open(lua_State *L)
 {
     /* create classes */
-    aux_newclass(L, "tcp{master}", tcp);
-    aux_newclass(L, "tcp{client}", tcp);
-    aux_newclass(L, "tcp{server}", tcp);
+    auxiliar_newclass(L, "tcp{master}", tcp);
+    auxiliar_newclass(L, "tcp{client}", tcp);
+    auxiliar_newclass(L, "tcp{server}", tcp);
     /* create class groups */
-    aux_add2group(L, "tcp{master}", "tcp{any}");
-    aux_add2group(L, "tcp{client}", "tcp{any}");
-    aux_add2group(L, "tcp{server}", "tcp{any}");
+    auxiliar_add2group(L, "tcp{master}", "tcp{any}");
+    auxiliar_add2group(L, "tcp{client}", "tcp{any}");
+    auxiliar_add2group(L, "tcp{server}", "tcp{any}");
     /* define library functions */
     luaL_openlib(L, NULL, func, 0); 
     return 0;
@@ -103,23 +103,23 @@ int tcp_open(lua_State *L)
 * Just call buffered IO methods
 \*-------------------------------------------------------------------------*/
 static int meth_send(lua_State *L) {
-    p_tcp tcp = (p_tcp) aux_checkclass(L, "tcp{client}", 1);
-    return buf_meth_send(L, &tcp->buf);
+    p_tcp tcp = (p_tcp) auxiliar_checkclass(L, "tcp{client}", 1);
+    return buffer_meth_send(L, &tcp->buf);
 }
 
 static int meth_receive(lua_State *L) {
-    p_tcp tcp = (p_tcp) aux_checkclass(L, "tcp{client}", 1);
-    return buf_meth_receive(L, &tcp->buf);
+    p_tcp tcp = (p_tcp) auxiliar_checkclass(L, "tcp{client}", 1);
+    return buffer_meth_receive(L, &tcp->buf);
 }
 
 static int meth_getstats(lua_State *L) {
-    p_tcp tcp = (p_tcp) aux_checkclass(L, "tcp{client}", 1);
-    return buf_meth_getstats(L, &tcp->buf);
+    p_tcp tcp = (p_tcp) auxiliar_checkclass(L, "tcp{client}", 1);
+    return buffer_meth_getstats(L, &tcp->buf);
 }
 
 static int meth_setstats(lua_State *L) {
-    p_tcp tcp = (p_tcp) aux_checkclass(L, "tcp{client}", 1);
-    return buf_meth_setstats(L, &tcp->buf);
+    p_tcp tcp = (p_tcp) auxiliar_checkclass(L, "tcp{client}", 1);
+    return buffer_meth_setstats(L, &tcp->buf);
 }
 
 /*-------------------------------------------------------------------------*\
@@ -127,7 +127,7 @@ static int meth_setstats(lua_State *L) {
 \*-------------------------------------------------------------------------*/
 static int meth_setoption(lua_State *L)
 {
-    p_tcp tcp = (p_tcp) aux_checkgroup(L, "tcp{any}", 1);
+    p_tcp tcp = (p_tcp) auxiliar_checkgroup(L, "tcp{any}", 1);
     return opt_meth_setoption(L, opt, &tcp->sock);
 }
 
@@ -136,7 +136,7 @@ static int meth_setoption(lua_State *L)
 \*-------------------------------------------------------------------------*/
 static int meth_getfd(lua_State *L)
 {
-    p_tcp tcp = (p_tcp) aux_checkgroup(L, "tcp{any}", 1);
+    p_tcp tcp = (p_tcp) auxiliar_checkgroup(L, "tcp{any}", 1);
     lua_pushnumber(L, (int) tcp->sock);
     return 1;
 }
@@ -144,15 +144,15 @@ static int meth_getfd(lua_State *L)
 /* this is very dangerous, but can be handy for those that are brave enough */
 static int meth_setfd(lua_State *L)
 {
-    p_tcp tcp = (p_tcp) aux_checkgroup(L, "tcp{any}", 1);
-    tcp->sock = (t_sock) luaL_checknumber(L, 2); 
+    p_tcp tcp = (p_tcp) auxiliar_checkgroup(L, "tcp{any}", 1);
+    tcp->sock = (t_socket) luaL_checknumber(L, 2); 
     return 0;
 }
 
 static int meth_dirty(lua_State *L)
 {
-    p_tcp tcp = (p_tcp) aux_checkgroup(L, "tcp{any}", 1);
-    lua_pushboolean(L, !buf_isempty(&tcp->buf));
+    p_tcp tcp = (p_tcp) auxiliar_checkgroup(L, "tcp{any}", 1);
+    lua_pushboolean(L, !buffer_isempty(&tcp->buf));
     return 1;
 }
 
@@ -162,25 +162,25 @@ static int meth_dirty(lua_State *L)
 \*-------------------------------------------------------------------------*/
 static int meth_accept(lua_State *L)
 {
-    p_tcp server = (p_tcp) aux_checkclass(L, "tcp{server}", 1);
-    p_tm tm = tm_markstart(&server->tm);
-    t_sock sock;
-    int err = sock_accept(&server->sock, &sock, NULL, NULL, tm);
+    p_tcp server = (p_tcp) auxiliar_checkclass(L, "tcp{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_tcp clnt = (p_tcp) lua_newuserdata(L, sizeof(t_tcp));
-        aux_setclass(L, "tcp{client}", -1);
+        auxiliar_setclass(L, "tcp{client}", -1);
         /* initialize structure fields */
-        sock_setnonblocking(&sock);
+        socket_setnonblocking(&sock);
         clnt->sock = sock;
-        io_init(&clnt->io, (p_send) sock_send, (p_recv) sock_recv, 
-                (p_error) sock_ioerror, &clnt->sock);
-        tm_init(&clnt->tm, -1, -1);
-        buf_init(&clnt->buf, &clnt->io, &clnt->tm);
+        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, sock_strerror(err));
+        lua_pushstring(L, socket_strerror(err));
         return 2;
     }
 }
@@ -190,7 +190,7 @@ static int meth_accept(lua_State *L)
 \*-------------------------------------------------------------------------*/
 static int meth_bind(lua_State *L)
 {
-    p_tcp tcp = (p_tcp) aux_checkclass(L, "tcp{master}", 1);
+    p_tcp tcp = (p_tcp) auxiliar_checkclass(L, "tcp{master}", 1);
     const char *address =  luaL_checkstring(L, 2);
     unsigned short port = (unsigned short) luaL_checknumber(L, 3);
     const char *err = inet_trybind(&tcp->sock, address, port);
@@ -208,13 +208,13 @@ static int meth_bind(lua_State *L)
 \*-------------------------------------------------------------------------*/
 static int meth_connect(lua_State *L)
 {
-    p_tcp tcp = (p_tcp) aux_checkgroup(L, "tcp{any}", 1);
+    p_tcp tcp = (p_tcp) auxiliar_checkgroup(L, "tcp{any}", 1);
     const char *address =  luaL_checkstring(L, 2);
     unsigned short port = (unsigned short) luaL_checknumber(L, 3);
-    p_tm tm = tm_markstart(&tcp->tm);
+    p_timeout tm = timeout_markstart(&tcp->tm);
     const char *err = inet_tryconnect(&tcp->sock, address, port, tm);
     /* have to set the class even if it failed due to non-blocking connects */
-    aux_setclass(L, "tcp{client}", 1);
+    auxiliar_setclass(L, "tcp{client}", 1);
     if (err) {
         lua_pushnil(L);
         lua_pushstring(L, err);
@@ -230,8 +230,8 @@ static int meth_connect(lua_State *L)
 \*-------------------------------------------------------------------------*/
 static int meth_close(lua_State *L)
 {
-    p_tcp tcp = (p_tcp) aux_checkgroup(L, "tcp{any}", 1);
-    sock_destroy(&tcp->sock);
+    p_tcp tcp = (p_tcp) auxiliar_checkgroup(L, "tcp{any}", 1);
+    socket_destroy(&tcp->sock);
     lua_pushnumber(L, 1);
     return 1;
 }
@@ -241,16 +241,16 @@ static int meth_close(lua_State *L)
 \*-------------------------------------------------------------------------*/
 static int meth_listen(lua_State *L)
 {
-    p_tcp tcp = (p_tcp) aux_checkclass(L, "tcp{master}", 1);
+    p_tcp tcp = (p_tcp) auxiliar_checkclass(L, "tcp{master}", 1);
     int backlog = (int) luaL_optnumber(L, 2, 32);
-    int err = sock_listen(&tcp->sock, backlog);
+    int err = socket_listen(&tcp->sock, backlog);
     if (err != IO_DONE) {
         lua_pushnil(L);
-        lua_pushstring(L, sock_strerror(err));
+        lua_pushstring(L, socket_strerror(err));
         return 2;
     }
     /* turn master object into a server object */
-    aux_setclass(L, "tcp{server}", 1);
+    auxiliar_setclass(L, "tcp{server}", 1);
     lua_pushnumber(L, 1);
     return 1;
 }
@@ -260,20 +260,20 @@ static int meth_listen(lua_State *L)
 \*-------------------------------------------------------------------------*/
 static int meth_shutdown(lua_State *L)
 {
-    p_tcp tcp = (p_tcp) aux_checkclass(L, "tcp{client}", 1);
+    p_tcp tcp = (p_tcp) auxiliar_checkclass(L, "tcp{client}", 1);
     const char *how = luaL_optstring(L, 2, "both");
     switch (how[0]) {
         case 'b':
             if (strcmp(how, "both")) goto error;
-            sock_shutdown(&tcp->sock, 2);
+            socket_shutdown(&tcp->sock, 2);
             break;
         case 's':
             if (strcmp(how, "send")) goto error;
-            sock_shutdown(&tcp->sock, 1);
+            socket_shutdown(&tcp->sock, 1);
             break;
         case 'r':
             if (strcmp(how, "receive")) goto error;
-            sock_shutdown(&tcp->sock, 0);
+            socket_shutdown(&tcp->sock, 0);
             break;
     }
     lua_pushnumber(L, 1);
@@ -288,13 +288,13 @@ error:
 \*-------------------------------------------------------------------------*/
 static int meth_getpeername(lua_State *L)
 {
-    p_tcp tcp = (p_tcp) aux_checkgroup(L, "tcp{any}", 1);
+    p_tcp tcp = (p_tcp) auxiliar_checkgroup(L, "tcp{any}", 1);
     return inet_meth_getpeername(L, &tcp->sock);
 }
 
 static int meth_getsockname(lua_State *L)
 {
-    p_tcp tcp = (p_tcp) aux_checkgroup(L, "tcp{any}", 1);
+    p_tcp tcp = (p_tcp) auxiliar_checkgroup(L, "tcp{any}", 1);
     return inet_meth_getsockname(L, &tcp->sock);
 }
 
@@ -303,8 +303,8 @@ static int meth_getsockname(lua_State *L)
 \*-------------------------------------------------------------------------*/
 static int meth_settimeout(lua_State *L)
 {
-    p_tcp tcp = (p_tcp) aux_checkgroup(L, "tcp{any}", 1);
-    return tm_meth_settimeout(L, &tcp->tm);
+    p_tcp tcp = (p_tcp) auxiliar_checkgroup(L, "tcp{any}", 1);
+    return timeout_meth_settimeout(L, &tcp->tm);
 }
 
 /*=========================================================================*\
@@ -315,21 +315,21 @@ static int meth_settimeout(lua_State *L)
 \*-------------------------------------------------------------------------*/
 static int global_create(lua_State *L)
 {
-    t_sock sock;
+    t_socket sock;
     const char *err = inet_trycreate(&sock, SOCK_STREAM);
     /* try to allocate a system socket */
     if (!err) { 
         /* allocate tcp object */
         p_tcp tcp = (p_tcp) lua_newuserdata(L, sizeof(t_tcp));
         /* set its type as master object */
-        aux_setclass(L, "tcp{master}", -1);
+        auxiliar_setclass(L, "tcp{master}", -1);
         /* initialize remaining structure fields */
-        sock_setnonblocking(&sock);
+        socket_setnonblocking(&sock);
         tcp->sock = sock;
-        io_init(&tcp->io, (p_send) sock_send, (p_recv) sock_recv, 
-                (p_error) sock_ioerror, &tcp->sock);
-        tm_init(&tcp->tm, -1, -1);
-        buf_init(&tcp->buf, &tcp->io, &tcp->tm);
+        io_init(&tcp->io, (p_send) socket_send, (p_recv) socket_recv, 
+                (p_error) socket_ioerror, &tcp->sock);
+        timeout_init(&tcp->tm, -1, -1);
+        buffer_init(&tcp->buf, &tcp->io, &tcp->tm);
         return 1;
     } else {
         lua_pushnil(L);