Select re-implemented in a nicer way.
Few changes in internal class and group registration. Lua modules are compiled and built into library. Dynamic library tested in Linux and Mac OS X.
This commit is contained in:
Diego Nehab
parent
b2724ad2d1
commit
58bdb658aa
28 changed files with 496 additions and 397 deletions
97
src/tcp.c
97
src/tcp.c
|
|
@ -10,43 +10,49 @@
|
|||
|
||||
#include "luasocket.h"
|
||||
|
||||
#include "aux.h"
|
||||
#include "auxiliar.h"
|
||||
#include "socket.h"
|
||||
#include "inet.h"
|
||||
#include "error.h"
|
||||
#include "tcp.h"
|
||||
|
||||
/*=========================================================================*\
|
||||
* Internal function prototypes
|
||||
\*=========================================================================*/
|
||||
static int tcp_global_create(lua_State *L);
|
||||
static int tcp_meth_connect(lua_State *L);
|
||||
static int tcp_meth_bind(lua_State *L);
|
||||
static int tcp_meth_send(lua_State *L);
|
||||
static int tcp_meth_getsockname(lua_State *L);
|
||||
static int tcp_meth_getpeername(lua_State *L);
|
||||
static int tcp_meth_receive(lua_State *L);
|
||||
static int tcp_meth_accept(lua_State *L);
|
||||
static int tcp_meth_close(lua_State *L);
|
||||
static int tcp_meth_timeout(lua_State *L);
|
||||
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_getsockname(lua_State *L);
|
||||
static int meth_getpeername(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_timeout(lua_State *L);
|
||||
static int meth_fd(lua_State *L);
|
||||
static int meth_dirty(lua_State *L);
|
||||
|
||||
/* tcp object methods */
|
||||
static luaL_reg tcp[] = {
|
||||
{"connect", tcp_meth_connect},
|
||||
{"send", tcp_meth_send},
|
||||
{"receive", tcp_meth_receive},
|
||||
{"bind", tcp_meth_bind},
|
||||
{"accept", tcp_meth_accept},
|
||||
{"setpeername", tcp_meth_connect},
|
||||
{"setsockname", tcp_meth_bind},
|
||||
{"getpeername", tcp_meth_getpeername},
|
||||
{"getsockname", tcp_meth_getsockname},
|
||||
{"timeout", tcp_meth_timeout},
|
||||
{"close", tcp_meth_close},
|
||||
{"connect", meth_connect},
|
||||
{"send", meth_send},
|
||||
{"receive", meth_receive},
|
||||
{"bind", meth_bind},
|
||||
{"accept", meth_accept},
|
||||
{"setpeername", meth_connect},
|
||||
{"setsockname", meth_bind},
|
||||
{"getpeername", meth_getpeername},
|
||||
{"getsockname", meth_getsockname},
|
||||
{"timeout", meth_timeout},
|
||||
{"close", meth_close},
|
||||
{"fd", meth_fd},
|
||||
{"dirty", meth_dirty},
|
||||
{NULL, NULL}
|
||||
};
|
||||
|
||||
/* functions in library namespace */
|
||||
static luaL_reg func[] = {
|
||||
{"tcp", tcp_global_create},
|
||||
{"tcp", global_create},
|
||||
{NULL, NULL}
|
||||
};
|
||||
|
||||
|
|
@ -60,11 +66,13 @@ void tcp_open(lua_State *L)
|
|||
aux_newclass(L, "tcp{client}", tcp);
|
||||
aux_newclass(L, "tcp{server}", tcp);
|
||||
/* create class groups */
|
||||
aux_add2group(L, "tcp{client}", "tcp{client, server}");
|
||||
aux_add2group(L, "tcp{server}", "tcp{client, server}");
|
||||
aux_add2group(L, "tcp{master}", "tcp{any}");
|
||||
aux_add2group(L, "tcp{client}", "tcp{any}");
|
||||
aux_add2group(L, "tcp{server}", "tcp{any}");
|
||||
aux_add2group(L, "tcp{client}", "tcp{client, server}");
|
||||
aux_add2group(L, "tcp{server}", "tcp{client, server}");
|
||||
aux_add2group(L, "tcp{client}", "select{able}");
|
||||
aux_add2group(L, "tcp{server}", "select{able}");
|
||||
/* define library functions */
|
||||
luaL_openlib(L, LUASOCKET_LIBNAME, func, 0);
|
||||
lua_pop(L, 1);
|
||||
|
|
@ -76,28 +84,45 @@ void tcp_open(lua_State *L)
|
|||
/*-------------------------------------------------------------------------*\
|
||||
* Just call buffered IO methods
|
||||
\*-------------------------------------------------------------------------*/
|
||||
static int tcp_meth_send(lua_State *L)
|
||||
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);
|
||||
}
|
||||
|
||||
static int tcp_meth_receive(lua_State *L)
|
||||
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);
|
||||
}
|
||||
|
||||
/*-------------------------------------------------------------------------*\
|
||||
* Select support methods
|
||||
\*-------------------------------------------------------------------------*/
|
||||
static int meth_fd(lua_State *L)
|
||||
{
|
||||
p_tcp tcp = (p_tcp) aux_checkclass(L, "tcp{client, server}", 1);
|
||||
lua_pushnumber(L, tcp->sock);
|
||||
return 1;
|
||||
}
|
||||
|
||||
static int meth_dirty(lua_State *L)
|
||||
{
|
||||
p_tcp tcp = (p_tcp) aux_checkclass(L, "tcp{client, server}", 1);
|
||||
lua_pushboolean(L, !buf_isempty(&tcp->buf));
|
||||
return 1;
|
||||
}
|
||||
|
||||
/*-------------------------------------------------------------------------*\
|
||||
* Just call inet methods
|
||||
\*-------------------------------------------------------------------------*/
|
||||
static int tcp_meth_getpeername(lua_State *L)
|
||||
static int meth_getpeername(lua_State *L)
|
||||
{
|
||||
p_tcp tcp = (p_tcp) aux_checkclass(L, "tcp{client}", 1);
|
||||
return inet_meth_getpeername(L, &tcp->sock);
|
||||
}
|
||||
|
||||
static int tcp_meth_getsockname(lua_State *L)
|
||||
static int meth_getsockname(lua_State *L)
|
||||
{
|
||||
p_tcp tcp = (p_tcp) aux_checkgroup(L, "tcp{client, server}", 1);
|
||||
return inet_meth_getsockname(L, &tcp->sock);
|
||||
|
|
@ -106,7 +131,7 @@ static int tcp_meth_getsockname(lua_State *L)
|
|||
/*-------------------------------------------------------------------------*\
|
||||
* Just call tm methods
|
||||
\*-------------------------------------------------------------------------*/
|
||||
static int tcp_meth_timeout(lua_State *L)
|
||||
static int meth_timeout(lua_State *L)
|
||||
{
|
||||
p_tcp tcp = (p_tcp) aux_checkgroup(L, "tcp{any}", 1);
|
||||
return tm_meth_timeout(L, &tcp->tm);
|
||||
|
|
@ -115,7 +140,7 @@ static int tcp_meth_timeout(lua_State *L)
|
|||
/*-------------------------------------------------------------------------*\
|
||||
* Closes socket used by object
|
||||
\*-------------------------------------------------------------------------*/
|
||||
static int tcp_meth_close(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);
|
||||
|
|
@ -125,7 +150,7 @@ static int tcp_meth_close(lua_State *L)
|
|||
/*-------------------------------------------------------------------------*\
|
||||
* Turns a master tcp object into a client object.
|
||||
\*-------------------------------------------------------------------------*/
|
||||
static int tcp_meth_connect(lua_State *L)
|
||||
static int meth_connect(lua_State *L)
|
||||
{
|
||||
p_tcp tcp = (p_tcp) aux_checkclass(L, "tcp{master}", 1);
|
||||
const char *address = luaL_checkstring(L, 2);
|
||||
|
|
@ -145,7 +170,7 @@ static int tcp_meth_connect(lua_State *L)
|
|||
/*-------------------------------------------------------------------------*\
|
||||
* Turns a master object into a server object
|
||||
\*-------------------------------------------------------------------------*/
|
||||
static int tcp_meth_bind(lua_State *L)
|
||||
static int meth_bind(lua_State *L)
|
||||
{
|
||||
p_tcp tcp = (p_tcp) aux_checkclass(L, "tcp{master}", 1);
|
||||
const char *address = luaL_checkstring(L, 2);
|
||||
|
|
@ -167,10 +192,10 @@ static int tcp_meth_bind(lua_State *L)
|
|||
* Waits for and returns a client object attempting connection to the
|
||||
* server object
|
||||
\*-------------------------------------------------------------------------*/
|
||||
static int tcp_meth_accept(lua_State *L)
|
||||
static int meth_accept(lua_State *L)
|
||||
{
|
||||
struct sockaddr_in addr;
|
||||
size_t addr_len = sizeof(addr);
|
||||
socklen_t addr_len = sizeof(addr);
|
||||
p_tcp server = (p_tcp) aux_checkclass(L, "tcp{server}", 1);
|
||||
p_tm tm = &server->tm;
|
||||
p_tcp client = lua_newuserdata(L, sizeof(t_tcp));
|
||||
|
|
@ -200,7 +225,7 @@ static int tcp_meth_accept(lua_State *L)
|
|||
/*-------------------------------------------------------------------------*\
|
||||
* Creates a master tcp object
|
||||
\*-------------------------------------------------------------------------*/
|
||||
int tcp_global_create(lua_State *L)
|
||||
int global_create(lua_State *L)
|
||||
{
|
||||
/* allocate tcp object */
|
||||
p_tcp tcp = (p_tcp) lua_newuserdata(L, sizeof(t_tcp));
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue