Imported Upstream version 3.3.3

[debian/amanda] / server-src / dumper.c

diff --git a/server-src/dumper.c b/server-src/dumper.c
index d9fd9ca52df3afa7965525f643e16fe47697ecbf..1c75398dc0ea006ebdbef431cf95ad5e36b59663 100644 (file)
--- a/server-src/dumper.c
+++ b/server-src/dumper.c
@@ -1,6 +1,7 @@
 /*
  * Amanda, The Advanced Maryland Automatic Network Disk Archiver
  * Copyright (c) 1991-1999 University of Maryland at College Park
+ * Copyright (c) 2007-2012 Zmanda, Inc.  All Rights Reserved.
  * All Rights Reserved.
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
@@ -1315,7 +1316,7 @@ do_dump(
     }
 
     /* copy the header in a file on the index dir */
-    {
+    if (ISSET(status, HEADER_DONE)) {
        FILE *a;
        char *s;
        char *f = getheaderfname(hostname, diskname, dumper_timestamp, level);
@@ -1566,7 +1567,6 @@ read_mesgfd(
     default:
        assert(buf != NULL);
        add_msg_data(buf, (size_t)size);
-       security_stream_read(streams[MESGFD].fd, read_mesgfd, cookie);
        break;
     }
 
@@ -1703,8 +1703,6 @@ read_datafd(
      * Reset the timeout for future reads
      */
     timeout(conf_dtimeout);
-
-    security_stream_read(streams[DATAFD].fd, read_datafd, cookie);
 }
 
 /*
@@ -1757,7 +1755,6 @@ read_indexfd(
            log_add(L_INFO, _("Index corrupted for %s:%s"), hostname, qdiskname);
        }
     }
-    security_stream_read(streams[INDEXFD].fd, read_indexfd, cookie);
 }
 
 static void
@@ -1769,8 +1766,6 @@ handle_filter_stderr(
     char     *b, *p;
     gint64    len;
 
-    event_release(filter->event);
-
     if (filter->buffer == NULL) {
        /* allocate initial buffer */
        filter->buffer = g_malloc(2048);
@@ -1793,6 +1788,7 @@ handle_filter_stderr(
                             filter->allocated_size - filter->first - filter->size - 2);
 
     if (nread <= 0) {
+       event_release(filter->event);
        aclose(filter->fd);
        if (filter->size > 0 && filter->buffer[filter->first + filter->size - 1] != '\n') {
            /* Add a '\n' at end of buffer */
@@ -1823,9 +1819,6 @@ handle_filter_stderr(
     if (nread <= 0) {
        g_free(filter->buffer);
        g_free(filter);
-    } else {
-       filter->event = event_register((event_id_t)filter->fd, EV_READFD,
-                                      handle_filter_stderr, filter);
     }
 }
 
@@ -1833,25 +1826,33 @@ handle_filter_stderr(
  * Startup a timeout in the event handler.  If the arg is 0,
  * then remove the timeout.
  */
+static event_handle_t *ev_timeout = NULL;
+static time_t timeout_time;
+
 static void
 timeout(
     time_t seconds)
 {
-    static event_handle_t *ev_timeout = NULL;
+    timeout_time = time(NULL) + seconds;
 
     /*
-     * First, remove a timeout if one is active.
+     * remove a timeout if seconds is 0
      */
-    if (ev_timeout != NULL) {
-       event_release(ev_timeout);
-       ev_timeout = NULL;
+    if (seconds == 0) {
+       if (ev_timeout != NULL) {
+           event_release(ev_timeout);
+           ev_timeout = NULL;
+       }
+       return;
     }
 
     /*
-     * Now, schedule a new one if 'seconds' is greater than 0
+     * schedule a timeout if it not already scheduled
      */
-    if (seconds > 0)
-       ev_timeout = event_register((event_id_t)seconds, EV_TIME, timeout_callback, NULL);
+    if (ev_timeout == NULL) {
+       ev_timeout = event_register((event_id_t)seconds, EV_TIME,
+                                    timeout_callback, NULL);
+    }
 }
 
 /*
@@ -1862,8 +1863,20 @@ static void
 timeout_callback(
     void *     unused)
 {
+    time_t now = time(NULL);
     (void)unused;      /* Quiet unused parameter warning */
 
+    if (ev_timeout != NULL) {
+       event_release(ev_timeout);
+       ev_timeout = NULL;
+    }
+
+    if (timeout_time > now) { /* not a data timeout yet */
+       ev_timeout = event_register((event_id_t)(timeout_time-now), EV_TIME,
+                                   timeout_callback, NULL);
+       return;
+    }
+
     assert(unused == NULL);
     errstr = newstralloc(errstr, _("data timeout"));
     dump_result = 2;