add socket.bind

5 files changed, 120 insertions, 2 deletions

diff --git a/core/src/xmake/io/socket_bind.c b/core/src/xmake/io/socket_bind.c
new file mode 100644
index 000000000..7a14040a6
--- /dev/null
+++ b/core/src/xmake/io/socket_bind.c
@@ -0,0 +1,69 @@
+/*!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_bind.c
+ *
+ */
+
+/* //////////////////////////////////////////////////////////////////////////////////////
+ * trace
+ */
+#define TB_TRACE_MODULE_NAME    "socket_bind"
+#define TB_TRACE_MODULE_DEBUG   (0)
+
+/* //////////////////////////////////////////////////////////////////////////////////////
+ * includes
+ */
+#include "prefix.h"
+
+/* //////////////////////////////////////////////////////////////////////////////////////
+ * interfaces
+ */
+
+// io.socket_bind(sock, addr, port, family)
+tb_int_t xm_io_socket_bind(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 address
+    tb_char_t const* address = lua_tostring(lua, 2);
+    tb_assert_and_check_return_val(address, 0);
+
+    // get port
+    tb_size_t port = (tb_size_t)luaL_checknumber(lua, 3);
+
+    // get family
+    tb_size_t family = (tb_size_t)luaL_checknumber(lua, 4);
+
+    // init address
+    tb_ipaddr_t addr;
+    tb_ipaddr_set(&addr, address, port, family);
+
+    // bind socket
+    lua_pushboolean(lua, tb_socket_bind(sock, &addr));
+    return 1;
+}
+
diff --git a/core/src/xmake/machine.c b/core/src/xmake/machine.c
index 462ff62ef..d22647728 100644
--- a/core/src/xmake/machine.c
+++ b/core/src/xmake/machine.c
@@ -113,6 +113,7 @@ tb_int_t xm_io_filelock_close(lua_State* lua);
 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_connect(lua_State* lua);
 tb_int_t xm_io_socket_close(lua_State* lua);
 
@@ -251,6 +252,7 @@ static luaL_Reg const g_io_functions[] =
 ,   { "socket_open",        xm_io_socket_open      }
 ,   { "socket_rawfd",       xm_io_socket_rawfd     }
 ,   { "socket_wait",        xm_io_socket_wait      }
+,   { "socket_bind",        xm_io_socket_bind      }
 ,   { "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 383f71555..fa9131d05 100644
--- a/core/src/xmake/makefile
+++ b/core/src/xmake/makefile
@@ -63,6 +63,7 @@ xmake_C_FILES 			+= \
 						io/socket_open \
 						io/socket_rawfd \
 						io/socket_wait \
+						io/socket_bind \
 						io/socket_connect \
 						io/socket_close \
 						path/relative \
diff --git a/xmake/core/base/socket.lua b/xmake/core/base/socket.lua
index 080cf16d9..c5de342c0 100644
--- a/xmake/core/base/socket.lua
+++ b/xmake/core/base/socket.lua
@@ -79,6 +79,23 @@ function _instance:rawfd()
     return result, errors
 end
 
+-- bind socket 
+function _instance:bind(addr, port)
+
+    -- ensure opened
+    local ok, errors = self:_ensure_opened()
+    if not ok then
+        return -1, errors
+    end
+
+    -- bind it
+    local result, errors = io.socket_bind(self._SOCK, addr, port, self:family())
+    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 f000495b3..f9a08c419 100644
--- a/xmake/core/sandbox/modules/import/core/base/socket.lua
+++ b/xmake/core/sandbox/modules/import/core/base/socket.lua
@@ -37,6 +37,15 @@ function sandbox_core_base_socket_instance.wait(sock, events, timeout)
     return result
 end
 
+-- bind socket 
+function sandbox_core_base_socket_instance.bind(sock, addr, port)
+    local result, errors = sock:_bind(addr, port)
+    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)
@@ -96,6 +105,26 @@ function sandbox_core_base_socket.udp6()
     return sandbox_core_base_socket.open(socket.UDP, socket.IPV6)
 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)
+    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)
@@ -110,7 +139,7 @@ function sandbox_core_base_socket.connect4(addr, port, timeout)
         return sock
     else
         sock:close()
-        raise("connect %s:%s failed!", addr, port)
+        raise("connect4 %s:%s failed!", addr, port)
     end
 end
 
@@ -128,7 +157,7 @@ function sandbox_core_base_socket.connect6(addr, port, timeout)
         return sock
     else
         sock:close()
-        raise("connect %s:%s failed!", addr, port)
+        raise("connect6 %s:%s failed!", addr, port)
     end
 end