Merge branch 'openresty:master' into SSL_set_status_check

Author: Fahnenfluchtige

src/api/ngx_stream_lua_api.h

@@ -29,7 +29,7 @@
 /* Public API for other Nginx modules */
 
 
-#define ngx_stream_lua_version  16
+#define ngx_stream_lua_version    16
 
 
 typedef struct {

src/ngx_stream_lua_api.c

@@ -17,6 +17,13 @@
 #endif
 #include "ddebug.h"
 
+#if (NGX_LINUX)
+#include <linux/netfilter_ipv4.h>
+#if (NGX_HAVE_INET6)
+#include <linux/netfilter_ipv6.h>
+#include <linux/netfilter_ipv6/ip6_tables.h>
+#endif
+#endif
 
 #include "ngx_stream_lua_common.h"
 #include "api/ngx_stream_lua_api.h"
@@ -35,8 +42,6 @@ ngx_stream_lua_get_global_state(ngx_conf_t *cf)
 }
 
 
-
-
 static ngx_int_t ngx_stream_lua_shared_memory_init(ngx_shm_zone_t *shm_zone,
     void *data);
 
@@ -218,4 +223,84 @@ ngx_stream_lua_shared_memory_init(ngx_shm_zone_t *shm_zone, void *data)
     return NGX_OK;
 }
 
+
+#if (NGX_LINUX)
+int
+ngx_stream_lua_ffi_req_dst_addr(ngx_stream_lua_request_t *r, char *buf,
+    int *buf_size, u_char *errbuf, size_t *errbuf_size)
+{
+    int                fd;
+    int                opt_name;
+    int                family;
+    socklen_t          addr_sz;
+    socklen_t          len = sizeof(family);
+
+    struct sockaddr_storage addr;
+
+    addr_sz = sizeof(addr);
+    /* Check if connection exists */
+    if (r->session->connection == NULL) {
+        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "no connection")
+                       - errbuf;
+        return NGX_ERROR;
+    }
+
+    fd = r->session->connection->fd;
+
+    /* Validate file descriptor */
+    if (fd < 0) {
+        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "invalid fd")
+                       - errbuf;
+        return NGX_ERROR;
+    }
+
+    /* Get socket family using getsockopt */
+    if (getsockopt(fd, SOL_SOCKET, SO_DOMAIN, &family, &len) != 0) {
+        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size,
+                                    "failed to get socket family") - errbuf;
+        return NGX_ERROR;
+    }
+
+    memset(&addr, 0, addr_sz);
+
+    /* Get original destination address based on socket family */
+    if (family == AF_INET) {
+        /* IPv4 */
+        opt_name = SO_ORIGINAL_DST;
+        if (getsockopt(fd, SOL_IP, opt_name, &addr, &addr_sz) != 0) {
+            *errbuf_size
+                = ngx_snprintf(errbuf, *errbuf_size,
+                               "failed to get IPv4 origin addr") - errbuf;
+            return NGX_ERROR;
+        }
+
+#if (NGX_HAVE_INET6)
+
+    } else if (family == AF_INET6) {
+        /* IPv6 */
+        opt_name = IP6T_SO_ORIGINAL_DST;
+        if (getsockopt(fd, SOL_IPV6, opt_name, &addr, &addr_sz) != 0) {
+            *errbuf_size
+                = ngx_snprintf(errbuf, *errbuf_size,
+                               "failed to get IPv6 origin addr") - errbuf;
+            return NGX_ERROR;
+        }
+#endif
+
+    } else {
+        /* Unsupported address family */
+        *errbuf_size
+            = ngx_snprintf(errbuf, *errbuf_size,
+                           "unsupported address family: %d", family) - errbuf;
+        return NGX_ERROR;
+    }
+
+    /* Convert socket address to string representation */
+    *buf_size = ngx_sock_ntop((struct sockaddr *)&addr, addr_sz,
+                              (u_char *) buf, *buf_size, 1);
+
+    return NGX_OK;
+}
+#endif
+
 /* vi:set ft=c ts=4 sw=4 et fdm=marker: */

src/ngx_stream_lua_args.c

@@ -156,6 +156,4 @@ ngx_stream_lua_parse_args(lua_State *L, u_char *buf, u_char *last, int max)
 }
 
 
-
-
 /* vi:set ft=c ts=4 sw=4 et fdm=marker: */

src/ngx_stream_lua_common.h

@@ -246,8 +246,6 @@ struct ngx_stream_lua_main_conf_s {
 };
 
 
-
-
 struct ngx_stream_lua_srv_conf_s {
 #if (NGX_STREAM_SSL)
     ngx_ssl_t              *ssl;  /* shared by SSL cosockets */
@@ -330,6 +328,7 @@ struct ngx_stream_lua_srv_conf_s {
 
 };
 
+
 typedef ngx_stream_lua_srv_conf_t ngx_stream_lua_loc_conf_t;
 
 
@@ -360,8 +359,6 @@ struct ngx_stream_lua_posted_thread_s {
 };
 
 
-
-
 struct ngx_stream_lua_co_ctx_s {
     void                    *data;      /* user state for cosockets */
 
@@ -527,12 +524,9 @@ typedef struct ngx_stream_lua_ctx_s {
 } ngx_stream_lua_ctx_t;
 
 
-
-
 extern ngx_module_t ngx_stream_lua_module;
 
 
-
 #endif /* _NGX_STREAM_LUA_COMMON_H_INCLUDED_ */
 
 /* vi:set ft=c ts=4 sw=4 et fdm=marker: */

src/ngx_stream_lua_consts.c

@@ -47,5 +47,4 @@ ngx_stream_lua_inject_core_consts(lua_State *L)
 }
 
 
-
 /* vi:set ft=c ts=4 sw=4 et fdm=marker: */

src/ngx_stream_lua_contentby.c

@@ -208,8 +208,6 @@ ngx_stream_lua_content_handler(ngx_stream_session_t *s)
 }
 
 
-
-
 ngx_int_t
 ngx_stream_lua_content_handler_file(ngx_stream_lua_request_t *r)
 {

src/ngx_stream_lua_control.c

@@ -40,8 +40,6 @@ ngx_stream_lua_inject_control_api(ngx_log_t *log, lua_State *L)
 }
 
 
-
-
 static int
 ngx_stream_lua_on_abort(lua_State *L)
 {

src/ngx_stream_lua_ctx.c

@@ -55,7 +55,8 @@ ngx_stream_lua_ngx_set_ctx_helper(lua_State *L, ngx_stream_lua_request_t *r,
         lua_pop(L, 1);
 
         pool = r->pool;
-        if (ngx_stream_lua_ngx_ctx_add_cleanup(r, pool, ctx->ctx_ref) != NGX_OK) {
+        if (ngx_stream_lua_ngx_ctx_add_cleanup(r, pool, ctx->ctx_ref) != NGX_OK)
+        {
             return luaL_error(L, "no memory");
         }
 
@@ -160,8 +161,8 @@ ngx_stream_lua_ffi_set_ctx_ref(ngx_stream_lua_request_t *r, int ref)
 
 
 static ngx_int_t
-ngx_stream_lua_ngx_ctx_add_cleanup(ngx_stream_lua_request_t *r, ngx_pool_t *pool,
-    int ref)
+ngx_stream_lua_ngx_ctx_add_cleanup(ngx_stream_lua_request_t *r,
+    ngx_pool_t *pool, int ref)
 {
     lua_State                   *L;
     ngx_pool_cleanup_t          *cln;

src/ngx_stream_lua_directive.c

@@ -234,12 +234,6 @@ ngx_stream_lua_package_path(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 }
 
 
-
-
-
-
-
-
 char *
 ngx_stream_lua_preread_by_lua_block(ngx_conf_t *cf, ngx_command_t *cmd,
     void *conf)
@@ -354,6 +348,7 @@ ngx_stream_lua_preread_by_lua(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
     return NGX_CONF_OK;
 }
 
+
 char *
 ngx_stream_lua_content_by_lua_block(ngx_conf_t *cf, ngx_command_t *cmd,
     void *conf)
@@ -597,8 +592,6 @@ ngx_stream_lua_log_by_lua(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 }
 
 
-
-
 char *
 ngx_stream_lua_init_by_lua_block(ngx_conf_t *cf, ngx_command_t *cmd,
     void *conf)
@@ -727,8 +720,6 @@ ngx_stream_lua_init_worker_by_lua(ngx_conf_t *cf, ngx_command_t *cmd,
 }
 
 
-
-
 static u_char *
 ngx_stream_lua_gen_chunk_name(ngx_conf_t *cf, const char *tag, size_t tag_len,
     size_t *chunkname_len)
@@ -870,13 +861,15 @@ ngx_stream_lua_conf_lua_block_parse(ngx_conf_t *cf, ngx_command_t *cmd)
                 if (dst == NULL) {
                     return NGX_CONF_ERROR;
                 }
+
                 dst->len = len;
                 dst->len--;  /* skip the trailing '}' block terminator */
 
                 p = ngx_palloc(cf->pool, len);
                 if (p == NULL) {
                     return NGX_CONF_ERROR;
                 }
+
                 dst->data = p;
 
                 for (i = 0; i < cf->args->nelts; i++) {

src/ngx_stream_lua_initworkerby.c

@@ -158,6 +158,7 @@ ngx_stream_lua_init_worker(ngx_cycle_t *cycle)
             if (part->next == NULL) {
                 break;
             }
+
             part = part->next;
             ofile = part->elts;
             i = 0;