Hakase/nginx-build
2
1 Fork 1
Code Issues Pull Requests Releases Activity

Latest update - 7591

Browse Source
This commit is contained in:
Hakase
2019-10-24 21:00:01 +09:00
parent 7451bdd624
commit d12bc8b656
8 changed files with 243 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/stream/ngx_stream_realip_module.c
+4 -4
View File
@@ -108,7 +108,7 @@ ngx_stream_realip_handler(ngx_stream_session_t *s)
c = s->connection;
if (c->proxy_protocol_addr.len == 0) {
if (c->proxy_protocol == NULL) {
return NGX_DECLINED;
}
@@ -116,14 +116,14 @@ ngx_stream_realip_handler(ngx_stream_session_t *s)
return NGX_DECLINED;
}
if (ngx_parse_addr(c->pool, &addr, c->proxy_protocol_addr.data,
c->proxy_protocol_addr.len)
if (ngx_parse_addr(c->pool, &addr, c->proxy_protocol->src_addr.data,
c->proxy_protocol->src_addr.len)
!= NGX_OK)
{
return NGX_DECLINED;
}
ngx_inet_set_port(addr.sockaddr, c->proxy_protocol_port);
ngx_inet_set_port(addr.sockaddr, c->proxy_protocol->src_port);
return ngx_stream_realip_set_addr(s, &addr);
}
src/stream/ngx_stream_variables.c
+34 -6
View File
@@ -64,10 +64,20 @@ static ngx_stream_variable_t ngx_stream_core_variables[] = {
ngx_stream_variable_remote_port, 0, 0, 0 },
{ ngx_string("proxy_protocol_addr"), NULL,
ngx_stream_variable_proxy_protocol_addr, 0, 0, 0 },
ngx_stream_variable_proxy_protocol_addr,
offsetof(ngx_proxy_protocol_t, src_addr), 0, 0 },
{ ngx_string("proxy_protocol_port"), NULL,
ngx_stream_variable_proxy_protocol_port, 0, 0, 0 },
ngx_stream_variable_proxy_protocol_port,
offsetof(ngx_proxy_protocol_t, src_port), 0, 0 },
{ ngx_string("proxy_protocol_server_addr"), NULL,
ngx_stream_variable_proxy_protocol_addr,
offsetof(ngx_proxy_protocol_t, dst_addr), 0, 0 },
{ ngx_string("proxy_protocol_server_port"), NULL,
ngx_stream_variable_proxy_protocol_port,
offsetof(ngx_proxy_protocol_t, dst_port), 0, 0 },
{ ngx_string("server_addr"), NULL,
ngx_stream_variable_server_addr, 0, 0, 0 },
@@ -557,11 +567,22 @@ static ngx_int_t
ngx_stream_variable_proxy_protocol_addr(ngx_stream_session_t *s,
ngx_stream_variable_value_t *v, uintptr_t data)
{
v->len = s->connection->proxy_protocol_addr.len;
ngx_str_t *addr;
ngx_proxy_protocol_t *pp;
pp = s->connection->proxy_protocol;
if (pp == NULL) {
v->not_found = 1;
return NGX_OK;
}
addr = (ngx_str_t *) ((char *) pp + data);
v->len = addr->len;
v->valid = 1;
v->no_cacheable = 0;
v->not_found = 0;
v->data = s->connection->proxy_protocol_addr.data;
v->data = addr->data;
return NGX_OK;
}
@@ -571,7 +592,14 @@ static ngx_int_t
ngx_stream_variable_proxy_protocol_port(ngx_stream_session_t *s,
ngx_stream_variable_value_t *v, uintptr_t data)
{
ngx_uint_t port;
ngx_uint_t port;
ngx_proxy_protocol_t *pp;
pp = s->connection->proxy_protocol;
if (pp == NULL) {
v->not_found = 1;
return NGX_OK;
}
v->len = 0;
v->valid = 1;
@@ -583,7 +611,7 @@ ngx_stream_variable_proxy_protocol_port(ngx_stream_session_t *s,
return NGX_ERROR;
}
port = s->connection->proxy_protocol_port;
port = *(in_port_t *) ((char *) pp + data);
if (port > 0 && port < 65536) {
v->len = ngx_sprintf(v->data, "%ui", port) - v->data;