nginx: src/core/ngx_proxy_protocol.c annotate

annotate src/core/ngx_proxy_protocol.c @ 8071:017fd847f4f7

Log only the first line of user input on PROXY protocol v1 error. Previously, all received user input was logged. If a multi-line text was received from client and logged, it could reduce log readability and also make it harder to parse nginx log by scripts. The change brings to PROXY protocol the same behavior that exists for HTTP request line in ngx_http_log_error_handler().

author	Roman Arutyunyan <arut@nginx.com>
date	Mon, 10 Oct 2022 13:57:31 +0400
parents	89adf49fe76a
children	cca4c8a715de

rev	line source
5605 3a72b1805c52 Added server-side support for PROXY protocol v1 (ticket #355). Roman Arutyunyan <arut@nginx.com> parents: diff changeset	1
3a72b1805c52 Added server-side support for PROXY protocol v1 (ticket #355). Roman Arutyunyan <arut@nginx.com> parents: diff changeset	2 /*
3a72b1805c52 Added server-side support for PROXY protocol v1 (ticket #355). Roman Arutyunyan <arut@nginx.com> parents: diff changeset	3 * Copyright (C) Roman Arutyunyan
3a72b1805c52 Added server-side support for PROXY protocol v1 (ticket #355). Roman Arutyunyan <arut@nginx.com> parents: diff changeset	4 * Copyright (C) Nginx, Inc.
3a72b1805c52 Added server-side support for PROXY protocol v1 (ticket #355). Roman Arutyunyan <arut@nginx.com> parents: diff changeset	5 */
3a72b1805c52 Added server-side support for PROXY protocol v1 (ticket #355). Roman Arutyunyan <arut@nginx.com> parents: diff changeset	6
3a72b1805c52 Added server-side support for PROXY protocol v1 (ticket #355). Roman Arutyunyan <arut@nginx.com> parents: diff changeset	7
3a72b1805c52 Added server-side support for PROXY protocol v1 (ticket #355). Roman Arutyunyan <arut@nginx.com> parents: diff changeset	8 #include <ngx_config.h>
3a72b1805c52 Added server-side support for PROXY protocol v1 (ticket #355). Roman Arutyunyan <arut@nginx.com> parents: diff changeset	9 #include <ngx_core.h>
3a72b1805c52 Added server-side support for PROXY protocol v1 (ticket #355). Roman Arutyunyan <arut@nginx.com> parents: diff changeset	10
3a72b1805c52 Added server-side support for PROXY protocol v1 (ticket #355). Roman Arutyunyan <arut@nginx.com> parents: diff changeset	11
7253 63e91f263a49 Core: revised the PROXY protocol v2 code. Ruslan Ermilov <ru@nginx.com> parents: 7252 diff changeset	12 #define NGX_PROXY_PROTOCOL_AF_INET 1
63e91f263a49 Core: revised the PROXY protocol v2 code. Ruslan Ermilov <ru@nginx.com> parents: 7252 diff changeset	13 #define NGX_PROXY_PROTOCOL_AF_INET6 2
7251 416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	14
416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	15
7253 63e91f263a49 Core: revised the PROXY protocol v2 code. Ruslan Ermilov <ru@nginx.com> parents: 7252 diff changeset	16 #define ngx_proxy_protocol_parse_uint16(p) ((p)[0] << 8 \| (p)[1])
7251 416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	17
416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	18
416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	19 typedef struct {
7253 63e91f263a49 Core: revised the PROXY protocol v2 code. Ruslan Ermilov <ru@nginx.com> parents: 7252 diff changeset	20 u_char signature[12];
63e91f263a49 Core: revised the PROXY protocol v2 code. Ruslan Ermilov <ru@nginx.com> parents: 7252 diff changeset	21 u_char version_command;
63e91f263a49 Core: revised the PROXY protocol v2 code. Ruslan Ermilov <ru@nginx.com> parents: 7252 diff changeset	22 u_char family_transport;
63e91f263a49 Core: revised the PROXY protocol v2 code. Ruslan Ermilov <ru@nginx.com> parents: 7252 diff changeset	23 u_char len[2];
63e91f263a49 Core: revised the PROXY protocol v2 code. Ruslan Ermilov <ru@nginx.com> parents: 7252 diff changeset	24 } ngx_proxy_protocol_header_t;
7251 416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	25
416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	26
416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	27 typedef struct {
7254 1fd992589ffe Core: fixed build, broken by 63e91f263a49. Vladimir Homutov <vl@nginx.com> parents: 7253 diff changeset	28 u_char src_addr[4];
1fd992589ffe Core: fixed build, broken by 63e91f263a49. Vladimir Homutov <vl@nginx.com> parents: 7253 diff changeset	29 u_char dst_addr[4];
1fd992589ffe Core: fixed build, broken by 63e91f263a49. Vladimir Homutov <vl@nginx.com> parents: 7253 diff changeset	30 u_char src_port[2];
1fd992589ffe Core: fixed build, broken by 63e91f263a49. Vladimir Homutov <vl@nginx.com> parents: 7253 diff changeset	31 u_char dst_port[2];
7253 63e91f263a49 Core: revised the PROXY protocol v2 code. Ruslan Ermilov <ru@nginx.com> parents: 7252 diff changeset	32 } ngx_proxy_protocol_inet_addrs_t;
7251 416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	33
416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	34
416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	35 typedef struct {
7254 1fd992589ffe Core: fixed build, broken by 63e91f263a49. Vladimir Homutov <vl@nginx.com> parents: 7253 diff changeset	36 u_char src_addr[16];
1fd992589ffe Core: fixed build, broken by 63e91f263a49. Vladimir Homutov <vl@nginx.com> parents: 7253 diff changeset	37 u_char dst_addr[16];
1fd992589ffe Core: fixed build, broken by 63e91f263a49. Vladimir Homutov <vl@nginx.com> parents: 7253 diff changeset	38 u_char src_port[2];
1fd992589ffe Core: fixed build, broken by 63e91f263a49. Vladimir Homutov <vl@nginx.com> parents: 7253 diff changeset	39 u_char dst_port[2];
7253 63e91f263a49 Core: revised the PROXY protocol v2 code. Ruslan Ermilov <ru@nginx.com> parents: 7252 diff changeset	40 } ngx_proxy_protocol_inet6_addrs_t;
7251 416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	41
416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	42
7591 89adf49fe76a Parsing server PROXY protocol address and port (ticket #1206). Roman Arutyunyan <arut@nginx.com> parents: 7590 diff changeset	43 static u_char ngx_proxy_protocol_read_addr(ngx_connection_t c, u_char *p,
89adf49fe76a Parsing server PROXY protocol address and port (ticket #1206). Roman Arutyunyan <arut@nginx.com> parents: 7590 diff changeset	44 u_char last, ngx_str_t addr);
89adf49fe76a Parsing server PROXY protocol address and port (ticket #1206). Roman Arutyunyan <arut@nginx.com> parents: 7590 diff changeset	45 static u_char ngx_proxy_protocol_read_port(u_char p, u_char *last,
89adf49fe76a Parsing server PROXY protocol address and port (ticket #1206). Roman Arutyunyan <arut@nginx.com> parents: 7590 diff changeset	46 in_port_t *port, u_char sep);
7251 416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	47 static u_char ngx_proxy_protocol_v2_read(ngx_connection_t c, u_char *buf,
416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	48 u_char *last);
416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	49
416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	50
5605 3a72b1805c52 Added server-side support for PROXY protocol v1 (ticket #355). Roman Arutyunyan <arut@nginx.com> parents: diff changeset	51 u_char *
6185 a420cb1c170b Core: renamed ngx_proxy_protocol_parse to ngx_proxy_protocol_read. Roman Arutyunyan <arut@nginx.com> parents: 6184 diff changeset	52 ngx_proxy_protocol_read(ngx_connection_t c, u_char buf, u_char *last)
5605 3a72b1805c52 Added server-side support for PROXY protocol v1 (ticket #355). Roman Arutyunyan <arut@nginx.com> parents: diff changeset	53 {
7590 06b01840bd42 Core: moved PROXY protocol fields out of ngx_connection_t. Roman Arutyunyan <arut@nginx.com> parents: 7254 diff changeset	54 size_t len;
7591 89adf49fe76a Parsing server PROXY protocol address and port (ticket #1206). Roman Arutyunyan <arut@nginx.com> parents: 7590 diff changeset	55 u_char *p;
7590 06b01840bd42 Core: moved PROXY protocol fields out of ngx_connection_t. Roman Arutyunyan <arut@nginx.com> parents: 7254 diff changeset	56 ngx_proxy_protocol_t *pp;
5605 3a72b1805c52 Added server-side support for PROXY protocol v1 (ticket #355). Roman Arutyunyan <arut@nginx.com> parents: diff changeset	57
7253 63e91f263a49 Core: revised the PROXY protocol v2 code. Ruslan Ermilov <ru@nginx.com> parents: 7252 diff changeset	58 static const u_char signature[] = "\r\n\r\n\0\r\nQUIT\n";
63e91f263a49 Core: revised the PROXY protocol v2 code. Ruslan Ermilov <ru@nginx.com> parents: 7252 diff changeset	59
5605 3a72b1805c52 Added server-side support for PROXY protocol v1 (ticket #355). Roman Arutyunyan <arut@nginx.com> parents: diff changeset	60 p = buf;
3a72b1805c52 Added server-side support for PROXY protocol v1 (ticket #355). Roman Arutyunyan <arut@nginx.com> parents: diff changeset	61 len = last - buf;
3a72b1805c52 Added server-side support for PROXY protocol v1 (ticket #355). Roman Arutyunyan <arut@nginx.com> parents: diff changeset	62
7253 63e91f263a49 Core: revised the PROXY protocol v2 code. Ruslan Ermilov <ru@nginx.com> parents: 7252 diff changeset	63 if (len >= sizeof(ngx_proxy_protocol_header_t)
63e91f263a49 Core: revised the PROXY protocol v2 code. Ruslan Ermilov <ru@nginx.com> parents: 7252 diff changeset	64 && memcmp(p, signature, sizeof(signature) - 1) == 0)
7251 416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	65 {
416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	66 return ngx_proxy_protocol_v2_read(c, buf, last);
416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	67 }
416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	68
5605 3a72b1805c52 Added server-side support for PROXY protocol v1 (ticket #355). Roman Arutyunyan <arut@nginx.com> parents: diff changeset	69 if (len < 8 \|\| ngx_strncmp(p, "PROXY ", 6) != 0) {
3a72b1805c52 Added server-side support for PROXY protocol v1 (ticket #355). Roman Arutyunyan <arut@nginx.com> parents: diff changeset	70 goto invalid;
3a72b1805c52 Added server-side support for PROXY protocol v1 (ticket #355). Roman Arutyunyan <arut@nginx.com> parents: diff changeset	71 }
3a72b1805c52 Added server-side support for PROXY protocol v1 (ticket #355). Roman Arutyunyan <arut@nginx.com> parents: diff changeset	72
3a72b1805c52 Added server-side support for PROXY protocol v1 (ticket #355). Roman Arutyunyan <arut@nginx.com> parents: diff changeset	73 p += 6;
3a72b1805c52 Added server-side support for PROXY protocol v1 (ticket #355). Roman Arutyunyan <arut@nginx.com> parents: diff changeset	74 len -= 6;
3a72b1805c52 Added server-side support for PROXY protocol v1 (ticket #355). Roman Arutyunyan <arut@nginx.com> parents: diff changeset	75
3a72b1805c52 Added server-side support for PROXY protocol v1 (ticket #355). Roman Arutyunyan <arut@nginx.com> parents: diff changeset	76 if (len >= 7 && ngx_strncmp(p, "UNKNOWN", 7) == 0) {
3a72b1805c52 Added server-side support for PROXY protocol v1 (ticket #355). Roman Arutyunyan <arut@nginx.com> parents: diff changeset	77 ngx_log_debug0(NGX_LOG_DEBUG_CORE, c->log, 0,
3a72b1805c52 Added server-side support for PROXY protocol v1 (ticket #355). Roman Arutyunyan <arut@nginx.com> parents: diff changeset	78 "PROXY protocol unknown protocol");
3a72b1805c52 Added server-side support for PROXY protocol v1 (ticket #355). Roman Arutyunyan <arut@nginx.com> parents: diff changeset	79 p += 7;
3a72b1805c52 Added server-side support for PROXY protocol v1 (ticket #355). Roman Arutyunyan <arut@nginx.com> parents: diff changeset	80 goto skip;
3a72b1805c52 Added server-side support for PROXY protocol v1 (ticket #355). Roman Arutyunyan <arut@nginx.com> parents: diff changeset	81 }
3a72b1805c52 Added server-side support for PROXY protocol v1 (ticket #355). Roman Arutyunyan <arut@nginx.com> parents: diff changeset	82
3a72b1805c52 Added server-side support for PROXY protocol v1 (ticket #355). Roman Arutyunyan <arut@nginx.com> parents: diff changeset	83 if (len < 5 \|\| ngx_strncmp(p, "TCP", 3) != 0
3a72b1805c52 Added server-side support for PROXY protocol v1 (ticket #355). Roman Arutyunyan <arut@nginx.com> parents: diff changeset	84 \|\| (p[3] != '4' && p[3] != '6') \|\| p[4] != ' ')
3a72b1805c52 Added server-side support for PROXY protocol v1 (ticket #355). Roman Arutyunyan <arut@nginx.com> parents: diff changeset	85 {
3a72b1805c52 Added server-side support for PROXY protocol v1 (ticket #355). Roman Arutyunyan <arut@nginx.com> parents: diff changeset	86 goto invalid;
3a72b1805c52 Added server-side support for PROXY protocol v1 (ticket #355). Roman Arutyunyan <arut@nginx.com> parents: diff changeset	87 }
3a72b1805c52 Added server-side support for PROXY protocol v1 (ticket #355). Roman Arutyunyan <arut@nginx.com> parents: diff changeset	88
3a72b1805c52 Added server-side support for PROXY protocol v1 (ticket #355). Roman Arutyunyan <arut@nginx.com> parents: diff changeset	89 p += 5;
3a72b1805c52 Added server-side support for PROXY protocol v1 (ticket #355). Roman Arutyunyan <arut@nginx.com> parents: diff changeset	90
7590 06b01840bd42 Core: moved PROXY protocol fields out of ngx_connection_t. Roman Arutyunyan <arut@nginx.com> parents: 7254 diff changeset	91 pp = ngx_pcalloc(c->pool, sizeof(ngx_proxy_protocol_t));
06b01840bd42 Core: moved PROXY protocol fields out of ngx_connection_t. Roman Arutyunyan <arut@nginx.com> parents: 7254 diff changeset	92 if (pp == NULL) {
5605 3a72b1805c52 Added server-side support for PROXY protocol v1 (ticket #355). Roman Arutyunyan <arut@nginx.com> parents: diff changeset	93 return NULL;
3a72b1805c52 Added server-side support for PROXY protocol v1 (ticket #355). Roman Arutyunyan <arut@nginx.com> parents: diff changeset	94 }
3a72b1805c52 Added server-side support for PROXY protocol v1 (ticket #355). Roman Arutyunyan <arut@nginx.com> parents: diff changeset	95
7591 89adf49fe76a Parsing server PROXY protocol address and port (ticket #1206). Roman Arutyunyan <arut@nginx.com> parents: 7590 diff changeset	96 p = ngx_proxy_protocol_read_addr(c, p, last, &pp->src_addr);
89adf49fe76a Parsing server PROXY protocol address and port (ticket #1206). Roman Arutyunyan <arut@nginx.com> parents: 7590 diff changeset	97 if (p == NULL) {
89adf49fe76a Parsing server PROXY protocol address and port (ticket #1206). Roman Arutyunyan <arut@nginx.com> parents: 7590 diff changeset	98 goto invalid;
7590 06b01840bd42 Core: moved PROXY protocol fields out of ngx_connection_t. Roman Arutyunyan <arut@nginx.com> parents: 7254 diff changeset	99 }
06b01840bd42 Core: moved PROXY protocol fields out of ngx_connection_t. Roman Arutyunyan <arut@nginx.com> parents: 7254 diff changeset	100
7591 89adf49fe76a Parsing server PROXY protocol address and port (ticket #1206). Roman Arutyunyan <arut@nginx.com> parents: 7590 diff changeset	101 p = ngx_proxy_protocol_read_addr(c, p, last, &pp->dst_addr);
89adf49fe76a Parsing server PROXY protocol address and port (ticket #1206). Roman Arutyunyan <arut@nginx.com> parents: 7590 diff changeset	102 if (p == NULL) {
89adf49fe76a Parsing server PROXY protocol address and port (ticket #1206). Roman Arutyunyan <arut@nginx.com> parents: 7590 diff changeset	103 goto invalid;
6561 28c76d9d75b7 Added the $proxy_protocol_port variable. Dmitry Volyntsev <xeioex@nginx.com> parents: 6185 diff changeset	104 }
28c76d9d75b7 Added the $proxy_protocol_port variable. Dmitry Volyntsev <xeioex@nginx.com> parents: 6185 diff changeset	105
7591 89adf49fe76a Parsing server PROXY protocol address and port (ticket #1206). Roman Arutyunyan <arut@nginx.com> parents: 7590 diff changeset	106 p = ngx_proxy_protocol_read_port(p, last, &pp->src_port, ' ');
89adf49fe76a Parsing server PROXY protocol address and port (ticket #1206). Roman Arutyunyan <arut@nginx.com> parents: 7590 diff changeset	107 if (p == NULL) {
6561 28c76d9d75b7 Added the $proxy_protocol_port variable. Dmitry Volyntsev <xeioex@nginx.com> parents: 6185 diff changeset	108 goto invalid;
28c76d9d75b7 Added the $proxy_protocol_port variable. Dmitry Volyntsev <xeioex@nginx.com> parents: 6185 diff changeset	109 }
28c76d9d75b7 Added the $proxy_protocol_port variable. Dmitry Volyntsev <xeioex@nginx.com> parents: 6185 diff changeset	110
7591 89adf49fe76a Parsing server PROXY protocol address and port (ticket #1206). Roman Arutyunyan <arut@nginx.com> parents: 7590 diff changeset	111 p = ngx_proxy_protocol_read_port(p, last, &pp->dst_port, CR);
89adf49fe76a Parsing server PROXY protocol address and port (ticket #1206). Roman Arutyunyan <arut@nginx.com> parents: 7590 diff changeset	112 if (p == NULL) {
89adf49fe76a Parsing server PROXY protocol address and port (ticket #1206). Roman Arutyunyan <arut@nginx.com> parents: 7590 diff changeset	113 goto invalid;
89adf49fe76a Parsing server PROXY protocol address and port (ticket #1206). Roman Arutyunyan <arut@nginx.com> parents: 7590 diff changeset	114 }
6561 28c76d9d75b7 Added the $proxy_protocol_port variable. Dmitry Volyntsev <xeioex@nginx.com> parents: 6185 diff changeset	115
7591 89adf49fe76a Parsing server PROXY protocol address and port (ticket #1206). Roman Arutyunyan <arut@nginx.com> parents: 7590 diff changeset	116 if (p == last) {
89adf49fe76a Parsing server PROXY protocol address and port (ticket #1206). Roman Arutyunyan <arut@nginx.com> parents: 7590 diff changeset	117 goto invalid;
89adf49fe76a Parsing server PROXY protocol address and port (ticket #1206). Roman Arutyunyan <arut@nginx.com> parents: 7590 diff changeset	118 }
89adf49fe76a Parsing server PROXY protocol address and port (ticket #1206). Roman Arutyunyan <arut@nginx.com> parents: 7590 diff changeset	119
89adf49fe76a Parsing server PROXY protocol address and port (ticket #1206). Roman Arutyunyan <arut@nginx.com> parents: 7590 diff changeset	120 if (*p++ != LF) {
89adf49fe76a Parsing server PROXY protocol address and port (ticket #1206). Roman Arutyunyan <arut@nginx.com> parents: 7590 diff changeset	121 goto invalid;
89adf49fe76a Parsing server PROXY protocol address and port (ticket #1206). Roman Arutyunyan <arut@nginx.com> parents: 7590 diff changeset	122 }
89adf49fe76a Parsing server PROXY protocol address and port (ticket #1206). Roman Arutyunyan <arut@nginx.com> parents: 7590 diff changeset	123
89adf49fe76a Parsing server PROXY protocol address and port (ticket #1206). Roman Arutyunyan <arut@nginx.com> parents: 7590 diff changeset	124 ngx_log_debug4(NGX_LOG_DEBUG_CORE, c->log, 0,
89adf49fe76a Parsing server PROXY protocol address and port (ticket #1206). Roman Arutyunyan <arut@nginx.com> parents: 7590 diff changeset	125 "PROXY protocol src: %V %d, dst: %V %d",
89adf49fe76a Parsing server PROXY protocol address and port (ticket #1206). Roman Arutyunyan <arut@nginx.com> parents: 7590 diff changeset	126 &pp->src_addr, pp->src_port, &pp->dst_addr, pp->dst_port);
7590 06b01840bd42 Core: moved PROXY protocol fields out of ngx_connection_t. Roman Arutyunyan <arut@nginx.com> parents: 7254 diff changeset	127
06b01840bd42 Core: moved PROXY protocol fields out of ngx_connection_t. Roman Arutyunyan <arut@nginx.com> parents: 7254 diff changeset	128 c->proxy_protocol = pp;
5605 3a72b1805c52 Added server-side support for PROXY protocol v1 (ticket #355). Roman Arutyunyan <arut@nginx.com> parents: diff changeset	129
7591 89adf49fe76a Parsing server PROXY protocol address and port (ticket #1206). Roman Arutyunyan <arut@nginx.com> parents: 7590 diff changeset	130 return p;
89adf49fe76a Parsing server PROXY protocol address and port (ticket #1206). Roman Arutyunyan <arut@nginx.com> parents: 7590 diff changeset	131
5605 3a72b1805c52 Added server-side support for PROXY protocol v1 (ticket #355). Roman Arutyunyan <arut@nginx.com> parents: diff changeset	132 skip:
3a72b1805c52 Added server-side support for PROXY protocol v1 (ticket #355). Roman Arutyunyan <arut@nginx.com> parents: diff changeset	133
3a72b1805c52 Added server-side support for PROXY protocol v1 (ticket #355). Roman Arutyunyan <arut@nginx.com> parents: diff changeset	134 for ( /* void */ ; p < last - 1; p++) {
3a72b1805c52 Added server-side support for PROXY protocol v1 (ticket #355). Roman Arutyunyan <arut@nginx.com> parents: diff changeset	135 if (p[0] == CR && p[1] == LF) {
3a72b1805c52 Added server-side support for PROXY protocol v1 (ticket #355). Roman Arutyunyan <arut@nginx.com> parents: diff changeset	136 return p + 2;
3a72b1805c52 Added server-side support for PROXY protocol v1 (ticket #355). Roman Arutyunyan <arut@nginx.com> parents: diff changeset	137 }
3a72b1805c52 Added server-side support for PROXY protocol v1 (ticket #355). Roman Arutyunyan <arut@nginx.com> parents: diff changeset	138 }
3a72b1805c52 Added server-side support for PROXY protocol v1 (ticket #355). Roman Arutyunyan <arut@nginx.com> parents: diff changeset	139
3a72b1805c52 Added server-side support for PROXY protocol v1 (ticket #355). Roman Arutyunyan <arut@nginx.com> parents: diff changeset	140 invalid:
3a72b1805c52 Added server-side support for PROXY protocol v1 (ticket #355). Roman Arutyunyan <arut@nginx.com> parents: diff changeset	141
8071 017fd847f4f7 Log only the first line of user input on PROXY protocol v1 error. Roman Arutyunyan <arut@nginx.com> parents: 7591 diff changeset	142 for (p = buf; p < last; p++) {
017fd847f4f7 Log only the first line of user input on PROXY protocol v1 error. Roman Arutyunyan <arut@nginx.com> parents: 7591 diff changeset	143 if (p == CR \|\| p == LF) {
017fd847f4f7 Log only the first line of user input on PROXY protocol v1 error. Roman Arutyunyan <arut@nginx.com> parents: 7591 diff changeset	144 break;
017fd847f4f7 Log only the first line of user input on PROXY protocol v1 error. Roman Arutyunyan <arut@nginx.com> parents: 7591 diff changeset	145 }
017fd847f4f7 Log only the first line of user input on PROXY protocol v1 error. Roman Arutyunyan <arut@nginx.com> parents: 7591 diff changeset	146 }
017fd847f4f7 Log only the first line of user input on PROXY protocol v1 error. Roman Arutyunyan <arut@nginx.com> parents: 7591 diff changeset	147
5605 3a72b1805c52 Added server-side support for PROXY protocol v1 (ticket #355). Roman Arutyunyan <arut@nginx.com> parents: diff changeset	148 ngx_log_error(NGX_LOG_ERR, c->log, 0,
8071 017fd847f4f7 Log only the first line of user input on PROXY protocol v1 error. Roman Arutyunyan <arut@nginx.com> parents: 7591 diff changeset	149 "broken header: \"%*s\"", (size_t) (p - buf), buf);
5605 3a72b1805c52 Added server-side support for PROXY protocol v1 (ticket #355). Roman Arutyunyan <arut@nginx.com> parents: diff changeset	150
3a72b1805c52 Added server-side support for PROXY protocol v1 (ticket #355). Roman Arutyunyan <arut@nginx.com> parents: diff changeset	151 return NULL;
3a72b1805c52 Added server-side support for PROXY protocol v1 (ticket #355). Roman Arutyunyan <arut@nginx.com> parents: diff changeset	152 }
6184 fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 5605 diff changeset	153
fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 5605 diff changeset	154
7591 89adf49fe76a Parsing server PROXY protocol address and port (ticket #1206). Roman Arutyunyan <arut@nginx.com> parents: 7590 diff changeset	155 static u_char *
89adf49fe76a Parsing server PROXY protocol address and port (ticket #1206). Roman Arutyunyan <arut@nginx.com> parents: 7590 diff changeset	156 ngx_proxy_protocol_read_addr(ngx_connection_t c, u_char p, u_char *last,
89adf49fe76a Parsing server PROXY protocol address and port (ticket #1206). Roman Arutyunyan <arut@nginx.com> parents: 7590 diff changeset	157 ngx_str_t *addr)
89adf49fe76a Parsing server PROXY protocol address and port (ticket #1206). Roman Arutyunyan <arut@nginx.com> parents: 7590 diff changeset	158 {
89adf49fe76a Parsing server PROXY protocol address and port (ticket #1206). Roman Arutyunyan <arut@nginx.com> parents: 7590 diff changeset	159 size_t len;
89adf49fe76a Parsing server PROXY protocol address and port (ticket #1206). Roman Arutyunyan <arut@nginx.com> parents: 7590 diff changeset	160 u_char ch, *pos;
89adf49fe76a Parsing server PROXY protocol address and port (ticket #1206). Roman Arutyunyan <arut@nginx.com> parents: 7590 diff changeset	161
89adf49fe76a Parsing server PROXY protocol address and port (ticket #1206). Roman Arutyunyan <arut@nginx.com> parents: 7590 diff changeset	162 pos = p;
89adf49fe76a Parsing server PROXY protocol address and port (ticket #1206). Roman Arutyunyan <arut@nginx.com> parents: 7590 diff changeset	163
89adf49fe76a Parsing server PROXY protocol address and port (ticket #1206). Roman Arutyunyan <arut@nginx.com> parents: 7590 diff changeset	164 for ( ;; ) {
89adf49fe76a Parsing server PROXY protocol address and port (ticket #1206). Roman Arutyunyan <arut@nginx.com> parents: 7590 diff changeset	165 if (p == last) {
89adf49fe76a Parsing server PROXY protocol address and port (ticket #1206). Roman Arutyunyan <arut@nginx.com> parents: 7590 diff changeset	166 return NULL;
89adf49fe76a Parsing server PROXY protocol address and port (ticket #1206). Roman Arutyunyan <arut@nginx.com> parents: 7590 diff changeset	167 }
89adf49fe76a Parsing server PROXY protocol address and port (ticket #1206). Roman Arutyunyan <arut@nginx.com> parents: 7590 diff changeset	168
89adf49fe76a Parsing server PROXY protocol address and port (ticket #1206). Roman Arutyunyan <arut@nginx.com> parents: 7590 diff changeset	169 ch = *p++;
89adf49fe76a Parsing server PROXY protocol address and port (ticket #1206). Roman Arutyunyan <arut@nginx.com> parents: 7590 diff changeset	170
89adf49fe76a Parsing server PROXY protocol address and port (ticket #1206). Roman Arutyunyan <arut@nginx.com> parents: 7590 diff changeset	171 if (ch == ' ') {
89adf49fe76a Parsing server PROXY protocol address and port (ticket #1206). Roman Arutyunyan <arut@nginx.com> parents: 7590 diff changeset	172 break;
89adf49fe76a Parsing server PROXY protocol address and port (ticket #1206). Roman Arutyunyan <arut@nginx.com> parents: 7590 diff changeset	173 }
89adf49fe76a Parsing server PROXY protocol address and port (ticket #1206). Roman Arutyunyan <arut@nginx.com> parents: 7590 diff changeset	174
89adf49fe76a Parsing server PROXY protocol address and port (ticket #1206). Roman Arutyunyan <arut@nginx.com> parents: 7590 diff changeset	175 if (ch != ':' && ch != '.'
89adf49fe76a Parsing server PROXY protocol address and port (ticket #1206). Roman Arutyunyan <arut@nginx.com> parents: 7590 diff changeset	176 && (ch < 'a' \|\| ch > 'f')
89adf49fe76a Parsing server PROXY protocol address and port (ticket #1206). Roman Arutyunyan <arut@nginx.com> parents: 7590 diff changeset	177 && (ch < 'A' \|\| ch > 'F')
89adf49fe76a Parsing server PROXY protocol address and port (ticket #1206). Roman Arutyunyan <arut@nginx.com> parents: 7590 diff changeset	178 && (ch < '0' \|\| ch > '9'))
89adf49fe76a Parsing server PROXY protocol address and port (ticket #1206). Roman Arutyunyan <arut@nginx.com> parents: 7590 diff changeset	179 {
89adf49fe76a Parsing server PROXY protocol address and port (ticket #1206). Roman Arutyunyan <arut@nginx.com> parents: 7590 diff changeset	180 return NULL;
89adf49fe76a Parsing server PROXY protocol address and port (ticket #1206). Roman Arutyunyan <arut@nginx.com> parents: 7590 diff changeset	181 }
89adf49fe76a Parsing server PROXY protocol address and port (ticket #1206). Roman Arutyunyan <arut@nginx.com> parents: 7590 diff changeset	182 }
89adf49fe76a Parsing server PROXY protocol address and port (ticket #1206). Roman Arutyunyan <arut@nginx.com> parents: 7590 diff changeset	183
89adf49fe76a Parsing server PROXY protocol address and port (ticket #1206). Roman Arutyunyan <arut@nginx.com> parents: 7590 diff changeset	184 len = p - pos - 1;
89adf49fe76a Parsing server PROXY protocol address and port (ticket #1206). Roman Arutyunyan <arut@nginx.com> parents: 7590 diff changeset	185
89adf49fe76a Parsing server PROXY protocol address and port (ticket #1206). Roman Arutyunyan <arut@nginx.com> parents: 7590 diff changeset	186 addr->data = ngx_pnalloc(c->pool, len);
89adf49fe76a Parsing server PROXY protocol address and port (ticket #1206). Roman Arutyunyan <arut@nginx.com> parents: 7590 diff changeset	187 if (addr->data == NULL) {
89adf49fe76a Parsing server PROXY protocol address and port (ticket #1206). Roman Arutyunyan <arut@nginx.com> parents: 7590 diff changeset	188 return NULL;
89adf49fe76a Parsing server PROXY protocol address and port (ticket #1206). Roman Arutyunyan <arut@nginx.com> parents: 7590 diff changeset	189 }
89adf49fe76a Parsing server PROXY protocol address and port (ticket #1206). Roman Arutyunyan <arut@nginx.com> parents: 7590 diff changeset	190
89adf49fe76a Parsing server PROXY protocol address and port (ticket #1206). Roman Arutyunyan <arut@nginx.com> parents: 7590 diff changeset	191 ngx_memcpy(addr->data, pos, len);
89adf49fe76a Parsing server PROXY protocol address and port (ticket #1206). Roman Arutyunyan <arut@nginx.com> parents: 7590 diff changeset	192 addr->len = len;
89adf49fe76a Parsing server PROXY protocol address and port (ticket #1206). Roman Arutyunyan <arut@nginx.com> parents: 7590 diff changeset	193
89adf49fe76a Parsing server PROXY protocol address and port (ticket #1206). Roman Arutyunyan <arut@nginx.com> parents: 7590 diff changeset	194 return p;
89adf49fe76a Parsing server PROXY protocol address and port (ticket #1206). Roman Arutyunyan <arut@nginx.com> parents: 7590 diff changeset	195 }
89adf49fe76a Parsing server PROXY protocol address and port (ticket #1206). Roman Arutyunyan <arut@nginx.com> parents: 7590 diff changeset	196
89adf49fe76a Parsing server PROXY protocol address and port (ticket #1206). Roman Arutyunyan <arut@nginx.com> parents: 7590 diff changeset	197
89adf49fe76a Parsing server PROXY protocol address and port (ticket #1206). Roman Arutyunyan <arut@nginx.com> parents: 7590 diff changeset	198 static u_char *
89adf49fe76a Parsing server PROXY protocol address and port (ticket #1206). Roman Arutyunyan <arut@nginx.com> parents: 7590 diff changeset	199 ngx_proxy_protocol_read_port(u_char p, u_char last, in_port_t *port,
89adf49fe76a Parsing server PROXY protocol address and port (ticket #1206). Roman Arutyunyan <arut@nginx.com> parents: 7590 diff changeset	200 u_char sep)
89adf49fe76a Parsing server PROXY protocol address and port (ticket #1206). Roman Arutyunyan <arut@nginx.com> parents: 7590 diff changeset	201 {
89adf49fe76a Parsing server PROXY protocol address and port (ticket #1206). Roman Arutyunyan <arut@nginx.com> parents: 7590 diff changeset	202 size_t len;
89adf49fe76a Parsing server PROXY protocol address and port (ticket #1206). Roman Arutyunyan <arut@nginx.com> parents: 7590 diff changeset	203 u_char *pos;
89adf49fe76a Parsing server PROXY protocol address and port (ticket #1206). Roman Arutyunyan <arut@nginx.com> parents: 7590 diff changeset	204 ngx_int_t n;
89adf49fe76a Parsing server PROXY protocol address and port (ticket #1206). Roman Arutyunyan <arut@nginx.com> parents: 7590 diff changeset	205
89adf49fe76a Parsing server PROXY protocol address and port (ticket #1206). Roman Arutyunyan <arut@nginx.com> parents: 7590 diff changeset	206 pos = p;
89adf49fe76a Parsing server PROXY protocol address and port (ticket #1206). Roman Arutyunyan <arut@nginx.com> parents: 7590 diff changeset	207
89adf49fe76a Parsing server PROXY protocol address and port (ticket #1206). Roman Arutyunyan <arut@nginx.com> parents: 7590 diff changeset	208 for ( ;; ) {
89adf49fe76a Parsing server PROXY protocol address and port (ticket #1206). Roman Arutyunyan <arut@nginx.com> parents: 7590 diff changeset	209 if (p == last) {
89adf49fe76a Parsing server PROXY protocol address and port (ticket #1206). Roman Arutyunyan <arut@nginx.com> parents: 7590 diff changeset	210 return NULL;
89adf49fe76a Parsing server PROXY protocol address and port (ticket #1206). Roman Arutyunyan <arut@nginx.com> parents: 7590 diff changeset	211 }
89adf49fe76a Parsing server PROXY protocol address and port (ticket #1206). Roman Arutyunyan <arut@nginx.com> parents: 7590 diff changeset	212
89adf49fe76a Parsing server PROXY protocol address and port (ticket #1206). Roman Arutyunyan <arut@nginx.com> parents: 7590 diff changeset	213 if (*p++ == sep) {
89adf49fe76a Parsing server PROXY protocol address and port (ticket #1206). Roman Arutyunyan <arut@nginx.com> parents: 7590 diff changeset	214 break;
89adf49fe76a Parsing server PROXY protocol address and port (ticket #1206). Roman Arutyunyan <arut@nginx.com> parents: 7590 diff changeset	215 }
89adf49fe76a Parsing server PROXY protocol address and port (ticket #1206). Roman Arutyunyan <arut@nginx.com> parents: 7590 diff changeset	216 }
89adf49fe76a Parsing server PROXY protocol address and port (ticket #1206). Roman Arutyunyan <arut@nginx.com> parents: 7590 diff changeset	217
89adf49fe76a Parsing server PROXY protocol address and port (ticket #1206). Roman Arutyunyan <arut@nginx.com> parents: 7590 diff changeset	218 len = p - pos - 1;
89adf49fe76a Parsing server PROXY protocol address and port (ticket #1206). Roman Arutyunyan <arut@nginx.com> parents: 7590 diff changeset	219
89adf49fe76a Parsing server PROXY protocol address and port (ticket #1206). Roman Arutyunyan <arut@nginx.com> parents: 7590 diff changeset	220 n = ngx_atoi(pos, len);
89adf49fe76a Parsing server PROXY protocol address and port (ticket #1206). Roman Arutyunyan <arut@nginx.com> parents: 7590 diff changeset	221 if (n < 0 \|\| n > 65535) {
89adf49fe76a Parsing server PROXY protocol address and port (ticket #1206). Roman Arutyunyan <arut@nginx.com> parents: 7590 diff changeset	222 return NULL;
89adf49fe76a Parsing server PROXY protocol address and port (ticket #1206). Roman Arutyunyan <arut@nginx.com> parents: 7590 diff changeset	223 }
89adf49fe76a Parsing server PROXY protocol address and port (ticket #1206). Roman Arutyunyan <arut@nginx.com> parents: 7590 diff changeset	224
89adf49fe76a Parsing server PROXY protocol address and port (ticket #1206). Roman Arutyunyan <arut@nginx.com> parents: 7590 diff changeset	225 *port = (in_port_t) n;
89adf49fe76a Parsing server PROXY protocol address and port (ticket #1206). Roman Arutyunyan <arut@nginx.com> parents: 7590 diff changeset	226
89adf49fe76a Parsing server PROXY protocol address and port (ticket #1206). Roman Arutyunyan <arut@nginx.com> parents: 7590 diff changeset	227 return p;
89adf49fe76a Parsing server PROXY protocol address and port (ticket #1206). Roman Arutyunyan <arut@nginx.com> parents: 7590 diff changeset	228 }
89adf49fe76a Parsing server PROXY protocol address and port (ticket #1206). Roman Arutyunyan <arut@nginx.com> parents: 7590 diff changeset	229
89adf49fe76a Parsing server PROXY protocol address and port (ticket #1206). Roman Arutyunyan <arut@nginx.com> parents: 7590 diff changeset	230
6184 fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 5605 diff changeset	231 u_char *
fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 5605 diff changeset	232 ngx_proxy_protocol_write(ngx_connection_t c, u_char buf, u_char *last)
fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 5605 diff changeset	233 {
fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 5605 diff changeset	234 ngx_uint_t port, lport;
fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 5605 diff changeset	235
fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 5605 diff changeset	236 if (last - buf < NGX_PROXY_PROTOCOL_MAX_HEADER) {
fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 5605 diff changeset	237 return NULL;
fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 5605 diff changeset	238 }
fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 5605 diff changeset	239
fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 5605 diff changeset	240 if (ngx_connection_local_sockaddr(c, NULL, 0) != NGX_OK) {
fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 5605 diff changeset	241 return NULL;
fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 5605 diff changeset	242 }
fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 5605 diff changeset	243
fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 5605 diff changeset	244 switch (c->sockaddr->sa_family) {
fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 5605 diff changeset	245
fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 5605 diff changeset	246 case AF_INET:
fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 5605 diff changeset	247 buf = ngx_cpymem(buf, "PROXY TCP4 ", sizeof("PROXY TCP4 ") - 1);
fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 5605 diff changeset	248 break;
fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 5605 diff changeset	249
fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 5605 diff changeset	250 #if (NGX_HAVE_INET6)
fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 5605 diff changeset	251 case AF_INET6:
fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 5605 diff changeset	252 buf = ngx_cpymem(buf, "PROXY TCP6 ", sizeof("PROXY TCP6 ") - 1);
fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 5605 diff changeset	253 break;
fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 5605 diff changeset	254 #endif
fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 5605 diff changeset	255
fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 5605 diff changeset	256 default:
fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 5605 diff changeset	257 return ngx_cpymem(buf, "PROXY UNKNOWN" CRLF,
fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 5605 diff changeset	258 sizeof("PROXY UNKNOWN" CRLF) - 1);
fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 5605 diff changeset	259 }
fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 5605 diff changeset	260
fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 5605 diff changeset	261 buf += ngx_sock_ntop(c->sockaddr, c->socklen, buf, last - buf, 0);
fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 5605 diff changeset	262
fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 5605 diff changeset	263 *buf++ = ' ';
fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 5605 diff changeset	264
fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 5605 diff changeset	265 buf += ngx_sock_ntop(c->local_sockaddr, c->local_socklen, buf, last - buf,
fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 5605 diff changeset	266 0);
fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 5605 diff changeset	267
6593 b3b7e33083ac Introduced ngx_inet_get_port() and ngx_inet_set_port() functions. Roman Arutyunyan <arut@nginx.com> parents: 6561 diff changeset	268 port = ngx_inet_get_port(c->sockaddr);
b3b7e33083ac Introduced ngx_inet_get_port() and ngx_inet_set_port() functions. Roman Arutyunyan <arut@nginx.com> parents: 6561 diff changeset	269 lport = ngx_inet_get_port(c->local_sockaddr);
b3b7e33083ac Introduced ngx_inet_get_port() and ngx_inet_set_port() functions. Roman Arutyunyan <arut@nginx.com> parents: 6561 diff changeset	270
6184 fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 5605 diff changeset	271 return ngx_slprintf(buf, last, " %ui %ui" CRLF, port, lport);
fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 5605 diff changeset	272 }
7251 416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	273
416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	274
416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	275 static u_char *
416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	276 ngx_proxy_protocol_v2_read(ngx_connection_t c, u_char buf, u_char *last)
416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	277 {
7253 63e91f263a49 Core: revised the PROXY protocol v2 code. Ruslan Ermilov <ru@nginx.com> parents: 7252 diff changeset	278 u_char *end;
63e91f263a49 Core: revised the PROXY protocol v2 code. Ruslan Ermilov <ru@nginx.com> parents: 7252 diff changeset	279 size_t len;
63e91f263a49 Core: revised the PROXY protocol v2 code. Ruslan Ermilov <ru@nginx.com> parents: 7252 diff changeset	280 socklen_t socklen;
63e91f263a49 Core: revised the PROXY protocol v2 code. Ruslan Ermilov <ru@nginx.com> parents: 7252 diff changeset	281 ngx_uint_t version, command, family, transport;
7591 89adf49fe76a Parsing server PROXY protocol address and port (ticket #1206). Roman Arutyunyan <arut@nginx.com> parents: 7590 diff changeset	282 ngx_sockaddr_t src_sockaddr, dst_sockaddr;
7590 06b01840bd42 Core: moved PROXY protocol fields out of ngx_connection_t. Roman Arutyunyan <arut@nginx.com> parents: 7254 diff changeset	283 ngx_proxy_protocol_t *pp;
7253 63e91f263a49 Core: revised the PROXY protocol v2 code. Ruslan Ermilov <ru@nginx.com> parents: 7252 diff changeset	284 ngx_proxy_protocol_header_t *header;
7254 1fd992589ffe Core: fixed build, broken by 63e91f263a49. Vladimir Homutov <vl@nginx.com> parents: 7253 diff changeset	285 ngx_proxy_protocol_inet_addrs_t *in;
7253 63e91f263a49 Core: revised the PROXY protocol v2 code. Ruslan Ermilov <ru@nginx.com> parents: 7252 diff changeset	286 #if (NGX_HAVE_INET6)
7254 1fd992589ffe Core: fixed build, broken by 63e91f263a49. Vladimir Homutov <vl@nginx.com> parents: 7253 diff changeset	287 ngx_proxy_protocol_inet6_addrs_t *in6;
7253 63e91f263a49 Core: revised the PROXY protocol v2 code. Ruslan Ermilov <ru@nginx.com> parents: 7252 diff changeset	288 #endif
7251 416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	289
7253 63e91f263a49 Core: revised the PROXY protocol v2 code. Ruslan Ermilov <ru@nginx.com> parents: 7252 diff changeset	290 header = (ngx_proxy_protocol_header_t *) buf;
7251 416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	291
7253 63e91f263a49 Core: revised the PROXY protocol v2 code. Ruslan Ermilov <ru@nginx.com> parents: 7252 diff changeset	292 buf += sizeof(ngx_proxy_protocol_header_t);
7251 416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	293
7253 63e91f263a49 Core: revised the PROXY protocol v2 code. Ruslan Ermilov <ru@nginx.com> parents: 7252 diff changeset	294 version = header->version_command >> 4;
7251 416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	295
7253 63e91f263a49 Core: revised the PROXY protocol v2 code. Ruslan Ermilov <ru@nginx.com> parents: 7252 diff changeset	296 if (version != 2) {
7251 416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	297 ngx_log_error(NGX_LOG_ERR, c->log, 0,
7253 63e91f263a49 Core: revised the PROXY protocol v2 code. Ruslan Ermilov <ru@nginx.com> parents: 7252 diff changeset	298 "unknown PROXY protocol version: %ui", version);
7251 416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	299 return NULL;
416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	300 }
416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	301
7253 63e91f263a49 Core: revised the PROXY protocol v2 code. Ruslan Ermilov <ru@nginx.com> parents: 7252 diff changeset	302 len = ngx_proxy_protocol_parse_uint16(header->len);
7251 416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	303
416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	304 if ((size_t) (last - buf) < len) {
416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	305 ngx_log_error(NGX_LOG_ERR, c->log, 0, "header is too large");
416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	306 return NULL;
416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	307 }
416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	308
416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	309 end = buf + len;
416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	310
7253 63e91f263a49 Core: revised the PROXY protocol v2 code. Ruslan Ermilov <ru@nginx.com> parents: 7252 diff changeset	311 command = header->version_command & 0x0f;
7251 416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	312
7253 63e91f263a49 Core: revised the PROXY protocol v2 code. Ruslan Ermilov <ru@nginx.com> parents: 7252 diff changeset	313 /* only PROXY is supported */
63e91f263a49 Core: revised the PROXY protocol v2 code. Ruslan Ermilov <ru@nginx.com> parents: 7252 diff changeset	314 if (command != 1) {
7251 416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	315 ngx_log_debug1(NGX_LOG_DEBUG_CORE, c->log, 0,
7253 63e91f263a49 Core: revised the PROXY protocol v2 code. Ruslan Ermilov <ru@nginx.com> parents: 7252 diff changeset	316 "PROXY protocol v2 unsupported command %ui", command);
7251 416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	317 return end;
416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	318 }
416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	319
7253 63e91f263a49 Core: revised the PROXY protocol v2 code. Ruslan Ermilov <ru@nginx.com> parents: 7252 diff changeset	320 transport = header->family_transport & 0x0f;
7251 416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	321
7253 63e91f263a49 Core: revised the PROXY protocol v2 code. Ruslan Ermilov <ru@nginx.com> parents: 7252 diff changeset	322 /* only STREAM is supported */
63e91f263a49 Core: revised the PROXY protocol v2 code. Ruslan Ermilov <ru@nginx.com> parents: 7252 diff changeset	323 if (transport != 1) {
7251 416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	324 ngx_log_debug1(NGX_LOG_DEBUG_CORE, c->log, 0,
7253 63e91f263a49 Core: revised the PROXY protocol v2 code. Ruslan Ermilov <ru@nginx.com> parents: 7252 diff changeset	325 "PROXY protocol v2 unsupported transport %ui",
7251 416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	326 transport);
416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	327 return end;
416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	328 }
416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	329
7590 06b01840bd42 Core: moved PROXY protocol fields out of ngx_connection_t. Roman Arutyunyan <arut@nginx.com> parents: 7254 diff changeset	330 pp = ngx_pcalloc(c->pool, sizeof(ngx_proxy_protocol_t));
06b01840bd42 Core: moved PROXY protocol fields out of ngx_connection_t. Roman Arutyunyan <arut@nginx.com> parents: 7254 diff changeset	331 if (pp == NULL) {
06b01840bd42 Core: moved PROXY protocol fields out of ngx_connection_t. Roman Arutyunyan <arut@nginx.com> parents: 7254 diff changeset	332 return NULL;
06b01840bd42 Core: moved PROXY protocol fields out of ngx_connection_t. Roman Arutyunyan <arut@nginx.com> parents: 7254 diff changeset	333 }
06b01840bd42 Core: moved PROXY protocol fields out of ngx_connection_t. Roman Arutyunyan <arut@nginx.com> parents: 7254 diff changeset	334
7253 63e91f263a49 Core: revised the PROXY protocol v2 code. Ruslan Ermilov <ru@nginx.com> parents: 7252 diff changeset	335 family = header->family_transport >> 4;
7251 416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	336
416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	337 switch (family) {
416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	338
7253 63e91f263a49 Core: revised the PROXY protocol v2 code. Ruslan Ermilov <ru@nginx.com> parents: 7252 diff changeset	339 case NGX_PROXY_PROTOCOL_AF_INET:
7251 416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	340
7253 63e91f263a49 Core: revised the PROXY protocol v2 code. Ruslan Ermilov <ru@nginx.com> parents: 7252 diff changeset	341 if ((size_t) (end - buf) < sizeof(ngx_proxy_protocol_inet_addrs_t)) {
7251 416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	342 return NULL;
416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	343 }
416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	344
7254 1fd992589ffe Core: fixed build, broken by 63e91f263a49. Vladimir Homutov <vl@nginx.com> parents: 7253 diff changeset	345 in = (ngx_proxy_protocol_inet_addrs_t *) buf;
7253 63e91f263a49 Core: revised the PROXY protocol v2 code. Ruslan Ermilov <ru@nginx.com> parents: 7252 diff changeset	346
7591 89adf49fe76a Parsing server PROXY protocol address and port (ticket #1206). Roman Arutyunyan <arut@nginx.com> parents: 7590 diff changeset	347 src_sockaddr.sockaddr_in.sin_family = AF_INET;
89adf49fe76a Parsing server PROXY protocol address and port (ticket #1206). Roman Arutyunyan <arut@nginx.com> parents: 7590 diff changeset	348 src_sockaddr.sockaddr_in.sin_port = 0;
89adf49fe76a Parsing server PROXY protocol address and port (ticket #1206). Roman Arutyunyan <arut@nginx.com> parents: 7590 diff changeset	349 memcpy(&src_sockaddr.sockaddr_in.sin_addr, in->src_addr, 4);
89adf49fe76a Parsing server PROXY protocol address and port (ticket #1206). Roman Arutyunyan <arut@nginx.com> parents: 7590 diff changeset	350
89adf49fe76a Parsing server PROXY protocol address and port (ticket #1206). Roman Arutyunyan <arut@nginx.com> parents: 7590 diff changeset	351 dst_sockaddr.sockaddr_in.sin_family = AF_INET;
89adf49fe76a Parsing server PROXY protocol address and port (ticket #1206). Roman Arutyunyan <arut@nginx.com> parents: 7590 diff changeset	352 dst_sockaddr.sockaddr_in.sin_port = 0;
89adf49fe76a Parsing server PROXY protocol address and port (ticket #1206). Roman Arutyunyan <arut@nginx.com> parents: 7590 diff changeset	353 memcpy(&dst_sockaddr.sockaddr_in.sin_addr, in->dst_addr, 4);
7251 416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	354
7590 06b01840bd42 Core: moved PROXY protocol fields out of ngx_connection_t. Roman Arutyunyan <arut@nginx.com> parents: 7254 diff changeset	355 pp->src_port = ngx_proxy_protocol_parse_uint16(in->src_port);
7591 89adf49fe76a Parsing server PROXY protocol address and port (ticket #1206). Roman Arutyunyan <arut@nginx.com> parents: 7590 diff changeset	356 pp->dst_port = ngx_proxy_protocol_parse_uint16(in->dst_port);
7251 416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	357
416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	358 socklen = sizeof(struct sockaddr_in);
416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	359
7253 63e91f263a49 Core: revised the PROXY protocol v2 code. Ruslan Ermilov <ru@nginx.com> parents: 7252 diff changeset	360 buf += sizeof(ngx_proxy_protocol_inet_addrs_t);
7251 416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	361
416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	362 break;
416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	363
416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	364 #if (NGX_HAVE_INET6)
416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	365
7253 63e91f263a49 Core: revised the PROXY protocol v2 code. Ruslan Ermilov <ru@nginx.com> parents: 7252 diff changeset	366 case NGX_PROXY_PROTOCOL_AF_INET6:
7251 416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	367
7253 63e91f263a49 Core: revised the PROXY protocol v2 code. Ruslan Ermilov <ru@nginx.com> parents: 7252 diff changeset	368 if ((size_t) (end - buf) < sizeof(ngx_proxy_protocol_inet6_addrs_t)) {
7251 416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	369 return NULL;
416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	370 }
416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	371
7254 1fd992589ffe Core: fixed build, broken by 63e91f263a49. Vladimir Homutov <vl@nginx.com> parents: 7253 diff changeset	372 in6 = (ngx_proxy_protocol_inet6_addrs_t *) buf;
7253 63e91f263a49 Core: revised the PROXY protocol v2 code. Ruslan Ermilov <ru@nginx.com> parents: 7252 diff changeset	373
7591 89adf49fe76a Parsing server PROXY protocol address and port (ticket #1206). Roman Arutyunyan <arut@nginx.com> parents: 7590 diff changeset	374 src_sockaddr.sockaddr_in6.sin6_family = AF_INET6;
89adf49fe76a Parsing server PROXY protocol address and port (ticket #1206). Roman Arutyunyan <arut@nginx.com> parents: 7590 diff changeset	375 src_sockaddr.sockaddr_in6.sin6_port = 0;
89adf49fe76a Parsing server PROXY protocol address and port (ticket #1206). Roman Arutyunyan <arut@nginx.com> parents: 7590 diff changeset	376 memcpy(&src_sockaddr.sockaddr_in6.sin6_addr, in6->src_addr, 16);
89adf49fe76a Parsing server PROXY protocol address and port (ticket #1206). Roman Arutyunyan <arut@nginx.com> parents: 7590 diff changeset	377
89adf49fe76a Parsing server PROXY protocol address and port (ticket #1206). Roman Arutyunyan <arut@nginx.com> parents: 7590 diff changeset	378 dst_sockaddr.sockaddr_in6.sin6_family = AF_INET6;
89adf49fe76a Parsing server PROXY protocol address and port (ticket #1206). Roman Arutyunyan <arut@nginx.com> parents: 7590 diff changeset	379 dst_sockaddr.sockaddr_in6.sin6_port = 0;
89adf49fe76a Parsing server PROXY protocol address and port (ticket #1206). Roman Arutyunyan <arut@nginx.com> parents: 7590 diff changeset	380 memcpy(&dst_sockaddr.sockaddr_in6.sin6_addr, in6->dst_addr, 16);
7251 416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	381
7590 06b01840bd42 Core: moved PROXY protocol fields out of ngx_connection_t. Roman Arutyunyan <arut@nginx.com> parents: 7254 diff changeset	382 pp->src_port = ngx_proxy_protocol_parse_uint16(in6->src_port);
7591 89adf49fe76a Parsing server PROXY protocol address and port (ticket #1206). Roman Arutyunyan <arut@nginx.com> parents: 7590 diff changeset	383 pp->dst_port = ngx_proxy_protocol_parse_uint16(in6->dst_port);
7251 416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	384
416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	385 socklen = sizeof(struct sockaddr_in6);
416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	386
7253 63e91f263a49 Core: revised the PROXY protocol v2 code. Ruslan Ermilov <ru@nginx.com> parents: 7252 diff changeset	387 buf += sizeof(ngx_proxy_protocol_inet6_addrs_t);
7251 416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	388
416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	389 break;
416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	390
416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	391 #endif
416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	392
416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	393 default:
416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	394 ngx_log_debug1(NGX_LOG_DEBUG_CORE, c->log, 0,
7253 63e91f263a49 Core: revised the PROXY protocol v2 code. Ruslan Ermilov <ru@nginx.com> parents: 7252 diff changeset	395 "PROXY protocol v2 unsupported address family %ui",
7252 7bdab16c55f1 Core: style. Vladimir Homutov <vl@nginx.com> parents: 7251 diff changeset	396 family);
7251 416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	397 return end;
416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	398 }
416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	399
7590 06b01840bd42 Core: moved PROXY protocol fields out of ngx_connection_t. Roman Arutyunyan <arut@nginx.com> parents: 7254 diff changeset	400 pp->src_addr.data = ngx_pnalloc(c->pool, NGX_SOCKADDR_STRLEN);
06b01840bd42 Core: moved PROXY protocol fields out of ngx_connection_t. Roman Arutyunyan <arut@nginx.com> parents: 7254 diff changeset	401 if (pp->src_addr.data == NULL) {
7251 416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	402 return NULL;
416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	403 }
416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	404
7591 89adf49fe76a Parsing server PROXY protocol address and port (ticket #1206). Roman Arutyunyan <arut@nginx.com> parents: 7590 diff changeset	405 pp->src_addr.len = ngx_sock_ntop(&src_sockaddr.sockaddr, socklen,
7590 06b01840bd42 Core: moved PROXY protocol fields out of ngx_connection_t. Roman Arutyunyan <arut@nginx.com> parents: 7254 diff changeset	406 pp->src_addr.data, NGX_SOCKADDR_STRLEN, 0);
7251 416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	407
7591 89adf49fe76a Parsing server PROXY protocol address and port (ticket #1206). Roman Arutyunyan <arut@nginx.com> parents: 7590 diff changeset	408 pp->dst_addr.data = ngx_pnalloc(c->pool, NGX_SOCKADDR_STRLEN);
89adf49fe76a Parsing server PROXY protocol address and port (ticket #1206). Roman Arutyunyan <arut@nginx.com> parents: 7590 diff changeset	409 if (pp->dst_addr.data == NULL) {
89adf49fe76a Parsing server PROXY protocol address and port (ticket #1206). Roman Arutyunyan <arut@nginx.com> parents: 7590 diff changeset	410 return NULL;
89adf49fe76a Parsing server PROXY protocol address and port (ticket #1206). Roman Arutyunyan <arut@nginx.com> parents: 7590 diff changeset	411 }
89adf49fe76a Parsing server PROXY protocol address and port (ticket #1206). Roman Arutyunyan <arut@nginx.com> parents: 7590 diff changeset	412
89adf49fe76a Parsing server PROXY protocol address and port (ticket #1206). Roman Arutyunyan <arut@nginx.com> parents: 7590 diff changeset	413 pp->dst_addr.len = ngx_sock_ntop(&dst_sockaddr.sockaddr, socklen,
89adf49fe76a Parsing server PROXY protocol address and port (ticket #1206). Roman Arutyunyan <arut@nginx.com> parents: 7590 diff changeset	414 pp->dst_addr.data, NGX_SOCKADDR_STRLEN, 0);
89adf49fe76a Parsing server PROXY protocol address and port (ticket #1206). Roman Arutyunyan <arut@nginx.com> parents: 7590 diff changeset	415
89adf49fe76a Parsing server PROXY protocol address and port (ticket #1206). Roman Arutyunyan <arut@nginx.com> parents: 7590 diff changeset	416 ngx_log_debug4(NGX_LOG_DEBUG_CORE, c->log, 0,
89adf49fe76a Parsing server PROXY protocol address and port (ticket #1206). Roman Arutyunyan <arut@nginx.com> parents: 7590 diff changeset	417 "PROXY protocol v2 src: %V %d, dst: %V %d",
89adf49fe76a Parsing server PROXY protocol address and port (ticket #1206). Roman Arutyunyan <arut@nginx.com> parents: 7590 diff changeset	418 &pp->src_addr, pp->src_port, &pp->dst_addr, pp->dst_port);
7251 416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	419
416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	420 if (buf < end) {
416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	421 ngx_log_debug1(NGX_LOG_DEBUG_CORE, c->log, 0,
7253 63e91f263a49 Core: revised the PROXY protocol v2 code. Ruslan Ermilov <ru@nginx.com> parents: 7252 diff changeset	422 "PROXY protocol v2 %z bytes of tlv ignored", end - buf);
7251 416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	423 }
416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	424
7590 06b01840bd42 Core: moved PROXY protocol fields out of ngx_connection_t. Roman Arutyunyan <arut@nginx.com> parents: 7254 diff changeset	425 c->proxy_protocol = pp;
06b01840bd42 Core: moved PROXY protocol fields out of ngx_connection_t. Roman Arutyunyan <arut@nginx.com> parents: 7254 diff changeset	426
7251 416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	427 return end;
416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	428 }

Mercurial > hg > nginx

annotate src/core/ngx_proxy_protocol.c @ 8071:017fd847f4f7