1 files changed, 44 insertions, 44 deletions

diff --git a/src/udp.c b/src/udp.c
index 4de7248..e604bea 100644
--- a/src/udp.c
+++ b/src/udp.c
@@ -45,7 +45,7 @@ static int meth_dirty(lua_State *L);
 /* udp object methods */
 static luaL_reg udp[] = {
     {"__gc",        meth_close},
-    {"__tostring",  aux_tostring},
+    {"__tostring",  auxiliar_tostring},
     {"close",       meth_close},
     {"dirty",       meth_dirty},
     {"getfd",       meth_getfd},
@@ -87,13 +87,13 @@ static luaL_reg func[] = {
 int udp_open(lua_State *L)
 {
     /* create classes */
-    aux_newclass(L, "udp{connected}", udp);
-    aux_newclass(L, "udp{unconnected}", udp);
+    auxiliar_newclass(L, "udp{connected}", udp);
+    auxiliar_newclass(L, "udp{unconnected}", udp);
     /* create class groups */
-    aux_add2group(L, "udp{connected}",   "udp{any}");
-    aux_add2group(L, "udp{unconnected}", "udp{any}");
-    aux_add2group(L, "udp{connected}",   "select{able}");
-    aux_add2group(L, "udp{unconnected}", "select{able}");
+    auxiliar_add2group(L, "udp{connected}",   "udp{any}");
+    auxiliar_add2group(L, "udp{unconnected}", "udp{any}");
+    auxiliar_add2group(L, "udp{connected}",   "select{able}");
+    auxiliar_add2group(L, "udp{unconnected}", "select{able}");
     /* define library functions */
     luaL_openlib(L, NULL, func, 0); 
     return 0;
@@ -106,20 +106,20 @@ const char *udp_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 sock_strerror(err);
+    else return socket_strerror(err);
 }
 
 /*-------------------------------------------------------------------------*\
 * Send data through connected udp socket
 \*-------------------------------------------------------------------------*/
 static int meth_send(lua_State *L) {
-    p_udp udp = (p_udp) aux_checkclass(L, "udp{connected}", 1);
-    p_tm tm = &udp->tm;
+    p_udp udp = (p_udp) auxiliar_checkclass(L, "udp{connected}", 1);
+    p_timeout tm = &udp->tm;
     size_t count, sent = 0;
     int err;
     const char *data = luaL_checklstring(L, 2, &count);
-    tm_markstart(tm);
-    err = sock_send(&udp->sock, data, count, &sent, tm);
+    timeout_markstart(tm);
+    err = socket_send(&udp->sock, data, count, &sent, tm);
     if (err != IO_DONE) {
         lua_pushnil(L);
         lua_pushstring(L, udp_strerror(err));
@@ -133,12 +133,12 @@ static int meth_send(lua_State *L) {
 * Send data through unconnected udp socket
 \*-------------------------------------------------------------------------*/
 static int meth_sendto(lua_State *L) {
-    p_udp udp = (p_udp) aux_checkclass(L, "udp{unconnected}", 1);
+    p_udp udp = (p_udp) auxiliar_checkclass(L, "udp{unconnected}", 1);
     size_t count, sent = 0;
     const char *data = luaL_checklstring(L, 2, &count);
     const char *ip = luaL_checkstring(L, 3);
     unsigned short port = (unsigned short) luaL_checknumber(L, 4);
-    p_tm tm = &udp->tm;
+    p_timeout tm = &udp->tm;
     struct sockaddr_in addr;
     int err;
     memset(&addr, 0, sizeof(addr));
@@ -146,8 +146,8 @@ static int meth_sendto(lua_State *L) {
         luaL_argerror(L, 3, "invalid ip address");
     addr.sin_family = AF_INET;
     addr.sin_port = htons(port);
-    tm_markstart(tm);
-    err = sock_sendto(&udp->sock, data, count, &sent, 
+    timeout_markstart(tm);
+    err = socket_sendto(&udp->sock, data, count, &sent, 
             (SA *) &addr, sizeof(addr), tm);
     if (err != IO_DONE) {
         lua_pushnil(L);
@@ -162,14 +162,14 @@ static int meth_sendto(lua_State *L) {
 * Receives data from a UDP socket
 \*-------------------------------------------------------------------------*/
 static int meth_receive(lua_State *L) {
-    p_udp udp = (p_udp) aux_checkgroup(L, "udp{any}", 1);
+    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));
     int err;
-    p_tm tm = &udp->tm;
+    p_timeout tm = &udp->tm;
     count = MIN(count, sizeof(buffer));
-    tm_markstart(tm);
-    err = sock_recv(&udp->sock, buffer, count, &got, tm);
+    timeout_markstart(tm);
+    err = socket_recv(&udp->sock, buffer, count, &got, tm);
     if (err != IO_DONE) {
         lua_pushnil(L);
         lua_pushstring(L, udp_strerror(err));
@@ -183,16 +183,16 @@ static int meth_receive(lua_State *L) {
 * Receives data and sender from a UDP socket
 \*-------------------------------------------------------------------------*/
 static int meth_receivefrom(lua_State *L) {
-    p_udp udp = (p_udp) aux_checkclass(L, "udp{unconnected}", 1);
+    p_udp udp = (p_udp) auxiliar_checkclass(L, "udp{unconnected}", 1);
     struct sockaddr_in addr;
     socklen_t addr_len = sizeof(addr);
     char buffer[UDP_DATAGRAMSIZE];
     size_t got, count = (size_t) luaL_optnumber(L, 2, sizeof(buffer));
     int err;
-    p_tm tm = &udp->tm;
-    tm_markstart(tm);
+    p_timeout tm = &udp->tm;
+    timeout_markstart(tm);
     count = MIN(count, sizeof(buffer));
-    err = sock_recvfrom(&udp->sock, buffer, count, &got, 
+    err = socket_recvfrom(&udp->sock, buffer, count, &got, 
             (SA *) &addr, &addr_len, tm);
     if (err == IO_DONE) {
         lua_pushlstring(L, buffer, got);
@@ -210,20 +210,20 @@ static int meth_receivefrom(lua_State *L) {
 * Select support methods
 \*-------------------------------------------------------------------------*/
 static int meth_getfd(lua_State *L) {
-    p_udp udp = (p_udp) aux_checkgroup(L, "udp{any}", 1);
+    p_udp udp = (p_udp) auxiliar_checkgroup(L, "udp{any}", 1);
     lua_pushnumber(L, (int) udp->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_udp udp = (p_udp) aux_checkgroup(L, "udp{any}", 1);
-    udp->sock = (t_sock) luaL_checknumber(L, 2);
+    p_udp udp = (p_udp) auxiliar_checkgroup(L, "udp{any}", 1);
+    udp->sock = (t_socket) luaL_checknumber(L, 2);
     return 0;
 }
 
 static int meth_dirty(lua_State *L) {
-    p_udp udp = (p_udp) aux_checkgroup(L, "udp{any}", 1);
+    p_udp udp = (p_udp) auxiliar_checkgroup(L, "udp{any}", 1);
     (void) udp;
     lua_pushboolean(L, 0);
     return 1;
@@ -233,12 +233,12 @@ static int meth_dirty(lua_State *L) {
 * Just call inet methods
 \*-------------------------------------------------------------------------*/
 static int meth_getpeername(lua_State *L) {
-    p_udp udp = (p_udp) aux_checkclass(L, "udp{connected}", 1);
+    p_udp udp = (p_udp) auxiliar_checkclass(L, "udp{connected}", 1);
     return inet_meth_getpeername(L, &udp->sock);
 }
 
 static int meth_getsockname(lua_State *L) {
-    p_udp udp = (p_udp) aux_checkgroup(L, "udp{any}", 1);
+    p_udp udp = (p_udp) auxiliar_checkgroup(L, "udp{any}", 1);
     return inet_meth_getsockname(L, &udp->sock);
 }
 
@@ -246,7 +246,7 @@ static int meth_getsockname(lua_State *L) {
 * Just call option handler
 \*-------------------------------------------------------------------------*/
 static int meth_setoption(lua_State *L) {
-    p_udp udp = (p_udp) aux_checkgroup(L, "udp{any}", 1);
+    p_udp udp = (p_udp) auxiliar_checkgroup(L, "udp{any}", 1);
     return opt_meth_setoption(L, opt, &udp->sock);
 }
 
@@ -254,16 +254,16 @@ static int meth_setoption(lua_State *L) {
 * Just call tm methods
 \*-------------------------------------------------------------------------*/
 static int meth_settimeout(lua_State *L) {
-    p_udp udp = (p_udp) aux_checkgroup(L, "udp{any}", 1);
-    return tm_meth_settimeout(L, &udp->tm);
+    p_udp udp = (p_udp) auxiliar_checkgroup(L, "udp{any}", 1);
+    return timeout_meth_settimeout(L, &udp->tm);
 }
 
 /*-------------------------------------------------------------------------*\
 * Turns a master udp object into a client object.
 \*-------------------------------------------------------------------------*/
 static int meth_setpeername(lua_State *L) {
-    p_udp udp = (p_udp) aux_checkgroup(L, "udp{any}", 1);
-    p_tm tm = &udp->tm;
+    p_udp udp = (p_udp) auxiliar_checkgroup(L, "udp{any}", 1);
+    p_timeout tm = &udp->tm;
     const char *address =  luaL_checkstring(L, 2);
     int connecting = strcmp(address, "*");
     unsigned short port = connecting ? 
@@ -276,8 +276,8 @@ static int meth_setpeername(lua_State *L) {
         return 2;
     }
     /* change class to connected or unconnected depending on address */
-    if (connecting) aux_setclass(L, "udp{connected}", 1);
-    else aux_setclass(L, "udp{unconnected}", 1);
+    if (connecting) auxiliar_setclass(L, "udp{connected}", 1);
+    else auxiliar_setclass(L, "udp{unconnected}", 1);
     lua_pushnumber(L, 1);
     return 1;
 }
@@ -286,8 +286,8 @@ static int meth_setpeername(lua_State *L) {
 * Closes socket used by object 
 \*-------------------------------------------------------------------------*/
 static int meth_close(lua_State *L) {
-    p_udp udp = (p_udp) aux_checkgroup(L, "udp{any}", 1);
-    sock_destroy(&udp->sock);
+    p_udp udp = (p_udp) auxiliar_checkgroup(L, "udp{any}", 1);
+    socket_destroy(&udp->sock);
     lua_pushnumber(L, 1);
     return 1;
 }
@@ -296,7 +296,7 @@ static int meth_close(lua_State *L) {
 * Turns a master object into a server object
 \*-------------------------------------------------------------------------*/
 static int meth_setsockname(lua_State *L) {
-    p_udp udp = (p_udp) aux_checkclass(L, "udp{unconnected}", 1);
+    p_udp udp = (p_udp) auxiliar_checkclass(L, "udp{unconnected}", 1);
     const char *address =  luaL_checkstring(L, 2);
     unsigned short port = (unsigned short) luaL_checknumber(L, 3);
     const char *err = inet_trybind(&udp->sock, address, port);
@@ -316,17 +316,17 @@ static int meth_setsockname(lua_State *L) {
 * Creates a master udp object 
 \*-------------------------------------------------------------------------*/
 static int global_create(lua_State *L) {
-    t_sock sock;
+    t_socket sock;
     const char *err = inet_trycreate(&sock, SOCK_DGRAM);
     /* try to allocate a system socket */
     if (!err) { 
         /* allocate tcp object */
         p_udp udp = (p_udp) lua_newuserdata(L, sizeof(t_udp));
-        aux_setclass(L, "udp{unconnected}", -1);
+        auxiliar_setclass(L, "udp{unconnected}", -1);
         /* initialize remaining structure fields */
-        sock_setnonblocking(&sock);
+        socket_setnonblocking(&sock);
         udp->sock = sock;
-        tm_init(&udp->tm, -1, -1);
+        timeout_init(&udp->tm, -1, -1);
         return 1;
     } else {
         lua_pushnil(L);