Routers: named variables

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

diff --git a/src/src/smtp_out.c b/src/src/smtp_out.c
index 8a4dace7e7f324f8589228035ac750f5422f4599..c19d12d43599c5baa5d94ffb9ede2a762ceed0cc 100644 (file)
--- a/src/src/smtp_out.c
+++ b/src/src/smtp_out.c
@@ -444,7 +444,7 @@ BOOL more = mode == SCMD_MORE;
 HDEBUG(D_transport|D_acl) debug_printf_indent("cmd buf flush %d bytes%s\n", n,
   more ? " (more expected)" : "");
 
 HDEBUG(D_transport|D_acl) debug_printf_indent("cmd buf flush %d bytes%s\n", n,
   more ? " (more expected)" : "");
 

-#ifdef SUPPORT_TLS
+#ifndef DISABLE_TLS

 if (outblock->cctx->tls_ctx)
   rc = tls_write(outblock->cctx->tls_ctx, outblock->buffer, n, more);
 else
 if (outblock->cctx->tls_ctx)
   rc = tls_write(outblock->cctx->tls_ctx, outblock->buffer, n, more);
 else


@@ -589,14 +589,14 @@ Arguments:
   inblock   the SMTP input block (contains holding buffer, socket, etc.)
   buffer    where to put the line
   size      space available for the line
   inblock   the SMTP input block (contains holding buffer, socket, etc.)
   buffer    where to put the line
   size      space available for the line

-  timeout   the timeout to use when reading a packet
+  timelimit deadline for reading the lime, seconds past epoch

 
 Returns:    length of a line that has been put in the buffer
             -1 otherwise, with errno set
 */
 
 static int
 
 Returns:    length of a line that has been put in the buffer
             -1 otherwise, with errno set
 */
 
 static int

-read_response_line(smtp_inblock *inblock, uschar *buffer, int size, int timeout)
+read_response_line(smtp_inblock *inblock, uschar *buffer, int size, time_t timelimit)

 {
 uschar *p = buffer;
 uschar *ptr = inblock->ptr;
 {
 uschar *p = buffer;
 uschar *ptr = inblock->ptr;


@@ -639,9 +639,9 @@ for (;;)
 
   /* Need to read a new input packet. */
 
 
   /* Need to read a new input packet. */
 

-  if((rc = ip_recv(cctx, inblock->buffer, inblock->buffersize, timeout)) <= 0)
+  if((rc = ip_recv(cctx, inblock->buffer, inblock->buffersize, timelimit)) <= 0)

     {
     {

-    DEBUG(D_deliver|D_transport|D_acl)
+    DEBUG(D_deliver|D_transport|D_acl|D_v)

       debug_printf_indent(errno ? "  SMTP(%s)<<\n" : "  SMTP(closed)<<\n",
        strerror(errno));
     break;
       debug_printf_indent(errno ? "  SMTP(%s)<<\n" : "  SMTP(closed)<<\n",
        strerror(errno));
     break;


@@ -690,22 +690,28 @@ Returns:    TRUE if a valid, non-error response was received; else FALSE
 /*XXX could move to smtp transport; no other users */
 
 BOOL
 /*XXX could move to smtp transport; no other users */
 
 BOOL

-smtp_read_response(void * sx0, uschar *buffer, int size, int okdigit,
+smtp_read_response(void * sx0, uschar * buffer, int size, int okdigit,

    int timeout)
 {
 smtp_context * sx = sx0;
    int timeout)
 {
 smtp_context * sx = sx0;

-uschar *ptr = buffer;
+uschar * ptr = buffer;

 int count = 0;
 int count = 0;

+time_t timelimit = time(NULL) + timeout;

 
 errno = 0;  /* Ensure errno starts out zero */
 
 
 errno = 0;  /* Ensure errno starts out zero */
 

-#ifdef EXPERIMENTAL_PIPE_CONNECT
+#ifdef SUPPORT_PIPE_CONNECT

 if (sx->pending_BANNER || sx->pending_EHLO)
 if (sx->pending_BANNER || sx->pending_EHLO)

-  if (smtp_reap_early_pipe(sx, &count) != OK)
+  {
+  int rc;
+  if ((rc = smtp_reap_early_pipe(sx, &count)) != OK)

     {
     DEBUG(D_transport) debug_printf("failed reaping pipelined cmd responsess\n");
     {
     DEBUG(D_transport) debug_printf("failed reaping pipelined cmd responsess\n");

+    buffer[0] = '\0';
+    if (rc == DEFER) errno = ERRNO_TLSFAILURE;

     return FALSE;
     }
     return FALSE;
     }

+  }

 #endif
 
 /* This is a loop to read and concatenate the lines that make up a multi-line
 #endif
 
 /* This is a loop to read and concatenate the lines that make up a multi-line


@@ -713,7 +719,7 @@ response. */
 
 for (;;)
   {
 
 for (;;)
   {

-  if ((count = read_response_line(&sx->inblock, ptr, size, timeout)) < 0)
+  if ((count = read_response_line(&sx->inblock, ptr, size, timelimit)) < 0)

     return FALSE;
 
   HDEBUG(D_transport|D_acl|D_v)
     return FALSE;
 
   HDEBUG(D_transport|D_acl|D_v)