@@ -2,9 +2,9 @@ #ifndef __LUARPC_CONFIG_H__ #define __LUARPC_CONFIG_H__ -#define LUARPC_ENABLE_SOCKET +/*#define LUARPC_ENABLE_SOCKET */ /* #define LUARPC_ENABLE_FIFO -- not implemented!!! */ -/* #define LUARPC_ENABLE_SERIAL */ +#define LUARPC_ENABLE_SERIAL /* signed and unsigned 8, 16 and 32 bit types */ config.h @@ -633,9 +633,12 @@ static int rpc_connect( lua_State *L ) Try { char header[ 5 ]; + printf("Pre handle\n"); handle = handle_create (L ); + printf("Post handle\n"); transport_open_connection( L, handle ); - + printf("Post-open-connection\n"); + /* write the protocol header */ header[0] = 'L'; header[1] = 'R'; @@ -643,6 +646,7 @@ static int rpc_connect( lua_State *L ) header[3] = 'C'; header[4] = RPC_PROTOCOL_VERSION; transport_write_string( &handle->tpt, header, sizeof( header ) ); + printf("post-wrote-string\n"); } Catch( e ) { @@ -1028,11 +1032,6 @@ static const luaL_reg rpc_helper[] = { NULL, NULL } }; -static const luaL_reg rpc_server_handle[] = -{ - { NULL, NULL } -}; - static const luaL_reg rpc_map[] = { { "connect", rpc_connect }, @@ -1059,13 +1058,12 @@ LUALIB_API int luaopen_luarpc(lua_State *L) luaL_register( L, "rpc", rpc_map ); luaL_newmetatable( L, "rpc.helper" ); - luaL_openlib( L, NULL, rpc_helper, 0 ); + luaL_register( L, NULL, rpc_helper ); luaL_newmetatable( L, "rpc.handle" ); - luaL_openlib( L, NULL, rpc_handle, 0 ); + luaL_register( L, NULL, rpc_handle ); luaL_newmetatable( L, "rpc.server_handle" ); - luaL_openlib( L, NULL, rpc_server_handle, 0 ); if ( sizeof( double ) != 8 ) debug ( "internal error: sizeof(double) != 8" ); luarpc.c @@ -158,7 +158,7 @@ int transport_open_connection(lua_State *L, Handle *handle); void transport_accept (Transport *tpt, Transport *atpt); /* Read & Write to Transport */ -void transport_read_buffer (Transport *tpt, const u8 *buffer, int length); +void transport_read_buffer (Transport *tpt, u8 *buffer, int length); void transport_write_buffer (Transport *tpt, const u8 *buffer, int length); /* Check if data is available on connection without reading: luarpc_rpc.h @@ -1,6 +1,7 @@ #include <stdio.h> #include <unistd.h> #include <stdlib.h> +#include <fcntl.h> #include <sys/fcntl.h> #include <sys/file.h> #include <sys/time.h> @@ -12,6 +13,8 @@ #include <string.h> #include <alloca.h> +/* FIXME: I know not all of the above is necessary, should pare it down sometime */ + #include "lua.h" #include "lualib.h" #include "lauxlib.h" @@ -32,7 +35,7 @@ void transport_open( Transport *tpt, const char *path ) struct termios options; struct exception e; - tpt->fd = open(path , O_RDWR | O_NOCTTY ); + tpt->fd = open(path , O_RDWR | O_NOCTTY | O_NDELAY ); if( tpt->fd == INVALID_TRANSPORT) { @@ -83,12 +86,13 @@ int transport_open_connection(lua_State *L, Handle *handle) /* Accept Connection */ void transport_accept (Transport *tpt, Transport *atpt) { + struct exception e; TRANSPORT_VERIFY_OPEN; atpt->fd = tpt->fd; } /* Read & Write to Transport */ -void transport_read_buffer (Transport *tpt, const u8 *buffer, int length) +void transport_read_buffer (Transport *tpt, u8 *buffer, int length) { int n; struct exception e; luarpc_serial.c @@ -288,7 +288,7 @@ void transport_accept (Transport *tpt, Transport *atpt) /* read from the socket into a buffer */ -void transport_read_buffer (Transport *tpt, const u8 *buffer, int length) +void transport_read_buffer (Transport *tpt, u8 *buffer, int length) { struct exception e; TRANSPORT_VERIFY_OPEN; luarpc_socket.c @@ -17,8 +17,9 @@ function doStuff() rpc.on_error (error_handler); io.write ("error set\n") - local slave,err = rpc.connect ("localhost",12345); - -- local slave,err = rpc.connect ("/dev/ttys0"); + -- local slave,err = rpc.connect ("localhost",12345); + --local slave,err = rpc.connect ("/dev/ttys0"); + local slave,err = rpc.connect ("/dev/tty.usbserial-ftCYPMYJ"); -- local slave,err = rpc.connect ("/dev/pts/4"); if not slave then io.write ("error: " .. err .. "\n"); @@ -44,10 +45,7 @@ function doStuff() print (slave.testvar) - function squareval(x) - print(x^2) - return x^2 - end + function squareval(x) return x^2 end print(slave.execfunc( string.dump(squareval), 8 )) test-client.lua @@ -32,9 +32,9 @@ testvar = 23 io.write ("server started\n") --- rpc.server ("/dev/ptys0"); -- use for serial mode +rpc.server ("/dev/ptys0"); -- use for serial mode -- rpc.server ("/dev/ptmx"); -- use for serial mode -rpc.server (12345); -- use for socket mode +-- rpc.server (12345); -- use for socket mode -- an alternative way test-server.lua b04d7f710926530e6be72f407215499e6c49ffc3 James Snyder jbsnyder@fanplastic.org http://github.com/jsnyder/luarpc/commit/c80ec38f990e4af222db6fa5c5122ef15ff039d9 c80ec38f990e4af222db6fa5c5122ef15ff039d9 2009-06-01T11:29:43-07:00 2009-06-01T11:29:43-07:00 Very simple working RPC. TODOs: - redirect stderr/stdout in some way that works better - deal with connection state in a way that's more resilient (packetize?) - set up _index in addition to _call to allow recursive calls to subtables 1272a47aefa16582e7ae8acf764c83ec6c6b2da7 James Snyder jbsnyder@fanplastic.org