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
MacOS: TCP Fast Open
[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 dc34f001fd9a399f124e1db41bba9dd471fd6dd7..7d3a462305a7245a57b2405af860f93a48708752 100644
(file)
--- a/
src/src/transports/smtp_socks.c
+++ b/
src/src/transports/smtp_socks.c
@@
-2,7
+2,7
@@
* Exim - an Internet mail transport agent *
*************************************************/
* Exim - an Internet mail transport agent *
*************************************************/
-/* Copyright (c) Jeremy Harris 2015 */
+/* Copyright (c) Jeremy Harris 2015
- 2018
*/
/* 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
+85,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;
}
@@
-297,6
+297,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)
{