diff options
Diffstat (limited to 'src/lua/modules/net')
| -rw-r--r-- | src/lua/modules/net/Buffer.cpp | 142 | ||||
| -rw-r--r-- | src/lua/modules/net/je_lua_buffer.cpp | 137 | ||||
| -rw-r--r-- | src/lua/modules/net/je_lua_buffer.h (renamed from src/lua/modules/net/Buffer.h) | 7 | ||||
| -rw-r--r-- | src/lua/modules/net/je_lua_net.cpp (renamed from src/lua/modules/net/net.cpp) | 42 | ||||
| -rw-r--r-- | src/lua/modules/net/je_lua_net.h | 0 | ||||
| -rw-r--r-- | src/lua/modules/net/je_lua_socket.cpp | 129 | ||||
| -rw-r--r-- | src/lua/modules/net/je_lua_socket.h | 16 | ||||
| -rw-r--r-- | src/lua/modules/net/socket.cpp | 129 |
8 files changed, 308 insertions, 294 deletions
diff --git a/src/lua/modules/net/Buffer.cpp b/src/lua/modules/net/Buffer.cpp deleted file mode 100644 index ddfbd6b..0000000 --- a/src/lua/modules/net/Buffer.cpp +++ /dev/null @@ -1,142 +0,0 @@ -#include "lua/modules/luax.h" -#include "lua/modules/types.h" -#include "lua/common/common.h" -#include "libjin/jin.h" -#include "Buffer.h" - -namespace JinEngine -{ - namespace Lua - { - namespace Net - { - - using namespace JinEngine; - - typedef Ref<Buffer>& BufferRef; - - static inline BufferRef checkNetBuffer(lua_State* L) - { - Proxy* proxy = (Proxy*)luax_checktype(L, 1, JIN_NETWORK_BUFFER); - return proxy->getRef<Buffer>(); - } - - // net.Buffer:append(value) -> value_length - static int l_append(lua_State* L) - { - BufferRef ref = checkNetBuffer(L); - const int vp = 2; - if (luax_isintegerstrict(L, vp)) - { - int n = luax_checkinteger(L, vp); - int size = sizeof(n); - ref->append(&n, size); - luax_pushinteger(L, size); - return 1; - } - else if (luax_isfloatstrict(L, vp)) - { - float n = luax_checknumber(L, vp); - int size = sizeof(n); - ref->append(&n, size); - luax_pushinteger(L, size); - return 1; - } - else if (luax_isbooleanstrict(L, vp)) - { - bool n = luax_checkbool(L, vp); - int size = sizeof(n); - ref->append(&n, size); - luax_pushinteger(L, size); - return 1; - } - else if (luax_isstringstrict(L, vp)) - { - const char* str = luax_checkstring(L, vp); - int size = strlen(str) + 1; - ref->append(str, size); - luax_pushinteger(L, size); - return 1; - } - else - { - luax_typerror(L, vp, "number, bool or string"); - return 0; - } - } - - // net.Buffer:grabString(offset) -> string, length - static int l_grabString(lua_State* L) - { - BufferRef ref = checkNetBuffer(L); - int offset = luax_checkinteger(L, 2); - unsigned int len; - char* data = ref->grabString(&len, offset); - Array<char> str; - str.bind(data, len); - luax_pushstring(L, &str); - luax_pushinteger(L, str.count()); - return 2; - } - - // net.Buffer:grabInteger(offset) -> integer, length - static int l_grabInteger(lua_State* L) - { - BufferRef ref = checkNetBuffer(L); - int offset = luax_checkinteger(L, 2); - int len; - int integer = ref->grabInteger(&len, offset); - luax_pushinteger(L, integer); - luax_pushinteger(L, len); - return 2; - } - - static int l_grabFloat(lua_State* L) - { - BufferRef ref = checkNetBuffer(L); - int offset = luax_checkinteger(L, 2); - int len; - float floatv = ref->grabFloat(&len, offset); - luax_pushnumber(L, floatv); - luax_pushinteger(L, len); - return 2; - } - - static int l_grabBoolean(lua_State* L) - { - BufferRef ref = checkNetBuffer(L); - int offset = luax_checkinteger(L, 2); - int len; - bool boolean = ref->grabBoolean(&len, offset); - luax_pushboolean(L, boolean); - luax_pushinteger(L, len); - return 2; - } - - static int l_gc(lua_State* L) - { - Proxy* proxy = (Proxy*)luax_checktype(L, 1, JIN_NETWORK_BUFFER); - proxy->release(); - return 0; - } - - static const luaL_Reg netbuffer_function[] = { - { "__gc", l_gc }, - { "append", l_append }, - { "grabString", l_grabString }, - { "grabInteger", l_grabInteger }, - { "grabBoolean", l_grabBoolean }, - { "grabFloat", l_grabFloat }, - { 0, 0 } - }; - - } // namespace Net - - int luaopen_Buffer(lua_State* L) - { - luax_newtype(L, JIN_NETWORK_BUFFER, Net::netbuffer_function); - return 0; - } - - } // namespace Lua -} // namespace JinEngine
\ No newline at end of file diff --git a/src/lua/modules/net/je_lua_buffer.cpp b/src/lua/modules/net/je_lua_buffer.cpp new file mode 100644 index 0000000..0198095 --- /dev/null +++ b/src/lua/modules/net/je_lua_buffer.cpp @@ -0,0 +1,137 @@ +#include "lua/modules/luax.h" + +#include "lua/common/je_lua_common.h" +#include "libjin/jin.h" +#include "je_lua_buffer.h" + +namespace JinEngine +{ + namespace Lua + { + + const char* Jin_Lua_Buffer = "Buffer"; + + typedef Shared<Net::Buffer>& SharedBuffer; + + static inline SharedBuffer checkNetBuffer(lua_State* L) + { + Proxy* proxy = (Proxy*)luax_checktype(L, 1, Jin_Lua_Buffer); + return proxy->getShared<Net::Buffer>(); + } + + // net.Buffer:append(value) -> value_length + LUA_IMPLEMENT int l_append(lua_State* L) + { + SharedBuffer shared = checkNetBuffer(L); + const int vp = 2; + if (luax_isintegerstrict(L, vp)) + { + int n = luax_checkinteger(L, vp); + int size = sizeof(n); + shared->append(&n, size); + luax_pushinteger(L, size); + return 1; + } + else if (luax_isfloatstrict(L, vp)) + { + float n = luax_checknumber(L, vp); + int size = sizeof(n); + shared->append(&n, size); + luax_pushinteger(L, size); + return 1; + } + else if (luax_isbooleanstrict(L, vp)) + { + bool n = luax_checkbool(L, vp); + int size = sizeof(n); + shared->append(&n, size); + luax_pushinteger(L, size); + return 1; + } + else if (luax_isstringstrict(L, vp)) + { + const char* str = luax_checkstring(L, vp); + int size = strlen(str) + 1; + shared->append(str, size); + luax_pushinteger(L, size); + return 1; + } + else + { + luax_typerror(L, vp, "number, bool or string"); + return 0; + } + } + + // net.Buffer:grabString(offset) -> string, length + LUA_IMPLEMENT int l_grabString(lua_State* L) + { + SharedBuffer shared = checkNetBuffer(L); + int offset = luax_checkinteger(L, 2); + unsigned int len; + char* data = shared->grabString(&len, offset); + Array<char> str; + str.bind(data, len); + luax_pushstring(L, &str); + luax_pushinteger(L, str.count()); + return 2; + } + + // net.Buffer:grabInteger(offset) -> integer, length + LUA_IMPLEMENT int l_grabInteger(lua_State* L) + { + SharedBuffer shared = checkNetBuffer(L); + int offset = luax_checkinteger(L, 2); + int len; + int integer = shared->grabInteger(&len, offset); + luax_pushinteger(L, integer); + luax_pushinteger(L, len); + return 2; + } + + LUA_IMPLEMENT int l_grabFloat(lua_State* L) + { + SharedBuffer shared = checkNetBuffer(L); + int offset = luax_checkinteger(L, 2); + int len; + float floatv = shared->grabFloat(&len, offset); + luax_pushnumber(L, floatv); + luax_pushinteger(L, len); + return 2; + } + + LUA_IMPLEMENT int l_grabBoolean(lua_State* L) + { + SharedBuffer shared = checkNetBuffer(L); + int offset = luax_checkinteger(L, 2); + int len; + bool boolean = shared->grabBoolean(&len, offset); + luax_pushboolean(L, boolean); + luax_pushinteger(L, len); + return 2; + } + + LUA_IMPLEMENT int l_gc(lua_State* L) + { + Proxy* proxy = (Proxy*)luax_checktype(L, 1, Jin_Lua_Buffer); + proxy->release(); + return 0; + } + + LUA_EXPORT void luaopen_Buffer(lua_State* L) + { + luaL_Reg netbuffer_function[] = { + { "__gc", l_gc }, + { "append", l_append }, + { "grabString", l_grabString }, + { "grabInteger", l_grabInteger }, + { "grabBoolean", l_grabBoolean }, + { "grabFloat", l_grabFloat }, + { 0, 0 } + }; + + luax_newtype(L, Jin_Lua_Buffer, netbuffer_function); + } + + } // namespace Lua +} // namespace JinEngine
\ No newline at end of file diff --git a/src/lua/modules/net/Buffer.h b/src/lua/modules/net/je_lua_buffer.h index 8733778..d226640 100644 --- a/src/lua/modules/net/Buffer.h +++ b/src/lua/modules/net/je_lua_buffer.h @@ -3,12 +3,17 @@ #include <cstring> #include <cstdlib> -#include "lua/common/common.h" +#include "lua/common/je_lua_common.h" namespace JinEngine { namespace Lua { + + extern const char* Jin_Lua_Buffer; + + void luaopen_Buffer(lua_State* L); + namespace Net { diff --git a/src/lua/modules/net/net.cpp b/src/lua/modules/net/je_lua_net.cpp index 4ef9ece..b081733 100644 --- a/src/lua/modules/net/net.cpp +++ b/src/lua/modules/net/je_lua_net.cpp @@ -1,8 +1,10 @@ #include "lua/modules/luax.h" -#include "lua/modules/types.h" + #include "libjin/jin.h" -#include "lua/common/common.h" -#include "Buffer.h" +#include "lua/common/je_lua_common.h" + +#include "je_lua_buffer.h" +#include "je_lua_socket.h" namespace JinEngine { @@ -12,13 +14,13 @@ namespace Lua using namespace JinEngine::Lua::Net; using namespace JinEngine::Net; - static int l_initNetwork(lua_State* L) + LUA_IMPLEMENT int l_initNetwork(lua_State* L) { JinEngine::Net::NetManager::get()->init(); return 1; } - static int l_Socket(lua_State* L) + LUA_IMPLEMENT int l_Socket(lua_State* L) { SocketInformation info = { 0 }; { @@ -48,35 +50,31 @@ namespace Lua } } Socket* socket = new Socket(info); - Proxy* proxy = (Proxy*)luax_newinstance(L, JIN_NETWORK_SOCKET, sizeof(Proxy)); - proxy->bind(new Ref<Socket>(socket, JIN_NETWORK_SOCKET)); + Proxy* proxy = luax_newinstance(L, Jin_Lua_Socket); + proxy->bind(new Shared<Socket>(socket, Jin_Lua_Socket)); return 1; } - static int l_Buffer(lua_State* L) + LUA_IMPLEMENT int l_Buffer(lua_State* L) { int size = luax_checkinteger(L, 1); - Proxy* proxy = (Proxy*)luax_newinstance(L, JIN_NETWORK_BUFFER, sizeof(Proxy)); + Proxy* proxy = luax_newinstance(L, Jin_Lua_Buffer); Net::Buffer* buffer = new Net::Buffer(size); - proxy->bind(new Ref<Buffer>(buffer, JIN_NETWORK_BUFFER)); + proxy->bind(new Shared<Buffer>(buffer, Jin_Lua_Buffer)); return 1; } - static const luaL_Reg f[] = { - { "init", l_initNetwork }, - { "newSocket", l_Socket }, - { "newBuffer", l_Buffer }, - { 0, 0 } - }; - - extern int luaopen_Socket(lua_State* L); - extern int luaopen_Buffer(lua_State* L); - - int luaopen_net(lua_State* L) + LUA_EXPORT int luaopen_net(lua_State* L) { luaopen_Socket(L); luaopen_Buffer(L); - + + luaL_Reg f[] = { + { "init", l_initNetwork }, + { "newSocket", l_Socket }, + { "newBuffer", l_Buffer }, + { 0, 0 } + }; luax_newlib(L, f); return 1; diff --git a/src/lua/modules/net/je_lua_net.h b/src/lua/modules/net/je_lua_net.h new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/src/lua/modules/net/je_lua_net.h diff --git a/src/lua/modules/net/je_lua_socket.cpp b/src/lua/modules/net/je_lua_socket.cpp new file mode 100644 index 0000000..db170e4 --- /dev/null +++ b/src/lua/modules/net/je_lua_socket.cpp @@ -0,0 +1,129 @@ +#include "lua/modules/luax.h" + +#include "lua/common/je_lua_common.h" +#include "libjin/jin.h" +#include "je_lua_buffer.h" + +using namespace JinEngine::Net; +using namespace JinEngine::Lua::Net; + +namespace JinEngine +{ + namespace Lua + { + + const char* Jin_Lua_Socket = "Socket"; + + typedef Shared<Socket>& SharedSocket; + + const int BUFFER_SIZE = 1024; + + LUA_IMPLEMENT inline SharedSocket checkSocket(lua_State* L, int pos = 1) + { + Proxy* proxy = (Proxy*)luax_checktype(L, pos, Jin_Lua_Socket); + return proxy->getShared<Socket>(); + } + + LUA_IMPLEMENT inline Shared<Buffer>& checkNetBuffer(lua_State* L, int pos = 1) + { + Proxy* proxy = (Proxy*)luax_checktype(L, pos, Jin_Lua_Buffer); + return proxy->getShared<Buffer>(); + } + + // return net.Socket + LUA_IMPLEMENT int l_accept(lua_State* L) + { + SharedSocket socket = checkSocket(L); + Socket* client = socket->accept(); + Proxy* proxy = luax_newinstance(L, Jin_Lua_Socket); + proxy->bind(new Shared<Socket>(client, Jin_Lua_Socket)); + return 1; + } + + // return net.Buffer + LUA_IMPLEMENT int l_receive(lua_State* L) + { + SharedSocket socket = checkSocket(L); + char buffer[BUFFER_SIZE] = {0}; + int size = socket->receive(buffer, BUFFER_SIZE); + Proxy* proxy = luax_newinstance(L, Jin_Lua_Buffer); + Net::Buffer* netBuffer = new Net::Buffer(buffer, size); + proxy->bind(new Shared<Buffer>(netBuffer, Jin_Lua_Buffer)); + return 1; + } + + // Socket:receiveFrom(address, port) + LUA_IMPLEMENT int l_receiveFrom(lua_State* L) + { + SharedSocket socket = checkSocket(L); + int address = luax_checkinteger(L, 2); + int port = luax_checkinteger(L, 3); + char buffer[BUFFER_SIZE]; + int size = socket->receiveFrom(buffer, BUFFER_SIZE, address, port); + Net::Buffer* netBuffer = new Net::Buffer(buffer, size); + Proxy* proxy = luax_newinstance(L, Jin_Lua_Buffer); + proxy->bind(new Shared<Buffer>(netBuffer, Jin_Lua_Buffer)); + return 1; + } + + // Socket:send(net.Buffer) -> data_length + LUA_IMPLEMENT int l_send(lua_State* L) + { + SharedSocket socket = checkSocket(L); + Shared<Buffer>& shared = checkNetBuffer(L, 2); + int len = socket->send(shared->buffer, shared->size); + luax_pushinteger(L, len); + return 1; + } + + // Socket:sendTo(address, port, net.Buffer) + LUA_IMPLEMENT int l_sendTo(lua_State* L) + { + SharedSocket socket = checkSocket(L); + int address = luax_checkinteger(L, 2); + int port = luax_checkinteger(L, 3); + Shared<Buffer>& buffer = checkNetBuffer(L, 4); + socket->sendTo(buffer->buffer, buffer->size, address, port); + return 0; + } + + LUA_IMPLEMENT int l_close(lua_State* L) + { + SharedSocket socket = checkSocket(L); + socket->close(); + return 0; + } + + LUA_IMPLEMENT int l_configBlocking(lua_State* L) + { + SharedSocket socket = checkSocket(L); + bool blocking = luax_checkbool(L, 2); + socket->configureBlocking(blocking); + return 0; + } + + LUA_IMPLEMENT int l_gc(lua_State* L) + { + Proxy* proxy = (Proxy*)luax_checktype(L, 1, Jin_Lua_Socket); + proxy->release(); + return 0; + } + + LUA_EXPORT void luaopen_Socket(lua_State* L) + { + luaL_Reg socket_function[] = { + { "__gc", l_gc }, + { "accept", l_accept }, + { "receive", l_receive }, + { "receiveFrom", l_receiveFrom }, + { "send", l_send }, + { "sendTo", l_sendTo }, + { "close", l_close }, + { "configBlocking", l_configBlocking }, + { 0, 0 } + }; + luax_newtype(L, Jin_Lua_Socket, socket_function); + } + + } // namespace Lua +} // namespace JinEngine
\ No newline at end of file diff --git a/src/lua/modules/net/je_lua_socket.h b/src/lua/modules/net/je_lua_socket.h new file mode 100644 index 0000000..b33fac6 --- /dev/null +++ b/src/lua/modules/net/je_lua_socket.h @@ -0,0 +1,16 @@ +#ifndef __JE_LUA_SOCKET_H__ +#define __JE_LUA_SOCKET_H__ + +namespace JinEngine +{ + namespace Lua + { + + extern const char* Jin_Lua_Socket; + + void luaopen_Socket(lua_State* L); + + } +} + +#endif
\ No newline at end of file diff --git a/src/lua/modules/net/socket.cpp b/src/lua/modules/net/socket.cpp deleted file mode 100644 index d6de730..0000000 --- a/src/lua/modules/net/socket.cpp +++ /dev/null @@ -1,129 +0,0 @@ -#include "lua/modules/luax.h" -#include "lua/modules/types.h" -#include "lua/common/common.h" -#include "libjin/jin.h" -#include "Buffer.h" - -namespace JinEngine -{ - namespace Lua - { - - using namespace JinEngine::Net; - using namespace Lua::Net; - - typedef Ref<Socket>& SocketRef; - - const int BUFFER_SIZE = 1024; - - static inline SocketRef checkSocket(lua_State* L, int pos = 1) - { - Proxy* proxy = (Proxy*)luax_checktype(L, pos, JIN_NETWORK_SOCKET); - return proxy->getRef<Socket>(); - } - - static inline Ref<Buffer>& checkNetBuffer(lua_State* L, int pos = 1) - { - Proxy* proxy = (Proxy*)luax_checktype(L, pos, JIN_NETWORK_BUFFER); - return proxy->getRef<Buffer>(); - } - - // return net.Socket - static int l_accept(lua_State* L) - { - SocketRef socket = checkSocket(L); - Socket* client = socket->accept(); - Proxy* proxy = (Proxy*)luax_newinstance(L, JIN_NETWORK_SOCKET, sizeof(Proxy)); - proxy->bind(new Ref<Socket>(client, JIN_NETWORK_SOCKET)); - return 1; - } - - // return net.Buffer - static int l_receive(lua_State* L) - { - SocketRef socket = checkSocket(L); - char buffer[BUFFER_SIZE] = {0}; - int size = socket->receive(buffer, BUFFER_SIZE); - Proxy* proxy = (Proxy*)luax_newinstance(L, JIN_NETWORK_BUFFER, sizeof(Proxy)); - Net::Buffer* netBuffer = new Net::Buffer(buffer, size); - proxy->bind(new Ref<Buffer>(netBuffer, JIN_NETWORK_BUFFER)); - return 1; - } - - // Socket:receiveFrom(address, port) - static int l_receiveFrom(lua_State* L) - { - SocketRef socket = checkSocket(L); - int address = luax_checkinteger(L, 2); - int port = luax_checkinteger(L, 3); - char buffer[BUFFER_SIZE]; - int size = socket->receiveFrom(buffer, BUFFER_SIZE, address, port); - Net::Buffer* netBuffer = new Net::Buffer(buffer, size); - Proxy* proxy = (Proxy*)luax_newinstance(L, JIN_NETWORK_BUFFER, sizeof(Proxy)); - proxy->bind(new Ref<Buffer>(netBuffer, JIN_NETWORK_BUFFER)); - return 1; - } - - // Socket:send(net.Buffer) -> data_length - static int l_send(lua_State* L) - { - SocketRef socket = checkSocket(L); - Ref<Buffer>& ref = checkNetBuffer(L, 2); - int len = socket->send(ref->buffer, ref->size); - luax_pushinteger(L, len); - return 1; - } - - // Socket:sendTo(address, port, net.Buffer) - static int l_sendTo(lua_State* L) - { - SocketRef socket = checkSocket(L); - int address = luax_checkinteger(L, 2); - int port = luax_checkinteger(L, 3); - Ref<Buffer>& buffer = checkNetBuffer(L, 4); - socket->sendTo(buffer->buffer, buffer->size, address, port); - return 0; - } - - static int l_close(lua_State* L) - { - SocketRef socket = checkSocket(L); - socket->close(); - return 0; - } - - static int l_configBlocking(lua_State* L) - { - SocketRef socket = checkSocket(L); - bool blocking = luax_checkbool(L, 2); - socket->configureBlocking(blocking); - return 0; - } - - static int l_gc(lua_State* L) - { - Proxy* proxy = (Proxy*)luax_checktype(L, 1, JIN_NETWORK_SOCKET); - proxy->release(); - return 0; - } - - static const luaL_Reg socket_function[] = { - { "__gc", l_gc }, - { "accept", l_accept }, - { "receive", l_receive }, - { "receiveFrom", l_receiveFrom }, - { "send", l_send }, - { "sendTo", l_sendTo }, - { "close", l_close }, - { "configBlocking", l_configBlocking }, - { 0, 0 } - }; - - int luaopen_Socket(lua_State* L) - { - luax_newtype(L, JIN_NETWORK_SOCKET, socket_function); - return 0; - } - - } // namespace Lua -} // namespace JinEngine
\ No newline at end of file |