feature: add support for tcp/udp bind.

Author: alonbg

.gitignore

@@ -76,3 +76,4 @@ src/ringbuf.c
 src/ringbuf.h
 src/ssl.c
 src/ssl.h
+*.project

src/ngx_stream_lua_socket_tcp.c

@@ -28,6 +28,7 @@
 
 
 static int ngx_stream_lua_socket_tcp(lua_State *L);
+static int ngx_stream_lua_socket_tcp_bind(lua_State *L);
 static int ngx_stream_lua_socket_tcp_connect(lua_State *L);
 #if (NGX_STREAM_SSL)
 static int ngx_stream_lua_socket_tcp_sslhandshake(lua_State *L);
@@ -183,9 +184,11 @@ 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(ngx_stream_lua_request_t *r);
+static ngx_int_t ngx_stream_lua_socket_tcp_peek_resume(
+    ngx_stream_lua_request_t *r);
 static int ngx_stream_lua_socket_tcp_shutdown(lua_State *L);
 
 
@@ -195,6 +198,8 @@ enum {
     SOCKET_CONNECT_TIMEOUT_INDEX = 2,
     SOCKET_SEND_TIMEOUT_INDEX = 4,
     SOCKET_READ_TIMEOUT_INDEX = 5,
+    SOCKET_BIND_INDEX = 6,   /* only in upstream cosocket */
+    SOCKET_IP_TRANSPARENT_INDEX = 7
 };
 
 
@@ -249,11 +254,24 @@ 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
+}
+
+
 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);
@@ -319,7 +337,10 @@ 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 */, 14 /* nrec */);
+    lua_createtable(L, 0 /* narr */, 15 /* nrec */);
+
+    lua_pushcfunction(L, ngx_stream_lua_socket_tcp_bind);
+    lua_setfield(L, -2, "bind");
 
     lua_pushcfunction(L, ngx_stream_lua_socket_tcp_connect);
     lua_setfield(L, -2, "connect");
@@ -457,7 +478,8 @@ ngx_stream_lua_socket_tcp(lua_State *L)
 
 static void
 ngx_stream_lua_socket_tcp_create_socket_pool(lua_State *L,
-    ngx_stream_lua_request_t *r, ngx_str_t key, ngx_int_t pool_size, ngx_int_t backlog,
+    ngx_stream_lua_request_t *r, ngx_str_t key, ngx_int_t pool_size,
+    ngx_int_t backlog,
     ngx_stream_lua_socket_pool_t **spool)
 {
     u_char                              *p;
@@ -854,6 +876,55 @@ ngx_stream_lua_socket_tcp_connect_helper(lua_State *L,
 }
 
 
+static int
+ngx_stream_lua_socket_tcp_bind(lua_State *L)
+{
+    ngx_stream_lua_ctx_t   *ctx;
+    int                     n;
+    u_char                 *text;
+    size_t                  len;
+    ngx_addr_t             *local;
+
+    ngx_stream_lua_request_t    *r;
+
+    n = lua_gettop(L);
+    if (n != 2) {
+        return luaL_error(L, "expecting 2 arguments, but got %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_CONTENT
+                                 | NGX_STREAM_LUA_CONTEXT_TIMER);
+
+    luaL_checktype(L, 1, LUA_TTABLE);
+
+    text = (u_char *) luaL_checklstring(L, 2, &len);
+    local = ngx_stream_lua_parse_addr(L, text, len);
+    if (local == NULL) {
+        lua_pushnil(L);
+        lua_pushfstring(L, "bad address");
+        return 2;
+    }
+
+    /* TODO: we may reuse the userdata here */
+    lua_rawseti(L, 1, SOCKET_BIND_INDEX);
+    ngx_log_debug1(NGX_LOG_DEBUG_STREAM, r->connection->log, 0,
+                   "lua tcp socket bind ip: %V", &local->name);
+    lua_pushboolean(L, 1);
+    return 1;
+}
+
+
 static int
 ngx_stream_lua_socket_tcp_connect(lua_State *L)
 {
@@ -864,6 +935,7 @@ ngx_stream_lua_socket_tcp_connect(lua_State *L)
     u_char                      *p;
     size_t                       len;
     ngx_peer_connection_t       *pc;
+    ngx_addr_t                  *local;
     int                          connect_timeout, send_timeout, read_timeout;
     unsigned                     custom_pool;
     int                          key_index;
@@ -1078,6 +1150,26 @@ ngx_stream_lua_socket_tcp_connect(lua_State *L)
 
     lua_pop(L, 3);
 
+    lua_rawgeti(L, 1, SOCKET_BIND_INDEX);
+    local = lua_touserdata(L, -1);
+    lua_pop(L, 1);
+
+    if (local) {
+        u->peer.local = local;
+    }
+
+#if (NGX_HAVE_TRANSPARENT_PROXY)
+    lua_rawgeti(L, 1, SOCKET_IP_TRANSPARENT_INDEX);
+
+    if (lua_tointeger(L, -1) > 0) {
+        pc->transparent = 1;
+        ngx_log_debug0(NGX_LOG_DEBUG_STREAM, r->connection->log, 0,
+                       "stream lua set TCP upstream with IP_TRANSPARENT");
+    }
+
+    lua_pop(L, 1);
+#endif
+
     if (connect_timeout > 0) {
         u->connect_timeout = (ngx_msec_t) connect_timeout;
 
@@ -1205,7 +1297,8 @@ ngx_stream_lua_socket_resolve_handler(ngx_resolver_ctx_t *ctx)
         addr.data = text;
 
         for (i = 0; i < ctx->naddrs; i++) {
-            addr.len = ngx_sock_ntop(ur->addrs[i].sockaddr, ur->addrs[i].socklen,
+            addr.len = ngx_sock_ntop(ur->addrs[i].sockaddr,
+                                     ur->addrs[i].socklen,
                                      text, NGX_SOCKADDR_STRLEN, 0);
 
             ngx_log_debug1(NGX_LOG_DEBUG_STREAM, r->connection->log, 0,
@@ -3259,8 +3352,50 @@ ngx_stream_lua_socket_tcp_shutdown(lua_State *L)
 static int
 ngx_stream_lua_socket_tcp_setoption(lua_State *L)
 {
-    /* TODO */
-    return 0;
+    ngx_stream_lua_ctx_t   *ctx;
+    int                     n;
+    int                     option;
+
+    ngx_stream_lua_request_t  *r;
+
+    n = lua_gettop(L);
+
+    if (n < 2) {
+        return luaL_error(L, "ngx.socket setoption: expecting 2 or 3 "
+                          "arguments (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_CONTENT
+                                  | NGX_STREAM_LUA_CONTEXT_TIMER);
+
+     luaL_checktype(L, 1, LUA_TTABLE);
+
+     option = luaL_checkint(L, 2);
+
+     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);
+
+    }
+
+    return 1;
 }
 
 
@@ -4252,7 +4387,8 @@ ngx_stream_lua_socket_tcp_conn_op_resume_handler(ngx_event_t *ev)
 
 
 static int
-ngx_stream_lua_socket_tcp_conn_op_resume_retval_handler(ngx_stream_lua_request_t *r,
+ngx_stream_lua_socket_tcp_conn_op_resume_retval_handler(
+    ngx_stream_lua_request_t *r,
     ngx_stream_lua_socket_tcp_upstream_t *u, lua_State *L)
 {
     int                                              nret;
@@ -5048,7 +5184,9 @@ ngx_stream_lua_req_socket_tcp(lua_State *L)
     raw = 1;
 
     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) {
@@ -5068,8 +5206,6 @@ ngx_stream_lua_req_socket_tcp(lua_State *L)
             return 2;
         }
 
-
-
         dd("ctx acquired raw req socket: %d", ctx->acquired_raw_req_socket);
 
         if (ctx->acquired_raw_req_socket) {
@@ -5192,6 +5328,7 @@ ngx_stream_lua_req_socket_rev_handler(ngx_stream_lua_request_t *r)
     u->read_event_handler(r, u);
 }
 
+
 static int
 ngx_stream_lua_socket_tcp_getreusedtimes(lua_State *L)
 {

src/ngx_stream_lua_socket_tcp.h

@@ -29,6 +29,9 @@
 #define NGX_STREAM_LUA_SOCKET_FT_CLIENTABORT   0x0080
 #define NGX_STREAM_LUA_SOCKET_FT_SSL           0x0100
 
+#if (NGX_HAVE_TRANSPARENT_PROXY)
+#define NGX_STREAM_LUA_SOCKET_OPTION_TRANSPARENT    1
+#endif
 
 typedef struct ngx_stream_lua_socket_tcp_upstream_s
         ngx_stream_lua_socket_tcp_upstream_t;