Changeset b043ad5

Timestamp:

2008-05-08T21:20:36Z (16 years ago)

Author:

ulim <a.sporto+bee@…>

Branches:

master

Children:

b5cfc2b

Parents:

44961cb

Message:

allow dcc optimization in progress watcher.

Apparently, irssi doesn't send any DCC ACKs if it "feels" that the sender
doesn't expect any(no idea how exactly it does that). Anyway, the progress
watcher used to check whether the ACKed bytes have increased which it shouldn't
do if there aren't any ACKs.

File:

• dcc.c (modified) (2 diffs)

dcc.c

@@ -185 +185 @@
         struct dcc_file_transfer *df = data;
 
-        if( df->ft->bytes_transferred == df->progress_bytes_last )
+        if( df->bytes_sent == df->progress_bytes_last )
         {
                 /* no progress. cancel */
@@ -191 +191 @@
                         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 dcc_abort( df, "Transfer stalled for %d seconds at %d kb", DCC_MAX_STALL, df->bytes_sent / 1024 );
+
+        }
+
+        df->progress_bytes_last = df->bytes_sent;
 
         return TRUE;