Changeset a81d679

Timestamp:

2010-03-21T15:56:59Z (15 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

767a148

Parents:

4ed9c8c

Message:

Fixed jabber_bs_peek() to deal with incomplete packets as well.

File:

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

protocols/jabber/s5bytestream.c

@@ -46 +46 @@
 
         gint connect_timeout;
+        
+        char peek_buf[64];
+        int peek_buf_len;
 };
 
@@ -150 +153 @@
         int fd = bt->tf->fd;
 
-        ASSERTSOCKOP( ret = recv( fd, buffer, buflen, MSG_PEEK ), "MSG_PEEK'ing" );
+        if( buflen > sizeof( bt->peek_buf ) )
+                return jabber_bs_abort( bt, "BUG: %d > sizeof(peek_buf)", buflen );
+
+        ASSERTSOCKOP( ret = recv( fd, bt->peek_buf + bt->peek_buf_len,
+                buflen - bt->peek_buf_len, 0 ), "recv() on SOCKS5 connection" );
 
         if( ret == 0 )
                 return jabber_bs_abort( bt, "Remote end closed connection" );
-                
-        if( ret < buflen )
-                return ret;
-
-        ASSERTSOCKOP( ret = recv( fd, buffer, buflen, 0 ), "Dequeuing after MSG_PEEK" );
-
-        if( ret != buflen )
-                return jabber_bs_abort( bt, "recv returned less than previous recv with MSG_PEEK" );
-        
-        return ret;
+        
+        bt->peek_buf_len += ret;
+        memcpy( buffer, bt->peek_buf, bt->peek_buf_len );
+        
+        if( bt->peek_buf_len == buflen )
+        {
+                /* If we have everything the caller wanted, reset the peek buffer. */
+                bt->peek_buf_len = 0;
+                return buflen;
+        }
+        else
+                return bt->peek_buf_len;
 }
 
@@ -560 +569 @@
 
         bt->tf->watch_in = 0;
+        /* MUST always return FALSE! */
         return FALSE;
 }
@@ -1012 +1022 @@
                 imcb_file_canceled( tf->ft, error );
 
+        /* MUST always return FALSE! */
         return FALSE;
 }