From adb21834f3684b6484d8c2214ee4c3c9c504d632 Mon Sep 17 00:00:00 2001 From: Jeremy Harris Date: Sat, 20 Jul 2019 20:58:24 +0100 Subject: [PATCH 1/1] Debug: indent lowlevel connect result --- src/src/ip.c | 10 +++++----- src/src/smtp_out.c | 4 ++-- test/stderr/0388 | 2 +- test/stderr/0432 | 4 ++-- test/stderr/2013 | 6 +++--- test/stderr/2113 | 6 +++--- test/stderr/4052 | 2 +- test/stderr/4520 | 2 +- test/stderr/5403 | 2 +- test/stderr/5820 | 2 +- test/stderr/5840 | 2 +- 11 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/src/ip.c b/src/src/ip.c index bc53db18d..0f25df1da 100644 --- a/src/src/ip.c +++ b/src/src/ip.c @@ -264,7 +264,7 @@ if (fastopen_blob && f.tcp_fastopen_ok) /* seen for with-data, proper TFO opt, with-cookie case */ { DEBUG(D_transport|D_v) - debug_printf("TFO mode connection attempt to %s, %lu data\n", + debug_printf(" TFO mode connection attempt to %s, %lu data\n", address, (unsigned long)fastopen_blob->len); /*XXX also seen on successful TFO, sigh */ tcp_out_fastopen = fastopen_blob->len > 0 ? TFO_ATTEMPTED_DATA : TFO_ATTEMPTED_NODATA; @@ -276,7 +276,7 @@ if (fastopen_blob && f.tcp_fastopen_ok) /* with netwk delay, post-conn tcp_info sees unacked 1 for R, 2 for C; code in smtp_out.c */ /* ? older Experimental TFO option behaviour ? */ { /* queue unsent data */ - DEBUG(D_transport|D_v) debug_printf("TFO mode sendto, %s data: EINPROGRESS\n", + DEBUG(D_transport|D_v) debug_printf(" TFO mode sendto, %s data: EINPROGRESS\n", fastopen_blob->len > 0 ? "with" : "no"); if (!fastopen_blob->data) { @@ -306,7 +306,7 @@ if (fastopen_blob && f.tcp_fastopen_ok) CONNECT_DATA_IDEMPOTENT, &iov, 1, &len, NULL)) == 0) { DEBUG(D_transport|D_v) - debug_printf("TFO mode connection attempt to %s, %lu data\n", + debug_printf(" TFO mode connection attempt to %s, %lu data\n", address, (unsigned long)fastopen_blob->len); tcp_out_fastopen = fastopen_blob->len > 0 ? TFO_ATTEMPTED_DATA : TFO_ATTEMPTED_NODATA; @@ -316,7 +316,7 @@ if (fastopen_blob && f.tcp_fastopen_ok) } else if (errno == EINPROGRESS) { - DEBUG(D_transport|D_v) debug_printf("TFO mode connectx, %s data: EINPROGRESS\n", + DEBUG(D_transport|D_v) debug_printf(" TFO mode connectx, %s data: EINPROGRESS\n", fastopen_blob->len > 0 ? "with" : "no"); if (!fastopen_blob->data) { @@ -336,7 +336,7 @@ legacy_connect: #endif DEBUG(D_transport|D_v) if (fastopen_blob) - debug_printf("non-TFO mode connection attempt to %s, %lu data\n", + debug_printf(" non-TFO mode connection attempt to %s, %lu data\n", address, (unsigned long)fastopen_blob->len); if ((rc = connect(sock, s_ptr, s_len)) >= 0) if ( fastopen_blob && fastopen_blob->data && fastopen_blob->len diff --git a/src/src/smtp_out.c b/src/src/smtp_out.c index c19d12d43..4f8a84e2b 100644 --- a/src/src/smtp_out.c +++ b/src/src/smtp_out.c @@ -296,7 +296,7 @@ if (save_errno != 0) { HDEBUG(D_transport|D_acl|D_v) { - debug_printf_indent("failed: %s", CUstrerror(save_errno)); + debug_printf_indent(" failed: %s", CUstrerror(save_errno)); if (save_errno == ETIMEDOUT) debug_printf(" (timeout=%s)", readconf_printtime(timeout)); debug_printf("\n"); @@ -313,7 +313,7 @@ else union sockaddr_46 interface_sock; EXIM_SOCKLEN_T size = sizeof(interface_sock); - 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 diff --git a/test/stderr/0388 b/test/stderr/0388 index 942ea7561..9e9822ffc 100644 --- a/test/stderr/0388 +++ b/test/stderr/0388 @@ -115,7 +115,7 @@ checking status of V4NET.0.0.0 no retry data available V4NET.0.0.0 in serialize_hosts? no (option unset) set_process_info: pppp delivering 10HmaX-0005vi-00 to V4NET.0.0.0 [V4NET.0.0.0]:PORT_S (x@y) -Connecting to V4NET.0.0.0 [V4NET.0.0.0]:1224 ... failed: Network Error +Connecting to V4NET.0.0.0 [V4NET.0.0.0]:1224 ... failed: Network Error LOG: MAIN H=V4NET.0.0.0 [V4NET.0.0.0] Network Error set_process_info: pppp delivering 10HmaX-0005vi-00: just tried V4NET.0.0.0 [V4NET.0.0.0]:PORT_S for x@y: result DEFER diff --git a/test/stderr/0432 b/test/stderr/0432 index 084f0afa7..3e5a3e5f2 100644 --- a/test/stderr/0432 +++ b/test/stderr/0432 @@ -260,7 +260,7 @@ MUNGED: ::1 will be omitted in what follows >>> callout cache: no domain record found for b >>> callout cache: no address record found for a@b >>> interface=NULL port=1224 ->>> Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +>>> Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected >>> SMTP<< 220 server ready >>> 127.0.0.1 in hosts_avoid_esmtp? no (option unset) >>> SMTP>> EHLO myhost.test.ex @@ -306,7 +306,7 @@ MUNGED: ::1 will be omitted in what follows >>> callout cache: no domain record found for q >>> callout cache: no address record found for p1@q >>> interface=NULL port=1224 ->>> Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +>>> Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected >>> SMTP<< 220 server ready >>> 127.0.0.1 in hosts_avoid_esmtp? no (option unset) >>> SMTP>> EHLO myhost.test.ex diff --git a/test/stderr/2013 b/test/stderr/2013 index 0e70cef71..32af8a3b1 100644 --- a/test/stderr/2013 +++ b/test/stderr/2013 @@ -4,7 +4,7 @@ admin user dropping to exim gid; retaining priv uid LOG: queue_run MAIN Start queue run: pid=pppp -qqf -Connecting to 127.0.0.1 [127.0.0.1]:1225 ... connected +Connecting to 127.0.0.1 [127.0.0.1]:1225 ... connected SMTP<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 SMTP>> EHLO myhost.test.ex cmd buf flush ddd bytes @@ -86,7 +86,7 @@ admin user dropping to exim gid; retaining priv uid LOG: queue_run MAIN Start queue run: pid=pppp -qqf -Connecting to 127.0.0.1 [127.0.0.1]:1225 ... connected +Connecting to 127.0.0.1 [127.0.0.1]:1225 ... connected SMTP<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 SMTP>> EHLO myhost.test.ex cmd buf flush ddd bytes @@ -168,7 +168,7 @@ admin user dropping to exim gid; retaining priv uid LOG: queue_run MAIN Start queue run: pid=pppp -qqf -Connecting to 127.0.0.1 [127.0.0.1]:1225 ... connected +Connecting to 127.0.0.1 [127.0.0.1]:1225 ... connected SMTP<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 SMTP>> EHLO myhost.test.ex cmd buf flush ddd bytes diff --git a/test/stderr/2113 b/test/stderr/2113 index 87445c733..77ed3fe23 100644 --- a/test/stderr/2113 +++ b/test/stderr/2113 @@ -4,7 +4,7 @@ admin user dropping to exim gid; retaining priv uid LOG: queue_run MAIN Start queue run: pid=pppp -qqf -Connecting to 127.0.0.1 [127.0.0.1]:1225 ... connected +Connecting to 127.0.0.1 [127.0.0.1]:1225 ... connected SMTP<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 SMTP>> EHLO myhost.test.ex cmd buf flush ddd bytes @@ -86,7 +86,7 @@ admin user dropping to exim gid; retaining priv uid LOG: queue_run MAIN Start queue run: pid=pppp -qqf -Connecting to 127.0.0.1 [127.0.0.1]:1225 ... connected +Connecting to 127.0.0.1 [127.0.0.1]:1225 ... connected SMTP<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 SMTP>> EHLO myhost.test.ex cmd buf flush ddd bytes @@ -168,7 +168,7 @@ admin user dropping to exim gid; retaining priv uid LOG: queue_run MAIN Start queue run: pid=pppp -qqf -Connecting to 127.0.0.1 [127.0.0.1]:1225 ... connected +Connecting to 127.0.0.1 [127.0.0.1]:1225 ... connected SMTP<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 SMTP>> EHLO myhost.test.ex cmd buf flush ddd bytes diff --git a/test/stderr/4052 b/test/stderr/4052 index e08fe2b72..261c73ba7 100644 --- a/test/stderr/4052 +++ b/test/stderr/4052 @@ -30,7 +30,7 @@ not using DSN SMTP>> DATA cmd buf flush ddd bytes Connecting to 127.0.0.1 [127.0.0.1]:1225 ... sending dd nonTFO early-data -connected + connected smtp_reap_early_pipe expect banner SMTP<< 220 banner smtp_reap_early_pipe expect ehlo diff --git a/test/stderr/4520 b/test/stderr/4520 index ceecc20c4..b55454ee0 100644 --- a/test/stderr/4520 +++ b/test/stderr/4520 @@ -8,7 +8,7 @@ configuration file is TESTSUITE/test-config trusted user admin user dropping to exim gid; retaining priv uid -Connecting to ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4]:1225 ... connected +Connecting to ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4]:1225 ... connected SMTP<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 SMTP>> EHLO myhost.test.ex cmd buf flush ddd bytes diff --git a/test/stderr/5403 b/test/stderr/5403 index 0ac39cad5..e7c605a01 100644 --- a/test/stderr/5403 +++ b/test/stderr/5403 @@ -69,7 +69,7 @@ MUNGED: ::1 will be omitted in what follows >>> Attempting full verification using callout >>> callout cache: disabled by no_cache >>> interface=ip4.ip4.ip4.ip4 port=1224 ->>> Connecting to 127.0.0.1 [127.0.0.1]:1224 from ip4.ip4.ip4.ip4 ... connected +>>> Connecting to 127.0.0.1 [127.0.0.1]:1224 from ip4.ip4.ip4.ip4 ... connected >>> SMTP<< 220 server ready >>> 127.0.0.1 in hosts_avoid_esmtp? no (option unset) >>> SMTP>> EHLO myhost.test.ex diff --git a/test/stderr/5820 b/test/stderr/5820 index f218f0c51..21d5127ff 100644 --- a/test/stderr/5820 +++ b/test/stderr/5820 @@ -22,7 +22,7 @@ >>> callout cache: no address record found for rcptuser@dane256ee.test.ex >>> ip4.ip4.ip4.ip4 in hosts_require_dane? yes (matched "ip4.ip4.ip4.ip4") >>> interface=NULL port=1225 ->>> Connecting to dane256ee.test.ex [ip4.ip4.ip4.ip4]:1225 ... connected +>>> Connecting to dane256ee.test.ex [ip4.ip4.ip4.ip4]:1225 ... connected >>> SMTP<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 >>> ip4.ip4.ip4.ip4 in hosts_avoid_esmtp? no (option unset) >>> SMTP>> EHLO myhost.test.ex diff --git a/test/stderr/5840 b/test/stderr/5840 index 0991dc695..bc9b18c84 100644 --- a/test/stderr/5840 +++ b/test/stderr/5840 @@ -22,7 +22,7 @@ >>> callout cache: no address record found for rcptuser@dane256ee.test.ex >>> ip4.ip4.ip4.ip4 in hosts_require_dane? yes (matched "ip4.ip4.ip4.ip4") >>> interface=NULL port=1225 ->>> Connecting to dane256ee.test.ex [ip4.ip4.ip4.ip4]:1225 ... connected +>>> Connecting to dane256ee.test.ex [ip4.ip4.ip4.ip4]:1225 ... connected >>> SMTP<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 >>> ip4.ip4.ip4.ip4 in hosts_avoid_esmtp? no (option unset) >>> SMTP>> EHLO myhost.test.ex -- 2.30.2