Changeset 6987

Timestamp:

Oct 29, 2008, 8:18:56 PM (12 years ago)

Author:

charles

Message:

#1389 test #3

File:

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

trunk/libtransmission/handshake.c

@@ -123 +123 @@
     AWAITING_PAD_C,
     AWAITING_IA,
+    AWAITING_PAYLOAD_STREAM,
 
     /* outgoing */
@@ -928 +929 @@
 {
     int               i;
-    const size_t      needlen = handshake->ia_len + HANDSHAKE_SIZE;
+    const size_t      needlen = handshake->ia_len;
     struct evbuffer * outbuf;
     uint32_t          crypto_select;
@@ -938 +939 @@
         return READ_LATER;
 
-    dbgmsg( handshake, "reading IA..." );
+    /**
+    ***  B->A: ENCRYPT(VC, crypto_select, len(padD), padD), ENCRYPT2(Payload
+    ***Stream)
+    **/
+
+    tr_cryptoEncryptInit( handshake->crypto );
+    outbuf = evbuffer_new( );
+
+    dbgmsg( handshake, "sending vc" );
+    /* send VC */
+    {
+        uint8_t vc[VC_LENGTH];
+        memset( vc, 0, VC_LENGTH );
+        tr_peerIoWriteBytes( handshake->io, outbuf, vc, VC_LENGTH );
+    }
+
+    /* send crypto_select */
+    crypto_select = getCryptoSelect( handshake, handshake->crypto_provide );
+    if( crypto_select )
+    {
+        dbgmsg( handshake, "selecting crypto mode '%d'", (int)crypto_select );
+        tr_peerIoWriteUint32( handshake->io, outbuf, crypto_select );
+    }
+    else
+    {
+        dbgmsg( handshake, "peer didn't offer an encryption mode we like." );
+        evbuffer_free( outbuf );
+        return tr_handshakeDone( handshake, FALSE );
+    }
+
+    dbgmsg( handshake, "sending pad d" );
+    /* ENCRYPT(VC, crypto_provide, len(PadC), PadC
+     * PadD is reserved for future extensions to the handshake...
+     * standard practice at this time is for it to be zero-length */
+    {
+        const int len = 0;
+        tr_peerIoWriteUint16( handshake->io, outbuf, len );
+    }
+
+    /* maybe de-encrypt our connection */
+    if( crypto_select == CRYPTO_PROVIDE_PLAINTEXT )
+        tr_peerIoSetEncryption( handshake->io, PEER_ENCRYPTION_NONE );
+
+    dbgmsg( handshake, "sending handshake" );
+    /* send our handshake */
+    {
+        int       msgSize;
+        uint8_t * msg = buildHandshakeMessage( handshake, &msgSize );
+        tr_peerIoWriteBytes( handshake->io, outbuf, msg, msgSize );
+        handshake->haveSentBitTorrentHandshake = 1;
+        tr_free( msg );
+    }
+
+    /* send it out */
+    tr_peerIoWriteBuf( handshake->io, outbuf );
+    evbuffer_free( outbuf );
+
+    /* now await the handshake */
+    setState( handshake, AWAITING_PAYLOAD_STREAM );
+    return READ_NOW;
+}
+
+static int
+readPayloadStream( tr_handshake    * handshake,
+                   struct evbuffer * inbuf )
+{
+    int i;
+    const size_t      needlen = HANDSHAKE_SIZE;
+    struct evbuffer * outbuf;
+
+    dbgmsg( handshake, "reading payload stream... have %d, need %d",
+            (int)EVBUFFER_LENGTH( inbuf ), (int)needlen );
+    if( EVBUFFER_LENGTH( inbuf ) < needlen )
+        return READ_LATER;
+
     /* parse the handshake ... */
     i = parseHandshake( handshake, inbuf );
@@ -945 +1020 @@
         return tr_handshakeDone( handshake, FALSE );
 
-    /**
-    ***  B->A: ENCRYPT(VC, crypto_select, len(padD), padD), ENCRYPT2(Payload
-    ***Stream)
-    **/
-
-    tr_cryptoEncryptInit( handshake->crypto );
-    outbuf = evbuffer_new( );
-
-    dbgmsg( handshake, "sending vc" );
-    /* send VC */
-    {
-        uint8_t vc[VC_LENGTH];
-        memset( vc, 0, VC_LENGTH );
-        tr_peerIoWriteBytes( handshake->io, outbuf, vc, VC_LENGTH );
-    }
-
-    /* send crypto_select */
-    crypto_select = getCryptoSelect( handshake, handshake->crypto_provide );
-    if( crypto_select )
-    {
-        dbgmsg( handshake, "selecting crypto mode '%d'", (int)crypto_select );
-        tr_peerIoWriteUint32( handshake->io, outbuf, crypto_select );
-    }
-    else
-    {
-        dbgmsg( handshake, "peer didn't offer an encryption mode we like." );
-        evbuffer_free( outbuf );
-        return tr_handshakeDone( handshake, FALSE );
-    }
-
-    dbgmsg( handshake, "sending pad d" );
-    /* ENCRYPT(VC, crypto_provide, len(PadC), PadC
-     * PadD is reserved for future extensions to the handshake...
-     * standard practice at this time is for it to be zero-length */
-    {
-        const int len = 0;
-        tr_peerIoWriteUint16( handshake->io, outbuf, len );
-    }
-
-    /* maybe de-encrypt our connection */
-    if( crypto_select == CRYPTO_PROVIDE_PLAINTEXT )
-        tr_peerIoSetEncryption( handshake->io, PEER_ENCRYPTION_NONE );
-
-    dbgmsg( handshake, "sending handshake" );
-    /* send our handshake */
-    {
-        int       msgSize;
-        uint8_t * msg = buildHandshakeMessage( handshake, &msgSize );
-        tr_peerIoWriteBytes( handshake->io, outbuf, msg, msgSize );
-        handshake->haveSentBitTorrentHandshake = 1;
-        tr_free( msg );
-    }
-
-    /* send it out */
-    tr_peerIoWriteBuf( handshake->io, outbuf );
-    evbuffer_free( outbuf );
-
     /* we've completed the BT handshake... pass the work on to peer-msgs */
     return tr_handshakeDone( handshake, TRUE );
@@ -1048 +1066 @@
             case AWAITING_IA:
                 ret = readIA           ( handshake, inbuf ); break;
+
+            case AWAITING_PAYLOAD_STREAM:
+                ret = readPayloadStream( handshake, inbuf ); break;
 
             case AWAITING_YB: