git://git.exim.org
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Debug: option access for expansion
[exim.git]
/
src
/
src
/
transports
/
smtp_socks.c
diff --git
a/src/src/transports/smtp_socks.c
b/src/src/transports/smtp_socks.c
index c410eceec8f972317c49c59d818eb3c60ad37534..ac8d0f2da69b2c442163e282b2ef08b917d7d6a2 100644
(file)
--- a/
src/src/transports/smtp_socks.c
+++ b/
src/src/transports/smtp_socks.c
@@
-2,8
+2,10
@@
* Exim - an Internet mail transport agent *
*************************************************/
* Exim - an Internet mail transport agent *
*************************************************/
+/* Copyright (c) The Exim Maintainers 2021 - 2022 */
/* Copyright (c) Jeremy Harris 2015 - 2018 */
/* See the file NOTICE for conditions of use and distribution. */
/* Copyright (c) Jeremy Harris 2015 - 2018 */
/* See the file NOTICE for conditions of use and distribution. */
+/* SPDX-License-Identifier: GPL-2.0-or-later */
/* SOCKS version 5 proxy, client-mode */
/* SOCKS version 5 proxy, client-mode */
@@
-227,6
+229,7
@@
blob early_data;
if (!timeout) timeout = 24*60*60; /* use 1 day for "indefinite" */
tmo = time(NULL) + timeout;
if (!timeout) timeout = 24*60*60; /* use 1 day for "indefinite" */
tmo = time(NULL) + timeout;
+GET_OPTION("socks_proxy");
if (!(proxy_list = expand_string(ob->socks_proxy)))
{
log_write(0, LOG_MAIN|LOG_PANIC, "Bad expansion for socks_proxy in %s",
if (!(proxy_list = expand_string(ob->socks_proxy)))
{
log_write(0, LOG_MAIN|LOG_PANIC, "Bad expansion for socks_proxy in %s",
@@
-273,7
+276,7
@@
for(;;)
{
int idx;
host_item proxy;
{
int idx;
host_item proxy;
-
int proxy_af
;
+
smtp_connect_args sc = {.sock = -1}
;
if ((idx = socks_get_proxy(proxies, nproxies)) < 0)
{
if ((idx = socks_get_proxy(proxies, nproxies)) < 0)
{
@@
-285,11
+288,16
@@
for(;;)
/* bodge up a host struct for the proxy */
proxy.address = proxy.name = sob->proxy_host;
/* bodge up a host struct for the proxy */
proxy.address = proxy.name = sob->proxy_host;
- proxy_af = Ustrchr(sob->proxy_host, ':') ? AF_INET6 : AF_INET;
+ proxy.port = sob->port;
+
+ sc.tblock = tb;
+ sc.ob = ob;
+ sc.host = &proxy;
+ sc.host_af = Ustrchr(sob->proxy_host, ':') ? AF_INET6 : AF_INET;
+ sc.interface = interface;
/*XXX we trust that the method-select command is idempotent */
/*XXX we trust that the method-select command is idempotent */
- if ((fd = smtp_sock_connect(&proxy, proxy_af, sob->port,
- interface, tb, sob->timeout, &early_data)) >= 0)
+ if ((fd = smtp_sock_connect(&sc, sob->timeout, &early_data)) >= 0)
{
proxy_local_address = string_copy(proxy.address);
proxy_local_port = sob->port;
{
proxy_local_address = string_copy(proxy.address);
proxy_local_port = sob->port;
@@
-321,7
+329,7
@@
if ( buf[0] != 5
)
goto proxy_err;
)
goto proxy_err;
-
{
+ {
union sockaddr_46 sin;
(void) ip_addr(&sin, host_af, host->address, port);
union sockaddr_46 sin;
(void) ip_addr(&sin, host_af, host->address, port);
@@
-344,7
+352,7
@@
if ( buf[0] != 5
&sin.v4.sin_port, sizeof(sin.v4.sin_port));
size = 4+sizeof(sin.v4.sin_addr.s_addr)+sizeof(sin.v4.sin_port);
}
&sin.v4.sin_port, sizeof(sin.v4.sin_port));
size = 4+sizeof(sin.v4.sin_addr.s_addr)+sizeof(sin.v4.sin_port);
}
-
}
+ }
state = US"connect";
HDEBUG(D_transport|D_acl|D_v)
state = US"connect";
HDEBUG(D_transport|D_acl|D_v)