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

missing #ifdefs. The right patch this time!

diff --git a/src/backend.c b/src/backend.c
index 20e3a040da6250f0a0244501e029ddc3f99b7889..037885074deb8adb3802b959c0d0786b62bf7ba4 100644 (file)
--- a/src/backend.c
+++ b/src/backend.c
@@ -1203,6 +1203,7 @@ int connect_server(struct session *s)
                struct sockaddr_in *remote = NULL;
                int ret, flags = 0;
 
+#if defined(CONFIG_HAP_CTTPROXY) || defined(CONFIG_HAP_LINUX_TPROXY)
                switch (s->srv->state & SRV_TPROXY_MASK) {
                case 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;
                        break;
                }
+#endif
                ret = tcpv4_bind_socket(fd, flags, &s->srv->source_addr, remote);
                if (ret) {
                        close(fd);
@@ -1240,6 +1242,7 @@ int connect_server(struct session *s)
                struct sockaddr_in *remote = NULL;
                int ret, flags = 0;
 
+#if defined(CONFIG_HAP_CTTPROXY) || defined(CONFIG_HAP_LINUX_TPROXY)
                switch (s->be->options & PR_O_TPXY_MASK) {
                case PR_O_TPXY_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;
                        break;
                }
-
+#endif
                ret = tcpv4_bind_socket(fd, flags, &s->be->source_addr, remote);
                if (ret) {
                        close(fd);

diff --git a/src/checks.c b/src/checks.c
index 124f40c53621484fc1b49d220d31f2f1339ebebb..0fbe166789bc7d42d76ba12cd65ae88bac642e1d 100644 (file)
--- a/src/checks.c
+++ b/src/checks.c
@@ -422,10 +422,12 @@ void process_chk(struct task *t, struct timeval *next)
                                        struct sockaddr_in *remote = NULL;
                                        int ret, flags = 0;
 
+#if defined(CONFIG_HAP_CTTPROXY) || defined(CONFIG_HAP_LINUX_TPROXY)
                                        if ((s->state & SRV_TPROXY_MASK) == SRV_TPROXY_ADDR) {
                                                remote = (struct sockaddr_in *)&s->tproxy_addr;
                                                flags  = 3;
                                        }
+#endif
                                        ret = tcpv4_bind_socket(fd, flags, &s->source_addr, remote);
                                        if (ret) {
                                                s->result |= SRV_CHK_ERROR;
@@ -445,10 +447,12 @@ void process_chk(struct task *t, struct timeval *next)
                                        struct sockaddr_in *remote = NULL;
                                        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) {
                                                remote = (struct sockaddr_in *)&s->proxy->tproxy_addr;
                                                flags  = 3;
                                        }
+#endif
                                        ret = tcpv4_bind_socket(fd, flags, &s->proxy->source_addr, remote);
                                        if (ret) {
                                                s->result |= SRV_CHK_ERROR;