Changes in protocols/jabber/s5bytestream.c [3ab1d31:17a6ee9]

File:

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

protocols/jabber/s5bytestream.c

@@ -482 +482 @@
                         else if( ret < sizeof( struct socks5_message ) )
                         {
-                                /* Either a buggy proxy or just one that doesnt regard
-                                 * the SHOULD in XEP-0065 saying the reply SHOULD
-                                 * contain the address. We'll take it, so make sure the
-                                 * next jabber_bs_peek starts with an empty buffer. */
-                                bt->peek_buf_len = 0;
+                                /* Either a buggy proxy or just one that doesnt regard the SHOULD in XEP-0065
+                                 * saying the reply SHOULD contain the address */
+
+                                ASSERTSOCKOP( ret = recv( fd, &socks5_reply, ret, 0 ), "Dequeuing after MSG_PEEK" );
                         }
 
@@ -567 +566 @@
         xt_free_node( reply );
 
-        imcb_file_canceled( tf->ft, "couldn't connect to any streamhosts" );
+        imcb_file_canceled( tf->ic, tf->ft, "couldn't connect to any streamhosts" );
 
         bt->tf->watch_in = 0;
@@ -604 +603 @@
                 
         if( !jabber_write_packet( tf->ic, reply ) )
-                imcb_file_canceled( tf->ft, "Error transmitting bytestream response" );
+                imcb_file_canceled( tf->ic, tf->ft, "Error transmitting bytestream response" );
         xt_free_node( reply );
 }
@@ -644 +643 @@
 
         if( tf->bytesread >= tf->ft->file_size )
-                imcb_file_finished( tf->ft );
+                imcb_file_finished( tf->ic, tf->ft );
 
         tf->ft->write( tf->ft, tf->ft->buffer, ret );   
@@ -660 +659 @@
         if( tf->watch_in )
         {
-                imcb_file_canceled( ft, "BUG in jabber file transfer: write_request called when already watching for input" );
+                imcb_file_canceled( tf->ic, ft, "BUG in jabber file transfer: write_request called when already watching for input" );
                 return FALSE;
         }
@@ -706 +705 @@
 
         if( tf->byteswritten >= ft->file_size )
-                imcb_file_finished( ft );
+                imcb_file_finished( tf->ic, ft );
         else
                 bt->tf->watch_out = b_input_add( tf->fd, GAIM_INPUT_WRITE, jabber_bs_send_can_write, bt );
@@ -1006 +1005 @@
 
         if( !jabber_write_packet( tf->ic, iq ) )
-                imcb_file_canceled( tf->ft, "Error transmitting bytestream request" );
+                imcb_file_canceled( tf->ic, tf->ft, "Error transmitting bytestream request" );
         return TRUE;
 }
@@ -1021 +1020 @@
 
         if( jd->streamhosts==NULL ) /* we're done here unless we have a proxy to try */
-                imcb_file_canceled( tf->ft, error );
+                imcb_file_canceled( tf->ic, tf->ft, error );
 
         /* MUST always return FALSE! */