[ProFTPD-committers] CVS: proftpd/modules mod_xfer.c,1.204,1.205

[TJ S. <cas...@us...>]

Update of /cvsroot/proftp/proftpd/modules
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18219/modules

Modified Files:
	mod_xfer.c 
Log Message:

Bug#2847 - HiddenStores files not properly removed if data transfer times out.


Index: mod_xfer.c
===================================================================
RCS file: /cvsroot/proftp/proftpd/modules/mod_xfer.c,v
retrieving revision 1.204
retrieving revision 1.205
diff -u -r1.204 -r1.205
--- mod_xfer.c	11 Sep 2006 18:30:05 -0000	1.204
+++ mod_xfer.c	4 Oct 2006 21:06:42 -0000	1.205
@@ -864,14 +864,26 @@
   }
 
   if (session.xfer.xfer_type == STOR_HIDDEN) {
-    /* If hidden stor aborted, remove only hidden file, not real one */
-    if (session.xfer.path_hidden)
-      pr_fsio_unlink(session.xfer.path_hidden);
+    delete_stores = get_param_ptr(CURRENT_CONF, "DeleteAbortedStores", FALSE);
+    if (delete_stores != NULL &&
+        *delete_stores == TRUE) {
+      /* If a hidden store was aborted, remove only hidden file, not real
+       * one.
+       */
+      if (session.xfer.path_hidden) {
+        pr_log_debug(DEBUG5, "removing aborted HiddenStores file '%s'",
+          session.xfer.path_hidden);
+        pr_fsio_unlink(session.xfer.path_hidden);
+      }
+    }
 
   } else if (session.xfer.path) {
-    if ((delete_stores = get_param_ptr(CURRENT_CONF, "DeleteAbortedStores",
-        FALSE)) != NULL && *delete_stores == TRUE)
+    delete_stores = get_param_ptr(CURRENT_CONF, "DeleteAbortedStores", FALSE);
+    if (delete_stores != NULL &&
+        *delete_stores == TRUE) {
+      pr_log_debug(DEBUG5, "removing aborted file '%s'", session.xfer.path);
       pr_fsio_unlink(session.xfer.path);
+    }
   }
 
   _log_transfer('i', 'i');
@@ -2528,15 +2540,36 @@
 static void xfer_exit_ev(const void *event_data, void *user_data) {
 
   if (session.sf_flags & SF_XFER) {
-    if (session.xfer.direction == PR_NETIO_IO_RD)
+    if (session.xfer.direction == PR_NETIO_IO_RD) {
        /* An upload is occurring... */
       stor_abort();
 
-    else
+    } else {
       /* A download is occurring... */
       retr_abort();
+    }
+  }
+
+  return;
+}
+
+static void xfer_xfer_stalled_ev(const void *event_data, void *user_data) {
+  if (!(session.sf_flags & SF_XFER)) {
+    if (session.xfer.direction == PR_NETIO_IO_RD) {
+      stor_abort();
+
+    } else {
+      retr_abort();
+    }
   }
 
+  /* The "else" case, for a stalled transfer, will be handled by the
+   * 'core.exit' event handler above.  In that case, a data transfer
+   * _will_ have actually been in progress, whereas in the !SF_XFER
+   * case, the client requested a transfer, but never actually opened
+   * the data connection.
+   */
+
   return;
 }
 
@@ -2563,8 +2596,8 @@
   config_rec *c = NULL;
 
   /* Check for a server-specific TimeoutNoTransfer */
-  if ((c = find_config(main_server->conf, CONF_PARAM, "TimeoutNoTransfer",
-      FALSE)) != NULL)
+  c = find_config(main_server->conf, CONF_PARAM, "TimeoutNoTransfer", FALSE);
+  if (c != NULL)
     TimeoutNoXfer = *((int *) c->argv[0]);
 
   /* Setup TimeoutNoXfer timer */
@@ -2572,8 +2605,8 @@
     pr_timer_add(TimeoutNoXfer, TIMER_NOXFER, &xfer_module, noxfer_timeout_cb);
 
   /* Check for a server-specific TimeoutStalled */
-  if ((c = find_config(main_server->conf, CONF_PARAM, "TimeoutStalled",
-      FALSE)) != NULL)
+  c = find_config(main_server->conf, CONF_PARAM, "TimeoutStalled", FALSE);
+  if (c != NULL)
     TimeoutStalled = *((int *) c->argv[0]);
 
   /* Note: timers for handling TimeoutStalled timeouts are handled in the
@@ -2585,8 +2618,10 @@
   if (c)
     use_sendfile = *((unsigned char *) c->argv[0]);
 
-  /* Exit handler for HiddenStores cleanup */
+  /* Exit handlers for HiddenStores cleanup */
   pr_event_register(&xfer_module, "core.exit", xfer_exit_ev, NULL);
+  pr_event_register(&xfer_module, "core.timeout-stalled",
+    xfer_xfer_stalled_ev, NULL);
 
   pr_event_register(&xfer_module, "core.signal.USR2", xfer_sigusr2_ev,
     NULL);