mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-09-21 22:01:31 +02:00
Code Issues Projects Releases Wiki Activity

[BUILD] backend.c and checks.c did not build without tproxy !

Browse Source 
missing #ifdefs. The right patch this time!
This commit is contained in:
Willy Tarreau 2008-02-14 20:28:18 +01:00
parent 21d2af3e9f
commit cf1d572f2a
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/backend.c
View File

@ -1203,6 +1203,7 @@ int connect_server(struct session *s)
struct sockaddr_in *remote = NULL; struct sockaddr_in *remote = NULL;
int ret, flags = 0; int ret, flags = 0;
#if defined(CONFIG_HAP_CTTPROXY) || defined(CONFIG_HAP_LINUX_TPROXY)
switch (s->srv->state & SRV_TPROXY_MASK) { switch (s->srv->state & SRV_TPROXY_MASK) {
case SRV_TPROXY_ADDR: case SRV_TPROXY_ADDR:
remote = (struct sockaddr_in *)&s->srv->tproxy_addr; remote = (struct sockaddr_in *)&s->srv->tproxy_addr;
@ -1217,6 +1218,7 @@ int connect_server(struct session *s)
remote = (struct sockaddr_in *)&s->cli_addr; remote = (struct sockaddr_in *)&s->cli_addr;
break; break;
} }
#endif
ret = tcpv4_bind_socket(fd, flags, &s->srv->source_addr, remote); ret = tcpv4_bind_socket(fd, flags, &s->srv->source_addr, remote);
if (ret) { if (ret) {
close(fd); close(fd);
@ -1240,6 +1242,7 @@ int connect_server(struct session *s)
struct sockaddr_in *remote = NULL; struct sockaddr_in *remote = NULL;
int ret, flags = 0; int ret, flags = 0;
#if defined(CONFIG_HAP_CTTPROXY) || defined(CONFIG_HAP_LINUX_TPROXY)
switch (s->be->options & PR_O_TPXY_MASK) { switch (s->be->options & PR_O_TPXY_MASK) {
case PR_O_TPXY_ADDR: case PR_O_TPXY_ADDR:
remote = (struct sockaddr_in *)&s->be->tproxy_addr; remote = (struct sockaddr_in *)&s->be->tproxy_addr;
@ -1254,7 +1257,7 @@ int connect_server(struct session *s)
remote = (struct sockaddr_in *)&s->cli_addr; remote = (struct sockaddr_in *)&s->cli_addr;
break; break;
} }
#endif
ret = tcpv4_bind_socket(fd, flags, &s->be->source_addr, remote); ret = tcpv4_bind_socket(fd, flags, &s->be->source_addr, remote);
if (ret) { if (ret) {
close(fd); close(fd);

4
src/checks.c
View File

@ -422,10 +422,12 @@ void process_chk(struct task *t, struct timeval *next)
struct sockaddr_in *remote = NULL; struct sockaddr_in *remote = NULL;
int ret, flags = 0; int ret, flags = 0;
#if defined(CONFIG_HAP_CTTPROXY) || defined(CONFIG_HAP_LINUX_TPROXY)
if ((s->state & SRV_TPROXY_MASK) == SRV_TPROXY_ADDR) { if ((s->state & SRV_TPROXY_MASK) == SRV_TPROXY_ADDR) {
remote = (struct sockaddr_in *)&s->tproxy_addr; remote = (struct sockaddr_in *)&s->tproxy_addr;
flags = 3; flags = 3;
} }
#endif
ret = tcpv4_bind_socket(fd, flags, &s->source_addr, remote); ret = tcpv4_bind_socket(fd, flags, &s->source_addr, remote);
if (ret) { if (ret) {
s->result |= SRV_CHK_ERROR; s->result |= SRV_CHK_ERROR;
@ -445,10 +447,12 @@ void process_chk(struct task *t, struct timeval *next)
struct sockaddr_in *remote = NULL; struct sockaddr_in *remote = NULL;
int ret, flags = 0; int ret, flags = 0;
#if defined(CONFIG_HAP_CTTPROXY) || defined(CONFIG_HAP_LINUX_TPROXY)
if ((s->proxy->options & PR_O_TPXY_MASK) == PR_O_TPXY_ADDR) { if ((s->proxy->options & PR_O_TPXY_MASK) == PR_O_TPXY_ADDR) {
remote = (struct sockaddr_in *)&s->proxy->tproxy_addr; remote = (struct sockaddr_in *)&s->proxy->tproxy_addr;
flags = 3; flags = 3;
} }
#endif
ret = tcpv4_bind_socket(fd, flags, &s->proxy->source_addr, remote); ret = tcpv4_bind_socket(fd, flags, &s->proxy->source_addr, remote);
if (ret) { if (ret) {
s->result |= SRV_CHK_ERROR; s->result |= SRV_CHK_ERROR;