improve socket apis

6 files changed, 107 insertions, 44 deletions

diff --git a/core/src/xmake/io/socket_listen.c b/core/src/xmake/io/socket_listen.c
new file mode 100644
index 000000000..c075bcb67
--- /dev/null
+++ b/core/src/xmake/io/socket_listen.c
@@ -0,0 +1,58 @@
+/*!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_listen.c
+ *
+ */
+
+/* //////////////////////////////////////////////////////////////////////////////////////
+ * trace
+ */
+#define TB_TRACE_MODULE_NAME    "socket_listen"
+#define TB_TRACE_MODULE_DEBUG   (0)
+
+/* //////////////////////////////////////////////////////////////////////////////////////
+ * includes
+ */
+#include "prefix.h"
+
+/* //////////////////////////////////////////////////////////////////////////////////////
+ * interfaces
+ */
+
+// io.socket_listen(sock, backlog)
+tb_int_t xm_io_socket_listen(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);
+
+    // get backlog
+    tb_size_t backlog = (tb_size_t)luaL_checknumber(lua, 2);
+
+    // listen socket
+    lua_pushnumber(lua, (tb_int_t)tb_socket_listen(sock, backlog));
+    return 1;
+}
+
diff --git a/core/src/xmake/io/socket_wait.c b/core/src/xmake/io/socket_wait.c
index 982afb60b..d9b845785 100644
--- a/core/src/xmake/io/socket_wait.c
+++ b/core/src/xmake/io/socket_wait.c
@@ -34,7 +34,7 @@
  * interfaces
  */
 
-// io.socket_wait(sock, addr, port, family)
+// io.socket_wait(sock, events, timeout)
 tb_int_t xm_io_socket_wait(lua_State* lua)
 {
     // check
diff --git a/core/src/xmake/machine.c b/core/src/xmake/machine.c
index d22647728..c1b1686b5 100644
--- a/core/src/xmake/machine.c
+++ b/core/src/xmake/machine.c
@@ -114,6 +114,7 @@ tb_int_t xm_io_socket_open(lua_State* lua);
 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_connect(lua_State* lua);
 tb_int_t xm_io_socket_close(lua_State* lua);
 
@@ -253,6 +254,7 @@ static luaL_Reg const g_io_functions[] =
 ,   { "socket_rawfd",       xm_io_socket_rawfd     }
 ,   { "socket_wait",        xm_io_socket_wait      }
 ,   { "socket_bind",        xm_io_socket_bind      }
+,   { "socket_listen",      xm_io_socket_listen    }
 ,   { "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 fa9131d05..79618ea4f 100644
--- a/core/src/xmake/makefile
+++ b/core/src/xmake/makefile
@@ -64,6 +64,7 @@ xmake_C_FILES 			+= \
 						io/socket_rawfd \
 						io/socket_wait \
 						io/socket_bind \
+						io/socket_listen \
 						io/socket_connect \
 						io/socket_close \
 						path/relative \
diff --git a/xmake/core/base/socket.lua b/xmake/core/base/socket.lua
index c5de342c0..ddd89c004 100644
--- a/xmake/core/base/socket.lua
+++ b/xmake/core/base/socket.lua
@@ -96,6 +96,23 @@ function _instance:bind(addr, port)
     return result, errors
 end
 
+-- listen socket 
+function _instance:listen(backlog)
+
+    -- ensure opened
+    local ok, errors = self:_ensure_opened()
+    if not ok then
+        return -1, errors
+    end
+
+    -- listen it
+    local result, errors = io.socket_listen(self._SOCK, backlog or 10)
+    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 f9a08c419..cca8b5227 100644
--- a/xmake/core/sandbox/modules/import/core/base/socket.lua
+++ b/xmake/core/sandbox/modules/import/core/base/socket.lua
@@ -46,6 +46,15 @@ function sandbox_core_base_socket_instance.bind(sock, addr, port)
     return result
 end
 
+-- listen socket 
+function sandbox_core_base_socket_instance.listen(backlog)
+    local result, errors = sock:_listen(backlog)
+    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)
@@ -95,60 +104,36 @@ function sandbox_core_base_socket.open(socktype, family)
     return sock
 end
 
--- open udp/ipv4 socket
-function sandbox_core_base_socket.udp4()
-    return sandbox_core_base_socket.open(socket.UDP, socket.IPV4)
+-- open tcp socket
+function sandbox_core_base_socket.tcp(opt)
+    opt = opt or {}
+    return sandbox_core_base_socket.open(socket.TCP, opt.family or socket.IPV4)
 end
 
--- open udp/ipv6 socket
-function sandbox_core_base_socket.udp6()
-    return sandbox_core_base_socket.open(socket.UDP, socket.IPV6)
+-- open udp socket
+function sandbox_core_base_socket.udp(opt)
+    opt = opt or {}
+    return sandbox_core_base_socket.open(socket.UDP, opt.family or socket.IPV4)
 end
 
--- open and bind tcp/ipv4 socket
-function sandbox_core_base_socket.bind4(addr, port)
-    local sock = sandbox_core_base_socket.open(socket.TCP, socket.IPV4)
+-- open and bind tcp socket
+function sandbox_core_base_socket.bind(addr, port, opt)
+    opt = opt or {}
+    local sock = sandbox_core_base_socket.open(socket.TCP, opt.family or socket.IPV4)
     if sock:bind(addr, port) then
         return sock
     end
     sock:close()
-    raise("bind4 %s:%s failed!", addr, port)
-end
-
--- open and bind tcp/ipv6 socket
-function sandbox_core_base_socket.bind6(addr, port)
-    local sock = sandbox_core_base_socket.open(socket.TCP, socket.IPV6)
-    if sock:bind(addr, port) then
-        return sock
-    end
-    sock:close()
-    raise("bind6 %s:%s failed!", addr, port)
-end
-
--- open and connect tcp/ipv4 socket
-function sandbox_core_base_socket.connect4(addr, port, timeout)
-    local sock = sandbox_core_base_socket.open(socket.TCP, socket.IPV4)
-    local ok = sock:connect(addr, port)
-    if ok == 0 then
-        ok = sock:wait(socket.EV_CONN, timeout)
-        if ok == socket.EV_CONN then
-            ok = sock:connect(addr, port)
-        end
-    end
-    if ok > 0 then
-        return sock
-    else
-        sock:close()
-        raise("connect4 %s:%s failed!", addr, port)
-    end
+    raise("bind %s:%s failed!", addr, port)
 end
 
--- open and connect tcp/ipv6 socket
-function sandbox_core_base_socket.connect6(addr, port, timeout)
-    local sock = sandbox_core_base_socket.open(socket.TCP, socket.IPV6)
+-- open and connect tcp socket
+function sandbox_core_base_socket.connect(addr, port, opt)
+    opt = opt or {}
+    local sock = sandbox_core_base_socket.open(socket.TCP, opt.family or socket.IPV4)
     local ok = sock:connect(addr, port)
     if ok == 0 then
-        ok = sock:wait(socket.EV_CONN, timeout)
+        ok = sock:wait(socket.EV_CONN, opt.timeout or -1)
         if ok == socket.EV_CONN then
             ok = sock:connect(addr, port)
         end
@@ -157,7 +142,7 @@ function sandbox_core_base_socket.connect6(addr, port, timeout)
         return sock
     else
         sock:close()
-        raise("connect6 %s:%s failed!", addr, port)
+        raise("connect %s:%s failed!", addr, port)
     end
 end