aboutsummaryrefslogtreecommitdiff
path: root/src/stream
diff options
context:
space:
mode:
Diffstat (limited to 'src/stream')
-rw-r--r--src/stream/ngx_stream.h12
-rw-r--r--src/stream/ngx_stream_core_module.c2
2 files changed, 2 insertions, 12 deletions
diff --git a/src/stream/ngx_stream.h b/src/stream/ngx_stream.h
index 77db43dda..a03e29f64 100644
--- a/src/stream/ngx_stream.h
+++ b/src/stream/ngx_stream.h
@@ -31,17 +31,7 @@ typedef struct {
typedef struct {
- union {
- struct sockaddr sockaddr;
- struct sockaddr_in sockaddr_in;
-#if (NGX_HAVE_INET6)
- struct sockaddr_in6 sockaddr_in6;
-#endif
-#if (NGX_HAVE_UNIX_DOMAIN)
- struct sockaddr_un sockaddr_un;
-#endif
- } u;
-
+ ngx_sockaddr_t u;
socklen_t socklen;
/* server ctx */
diff --git a/src/stream/ngx_stream_core_module.c b/src/stream/ngx_stream_core_module.c
index ccc3d791a..5d00c57db 100644
--- a/src/stream/ngx_stream_core_module.c
+++ b/src/stream/ngx_stream_core_module.c
@@ -280,7 +280,7 @@ ngx_stream_core_listen(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
ngx_memzero(ls, sizeof(ngx_stream_listen_t));
- ngx_memcpy(&ls->u.sockaddr, u.sockaddr, u.socklen);
+ ngx_memcpy(&ls->u.sockaddr, &u.sockaddr, u.socklen);
ls->socklen = u.socklen;
ls->backlog = NGX_LISTEN_BACKLOG;