Another small test tweak.

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

diff --git a/src/src/transport.c b/src/src/transport.c
index 6630f36ee87ba3f3b51af6d094395e02f5772978..3e63052e15d582447e67e5d76d10fec9cb309ae9 100644 (file)
--- a/src/src/transport.c
+++ b/src/src/transport.c
@@ -1,10 +1,10 @@
-/* $Cambridge: exim/src/src/transport.c,v 1.10 2005/06/20 11:20:41 ph10 Exp $ */
+/* $Cambridge: exim/src/src/transport.c,v 1.19 2007/01/08 10:50:18 ph10 Exp $ */

 
 /*************************************************
 *     Exim - an Internet mail transport agent    *
 *************************************************/
 
 
 /*************************************************
 *     Exim - an Internet mail transport agent    *
 *************************************************/
 

-/* Copyright (c) University of Cambridge 1995 - 2005 */
+/* Copyright (c) University of Cambridge 1995 - 2007 */

 /* See the file NOTICE for conditions of use and distribution. */
 
 /* General functions concerned with transportation, and generic options for all
 /* See the file NOTICE for conditions of use and distribution. */
 
 /* General functions concerned with transportation, and generic options for all


@@ -13,6 +13,9 @@ transports. */
 
 #include "exim.h"
 
 
 #include "exim.h"
 

+#ifdef HAVE_LINUX_SENDFILE
+#include <sys/sendfile.h>
+#endif

 
 /* Structure for keeping list of addresses that have been added to
 Envelope-To:, in order to avoid duplication. */
 
 /* Structure for keeping list of addresses that have been added to
 Envelope-To:, in order to avoid duplication. */


@@ -983,10 +986,11 @@ dk_transport_write_message(address_item *addr, int fd, int options,
   int sread = 0;
   int wwritten = 0;
   uschar *dk_signature = NULL;
   int sread = 0;
   int wwritten = 0;
   uschar *dk_signature = NULL;

+  off_t size = 0;

 
 

-  snprintf(CS dk_spool_name, 256, "%s/input/%s/%s-K",
-          spool_directory, message_subdir, message_id);
-  dk_fd = Uopen(dk_spool_name, O_RDWR|O_CREAT|O_EXCL, SPOOL_MODE);
+  (void)string_format(dk_spool_name, 256, "%s/input/%s/%s-%d-K",
+          spool_directory, message_subdir, message_id, (int)getpid());
+  dk_fd = Uopen(dk_spool_name, O_RDWR|O_CREAT|O_TRUNC, SPOOL_MODE);

   if (dk_fd < 0)
     {
     /* Can't create spool file. Ugh. */
   if (dk_fd < 0)
     {
     /* Can't create spool file. Ugh. */


@@ -1052,9 +1056,35 @@ dk_transport_write_message(address_item *addr, int fd, int options,
       }
     }
 
       }
     }
 

-  /* Rewind file and send it down the original fd. */
+  /* Fetch file positition (the size) */
+  size = lseek(dk_fd,0,SEEK_CUR);
+
+  /* Rewind file */

   lseek(dk_fd, 0, SEEK_SET);
 
   lseek(dk_fd, 0, SEEK_SET);
 

+#ifdef HAVE_LINUX_SENDFILE
+  /* We can use sendfile() to shove the file contents
+     to the socket. However only if we don't use TLS,
+     in which case theres another layer of indirection
+     before the data finally hits the socket. */
+  if (tls_active != fd)
+    {
+    ssize_t copied = 0;
+    off_t offset = 0;
+    while((copied >= 0) && (offset<size))
+      {
+      copied = sendfile(fd, dk_fd, &offset, (size - offset));
+      }
+    if (copied < 0)
+      {
+      save_errno = errno;
+      rc = FALSE;
+      }
+    goto CLEANUP;
+    }
+#endif
+
+  /* Send file down the original fd */

   while((sread = read(dk_fd,sbuf,2048)) > 0)
     {
     char *p = sbuf;
   while((sread = read(dk_fd,sbuf,2048)) > 0)
     {
     char *p = sbuf;


@@ -1087,10 +1117,9 @@ dk_transport_write_message(address_item *addr, int fd, int options,
     goto CLEANUP;
     }
 
     goto CLEANUP;
     }
 

-

   CLEANUP:
   /* unlink -K file */
   CLEANUP:
   /* unlink -K file */

-  close(dk_fd);
+  (void)close(dk_fd);

   Uunlink(dk_spool_name);
   errno = save_errno;
   return rc;
   Uunlink(dk_spool_name);
   errno = save_errno;
   return rc;


@@ -1164,10 +1193,10 @@ save_errno = 0;
 yield = FALSE;
 write_pid = (pid_t)(-1);
 
 yield = FALSE;
 write_pid = (pid_t)(-1);
 

-fcntl(fd, F_SETFD, fcntl(fd, F_GETFD) | FD_CLOEXEC);
+(void)fcntl(fd, F_SETFD, fcntl(fd, F_GETFD) | FD_CLOEXEC);

 filter_pid = child_open(transport_filter_argv, NULL, 077, &fd_write, &fd_read,
   FALSE);
 filter_pid = child_open(transport_filter_argv, NULL, 077, &fd_write, &fd_read,
   FALSE);

-fcntl(fd, F_SETFD, fcntl(fd, F_GETFD) & ~FD_CLOEXEC);
+(void)fcntl(fd, F_SETFD, fcntl(fd, F_GETFD) & ~FD_CLOEXEC);

 if (filter_pid < 0) goto TIDY_UP;      /* errno set */
 
 DEBUG(D_transport)
 if (filter_pid < 0) goto TIDY_UP;      /* errno set */
 
 DEBUG(D_transport)


@@ -1182,25 +1211,25 @@ if (pipe(pfd) != 0) goto TIDY_UP;      /* errno set */
 if ((write_pid = fork()) == 0)
   {
   BOOL rc;
 if ((write_pid = fork()) == 0)
   {
   BOOL rc;

-  close(fd_read);
-  close(pfd[pipe_read]);
+  (void)close(fd_read);
+  (void)close(pfd[pipe_read]);

   nl_check_length = nl_escape_length = 0;
   rc = internal_transport_write_message(addr, fd_write,
     (options & ~(topt_use_crlf | topt_end_dot)),
     size_limit, add_headers, remove_headers, NULL, NULL,
     rewrite_rules, rewrite_existflags);
   save_errno = errno;
   nl_check_length = nl_escape_length = 0;
   rc = internal_transport_write_message(addr, fd_write,
     (options & ~(topt_use_crlf | topt_end_dot)),
     size_limit, add_headers, remove_headers, NULL, NULL,
     rewrite_rules, rewrite_existflags);
   save_errno = errno;

-  write(pfd[pipe_write], (void *)&rc, sizeof(BOOL));
-  write(pfd[pipe_write], (void *)&save_errno, sizeof(int));
-  write(pfd[pipe_write], (void *)&(addr->more_errno), sizeof(int));
+  (void)write(pfd[pipe_write], (void *)&rc, sizeof(BOOL));
+  (void)write(pfd[pipe_write], (void *)&save_errno, sizeof(int));
+  (void)write(pfd[pipe_write], (void *)&(addr->more_errno), sizeof(int));

   _exit(0);
   }
 save_errno = errno;
 
 /* Parent process: close our copy of the writing subprocess' pipes. */
 
   _exit(0);
   }
 save_errno = errno;
 
 /* Parent process: close our copy of the writing subprocess' pipes. */
 

-close(pfd[pipe_write]);
-close(fd_write);
+(void)close(pfd[pipe_write]);
+(void)close(fd_write);

 fd_write = -1;
 
 /* Writing process creation failed */
 fd_write = -1;
 
 /* Writing process creation failed */


@@ -1270,8 +1299,8 @@ sure. Also apply a paranoia timeout. */
 TIDY_UP:
 save_errno = errno;
 
 TIDY_UP:
 save_errno = errno;
 

-close(fd_read);
-if (fd_write > 0) close(fd_write);
+(void)close(fd_read);
+if (fd_write > 0) (void)close(fd_write);

 
 if (!yield)
   {
 
 if (!yield)
   {


@@ -1303,11 +1332,11 @@ if (write_pid > 0)
     if (rc == 0)
       {
       BOOL ok;
     if (rc == 0)
       {
       BOOL ok;

-      read(pfd[pipe_read], (void *)&ok, sizeof(BOOL));
+      (void)read(pfd[pipe_read], (void *)&ok, sizeof(BOOL));

       if (!ok)
         {
       if (!ok)
         {

-        read(pfd[pipe_read], (void *)&save_errno, sizeof(int));
-        read(pfd[pipe_read], (void *)&(addr->more_errno), sizeof(int));
+        (void)read(pfd[pipe_read], (void *)&save_errno, sizeof(int));
+        (void)read(pfd[pipe_read], (void *)&(addr->more_errno), sizeof(int));

         yield = FALSE;
         }
       }
         yield = FALSE;
         }
       }


@@ -1320,7 +1349,7 @@ if (write_pid > 0)
       }
     }
   }
       }
     }
   }

-close(pfd[pipe_read]);
+(void)close(pfd[pipe_read]);

 
 /* If there have been no problems we can now add the terminating "." if this is
 SMTP output, turning off escaping beforehand. If the last character from the
 
 /* If there have been no problems we can now add the terminating "." if this is
 SMTP output, turning off escaping beforehand. If the last character from the


@@ -1389,8 +1418,7 @@ better.
 Old records should eventually get swept up by the exim_tidydb utility.
 
 Arguments:
 Old records should eventually get swept up by the exim_tidydb utility.
 
 Arguments:

-  hostlist  list of hosts that this message could be sent to;
-              the update_waiting flag is set if a host is to be noted
+  hostlist  list of hosts that this message could be sent to

   tpname    name of the transport
 
 Returns:    nothing
   tpname    name of the transport
 
 Returns:    nothing


@@ -1405,6 +1433,8 @@ host_item *host;
 open_db dbblock;
 open_db *dbm_file;
 
 open_db dbblock;
 open_db *dbm_file;
 

+DEBUG(D_transport) debug_printf("updating wait-%s database\n", tpname);
+

 /* Open the database for this transport */
 
 sprintf(CS buffer, "wait-%.200s", tpname);
 /* Open the database for this transport */
 
 sprintf(CS buffer, "wait-%.200s", tpname);


@@ -1412,8 +1442,7 @@ dbm_file = dbfn_open(buffer, O_RDWR, &dbblock, TRUE);
 if (dbm_file == NULL) return;
 
 /* Scan the list of hosts for which this message is waiting, and ensure
 if (dbm_file == NULL) return;
 
 /* Scan the list of hosts for which this message is waiting, and ensure

-that the message id is in each host record for those that have the
-update_waiting flag set. */
+that the message id is in each host record. */

 
 for (host = hostlist; host!= NULL; host = host->next)
   {
 
 for (host = hostlist; host!= NULL; host = host->next)
   {


@@ -1422,10 +1451,6 @@ for (host = hostlist; host!= NULL; host = host->next)
   uschar *s;
   int i, host_length;
 
   uschar *s;
   int i, host_length;
 

-  /* Skip if the update_waiting flag is not set. */
-
-  if (!host->update_waiting) continue;
-

   /* Skip if this is the same host as we just processed; otherwise remember
   the name for next time. */
 
   /* Skip if this is the same host as we just processed; otherwise remember
   the name for next time. */
 


@@ -1475,7 +1500,11 @@ for (host = hostlist; host!= NULL; host = host->next)
 
   /* If this message is already in a record, no need to update. */
 
 
   /* If this message is already in a record, no need to update. */
 

-  if (already) continue;
+  if (already)
+    {
+    DEBUG(D_transport) debug_printf("already listed for %s\n", host->name);
+    continue;
+    }

 
 
   /* If this record is full, write it out with a new name constructed
 
 
   /* If this record is full, write it out with a new name constructed


@@ -1511,6 +1540,7 @@ for (host = hostlist; host!= NULL; host = host->next)
   /* Update the database */
 
   dbfn_write(dbm_file, host->name, host_record, sizeof(dbdata_wait) + host_length);
   /* Update the database */
 
   dbfn_write(dbm_file, host->name, host_record, sizeof(dbdata_wait) + host_length);

+  DEBUG(D_transport) debug_printf("added to list for %s\n", host->name);

   }
 
 /* All now done */
   }
 
 /* All now done */


@@ -1749,7 +1779,7 @@ if ((pid = fork()) == 0)
   automatic comparison. */
 
   if ((pid = fork()) != 0) _exit(EXIT_SUCCESS);
   automatic comparison. */
 
   if ((pid = fork()) != 0) _exit(EXIT_SUCCESS);

-  if (running_in_test_harness) millisleep(500);
+  if (running_in_test_harness) sleep(1);

 
   /* Set up the calling arguments; use the standard function for the basics,
   but we have a number of extras that may be added. */
 
   /* Set up the calling arguments; use the standard function for the basics,
   but we have a number of extras that may be added. */


@@ -1784,8 +1814,8 @@ if ((pid = fork()) == 0)
 
   if (socket_fd != 0)
     {
 
   if (socket_fd != 0)
     {

-    dup2(socket_fd, 0);
-    close(socket_fd);
+    (void)dup2(socket_fd, 0);
+    (void)close(socket_fd);

     }
 
   DEBUG(D_exec) debug_print_argv(argv);
     }
 
   DEBUG(D_exec) debug_print_argv(argv);