Changeset 7287

Timestamp:

Dec 5, 2008, 5:31:39 PM (12 years ago)

Author:

charles

Message:

(1.3x libT) backport #1389: protocol error - bitcomet handshake with TransmissionBT failed

File:

• branches/1.3x/libtransmission/handshake.c (modified) (6 diffs)

branches/1.3x/libtransmission/handshake.c

@@ -122 +122 @@
     AWAITING_PAD_C,
     AWAITING_IA,
+    AWAITING_PAYLOAD_STREAM,
 
     /* outgoing */
@@ -147 +148 @@
         case AWAITING_PAD_C:          str = "awaiting pad c"; break;
         case AWAITING_IA:             str = "awaiting ia"; break;
+        case AWAITING_PAYLOAD_STREAM: str = "awaiting payload stream"; break;
         case AWAITING_YB:             str = "awaiting yb"; break;
         case AWAITING_VC:             str = "awaiting vc"; break;
@@ -846 +848 @@
 readIA( tr_handshake * handshake, struct evbuffer * inbuf )
 {
-    int i;
     const size_t needlen = handshake->ia_len;
     struct evbuffer * outbuf;
@@ -854 +855 @@
     if( EVBUFFER_LENGTH(inbuf) < needlen )
         return READ_MORE;
-
-dbgmsg( handshake, "reading IA..." );
-    /* parse the handshake ... */
-    i = parseHandshake( handshake, inbuf );
-dbgmsg( handshake, "parseHandshake returned %d", i );
-    if( i != HANDSHAKE_OK ) {
-        tr_handshakeDone( handshake, FALSE );
-        return READ_DONE;
-    }
 
     /**
@@ -923 +915 @@
 }
 
+static int
+readPayloadStream( tr_handshake    * handshake,
+                   struct evbuffer * inbuf )
+{
+    int i;
+    const size_t needlen = HANDSHAKE_SIZE;
+
+    dbgmsg( handshake, "reading payload stream... have %zu, need %zu",
+            EVBUFFER_LENGTH( inbuf ), needlen );
+    if( EVBUFFER_LENGTH( inbuf ) < needlen )
+        return READ_MORE;
+
+    /* parse the handshake ... */
+    i = parseHandshake( handshake, inbuf );
+    dbgmsg( handshake, "parseHandshake returned %d", i );
+    tr_handshakeDone( handshake, i == HANDSHAKE_OK );
+    return READ_DONE;
+}
+
 /***
 ****
@@ -935 +946 @@
     struct evbuffer * inbuf = EVBUFFER_INPUT ( evin );
     ReadState ret;
+    int readyForMore = TRUE;
     dbgmsg( handshake, "handling canRead; state is [%s]", getStateName(handshake->state) );
 
-    switch( handshake->state )
-    {
-        case AWAITING_HANDSHAKE:       ret = readHandshake    ( handshake, inbuf ); break;
-        case AWAITING_PEER_ID:         ret = readPeerId       ( handshake, inbuf ); break;
-        case AWAITING_YA:              ret = readYa           ( handshake, inbuf ); break;
-        case AWAITING_PAD_A:           ret = readPadA         ( handshake, inbuf ); break;
-        case AWAITING_CRYPTO_PROVIDE:  ret = readCryptoProvide( handshake, inbuf ); break;
-        case AWAITING_PAD_C:           ret = readPadC         ( handshake, inbuf ); break;
-        case AWAITING_IA:              ret = readIA           ( handshake, inbuf ); break;
-
-        case AWAITING_YB:              ret = readYb           ( handshake, inbuf ); break;
-        case AWAITING_VC:              ret = readVC           ( handshake, inbuf ); break;
-        case AWAITING_CRYPTO_SELECT:   ret = readCryptoSelect ( handshake, inbuf ); break;
-        case AWAITING_PAD_D:           ret = readPadD         ( handshake, inbuf ); break;
-
-        default: assert( 0 );
+    while( readyForMore )
+    {
+        switch( handshake->state )
+        {
+            case AWAITING_HANDSHAKE:       ret = readHandshake    ( handshake, inbuf ); break;
+            case AWAITING_PEER_ID:         ret = readPeerId       ( handshake, inbuf ); break;
+            case AWAITING_YA:              ret = readYa           ( handshake, inbuf ); break;
+            case AWAITING_PAD_A:           ret = readPadA         ( handshake, inbuf ); break;
+            case AWAITING_CRYPTO_PROVIDE:  ret = readCryptoProvide( handshake, inbuf ); break;
+            case AWAITING_PAD_C:           ret = readPadC         ( handshake, inbuf ); break;
+            case AWAITING_IA:              ret = readIA           ( handshake, inbuf ); break;
+            case AWAITING_PAYLOAD_STREAM:  ret = readPayloadStream( handshake, inbuf ); break;
+
+            case AWAITING_YB:              ret = readYb           ( handshake, inbuf ); break;
+            case AWAITING_VC:              ret = readVC           ( handshake, inbuf ); break;
+            case AWAITING_CRYPTO_SELECT:   ret = readCryptoSelect ( handshake, inbuf ); break;
+            case AWAITING_PAD_D:           ret = readPadD         ( handshake, inbuf ); break;
+
+            default: assert( 0 );
+        }
+
+        if( ret != READ_AGAIN )
+            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;
     }