Changeset 4ac647d for protocols/jabber/s5bytestream.c

Timestamp:

2008-08-04T14:21:49Z (16 years ago)

Author:

ulim <a.sporto+bee@…>

Branches:

master

Children:

8661caa

Parents:

8a90001

Message:

moved some stuff around in preperation for MSN merge.

• both ends (proto&dcc) need to finish a transfer now for it to be finished
• moved throughput calc. and some messages to dcc (no need to implement in protocols)

File:

• protocols/jabber/s5bytestream.c (modified) (3 diffs)

protocols/jabber/s5bytestream.c

@@ -643 +643 @@
                 return jabber_bs_abort( bt, "Remote end closed connection" );
         
-        if( tf->bytesread == 0 )
-                tf->ft->started = time( NULL );
-
         tf->bytesread += ret;
+
+        if( tf->bytesread >= tf->ft->file_size )
+                imcb_file_finished( tf->ft );
 
         tf->ft->write( tf->ft, tf->ft->buffer, ret );   
@@ -701 +701 @@
         ASSERTSOCKOP( ret = send( tf->fd, buffer, len, 0 ), "Sending" );
 
-        if( tf->byteswritten == 0 )
-                tf->ft->started = time( NULL );
-
         tf->byteswritten += ret;
         
@@ -710 +707 @@
                 return jabber_bs_abort( bt, "send() sent %d instead of %d (send buffer too big!)", ret, len );
 
-        bt->tf->watch_out = b_input_add( tf->fd, GAIM_INPUT_WRITE, jabber_bs_send_can_write, bt );
+        if( tf->byteswritten >= ft->file_size )
+                imcb_file_finished( ft );
+        else
+                bt->tf->watch_out = b_input_add( tf->fd, GAIM_INPUT_WRITE, jabber_bs_send_can_write, bt );
                 
         return TRUE;