* Exim - an Internet mail transport agent *
*************************************************/
-/* Copyright (c) Jeremy Harris 2015 - 2017 */
+/* Copyright (c) Jeremy Harris 2015 - 2018 */
/* See the file NOTICE for conditions of use and distribution. */
/* SOCKS version 5 proxy, client-mode */
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)
- sob->timeout = atoi(opt + 4);
+ sob->timeout = atoi(CCS opt + 4);
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)
- sob->weight = atoi(opt + 7);
+ sob->weight = atoi(CCS opt + 7);
return;
}
len = i + j + 3;
HDEBUG(D_transport|D_acl|D_v)
{
- int i;
debug_printf_indent(" SOCKS>>");
- for (i = 0; i<len; i++) debug_printf(" %02x", s[i]);
+ for (int i = 0; i<len; i++) debug_printf(" %02x", s[i]);
debug_printf("\n");
}
if (send(fd, s, len, 0) < 0)
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)
{
state = US"connect";
HDEBUG(D_transport|D_acl|D_v)
{
- int i;
debug_printf_indent(" SOCKS>>");
- for (i = 0; i<size; i++) debug_printf(" %02x", buf[i]);
+ for (int i = 0; i<size; i++) debug_printf(" %02x", buf[i]);
debug_printf("\n");
}
if (send(fd, buf, size, 0) < 0)
goto rcv_err;
HDEBUG(D_transport|D_acl|D_v)
{
- int i;
debug_printf_indent(" SOCKS>>");
- for (i = 0; i<size; i++) debug_printf(" %02x", buf[i]);
+ for (int i = 0; i<size; i++) debug_printf(" %02x", buf[i]);
debug_printf("\n");
}
if ( buf[0] != 5