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
tidying
[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 5eee220a51e221a70d31705fd0eb6ee041d1e759..5aff62c15761eabba25c23d113e78d1ca6d91341 100644
(file)
--- a/
src/src/transports/smtp_socks.c
+++ b/
src/src/transports/smtp_socks.c
@@
-2,7
+2,8
@@
* Exim - an Internet mail transport agent *
*************************************************/
* Exim - an Internet mail transport agent *
*************************************************/
-/* Copyright (c) Jeremy Harris 2015 - 2017 */
+/* Copyright (c) Jeremy Harris 2015 - 2018 */
+/* Copyright (c) The Exim Maintainers 2021 */
/* See the file NOTICE for conditions of use and distribution. */
/* SOCKS version 5 proxy, client-mode */
/* See the file NOTICE for conditions of use and distribution. */
/* SOCKS version 5 proxy, client-mode */
@@
-85,13
+86,13
@@
else if (Ustrncmp(opt, "name=", 5) == 0)
else if (Ustrncmp(opt, "pass=", 5) == 0)
sob->auth_pwd = opt + 5;
else if (Ustrncmp(opt, "port=", 5) == 0)
else if (Ustrncmp(opt, "pass=", 5) == 0)
sob->auth_pwd = opt + 5;
else if (Ustrncmp(opt, "port=", 5) == 0)
- sob->port = atoi(opt + 5);
+ sob->port = atoi(
CCS
opt + 5);
else if (Ustrncmp(opt, "tmo=", 4) == 0)
else if (Ustrncmp(opt, "tmo=", 4) == 0)
- sob->timeout = atoi(opt + 4);
+ sob->timeout = atoi(
CCS
opt + 4);
else if (Ustrncmp(opt, "pri=", 4) == 0)
else if (Ustrncmp(opt, "pri=", 4) == 0)
- sob->priority = atoi(opt + 4);
+ sob->priority = atoi(
CCS
opt + 4);
else if (Ustrncmp(opt, "weight=", 7) == 0)
else if (Ustrncmp(opt, "weight=", 7) == 0)
- sob->weight = atoi(opt + 7);
+ sob->weight = atoi(
CCS
opt + 7);
return;
}
return;
}
@@
-119,9
+120,8
@@
switch(method)
len = i + j + 3;
HDEBUG(D_transport|D_acl|D_v)
{
len = i + j + 3;
HDEBUG(D_transport|D_acl|D_v)
{
- int i;
debug_printf_indent(" SOCKS>>");
debug_printf_indent(" SOCKS>>");
- for (i = 0; i<len; i++) debug_printf(" %02x", s[i]);
+ for (i
nt i
= 0; i<len; i++) debug_printf(" %02x", s[i]);
debug_printf("\n");
}
if (send(fd, s, len, 0) < 0)
debug_printf("\n");
}
if (send(fd, s, len, 0) < 0)
@@
-129,7
+129,7
@@
switch(method)
#ifdef TCP_QUICKACK
(void) setsockopt(fd, IPPROTO_TCP, TCP_QUICKACK, US &off, sizeof(off));
#endif
#ifdef TCP_QUICKACK
(void) setsockopt(fd, IPPROTO_TCP, TCP_QUICKACK, US &off, sizeof(off));
#endif
- if (!fd_ready(fd, tmo
-time(NULL)
) || read(fd, s, 2) != 2)
+ if (!fd_ready(fd, tmo) || read(fd, s, 2) != 2)
return FAIL;
HDEBUG(D_transport|D_acl|D_v)
debug_printf_indent(" SOCKS<< %02x %02x\n", s[0], s[1]);
return FAIL;
HDEBUG(D_transport|D_acl|D_v)
debug_printf_indent(" SOCKS<< %02x %02x\n", s[0], s[1]);
@@
-161,20
+161,10
@@
socks_opts * sd;
socks_opts * lim = &proxies[nproxies];
long rnd, weights;
unsigned pri;
socks_opts * lim = &proxies[nproxies];
long rnd, weights;
unsigned pri;
-static BOOL srandomed = FALSE;
if (nproxies == 1) /* shortcut, if we have only 1 server */
return (proxies[0].is_failed ? -1 : 0);
if (nproxies == 1) /* shortcut, if we have only 1 server */
return (proxies[0].is_failed ? -1 : 0);
-/* init random */
-if (!srandomed)
- {
- struct timeval tv;
- gettimeofday(&tv, NULL);
- srandom((unsigned int)(tv.tv_usec/1000));
- srandomed = TRUE;
- }
-
/* scan for highest pri */
for (pri = 0, sd = proxies; sd < lim; sd++)
if (!sd->is_failed && sd->priority > pri)
/* scan for highest pri */
for (pri = 0, sd = proxies; sd < lim; sd++)
if (!sd->is_failed && sd->priority > pri)
@@
-187,11
+177,11
@@
for (weights = 0, sd = proxies; sd < lim; sd++)
if (weights == 0) /* all servers failed */
return -1;
if (weights == 0) /* all servers failed */
return -1;
-for (rnd = random
() % weights
, i = 0; i < nproxies; i++)
+for (rnd = random
_number(weights)
, i = 0; i < nproxies; i++)
{
sd = &proxies[i];
if (!sd->is_failed && sd->priority == pri)
{
sd = &proxies[i];
if (!sd->is_failed && sd->priority == pri)
- if ((rnd -= sd->weight) <
=
0)
+ if ((rnd -= sd->weight) < 0)
return i;
}
return i;
}
@@
-231,7
+221,7
@@
const uschar * state;
uschar buf[24];
socks_opts proxies[32]; /* max #proxies handled */
unsigned nproxies;
uschar buf[24];
socks_opts proxies[32]; /* max #proxies handled */
unsigned nproxies;
-socks_opts * sob;
+socks_opts * sob
= NULL
;
unsigned size;
blob early_data;
unsigned size;
blob early_data;
@@
-268,6
+258,7
@@
for (nproxies = 0;
while ((option = string_nextinlist(&proxy_spec, &subsep, NULL, 0)))
socks_option(sob, option);
}
while ((option = string_nextinlist(&proxy_spec, &subsep, NULL, 0)))
socks_option(sob, option);
}
+if (!sob) return -1;
/* Set up the socks protocol method-selection message,
for sending on connection */
/* Set up the socks protocol method-selection message,
for sending on connection */
@@
-297,6
+288,7
@@
for(;;)
proxy.address = proxy.name = sob->proxy_host;
proxy_af = Ustrchr(sob->proxy_host, ':') ? AF_INET6 : AF_INET;
proxy.address = proxy.name = sob->proxy_host;
proxy_af = Ustrchr(sob->proxy_host, ':') ? AF_INET6 : AF_INET;
+ /*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(&proxy, proxy_af, sob->port,
interface, tb, sob->timeout, &early_data)) >= 0)
{
@@
-319,7
+311,7
@@
HDEBUG(D_transport|D_acl|D_v) debug_printf_indent(" SOCKS>> 05 01 %02x\n", sob-
(void) setsockopt(fd, IPPROTO_TCP, TCP_QUICKACK, US &off, sizeof(off));
#endif
(void) setsockopt(fd, IPPROTO_TCP, TCP_QUICKACK, US &off, sizeof(off));
#endif
-if ( !fd_ready(fd, tmo
-time(NULL)
)
+if ( !fd_ready(fd, tmo)
|| read(fd, buf, 2) != 2
)
goto rcv_err;
|| read(fd, buf, 2) != 2
)
goto rcv_err;
@@
-330,7
+322,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);
@@
-353,14
+345,13
@@
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)
{
- int i;
debug_printf_indent(" SOCKS>>");
debug_printf_indent(" SOCKS>>");
- for (i = 0; i<size; i++) debug_printf(" %02x", buf[i]);
+ for (i
nt i
= 0; i<size; i++) debug_printf(" %02x", buf[i]);
debug_printf("\n");
}
if (send(fd, buf, size, 0) < 0)
debug_printf("\n");
}
if (send(fd, buf, size, 0) < 0)
@@
-369,15
+360,14
@@
if (send(fd, buf, size, 0) < 0)
/* expect conn-reply (success, local(ipver, addr, port))
of same length as conn-request, or non-success fail code */
/* expect conn-reply (success, local(ipver, addr, port))
of same length as conn-request, or non-success fail code */
-if ( !fd_ready(fd, tmo
-time(NULL)
)
+if ( !fd_ready(fd, tmo)
|| (size = read(fd, buf, size)) < 2
)
goto rcv_err;
HDEBUG(D_transport|D_acl|D_v)
{
|| (size = read(fd, buf, size)) < 2
)
goto rcv_err;
HDEBUG(D_transport|D_acl|D_v)
{
- int i;
debug_printf_indent(" SOCKS>>");
debug_printf_indent(" SOCKS>>");
- for (i = 0; i<size; i++) debug_printf(" %02x", buf[i]);
+ for (i
nt i
= 0; i<size; i++) debug_printf(" %02x", buf[i]);
debug_printf("\n");
}
if ( buf[0] != 5
debug_printf("\n");
}
if ( buf[0] != 5