Apply timeout to Fsecure malware response. Bug 1549

[users/heiko/exim.git] / src / src / smtp_out.c

diff --git a/src/src/smtp_out.c b/src/src/smtp_out.c
index 4920b737129ffbe2cdf3a6e3a5938fb1cab7b747..530fcfec75687954629ba0d9471820191e290bc9 100644 (file)
--- a/src/src/smtp_out.c
+++ b/src/src/smtp_out.c
@@ -165,7 +165,7 @@ Arguments:
   timeout     timeout value or 0
   keepalive   TRUE to use keepalive
   dscp        DSCP value to assign to socket
   timeout     timeout value or 0
   keepalive   TRUE to use keepalive
   dscp        DSCP value to assign to socket

-  tpda_event  event expansion
+  event       event expansion

 
 Returns:      connected socket number, or -1 with errno set
 */
 
 Returns:      connected socket number, or -1 with errno set
 */


@@ -173,8 +173,8 @@ Returns:      connected socket number, or -1 with errno set
 int
 smtp_connect(host_item *host, int host_af, int port, uschar *interface,
   int timeout, BOOL keepalive, const uschar *dscp
 int
 smtp_connect(host_item *host, int host_af, int port, uschar *interface,
   int timeout, BOOL keepalive, const uschar *dscp

-#ifdef EXPERIMENTAL_TPDA
-  , uschar * tpda_event
+#ifdef EXPERIMENTAL_EVENT
+  , uschar * event

 #endif
   )
 {
 #endif
   )
 {


@@ -203,11 +203,11 @@ HDEBUG(D_transport|D_acl|D_v)
       host->address, port, interface);
   }
 
       host->address, port, interface);
   }
 

-#ifdef EXPERIMENTAL_TPDA
-  /*XXX Called from both delivery and verify.  Is that status observable? */
+#ifdef EXPERIMENTAL_EVENT

   deliver_host_address = host->address;
   deliver_host_port = port;
   deliver_host_address = host->address;
   deliver_host_port = port;

-  if (tpda_raise_event(tpda_event, US"tcp:connect", NULL) == DEFER) return -1;
+  if (event_raise(event, US"tcp:connect", NULL)) return -1;
+  /* Logging?  Debug? */

 #endif
 
 /* Create the socket */
 #endif
 
 /* Create the socket */