Changeset 6986

Timestamp:

Oct 29, 2008, 8:06:44 PM (12 years ago)

Author:

charles

Message:

#1389 test #2

File:

• trunk/libtransmission/handshake.c (modified) (2 diffs)

trunk/libtransmission/handshake.c

@@ -928 +928 @@
 {
     int               i;
-    const size_t      needlen = handshake->ia_len;
+    const size_t      needlen = handshake->ia_len + HANDSHAKE_SIZE;
     struct evbuffer * outbuf;
     uint32_t          crypto_select;
@@ -1065 +1065 @@
         }
 
-        switch( handshake->state )
-        {
-            case AWAITING_PAD_C:
-                readyForMore = EVBUFFER_LENGTH( inbuf ) >= handshake->pad_c_len;
-                break;
-
-            case AWAITING_PAD_D:
-                readyForMore = EVBUFFER_LENGTH( inbuf ) >= handshake->pad_d_len;
-                break;
-
-            case AWAITING_IA:
-                readyForMore = EVBUFFER_LENGTH( inbuf ) >= handshake->ia_len;
-                break;
-
-            default:
-                readyForMore = ret == READ_NOW;
-                break;
-        }
+        if( ret != READ_NOW )
+            readyForMore = FALSE;
+        else if( handshake->state == AWAITING_PAD_C )
+            readyForMore = EVBUFFER_LENGTH( inbuf ) >= handshake->pad_c_len;
+        else if( handshake->state == AWAITING_PAD_D )
+            readyForMore = EVBUFFER_LENGTH( inbuf ) >= handshake->pad_d_len;
+        else if( handshake->state == AWAITING_IA )
+            readyForMore = EVBUFFER_LENGTH( inbuf ) >= handshake->ia_len;
     }