improve send

2 files changed, 17 insertions, 53 deletions

diff --git a/core/src/xmake/io/socket_send.c b/core/src/xmake/io/socket_send.c
index 5d697f3e4..ecf3421ff 100644
--- a/core/src/xmake/io/socket_send.c
+++ b/core/src/xmake/io/socket_send.c
@@ -52,29 +52,11 @@ tb_int_t xm_io_socket_send(lua_State* lua)
     tb_socket_ref_t sock = (tb_socket_ref_t)xm_lua_topointer(lua, 1);
     tb_check_return_val(sock, 0);
 
-    // get data
+    // get data and size
     tb_size_t        size = 0;
     tb_byte_t const* data = tb_null;
-    if (lua_istable(lua, 2))
-    {
-        // get data address
-        lua_pushstring(lua, "data");
-        lua_gettable(lua, 2);
-        data = (tb_byte_t const*)(tb_size_t)(tb_long_t)lua_tonumber(lua, -1);
-        lua_pop(lua, 1);
-
-        // get data size
-        lua_pushstring(lua, "size");
-        lua_gettable(lua, 2);
-        size = (tb_size_t)lua_tonumber(lua, -1);
-        lua_pop(lua, 1);
-    }
-    else
-    {
-        size_t datasize = 0;
-        data = (tb_byte_t const*)luaL_checklstring(lua, 2, &datasize);
-        size = (tb_size_t)datasize;
-    }
+    if (lua_isnumber(lua, 2)) data = (tb_byte_t const*)(tb_size_t)(tb_long_t)lua_tonumber(lua, 2);
+    if (lua_isnumber(lua, 3)) size = (tb_size_t)lua_tonumber(lua, 3);
     if (!data || !size)
     {
         lua_pushinteger(lua, -1);
@@ -82,28 +64,8 @@ tb_int_t xm_io_socket_send(lua_State* lua)
         return 2;
     }
 
-    // get start
-    tb_long_t start = 1;
-    if (lua_isnumber(lua, 3)) start = (tb_long_t)lua_tonumber(lua, 3);
-    if (start < 1 || start > size)
-    {
-        lua_pushinteger(lua, -1);
-        lua_pushfstring(lua, "invalid start position(%d)!", (tb_int_t)start);
-        return 2;
-    }
-
-    // get last
-    tb_long_t last = (tb_long_t)size;
-    if (lua_isnumber(lua, 4)) last = (tb_long_t)lua_tonumber(lua, 4);
-    if (last < start - 1 || last > size + start - 1)
-    {
-        lua_pushinteger(lua, -1);
-        lua_pushfstring(lua, "invalid last position(%d)!", (tb_int_t)last);
-        return 2;
-    }
-
     // send data
-    tb_long_t real = tb_socket_send(sock, data + start - 1, last - start + 1);
+    tb_long_t real = tb_socket_send(sock, data, size);
     lua_pushinteger(lua, (tb_int_t)real);
     return 1;
 }
diff --git a/xmake/core/base/socket.lua b/xmake/core/base/socket.lua
index 04520ba21..8fe895a67 100644
--- a/xmake/core/base/socket.lua
+++ b/xmake/core/base/socket.lua
@@ -24,6 +24,7 @@ local _instance   = _instance or {}
 
 -- load modules
 local io        = require("base/io")
+local libc      = require("base/libc")
 local bytes     = require("base/bytes")
 local table     = require("base/table")
 local string    = require("base/string")
@@ -265,21 +266,22 @@ function _instance:send(data, opt)
         return -1, errors
     end
 
-    -- data is bytes? table.unpack the raw address
-    local datasize = #data
-    if bytes.instance_of(data) then
-        datasize = data:size()
-        data = {data = data:caddr(), size = data:size()}
+    -- get data address and size for bytes and string
+    if type(data) == "string" then
+        data = bytes(data)
     end
+    local datasize = data:size()
+    local dataaddr = data:caddr()
 
     -- init start and last
     opt = opt or {}
     local start = opt.start or 1
     local last = opt.last or datasize
-
-    -- check start and last
-    if start > last or start < 1 then
-        return -1, string.format("%s: invalid start(%d) and last(%d)!", self, start, last)
+    if start < 1 or start > datasize then
+        return -1, string.format("%s: invalid start(%d)!", self, start)
+    end
+    if last < start - 1 or last > datasize + start - 1 then
+        return -1, string.format("%s: invalid last(%d)!", self, last)
     end
 
     -- send it
@@ -290,7 +292,7 @@ function _instance:send(data, opt)
     if opt.block then
         local size = last + 1 - start
         while start <= last do
-            real, errors = io.socket_send(self:cdata(), data, start, last)
+            real, errors = io.socket_send(self:cdata(), dataaddr + start - 1, last + 1 - start)
             if real > 0 then
                 send = send + real
                 start = start + real
@@ -311,7 +313,7 @@ function _instance:send(data, opt)
             send = -1
         end
     else
-        send, errors = io.socket_send(self:cdata(), data, start, last)
+        send, errors = io.socket_send(self:cdata(), dataaddr + start - 1, last + 1 - start)
         if send < 0 and errors then
             errors = string.format("%s: %s", self, errors)
         end