git://git.exim.org
/
exim.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
5f5708e
)
Debug: indent lowlevel connect result
author
Jeremy Harris
<jgh146exb@wizmail.org>
Sat, 20 Jul 2019 19:58:24 +0000
(20:58 +0100)
committer
Jeremy Harris
<jgh146exb@wizmail.org>
Sat, 20 Jul 2019 19:58:24 +0000
(20:58 +0100)
src/src/ip.c
patch
|
blob
|
history
src/src/smtp_out.c
patch
|
blob
|
history
test/stderr/0388
patch
|
blob
|
history
test/stderr/0432
patch
|
blob
|
history
test/stderr/2013
patch
|
blob
|
history
test/stderr/2113
patch
|
blob
|
history
test/stderr/4052
patch
|
blob
|
history
test/stderr/4520
patch
|
blob
|
history
test/stderr/5403
patch
|
blob
|
history
test/stderr/5820
patch
|
blob
|
history
test/stderr/5840
patch
|
blob
|
history
diff --git
a/src/src/ip.c
b/src/src/ip.c
index bc53db18d612f2b50ca974d363b6b2f98643e622..0f25df1dacc1a598615e8ec89ed1f3beb0f6bfd3 100644
(file)
--- 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)
/* 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;
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 */
/* 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)
{
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)
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;
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)
{
}
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)
{
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)
#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
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 c19d12d43599c5baa5d94ffb9ede2a762ceed0cc..4f8a84e2b794b074642249883a59794f9d461f07 100644
(file)
--- 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)
{
{
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");
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);
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
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 942ea75619676138680e43d0848108aefe949355..9e9822ffc8f5bf9206338b08b1a6fe0b4af5fa79 100644
(file)
--- 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)
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
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 084f0afa7d516c4f8473ade424254f362d88d3a1..3e5a3e5f20300c569b2092a573b91ffd52a43ae8 100644
(file)
--- 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
>>> 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
>>> 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
>>> 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
>>> 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 0e70cef711f3af028dd91a9aa555d51b6cc3fea4..32af8a3b16ef51a0c90f8fd295fe9f2b5576b5f0 100644
(file)
--- 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
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
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
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
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
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
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 87445c733196125a4463a8f26500b50b8f2b3b8d..77ed3fe2362ccada1c18948fce8b57f465bc00d6 100644
(file)
--- 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
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
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
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
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
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
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 e08fe2b724cd8e913a3ec8bce1d1277dba5db65b..261c73ba7faa647c478e74a5a054841f9df4691f 100644
(file)
--- 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
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
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 ceecc20c499c1459c744f2d0705abcd62eb090b8..b55454ee0d7b5a1fe6623d4ff60583d8630fb553 100644
(file)
--- 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
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
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 0ac39cad5725776b677b0c4059f6df44a54bfd25..e7c605a0192a098f4fe9bc74eb1953cb1d6c7b47 100644
(file)
--- 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
>>> 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
>>> 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 f218f0c519c8f7fcce19cdec306ada38ba88b889..21d5127ff69af7842ef34504b23f36aa67720c36 100644
(file)
--- 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
>>> 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
>>> 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 0991dc695a9a9f92cb17560a99ef5d59b9f34fd5..bc9b18c846e88f528714dd7c178fa89c930319ba 100644
(file)
--- 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
>>> 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
>>> 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