* Exim - an Internet mail transport agent *
*************************************************/
-/* Copyright (c) The Exim Maintainers 2020 - 2022 */
+/* Copyright (c) The Exim Maintainers 2020 - 2024 */
/* Copyright (c) University of Cambridge 1995 - 2018 */
/* See the file NOTICE for conditions of use and distribution. */
/* SPDX-License-Identifier: GPL-2.0-or-later */
/* Set DSCP value, if we can. For now, if we fail to set the value, we don't
bomb out, just log it and continue in default traffic class. */
+GET_OPTION("dscp");
if (dscp && dscp_lookup(dscp, sc->host_af, &dscp_level, &dscp_option, &dscp_value))
{
HDEBUG(D_transport|D_acl|D_v)
{
#ifdef TCP_FASTOPEN
/* See if TCP Fast Open usable. Default is a traditional 3WHS connect */
+ expand_level++;
if (verify_check_given_host(CUSS &ob->hosts_try_fastopen, sc->host) == OK)
{
if (!early_data)
}
# endif
}
+ expand_level--;
#endif
if (ip_connect(sock, sc->host_af, sc->host->address, sc->host->port, timeout, fastopen_blob) < 0)
/* Both bind() and connect() succeeded, and any early-data */
- HDEBUG(D_transport|D_acl|D_v) debug_printf_indent(" connected\n");
+ HDEBUG(D_transport|D_acl|D_v) debug_printf_indent("connected\n");
if (getsockname(sock, (struct sockaddr *)(&interface_sock), &size) == 0)
sending_ip_address = host_ntoa(-1, &interface_sock, NULL, &sending_port);
else
#ifdef SUPPORT_SOCKS
if (ob->socks_proxy) s = string_sprintf("%svia proxy ", s);
#endif
- debug_printf_indent("Connecting to %s %s%s... ", sc->host->name, callout_address, s);
+ debug_printf_indent("Connecting to %s %s%s...\n", sc->host->name, callout_address, s);
}
/* Create and connect the socket */
sx SMTP connection, contains buffer for pipelining, and socket
mode buffer, write-with-more-likely, write
format a format, starting with one of
- of HELO, MAIL FROM, RCPT TO, DATA, ".", or QUIT.
+ of HELO, MAIL FROM, RCPT TO, DATA, BDAT, ".", or QUIT.
If NULL, flush pipeline buffer only.
... data for the format
log_write(0, LOG_MAIN|LOG_PANIC_DIE, "overlong write_command in outgoing "
"SMTP");
va_end(ap);
- string_from_gstring(&gs);
if (gs.ptr > outblock->buffersize)
log_write(0, LOG_MAIN|LOG_PANIC_DIE, "overlong write_command in outgoing "
if (outblock->authenticating)
{
- uschar *p = big_buffer;
+ uschar * p = big_buffer;
if (Ustrncmp(big_buffer, "AUTH ", 5) == 0)
{
p += 5;
- while (isspace(*p)) p++;
- while (!isspace(*p)) p++;
- while (isspace(*p)) p++;
+ Uskip_whitespace(&p);
+ Uskip_nonwhite(&p);
+ Uskip_whitespace(&p);
}
while (*p) *p++ = '*';
}