add socket.accept

7 files changed, 132 insertions, 1 deletions

diff --git a/core/src/xmake/io/socket_accept.c b/core/src/xmake/io/socket_accept.c
new file mode 100644
index 000000000..efd667c5a
--- /dev/null
+++ b/core/src/xmake/io/socket_accept.c
@@ -0,0 +1,57 @@
+/*!A cross-platform build utility based on Lua
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * Copyright (C) 2015 - 2019, TBOOX Open Source Group.
+ *
+ * @author      ruki
+ * @file        socket_accept.c
+ *
+ */
+
+/* //////////////////////////////////////////////////////////////////////////////////////
+ * trace
+ */
+#define TB_TRACE_MODULE_NAME    "socket_accept"
+#define TB_TRACE_MODULE_DEBUG   (0)
+
+/* //////////////////////////////////////////////////////////////////////////////////////
+ * includes
+ */
+#include "prefix.h"
+
+/* //////////////////////////////////////////////////////////////////////////////////////
+ * interfaces
+ */
+
+// local sock = io.socket_accept(sock)
+tb_int_t xm_io_socket_accept(lua_State* lua)
+{
+    // check
+    tb_assert_and_check_return_val(lua, 0);
+
+    // is user data?
+    if (!lua_isuserdata(lua, 1)) 
+        return 0;
+
+    // get socket
+    tb_socket_ref_t sock = (tb_socket_ref_t)lua_touserdata(lua, 1);
+    tb_check_return_val(sock, 0);
+
+    // accept socket
+    tb_socket_ref_t client = tb_socket_accept(sock, tb_null);
+    if (client) lua_pushlightuserdata(lua, (tb_pointer_t)client);
+    else lua_pushnil(lua);
+    return 1;
+}
+
diff --git a/core/src/xmake/machine.c b/core/src/xmake/machine.c
index c1b1686b5..0a72b2456 100644
--- a/core/src/xmake/machine.c
+++ b/core/src/xmake/machine.c
@@ -115,6 +115,7 @@ tb_int_t xm_io_socket_rawfd(lua_State* lua);
 tb_int_t xm_io_socket_wait(lua_State* lua);
 tb_int_t xm_io_socket_bind(lua_State* lua);
 tb_int_t xm_io_socket_listen(lua_State* lua);
+tb_int_t xm_io_socket_accept(lua_State* lua);
 tb_int_t xm_io_socket_connect(lua_State* lua);
 tb_int_t xm_io_socket_close(lua_State* lua);
 
@@ -255,6 +256,7 @@ static luaL_Reg const g_io_functions[] =
 ,   { "socket_wait",        xm_io_socket_wait      }
 ,   { "socket_bind",        xm_io_socket_bind      }
 ,   { "socket_listen",      xm_io_socket_listen    }
+,   { "socket_accept",      xm_io_socket_accept    }
 ,   { "socket_connect",     xm_io_socket_connect   }
 ,   { "socket_close",       xm_io_socket_close     }
 ,   { tb_null,              tb_null                }
diff --git a/core/src/xmake/makefile b/core/src/xmake/makefile
index 79618ea4f..830f83066 100644
--- a/core/src/xmake/makefile
+++ b/core/src/xmake/makefile
@@ -65,6 +65,7 @@ xmake_C_FILES 			+= \
 						io/socket_wait \
 						io/socket_bind \
 						io/socket_listen \
+						io/socket_accept \
 						io/socket_connect \
 						io/socket_close \
 						path/relative \
diff --git a/tests/modules/socket/echo_client.lua b/tests/modules/socket/echo_client.lua
new file mode 100644
index 000000000..fce4ffcff
--- /dev/null
+++ b/tests/modules/socket/echo_client.lua
@@ -0,0 +1,7 @@
+import("core.base.socket")
+
+function main()
+    local sock = socket.connect("127.0.0.1", 9001)
+    print(sock)
+    sock:close()
+end
diff --git a/tests/modules/socket/echo_server.lua b/tests/modules/socket/echo_server.lua
new file mode 100644
index 000000000..76aa9dfb6
--- /dev/null
+++ b/tests/modules/socket/echo_server.lua
@@ -0,0 +1,18 @@
+import("core.base.socket")
+
+function main()
+    local sock = socket.bind("127.0.0.1", 9001)
+    sock:listen(20)
+    local sock_client = nil
+    while true do 
+        local ok = sock:wait(socket.EV_ACPT, -1)
+        if ok == socket.EV_ACPT then
+            sock_client = sock:accept()
+            if sock_client then
+                print(sock_client) 
+                sock_client:close()
+            end
+        end
+    end
+    sock:close()
+end
diff --git a/xmake/core/base/socket.lua b/xmake/core/base/socket.lua
index ddd89c004..bdc79faa7 100644
--- a/xmake/core/base/socket.lua
+++ b/xmake/core/base/socket.lua
@@ -113,6 +113,23 @@ function _instance:listen(backlog)
     return result, errors
 end
 
+-- accept socket 
+function _instance:accept()
+
+    -- ensure opened
+    local ok, errors = self:_ensure_opened()
+    if not ok then
+        return -1, errors
+    end
+
+    -- accept it
+    local result, errors = io.socket_accept(self._SOCK)
+    if not result and errors then
+        errors = string.format("%s: %s", self, errors)
+    end
+    return result, errors
+end
+
 -- connect socket 
 function _instance:connect(addr, port)
 
diff --git a/xmake/core/sandbox/modules/import/core/base/socket.lua b/xmake/core/sandbox/modules/import/core/base/socket.lua
index cca8b5227..b68b4a560 100644
--- a/xmake/core/sandbox/modules/import/core/base/socket.lua
+++ b/xmake/core/sandbox/modules/import/core/base/socket.lua
@@ -47,7 +47,7 @@ function sandbox_core_base_socket_instance.bind(sock, addr, port)
 end
 
 -- listen socket 
-function sandbox_core_base_socket_instance.listen(backlog)
+function sandbox_core_base_socket_instance.listen(sock, backlog)
     local result, errors = sock:_listen(backlog)
     if not result and errors then
         raise(errors)
@@ -55,6 +55,15 @@ function sandbox_core_base_socket_instance.listen(backlog)
     return result
 end
 
+-- accept socket 
+function sandbox_core_base_socket_instance.accept(sock)
+    local result, errors = sock:_accept()
+    if not result and errors then
+        raise(errors)
+    end
+    return result
+end
+
 -- connect socket 
 function sandbox_core_base_socket_instance.connect(sock, addr, port)
     local result, errors = sock:_connect(addr, port)
@@ -127,6 +136,26 @@ function sandbox_core_base_socket.bind(addr, port, opt)
     raise("bind %s:%s failed!", addr, port)
 end
 
+-- open and accept tcp socket
+function sandbox_core_base_socket.accept(addr, port, opt)
+    opt = opt or {}
+    local sock = socket.bind(addr, port, opt)
+    sock:listen()
+    local sock_client = nil
+    repeat 
+        local ok = sock:wait(socket.EV_ACPT, opt.timeout or -1)
+        if ok == socket.EV_ACPT then
+            sock_client = sock:accept()
+        end
+    until sock_client ~= nil
+    if ok > 0 then
+        return sock
+    else
+        sock:close()
+        raise("connect %s:%s failed!", addr, port)
+    end
+end
+
 -- open and connect tcp socket
 function sandbox_core_base_socket.connect(addr, port, opt)
     opt = opt or {}