refactor(socket): use path instead fd as input parameter for `sen…

…dfile`

Signed-off-by: Jianhui Zhao <zhaojh329@gmail.com>

http/server.lua

@@ -392,12 +392,7 @@ local function http_send_file(self, path, size, count, offset)
     local ret
 
     if sock.sendfile then
-        local fd, err = file.open(path)
-        if not fd then
-            return nil, err
-        end
-        ret, err = sock:sendfile(fd, count, offset)
-        file.close(fd)
+        ret, err = sock:sendfile(path, count, offset)
     else
         ret, err = sendfile(sock, path, count, offset)
     end

socket.c

@@ -7,6 +7,7 @@
 #include <string.h>
 #include <unistd.h>
 #include <errno.h>
+#include <fcntl.h>
 
 #include <sys/sendfile.h>
 #include <sys/socket.h>
@@ -549,6 +550,8 @@ static int lua_sendfilek(lua_State *L, int status, lua_KContext ctx)
             return lua_yieldk(L, 0, ctx, lua_sendfilek);
         }
 
+        close(sock->snd.fd);
+
         if (errno == EPIPE)
             lua_pushliteral(L, "closed");
         else
@@ -558,12 +561,14 @@ static int lua_sendfilek(lua_State *L, int status, lua_KContext ctx)
 
     sent += ret;
 
-    if (sent < len) {
+    if (ret && sent < len) {
         sock->snd.sent = sent;
         sock->snd.offset = offset;
         return lua_sendfilek(L, 0, ctx);
     }
 
+    close(sock->snd.fd);
+
     lua_pushinteger(L, sent);
 
     if (offset < 0)
@@ -576,15 +581,26 @@ static int lua_sendfilek(lua_State *L, int status, lua_KContext ctx)
 static int lua_sendfile(lua_State *L)
 {
     struct eco_socket *sock = luaL_checkudata(L, 1, ECO_SOCKET_MT);
+    const char *path;
+    int fd;
 
     if (sock->L) {
         lua_pushnil(L);
         lua_pushliteral(L, "busy");
         return 2;
     }
 
+    path = luaL_checkstring(L, 2);
+
+    fd = open(path, O_RDONLY);
+    if (fd < 0) {
+        lua_pushnil(L);
+        lua_pushstring(L, strerror(errno));
+        return 2;
+    }
+
     sock->snd.sent = 0;
-    sock->snd.fd = luaL_checkinteger(L, 2);
+    sock->snd.fd = fd;
     sock->snd.len = luaL_checkinteger(L, 3);
     sock->snd.offset = luaL_optinteger(L, 4, -1);
 

socket.lua

@@ -86,8 +86,8 @@ function methods:sendto(data, ...)
     return self.sock:sendto(data, ...)
 end
 
-function methods:sendfile(fd, len, offset)
-    return self.sock:sendfile(fd, len, offset)
+function methods:sendfile(path, len, offset)
+    return self.sock:sendfile(path, len, offset)
 end
 
 --[[