small fixes.

Author: zhuizhuhaomeng

src/ngx_stream_lua_socket_tcp.c

@@ -37,9 +37,9 @@ static int ngx_stream_lua_socket_tcp_receive(lua_State *L);
 static int ngx_stream_lua_socket_tcp_receiveany(lua_State *L);
 static int ngx_stream_lua_socket_tcp_send(lua_State *L);
 static int ngx_stream_lua_socket_tcp_close(lua_State *L);
-static int ngx_stream_lua_socket_tcp_setoption(lua_State *L);
 static int ngx_stream_lua_socket_tcp_settimeout(lua_State *L);
 static int ngx_stream_lua_socket_tcp_settimeouts(lua_State *L);
+static int ngx_stream_lua_socket_tcp_settransparent(lua_State *L);
 static void ngx_stream_lua_socket_tcp_handler(ngx_event_t *ev);
 static ngx_int_t ngx_stream_lua_socket_tcp_get_peer(ngx_peer_connection_t *pc,
     void *data);
@@ -184,7 +184,6 @@ static void ngx_stream_lua_ssl_handshake_handler(ngx_connection_t *c);
 static int ngx_stream_lua_ssl_free_session(lua_State *L);
 #endif
 static void ngx_stream_lua_socket_tcp_close_connection(ngx_connection_t *c);
-static void ngx_stream_lua_inject_socket_option_consts(lua_State *L);
 
 static int ngx_stream_lua_socket_tcp_peek(lua_State *L);
 static ngx_int_t ngx_stream_lua_socket_tcp_peek_resume(
@@ -210,6 +209,14 @@ enum {
     SOCKET_OP_RESUME_CONN
 };
 
+enum {
+    NGX_STREAM_LUA_SOCKOPT_KEEPALIVE = 1,
+    NGX_STREAM_LUA_SOCKOPT_REUSEADDR,
+    NGX_STREAM_LUA_SOCKOPT_TCP_NODELAY,
+    NGX_STREAM_LUA_SOCKOPT_SNDBUF,
+    NGX_STREAM_LUA_SOCKOPT_RCVBUF,
+};
+
 
 #define ngx_stream_lua_socket_check_busy_connecting(r, u, L)                 \
     if ((u)->conn_waiting) {                                                 \
@@ -253,25 +260,14 @@ static char ngx_stream_lua_pattern_udata_metatable_key;
 static char ngx_stream_lua_ssl_session_metatable_key;
 #endif
 
-
-static void
-ngx_stream_lua_inject_socket_option_consts(lua_State *L)
-{
-    /* {{{ socket option constants */
-#if (NGX_HAVE_TRANSPARENT_PROXY)
-    lua_pushinteger(L, NGX_STREAM_LUA_SOCKET_OPTION_TRANSPARENT);
-    lua_setfield(L, -2, "IP_TRANSPARENT");
-#endif
-}
+#define ngx_stream_lua_tcp_socket_metatable_literal_key  "__tcp_cosocket_mt"
 
 
 void
 ngx_stream_lua_inject_socket_tcp_api(ngx_log_t *log, lua_State *L)
 {
     ngx_int_t         rc;
 
-    ngx_stream_lua_inject_socket_option_consts(L);
-
     lua_createtable(L, 0, 4 /* nrec */);    /* ngx.socket */
 
     lua_pushcfunction(L, ngx_stream_lua_socket_tcp);
@@ -337,7 +333,7 @@ ngx_stream_lua_inject_socket_tcp_api(ngx_log_t *log, lua_State *L)
     /* {{{tcp object metatable */
     lua_pushlightuserdata(L, ngx_stream_lua_lightudata_mask(
                           tcp_socket_metatable_key));
-    lua_createtable(L, 0 /* narr */, 15 /* nrec */);
+    lua_createtable(L, 0 /* narr */, 17 /* nrec */);
 
     lua_pushcfunction(L, ngx_stream_lua_socket_tcp_bind);
     lua_setfield(L, -2, "bind");
@@ -367,12 +363,12 @@ ngx_stream_lua_inject_socket_tcp_api(ngx_log_t *log, lua_State *L)
     lua_pushcfunction(L, ngx_stream_lua_socket_tcp_close);
     lua_setfield(L, -2, "close");
 
-    lua_pushcfunction(L, ngx_stream_lua_socket_tcp_setoption);
-    lua_setfield(L, -2, "setoption");
-
     lua_pushcfunction(L, ngx_stream_lua_socket_tcp_settimeout);
     lua_setfield(L, -2, "settimeout"); /* ngx socket mt */
 
+    lua_pushcfunction(L, ngx_stream_lua_socket_tcp_settransparent);
+    lua_setfield(L, -2, "settransparent"); /* ngx socket mt */
+
     lua_pushcfunction(L, ngx_stream_lua_socket_tcp_settimeouts);
     lua_setfield(L, -2, "settimeouts"); /* ngx socket mt */
 
@@ -388,6 +384,12 @@ ngx_stream_lua_inject_socket_tcp_api(ngx_log_t *log, lua_State *L)
     lua_pushvalue(L, -1);
     lua_setfield(L, -2, "__index");
     lua_rawset(L, LUA_REGISTRYINDEX);
+
+    lua_pushliteral(L, ngx_stream_lua_tcp_socket_metatable_literal_key);
+    lua_pushlightuserdata(L, ngx_stream_lua_lightudata_mask(
+                          tcp_socket_metatable_key));
+    lua_rawget(L, LUA_REGISTRYINDEX);
+    lua_rawset(L, LUA_REGISTRYINDEX);
     /* }}} */
 
     /* {{{upstream userdata metatable */
@@ -903,8 +905,7 @@ ngx_stream_lua_socket_tcp_bind(lua_State *L)
         return luaL_error(L, "no ctx found");
     }
 
-    ngx_stream_lua_check_context(L, ctx, NGX_STREAM_LUA_CONTEXT_CONTENT
-                                 | NGX_STREAM_LUA_CONTEXT_TIMER);
+    ngx_stream_lua_check_context(L, ctx, NGX_STREAM_LUA_CONTEXT_YIELDABLE);
 
     luaL_checktype(L, 1, LUA_TTABLE);
 
@@ -1161,7 +1162,7 @@ ngx_stream_lua_socket_tcp_connect(lua_State *L)
 #if (NGX_HAVE_TRANSPARENT_PROXY)
     lua_rawgeti(L, 1, SOCKET_IP_TRANSPARENT_INDEX);
 
-    if (lua_tointeger(L, -1) > 0) {
+    if (lua_toboolean(L, -1)) {
         pc->transparent = 1;
         ngx_log_debug0(NGX_LOG_DEBUG_STREAM, r->connection->log, 0,
                        "stream lua set TCP upstream with IP_TRANSPARENT");
@@ -3349,53 +3350,123 @@ ngx_stream_lua_socket_tcp_shutdown(lua_State *L)
 }
 
 
-static int
-ngx_stream_lua_socket_tcp_setoption(lua_State *L)
+int
+ngx_stream_lua_ffi_socket_tcp_getoption(ngx_stream_lua_socket_tcp_upstream_t *u,
+    int option, int *val, u_char *err, size_t *errlen)
 {
-    ngx_stream_lua_ctx_t   *ctx;
-    int                     n;
-    int                     option;
+    socklen_t len;
+    int       fd, rc;
 
-    ngx_stream_lua_request_t  *r;
+    if (u == NULL || u->peer.connection == NULL) {
+        *errlen = ngx_snprintf(err, *errlen, "closed") - err;
+        return NGX_ERROR;
+    }
 
-    n = lua_gettop(L);
+    fd = u->peer.connection->fd;
 
-    if (n < 2) {
-        return luaL_error(L, "ngx.socket setoption: expecting 2 or 3 "
-                          "arguments (including the object) but seen %d",
-                          lua_gettop(L));
+    if (fd == (int) -1) {
+        *errlen = ngx_snprintf(err, *errlen, "invalid socket fd") - err;
+        return NGX_ERROR;
     }
 
-    r = ngx_stream_lua_get_req(L);
-    if (r == NULL) {
-        return luaL_error(L, "no request found");
+    len = sizeof(int);
+
+    switch (option) {
+    case NGX_STREAM_LUA_SOCKOPT_KEEPALIVE:
+        rc = getsockopt(fd, SOL_SOCKET, SO_KEEPALIVE, (void *) val, &len);
+        break;
+
+    case NGX_STREAM_LUA_SOCKOPT_REUSEADDR:
+        rc = getsockopt(fd, SOL_SOCKET, SO_REUSEADDR, (void *) val, &len);
+        break;
+
+    case NGX_STREAM_LUA_SOCKOPT_TCP_NODELAY:
+        rc = getsockopt(fd, IPPROTO_TCP, TCP_NODELAY, (void *) val, &len);
+        break;
+
+    case NGX_STREAM_LUA_SOCKOPT_SNDBUF:
+        rc = getsockopt(fd, SOL_SOCKET, SO_RCVBUF, (void *) val, &len);
+        break;
+
+    case NGX_STREAM_LUA_SOCKOPT_RCVBUF:
+        rc = getsockopt(fd, SOL_SOCKET, SO_SNDBUF, (void *) val, &len);
+        break;
+
+    default:
+        *errlen = ngx_snprintf(err, *errlen, "unsupported option %d", option)
+                  - err;
+        return NGX_ERROR;
     }
 
-    ctx = ngx_stream_lua_get_module_ctx(r, ngx_stream_lua_module);
-    if (ctx == NULL) {
-        return luaL_error(L, "no ctx found");
-     }
+    if (rc == -1) {
+        *errlen = ngx_strerror(ngx_errno, err, NGX_MAX_ERROR_STR) - err;
+        return NGX_ERROR;
+    }
 
-     ngx_stream_lua_check_context(L, ctx, NGX_STREAM_LUA_CONTEXT_CONTENT
-                                  | NGX_STREAM_LUA_CONTEXT_TIMER);
+    return NGX_OK;
+}
 
-     luaL_checktype(L, 1, LUA_TTABLE);
 
-     option = luaL_checkint(L, 2);
+int
+ngx_stream_lua_ffi_socket_tcp_setoption(
+    ngx_stream_lua_socket_tcp_upstream_t *u,
+    int option, int val, u_char *err, size_t *errlen)
+{
+    socklen_t len;
+    int       fd, rc;
 
-     switch (option) {
-#if (NGX_HAVE_TRANSPARENT_PROXY)
-         case NGX_STREAM_LUA_SOCKET_OPTION_TRANSPARENT:
-             lua_rawseti(L, 1, SOCKET_IP_TRANSPARENT_INDEX);
-             lua_pushboolean(L, 1);
-           break;
-#endif
-       default:
-           return luaL_error(L, "invalid tcp socket option: %d", option);
+    if (u == NULL || u->peer.connection == NULL) {
+        *errlen = ngx_snprintf(err, *errlen, "closed") - err;
+        return NGX_ERROR;
+    }
+
+    fd = u->peer.connection->fd;
 
+    if (fd == (int) -1) {
+        *errlen = ngx_snprintf(err, *errlen, "invalid socket fd") - err;
+        return NGX_ERROR;
     }
 
-    return 1;
+    len = sizeof(int);
+
+    switch (option) {
+    case NGX_STREAM_LUA_SOCKOPT_KEEPALIVE:
+        rc = setsockopt(fd, SOL_SOCKET, SO_KEEPALIVE,
+                        (const void *) &val, len);
+        break;
+
+    case NGX_STREAM_LUA_SOCKOPT_REUSEADDR:
+        rc = setsockopt(fd, SOL_SOCKET, SO_REUSEADDR,
+                        (const void *) &val, len);
+        break;
+
+    case NGX_STREAM_LUA_SOCKOPT_TCP_NODELAY:
+        rc = setsockopt(fd, IPPROTO_TCP, TCP_NODELAY,
+                        (const void *) &val, len);
+        break;
+
+    case NGX_STREAM_LUA_SOCKOPT_SNDBUF:
+        rc = setsockopt(fd, SOL_SOCKET, SO_RCVBUF,
+                        (const void *) &val, len);
+        break;
+
+    case NGX_STREAM_LUA_SOCKOPT_RCVBUF:
+        rc = setsockopt(fd, SOL_SOCKET, SO_SNDBUF,
+                        (const void *) &val, len);
+        break;
+
+    default:
+        *errlen = ngx_snprintf(err, *errlen, "unsupported option: %d", option)
+                  - err;
+        return NGX_ERROR;
+    }
+
+    if (rc == -1) {
+        *errlen = ngx_strerror(ngx_errno, err, NGX_MAX_ERROR_STR) - err;
+        return NGX_ERROR;
+    }
+
+    return NGX_OK;
 }
 
 
@@ -3510,6 +3581,43 @@ ngx_stream_lua_socket_tcp_settimeouts(lua_State *L)
 }
 
 
+static int
+ngx_stream_lua_socket_tcp_settransparent(lua_State *L)
+{
+    ngx_stream_lua_ctx_t   *ctx;
+    int                     n;
+
+    ngx_stream_lua_request_t  *r;
+
+    n = lua_gettop(L);
+
+    if (n != 1) {
+        return luaL_error(L, "ngx.socket settransparent: expecting 1"
+                          "argument (including the object) but seen %d",
+                          lua_gettop(L));
+    }
+
+    r = ngx_stream_lua_get_req(L);
+    if (r == NULL) {
+        return luaL_error(L, "no request found");
+    }
+
+    ctx = ngx_stream_lua_get_module_ctx(r, ngx_stream_lua_module);
+    if (ctx == NULL) {
+        return luaL_error(L, "no ctx found");
+    }
+
+    ngx_stream_lua_check_context(L, ctx,  NGX_STREAM_LUA_CONTEXT_YIELDABLE);
+
+    luaL_checktype(L, 1, LUA_TTABLE);
+
+    lua_rawseti(L, 1, SOCKET_IP_TRANSPARENT_INDEX);
+    lua_pushboolean(L, 1);
+
+    return 1;
+}
+
+
 static void
 ngx_stream_lua_socket_tcp_handler(ngx_event_t *ev)
 {