Changeset d56ee38

Timestamp:

2008-05-06T00:20:11Z (17 years ago)

Author:

ulim <a.sporto+bee@…>

Branches:

master

Children:

44961cb

Parents:

29c1456

Message:

timeout of transfers after 120 seconds of no progress (bytes received/sent).

Files:

• dcc.c (modified) (6 diffs)
• dcc.h (modified) (2 diffs)
• protocols/jabber/si.c (modified) (1 diff)

dcc.c

@@ -85 +85 @@
 gboolean dccs_recv_proto( gpointer data, gint fd, b_input_condition cond);
 gboolean dccs_recv_write_request( file_transfer_t *ft );
+gboolean dcc_progress( gpointer data, gint fd, b_input_condition cond );
 
 /* As defined in ft.h */
@@ -152 +153 @@
         df->ic->irc->file_transfers = g_slist_prepend( df->ic->irc->file_transfers, file );
 
+        df->progress_timeout = b_timeout_add( DCC_MAX_STALL * 1000, dcc_progress, df );
+
         return file;
 }
@@ -168 +171 @@
         if( file->canceled )
                 file->canceled( file, msg );
-        else 
-                imcb_log( df->ic, "DCC transfer aborted: %s", msg );
+
+        imcb_log( df->ic, "File %s: DCC transfer aborted: %s", file->file_name, msg );
 
         g_free( msg );
@@ -176 +179 @@
 
         return FALSE;
+}
+
+gboolean dcc_progress( gpointer data, gint fd, b_input_condition cond )
+{
+        struct dcc_file_transfer *df = data;
+
+        if( df->ft->bytes_transferred == df->progress_bytes_last )
+        {
+                /* no progress. cancel */
+                if( df->bytes_sent == 0 )
+                        return dcc_abort( df, "Couldnt establish transfer within %d seconds", DCC_MAX_STALL );
+                else 
+                        return dcc_abort( df, "Transfer stalled for %d seconds at %d kb", DCC_MAX_STALL, df->ft->bytes_transferred / 1024 );
+
+        }
+
+        df->progress_bytes_last = df->ft->bytes_transferred;
+
+        return TRUE;
 }
 
@@ -435 +457 @@
         ft->write_request = dccs_recv_write_request;
 
+        df->progress_timeout = b_timeout_add( DCC_MAX_STALL * 1000, dcc_progress, df );
+
         return TRUE;
 }
@@ -573 +597 @@
         if( df->watch_out )
                 b_event_remove( df->watch_out );
+        
+        if( df->progress_timeout )
+                b_event_remove( df->progress_timeout );
         
         df->ic->irc->file_transfers = g_slist_remove( df->ic->irc->file_transfers, file );

dcc.h

@@ -47 +47 @@
 #define DCC_PACKET_SIZE 1024
 
+/* Time in seconds that a DCC transfer can be stalled before being aborted.
+ * By handling this here individual protocols don't have to think about this. */
+#define DCC_MAX_STALL 120
+
 typedef struct dcc_file_transfer {
 
@@ -64 +68 @@
         gint watch_out;  /* writable */
         
+        /* the progress watcher cancels any file transfer if nothing happens within DCC_MAX_STALL */
+        gint progress_timeout;
+        size_t progress_bytes_last;
+
         /*
          * The total amount of bytes that have been sent to the irc client.

protocols/jabber/si.c

@@ -55 +55 @@
 {
         struct jabber_transfer *tf = ft->data;
-
-        imcb_log( tf->ic, "File %s transferred successfully!" , ft->file_name );
+        time_t diff = time( NULL ) - ft->started;
+
+        imcb_log( tf->ic, "File %s transferred successfully at %d kb/s!" , ft->file_name, (int) ( ft->bytes_transferred / 1024 / diff ) );
 }