ph10 2004/11/04 12:19:49 GMT
Modified files:
exim-doc/doc-txt ChangeLog NewStuff
exim-src/src acl.c exim.c functions.h smtp_in.c
smtp_out.c verify.c
exim-src/src/routers rf_get_errors_address.c
exim-test-orig/AutoTest/confs 552
exim-test-orig/AutoTest/log 260
exim-test-orig/AutoTest/stderr 247 257 315 437 451 516 524 555
Log:
Added a "connect=<time>" option to callouts, for a separate timeout
for making the connection. As part of this, the debug output for a
failed connection now shows the error, and, if it's a timeout, the
timeout value.
Revision Changes Path
1.15 +3 -0 exim/exim-doc/doc-txt/ChangeLog
1.6 +8 -0 exim/exim-doc/doc-txt/NewStuff
1.5 +28 -3 exim/exim-src/src/acl.c
1.7 +1 -1 exim/exim-src/src/exim.c
1.2 +3 -3 exim/exim-src/src/functions.h
1.2 +1 -1 exim/exim-src/src/routers/rf_get_errors_address.c
1.4 +3 -2 exim/exim-src/src/smtp_in.c
1.2 +7 -1 exim/exim-src/src/smtp_out.c
1.2 +19 -13 exim/exim-src/src/verify.c
1.2 +1 -1 exim/exim-test-orig/AutoTest/confs/552
1.2 +1 -1 exim/exim-test-orig/AutoTest/log/260
1.2 +1 -1 exim/exim-test-orig/AutoTest/stderr/247
1.2 +3 -3 exim/exim-test-orig/AutoTest/stderr/257
1.2 +2 -2 exim/exim-test-orig/AutoTest/stderr/315
1.2 +1 -1 exim/exim-test-orig/AutoTest/stderr/437
1.3 +1 -1 exim/exim-test-orig/AutoTest/stderr/451
1.2 +2 -2 exim/exim-test-orig/AutoTest/stderr/516
1.2 +2 -2 exim/exim-test-orig/AutoTest/stderr/524
1.2 +1 -1 exim/exim-test-orig/AutoTest/stderr/555
Index: ChangeLog
===================================================================
RCS file: /home/cvs/exim/exim-doc/doc-txt/ChangeLog,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ChangeLog 4 Nov 2004 10:42:11 -0000 1.14
+++ ChangeLog 4 Nov 2004 12:19:48 -0000 1.15
@@ -1,4 +1,4 @@
-$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.14 2004/11/04 10:42:11 ph10 Exp $
+$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.15 2004/11/04 12:19:48 ph10 Exp $
Change log file for Exim from version 4.21
-------------------------------------------
@@ -55,6 +55,9 @@
$sender_address_data in subsequent conditions in the ACL statement.
14. Added forbid_sieve_filter and forbid_exim_filter to the redirect router.
+
+15. Added a new option "connect=<time>" to callout options, to set a different
+ connection timeout.
Exim version 4.43
Index: NewStuff
===================================================================
RCS file: /home/cvs/exim/exim-doc/doc-txt/NewStuff,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- NewStuff 4 Nov 2004 10:42:11 -0000 1.5
+++ NewStuff 4 Nov 2004 12:19:48 -0000 1.6
@@ -1,4 +1,4 @@
-$Cambridge: exim/exim-doc/doc-txt/NewStuff,v 1.5 2004/11/04 10:42:11 ph10 Exp $
+$Cambridge: exim/exim-doc/doc-txt/NewStuff,v 1.6 2004/11/04 12:19:48 ph10 Exp $
New Features in Exim
--------------------
@@ -32,6 +32,14 @@
forbid_exim_filter. When filtering is enabled by allow_filter, these
options control which type(s) of filtering are permitted. By default, both
Exim and Sieve filters are allowed.
+
+ 6. A new option for callouts makes it possible to set a different (usually
+ smaller) timeout for making the SMTP connection. The keyword is "connect".
+ For example:
+
+ verify = sender/callout=5s,connect=1s
+
+ If not specified, it defaults to the general timeout value.
Version 4.43
Index: acl.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/acl.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- acl.c 19 Oct 2004 13:40:39 -0000 1.4
+++ acl.c 4 Nov 2004 12:19:48 -0000 1.5
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/acl.c,v 1.4 2004/10/19 13:40:39 ph10 Exp $ */
+/* $Cambridge: exim/exim-src/src/acl.c,v 1.5 2004/11/04 12:19:48 ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -689,6 +689,7 @@
int sep = '/';
int callout = -1;
int callout_overall = -1;
+int callout_connect = -1;
int verify_options = 0;
int rc;
BOOL verify_header_sender = FALSE;
@@ -835,6 +836,11 @@
uschar *opt;
uschar buffer[256];
while (isspace(*ss)) ss++;
+
+ /* This callout option handling code has become a mess as new options
+ have been added in an ad hoc manner. It should be tidied up into some
+ kind of table-driven thing. */
+
while ((opt = string_nextinlist(&ss, &optsep, buffer, sizeof(buffer)))
!= NULL)
{
@@ -903,6 +909,25 @@
return ERROR;
}
}
+ else if (strncmpic(opt, US"connect", 7) == 0)
+ {
+ opt += 7;
+ while (isspace(*opt)) opt++;
+ if (*opt++ != '=')
+ {
+ *log_msgptr = string_sprintf("'=' expected after "
+ "\"callout_overaall\" in ACL condition \"%s\"", arg);
+ return ERROR;
+ }
+ while (isspace(*opt)) opt++;
+ callout_connect = readconf_readtime(opt, 0, FALSE);
+ if (callout_connect < 0)
+ {
+ *log_msgptr = string_sprintf("bad time value in ACL condition "
+ "\"verify %s\"", arg);
+ return ERROR;
+ }
+ }
else /* Plain time is callout connect/command timeout */
{
callout = readconf_readtime(opt, 0, FALSE);
@@ -948,7 +973,7 @@
if (verify_header_sender)
{
rc = verify_check_header_address(user_msgptr, log_msgptr, callout,
- callout_overall, se_mailfrom, pm_mailfrom, verify_options);
+ callout_overall, callout_connect, se_mailfrom, pm_mailfrom, verify_options);
if (smtp_return_error_details)
{
if (*user_msgptr == NULL && *log_msgptr != NULL)
@@ -1031,7 +1056,7 @@
verify_options. */
rc = verify_address(sender_vaddr, NULL, verify_options, callout,
- callout_overall, se_mailfrom, pm_mailfrom, &routed);
+ callout_overall, callout_connect, se_mailfrom, pm_mailfrom, &routed);
HDEBUG(D_acl) debug_printf("----------- end verify ------------\n");
@@ -1083,7 +1108,7 @@
addr2 = *addr;
rc = verify_address(&addr2, NULL, verify_options|vopt_is_recipient, callout,
- callout_overall, se_mailfrom, pm_mailfrom, NULL);
+ callout_overall, callout_connect, se_mailfrom, pm_mailfrom, NULL);
HDEBUG(D_acl) debug_printf("----------- end verify ------------\n");
*log_msgptr = addr2.message;
*user_msgptr = addr2.user_message;
Index: exim.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/exim.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- exim.c 19 Oct 2004 11:40:52 -0000 1.6
+++ exim.c 4 Nov 2004 12:19:48 -0000 1.7
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/exim.c,v 1.6 2004/10/19 11:40:52 ph10 Exp $ */
+/* $Cambridge: exim/exim-src/src/exim.c,v 1.7 2004/11/04 12:19:48 ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -640,7 +640,7 @@
else
{
int rc = verify_address(deliver_make_addr(address,TRUE), stdout, flags, -1,
- -1, NULL, NULL, NULL);
+ -1, -1, NULL, NULL, NULL);
if (rc == FAIL) *exit_value = 2;
else if (rc == DEFER && *exit_value == 0) *exit_value = 1;
}
Index: functions.h
===================================================================
RCS file: /home/cvs/exim/exim-src/src/functions.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- functions.h 7 Oct 2004 10:39:01 -0000 1.1
+++ functions.h 4 Nov 2004 12:19:48 -0000 1.2
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/functions.h,v 1.1 2004/10/07 10:39:01 ph10 Exp $ */
+/* $Cambridge: exim/exim-src/src/functions.h,v 1.2 2004/11/04 12:19:48 ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -292,10 +292,10 @@
extern tree_node *tree_search(tree_node *, uschar *);
extern void tree_write(tree_node *, FILE *);
-extern int verify_address(address_item *, FILE *, int, int, int, uschar *,
- uschar *, BOOL *);
+extern int verify_address(address_item *, FILE *, int, int, int, int,
+ uschar *, uschar *, BOOL *);
extern int verify_check_dnsbl(uschar **);
-extern int verify_check_header_address(uschar **, uschar **, int, int,
+extern int verify_check_header_address(uschar **, uschar **, int, int, int,
uschar *, uschar *, int);
extern int verify_check_headers(uschar **);
extern int verify_check_host(uschar **);
Index: smtp_in.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/smtp_in.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- smtp_in.c 19 Oct 2004 11:29:25 -0000 1.3
+++ smtp_in.c 4 Nov 2004 12:19:48 -0000 1.4
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/smtp_in.c,v 1.3 2004/10/19 11:29:25 ph10 Exp $ */
+/* $Cambridge: exim/exim-src/src/smtp_in.c,v 1.4 2004/11/04 12:19:48 ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -3078,7 +3078,7 @@
{
address_item *addr = deliver_make_addr(address, FALSE);
switch(verify_address(addr, NULL, vopt_is_recipient | vopt_qualify, -1,
- -1, NULL, NULL, NULL))
+ -1, -1, NULL, NULL, NULL))
{
case OK:
s = string_sprintf("250 <%s> is deliverable", address);
@@ -3115,7 +3115,8 @@
BOOL save_log_testing_mode = log_testing_mode;
address_test_mode = log_testing_mode = TRUE;
(void) verify_address(deliver_make_addr(smtp_data, FALSE), smtp_out,
- vopt_is_recipient | vopt_qualify | vopt_expn, -1, -1, NULL, NULL, NULL);
+ vopt_is_recipient | vopt_qualify | vopt_expn, -1, -1, -1, NULL, NULL,
+ NULL);
address_test_mode = FALSE;
log_testing_mode = save_log_testing_mode; /* true for -bh */
}
Index: smtp_out.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/smtp_out.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- smtp_out.c 7 Oct 2004 10:39:01 -0000 1.1
+++ smtp_out.c 4 Nov 2004 12:19:48 -0000 1.2
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/smtp_out.c,v 1.1 2004/10/07 10:39:01 ph10 Exp $ */
+/* $Cambridge: exim/exim-src/src/smtp_out.c,v 1.2 2004/11/04 12:19:48 ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -223,7 +223,13 @@
if (save_errno != 0)
{
- HDEBUG(D_transport|D_acl|D_v) debug_printf("failed\n");
+ HDEBUG(D_transport|D_acl|D_v)
+ {
+ debug_printf("failed: %s", CUstrerror(save_errno));
+ if (save_errno == ETIMEDOUT)
+ debug_printf(" (timeout=%s)", readconf_printtime(timeout));
+ debug_printf("\n");
+ }
close(sock);
errno = save_errno;
return -1;
Index: verify.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/verify.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- verify.c 7 Oct 2004 10:39:01 -0000 1.1
+++ verify.c 4 Nov 2004 12:19:48 -0000 1.2
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/verify.c,v 1.1 2004/10/07 10:39:01 ph10 Exp $ */
+/* $Cambridge: exim/exim-src/src/verify.c,v 1.2 2004/11/04 12:19:48 ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -123,7 +123,8 @@
portstring "port" option from transport, or NULL
protocolstring "protocol" option from transport, or NULL
callout the per-command callout timeout
- callout_overall the overall callout timeout (if < 0; use 4*callout)
+ callout_overall the overall callout timeout (if < 0 use 4*callout)
+ callout_connect the callout connection timeout (if < 0 use callout)
options the verification options - these bits are used:
vopt_is_recipient => this is a recipient address
vopt_callout_no_cache => don't use callout cache
@@ -138,8 +139,8 @@
static int
do_callout(address_item *addr, host_item *host_list, transport_feedback *tf,
- int callout, int callout_overall, int options, uschar *se_mailfrom,
- uschar *pm_mailfrom)
+ int callout, int callout_overall, int callout_connect, int options,
+ uschar *se_mailfrom, uschar *pm_mailfrom)
{
BOOL is_recipient = (options & vopt_is_recipient) != 0;
BOOL callout_no_cache = (options & vopt_callout_no_cache) != 0;
@@ -355,10 +356,11 @@
"callout_random_local_part: %s", expand_string_message);
}
-/* Default the overall callout timeout if not set, and record the time we are
-starting so that we can enforce it. */
+/* Default the connect and overall callout timeouts if not set, and record the
+time we are starting so that we can enforce it. */
if (callout_overall < 0) callout_overall = 4 * callout;
+if (callout_connect < 0) callout_connect = callout;
callout_start_time = time(NULL);
/* Now make connections to the hosts and do real callouts. The list of hosts
@@ -435,10 +437,10 @@
outblock.authenticating = FALSE;
/* Connect to the host; on failure, just loop for the next one, but we
- set the error for the last one. */
+ set the error for the last one. Use the callout_connect timeout. */
inblock.sock = outblock.sock =
- smtp_connect(host, host_af, port, interface, callout, TRUE);
+ smtp_connect(host, host_af, port, interface, callout_connect, TRUE);
if (inblock.sock < 0)
{
addr->message = string_sprintf("could not connect to %s [%s]: %s",
@@ -782,9 +784,10 @@
vopt_callout_recippmaster => use postmaster for recipient
callout if > 0, specifies that callout is required, and gives timeout
- for individual connections and commands
+ for individual commands
callout_overall if > 0, gives overall timeout for the callout function;
if < 0, a default is used (see do_callout())
+ callout_connect the connection timeout for callouts
se_mailfrom when callout is requested to verify a sender, use this
in MAIL FROM; NULL => ""
pm_mailfrom when callout is requested, if non-NULL, do the postmaster
@@ -800,7 +803,8 @@
int
verify_address(address_item *vaddr, FILE *f, int options, int callout,
- int callout_overall, uschar *se_mailfrom, uschar *pm_mailfrom, BOOL *routed)
+ int callout_overall, int callout_connect, uschar *se_mailfrom,
+ uschar *pm_mailfrom, BOOL *routed)
{
BOOL allok = TRUE;
BOOL full_info = (f == NULL)? FALSE : (debug_selector != 0);
@@ -1054,7 +1058,7 @@
else
{
rc = do_callout(addr, host_list, &tf, callout, callout_overall,
- options, se_mailfrom, pm_mailfrom);
+ callout_connect, options, se_mailfrom, pm_mailfrom);
}
}
else
@@ -1426,6 +1430,7 @@
log_msgptr points to where to put a log error message
callout timeout for callout check (passed to verify_address())
callout_overall overall callout timeout (ditto)
+ callout_connect connect callout timeout (ditto)
se_mailfrom mailfrom for verify; NULL => ""
pm_mailfrom sender for pm callout check (passed to verify_address())
options callout options (passed to verify_address())
@@ -1439,8 +1444,8 @@
int
verify_check_header_address(uschar **user_msgptr, uschar **log_msgptr,
- int callout, int callout_overall, uschar *se_mailfrom, uschar *pm_mailfrom,
- int options)
+ int callout, int callout_overall, int callout_connect, uschar *se_mailfrom,
+ uschar *pm_mailfrom, int options)
{
static int header_types[] = { htype_sender, htype_reply_to, htype_from };
int yield = FAIL;
@@ -1529,7 +1534,8 @@
{
vaddr = deliver_make_addr(address, FALSE);
new_ok = verify_address(vaddr, NULL, options | vopt_fake_sender,
- callout, callout_overall, se_mailfrom, pm_mailfrom, NULL);
+ callout, callout_overall, callout_connect, se_mailfrom,
+ pm_mailfrom, NULL);
}
}
Index: rf_get_errors_address.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/routers/rf_get_errors_address.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rf_get_errors_address.c 7 Oct 2004 13:10:02 -0000 1.1
+++ rf_get_errors_address.c 4 Nov 2004 12:19:48 -0000 1.2
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/routers/rf_get_errors_address.c,v 1.1 2004/10/07 13:10:02 ph10 Exp $ */
+/* $Cambridge: exim/exim-src/src/routers/rf_get_errors_address.c,v 1.2 2004/11/04 12:19:48 ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -102,7 +102,7 @@
DEBUG(D_route|D_verify)
debug_printf("------ Verifying errors address %s ------\n", s);
- if (verify_address(snew, NULL, vopt_is_recipient | vopt_qualify, -1, -1,
+ if (verify_address(snew, NULL, vopt_is_recipient | vopt_qualify, -1, -1, -1,
NULL, NULL, NULL) == OK) *errors_to = snew->address;
DEBUG(D_route|D_verify)
debug_printf("------ End verifying errors address %s ------\n", s);
Index: 552
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/confs/552,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 552 8 Oct 2004 14:49:16 -0000 1.1
+++ 552 4 Nov 2004 12:19:48 -0000 1.2
@@ -24,7 +24,7 @@
accept verify = recipient/callout=1sUSE_SENDER
acl_rcpt_sender:
- accept verify = sender/callout=1s
+ accept verify = sender/callout=1s,connect=2s
# ----- Routers -----
Index: 260
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/260,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 260 8 Oct 2004 14:49:31 -0000 1.1
+++ 260 4 Nov 2004 12:19:48 -0000 1.2
@@ -17,7 +17,7 @@
1999-03-02 09:44:33 SMTP connection from [::1]:1112 I=[::1]:1225 (TCP/IP connection count = 1)
1999-03-02 09:44:33 10HmaY-0005vi-00 <= x@??? H=[::1]:1112 I=[::1]:1225 P=smtp S=145
1999-03-02 09:44:33 SMTP connection from [::1]:1112 I=[::1]:1225 closed by QUIT
-1999-03-02 09:44:33 SMTP connection from [127.0.0.1]:1113 I=[127.0.0.1]:1225 (TCP/IP connection count = 2)
+1999-03-02 09:44:33 SMTP connection from [127.0.0.1]:1113 I=[127.0.0.1]:1225 (TCP/IP connection count = 1)
1999-03-02 09:44:33 10HmaZ-0005vi-00 <= x@??? H=[127.0.0.1]:1113 I=[127.0.0.1]:1225 P=smtp S=151
1999-03-02 09:44:33 SMTP connection from [127.0.0.1]:1113 I=[127.0.0.1]:1225 closed by QUIT
1999-03-02 09:44:33 SMTP connection from [::1]:1114 I=[::1]:1225 (TCP/IP connection count = 1)
Index: 247
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/247,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 247 8 Oct 2004 14:50:08 -0000 1.1
+++ 247 4 Nov 2004 12:19:49 -0000 1.2
@@ -95,7 +95,7 @@
LOG: MAIN
Completed
delivering 10HmbA-0005vi-00 (queue run pid ppppp)
-Connecting to 127.0.0.1 [127.0.0.1]:1225 ... failed
+Connecting to 127.0.0.1 [127.0.0.1]:1225 ... failed: Connection refused
LOG: MAIN
127.0.0.1 [127.0.0.1]: Connection refused
LOG: MAIN
Index: 257
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/257,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 257 8 Oct 2004 14:50:08 -0000 1.1
+++ 257 4 Nov 2004 12:19:49 -0000 1.2
@@ -113,8 +113,8 @@
SMTP connection from root closed by QUIT
LOG: smtp_connection MAIN
SMTP connection from root
-Connecting to 127.0.0.1 [127.0.0.1]:1225 ... failed
-Connecting to ::1 [::1]:1225 ... failed
+Connecting to 127.0.0.1 [127.0.0.1]:1225 ... failed: Connection refused
+Connecting to ::1 [::1]:1225 ... failed: Connection refused
LOG: MAIN REJECT
H=[10.0.0.3] U=root F=<uncheckable@localhost1> temporarily rejected RCPT <z@???>: Could not complete recipient verify callout
LOG: smtp_connection MAIN
@@ -220,7 +220,7 @@
SMTP connection from root closed by QUIT
LOG: smtp_connection MAIN
SMTP connection from root
-Connecting to 127.0.0.1 [127.0.0.1]:1225 ... failed
+Connecting to 127.0.0.1 [127.0.0.1]:1225 ... failed: Connection refused
LOG: MAIN REJECT
H=[10.0.0.1] U=root sender verify defer for <bad@localhost1>: could not connect to 127.0.0.1 [127.0.0.1]: Connection refused
LOG: MAIN REJECT
Index: 315
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/315,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 315 8 Oct 2004 14:50:08 -0000 1.1
+++ 315 4 Nov 2004 12:19:49 -0000 1.2
@@ -19,7 +19,7 @@
LOG: MAIN
<= <> R=10HmaX-0005vi-00 U=exim P=local S=1086
delivering 10HmaY-0005vi-00
-Connecting to 127.0.0.1 [127.0.0.1]:1225 ... failed
+Connecting to 127.0.0.1 [127.0.0.1]:1225 ... failed: Connection refused
LOG: MAIN
127.0.0.1 [127.0.0.1]: Connection refused
LOG: MAIN
@@ -52,7 +52,7 @@
LOG: MAIN
<= <> R=10HmaZ-0005vi-00 U=exim P=local S=1076
delivering 10HmbA-0005vi-00
-Connecting to 127.0.0.1 [127.0.0.1]:1225 ... failed
+Connecting to 127.0.0.1 [127.0.0.1]:1225 ... failed: Connection refused
LOG: MAIN
127.0.0.1 [127.0.0.1]: Connection refused
LOG: MAIN
Index: 437
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/437,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 437 8 Oct 2004 14:50:08 -0000 1.1
+++ 437 4 Nov 2004 12:19:49 -0000 1.2
@@ -67,7 +67,7 @@
callout cache: found domain record
callout cache: address record expired
interface=NULL port=1225
-Connecting to 127.0.0.1 [127.0.0.1]:1225 ... failed
+Connecting to 127.0.0.1 [127.0.0.1]:1225 ... failed: Connection refused
LOG: MAIN REJECT
H=[10.0.0.1] U=root sender verify defer for <ok@localhost>: could not connect to 127.0.0.1 [127.0.0.1]: Connection refused
created log directory /source/exim4/AutoTest/spool/log
Index: 451
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/451,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 451 19 Oct 2004 14:31:15 -0000 1.2
+++ 451 4 Nov 2004 12:19:49 -0000 1.3
@@ -125,7 +125,7 @@
set_process_info: 21680 delivering 10HmaX-0005vi-00 to 10.0.0.0 [10.0.0.0] (x@y)
hosts_max_try limit reached with this host
set_process_info: 21680 delivering 10HmaX-0005vi-00: waiting for a remote delivery subprocess to finish
-Connecting to 10.0.0.0 [10.0.0.0]:1225 ... failed
+Connecting to 10.0.0.0 [10.0.0.0]:1225 ... failed: Connection timed out (timeout=2s)
LOG: MAIN
10.0.0.0 [10.0.0.0]: Connection timed out
set_process_info: 21680 delivering 10HmaX-0005vi-00: just tried 10.0.0.0 [10.0.0.0] for x@y: result DEFER
Index: 516
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/516,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 516 8 Oct 2004 14:50:08 -0000 1.1
+++ 516 4 Nov 2004 12:19:49 -0000 1.2
@@ -17,9 +17,9 @@
>>> callout cache: no domain record found
>>> callout cache: no address record found
>>> interface=NULL port=25
->>> Connecting to ten-1.test.ex [10.0.0.1]:25 ... failed
+>>> Connecting to ten-1.test.ex [10.0.0.1]:25 ... failed: Connection timed out (timeout=1s)
>>> interface=NULL port=25
->>> Connecting to v6.test.ex [3ffe:ffff:836f:a00:a:800:200a:c032]:25 ... failed
+>>> Connecting to v6.test.ex [3ffe:ffff:836f:a00:a:800:200a:c032]:25 ... failed: Connection timed out (timeout=1s)
>>> ----------- end verify ------------
>>> accept: condition test deferred
LOG: H=[10.0.0.1] sender verify defer for <x@???>: Could not complete sender verify callout
Index: 524
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/524,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 524 8 Oct 2004 14:50:08 -0000 1.1
+++ 524 4 Nov 2004 12:19:49 -0000 1.2
@@ -23,7 +23,7 @@
checking status of 127.0.0.1
127.0.0.1 [127.0.0.1]:1111 status = usable
delivering 10HmaX-0005vi-00 to 127.0.0.1 [127.0.0.1] (ph10@???)
-Connecting to 127.0.0.1 [127.0.0.1]:1225 ... failed
+Connecting to 127.0.0.1 [127.0.0.1]:1225 ... failed: Connection refused
LOG: MAIN
127.0.0.1 [127.0.0.1]: Connection refused
added retry item for T:127.0.0.1:127.0.0.1:1225: errno=111 more_errno=0,A flags=2
@@ -52,7 +52,7 @@
no message retry record
127.0.0.1 [127.0.0.1]:1112 status = usable
delivering 10HmaX-0005vi-00 to 127.0.0.1 [127.0.0.1] (ph10@???)
-Connecting to 127.0.0.1 [127.0.0.1]:1226 ... failed
+Connecting to 127.0.0.1 [127.0.0.1]:1226 ... failed: Connection refused
LOG: MAIN
127.0.0.1 [127.0.0.1]: Connection refused
added retry item for T:127.0.0.1:127.0.0.1:1226: errno=111 more_errno=0,A flags=2
Index: 555
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/555,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 555 8 Oct 2004 14:50:08 -0000 1.1
+++ 555 4 Nov 2004 12:19:49 -0000 1.2
@@ -84,7 +84,7 @@
127.0.0.1 [127.0.0.1]:1111 status = usable
delivering 10HmaZ-0005vi-00 to 127.0.0.1 [127.0.0.1] (ph10@???)
set_process_info: 21680 delivering 10HmaZ-0005vi-00 to 127.0.0.1 [127.0.0.1] (ph10@???)
-Connecting to 127.0.0.1 [127.0.0.1]:1225 ... failed
+Connecting to 127.0.0.1 [127.0.0.1]:1225 ... failed: Connection refused
LOG: MAIN
127.0.0.1 [127.0.0.1]: Connection refused
set_process_info: 21680 delivering 10HmaZ-0005vi-00: just tried 127.0.0.1 [127.0.0.1] for ph10@???: result DEFER
