Changeset 2946

Timestamp:

Aug 30, 2007, 4:23:19 AM (15 years ago)

Author:

charles

Message:

this is another code dump that prints a lot of debug messages to the console and then crashes. outbound connections: handshake->ltep->pex->packets is coming along. lots of functionality in trunk not plugged back in yet.

Location:

branches/encryption/libtransmission

Files:

• handshake.c (modified) (9 diffs)
• p.c (added)
• p.h (added)
• peer-connection.c (modified) (5 diffs)
• peer-connection.h (modified) (1 diff)
• trevent.c (modified) (7 diffs)
• trevent.h (modified) (1 diff)

branches/encryption/libtransmission/handshake.c

@@ -169 +169 @@
 {
     setState( handshake, state );
-    tr_peerConnectionSetIOMode( handshake->connection, EV_READ );
+    tr_peerConnectionSetIOMode( handshake->connection, EV_READ, EV_WRITE );
 }
 
@@ -196 +196 @@
     setState( handshake, SENDING_YA );
     tr_peerConnectionWriteBuf( handshake->connection, outbuf );
+    tr_peerConnectionSetIOMode( handshake->connection, EV_WRITE, EV_READ );
 
     /* cleanup */
@@ -228 +229 @@
     setState( handshake, SENDING_PLAINTEXT_HANDSHAKE );
     tr_peerConnectionWrite( handshake->connection, buf, HANDSHAKE_SIZE );
+    tr_peerConnectionSetIOMode( handshake->connection, EV_WRITE, EV_READ );
 }
 
@@ -250 +252 @@
     char * buf;
     int len;
-    int i;
     const char * v = TR_NAME " " USERAGENT_PREFIX;
     const int port = tr_getPublicPort( handshake->handle );
     struct evbuffer * outbuf = evbuffer_new( );
     uint32_t msglen;
-    uint32_t msgextid;
-    uint8_t msgid;
-
-    
-void tr_peerConnectionWriteUint32 ( tr_peerConnection   * conn,
-                                    struct evbuffer     * outbuf,
-                                    uint32_t              writeme );
-void tr_peerConnectionWriteBytes   ( tr_peerConnection  * conn,
-                                     struct evbuffer    * outbuf,
-                                     const void         * bytes,
-                                     int                  byteCount );
-
-void tr_peerConnectionWriteUint16 ( tr_peerConnection   * conn,
-                                    struct evbuffer     * outbuf,
-                                    uint16_t              writeme );
-
+    const uint8_t tr_msgid = 20; /* ltep extension id */
+    const uint8_t ltep_msgid = 0; /* handshake id */
 
     tr_bencInit( &val, TYPE_DICT );
@@ -284 +271 @@
     fprintf( stderr, "sending ltep handshake...\n" );
     buf = tr_bencSaveMalloc( &val,  &len );
-for( i=0; i<len; ++i) fprintf( stderr, "%c", buf[i] );
-fprintf( stderr, "\n" );
-
-    msglen = 1 + sizeof(uint32_t) + len;
-    msgid = 20; /* LTEP extension command number */
-    msgextid = 0; /* LTEP handshake number */
+    tr_bencPrint( &val );
+
+    msglen = sizeof(tr_msgid) + sizeof(ltep_msgid) + len;
     tr_peerConnectionWriteUint32( handshake->connection, outbuf, msglen );
-    tr_peerConnectionWriteBytes( handshake->connection, outbuf, &msgid, 1 );
-    tr_peerConnectionWriteUint32( handshake->connection, outbuf, msgextid );
-    tr_peerConnectionWriteBytes( handshake->connection, outbuf, buf, len );
+    tr_peerConnectionWriteBytes ( handshake->connection, outbuf, &tr_msgid, 1 );
+    tr_peerConnectionWriteBytes ( handshake->connection, outbuf, &ltep_msgid, 1 );
+    tr_peerConnectionWriteBytes ( handshake->connection, outbuf, buf, len );
     
     handshake->state = SENDING_LTEP_HANDHAKE;
     tr_peerConnectionWriteBuf( handshake->connection, outbuf );
+    tr_peerConnectionSetIOMode( handshake->connection, EV_WRITE, EV_READ );
   
     /* cleanup */ 
@@ -335 +320 @@
     setState( handshake, SENDING_YB );
     tr_peerConnectionWrite( handshake->connection, outbuf, walk-outbuf );
+    tr_peerConnectionSetIOMode( handshake->connection, EV_WRITE, EV_READ );
 
     return READ_DONE;
@@ -561 +547 @@
     setState( handshake, SENDING_CRYPTO_PROVIDE );
     tr_peerConnectionWriteBuf( handshake->connection, outbuf );
+    tr_peerConnectionSetIOMode( handshake->connection, EV_WRITE, EV_READ );
 
     /* cleanup */
@@ -573 +560 @@
     const int key_len = VC_LENGTH;
     uint8_t tmp[VC_LENGTH];
-
-static int drained = 0;
 
     /* note: this works w/o having to `unwind' the buffer if
@@ -593 +578 @@
 
         evbuffer_drain( inbuf, 1 );
-        fprintf( stderr, "drained %d\n", ++drained );
     }
 

branches/encryption/libtransmission/peer-connection.c

@@ -75 +75 @@
         const int ret = (*c->canRead)( e, c->userData );
         switch( ret ) {
+            case READ_AGAIN: if( EVBUFFER_LENGTH( e->input ) ) continue; /* note fall-through */
+            case READ_MORE: fprintf( stderr, "waiting for bytes from peer...\n" );
+                            tr_peerConnectionSetIOMode( c, EV_READ, 0 ); return; break;
             case READ_DONE: return; fprintf( stderr, "READ_DONE\n"); break;
-            case READ_AGAIN: fprintf( stderr, "READ_AGAIN: going again w/o reading more data\n"); continue; break;
-            case READ_MORE: fprintf( stderr, "READ_MORE: waiting for more...\n" ); tr_peerConnectionSetIOMode( c, EV_READ ); return; break;
         }
     }
@@ -181 +182 @@
 
 void
-tr_peerConnectionSetIOMode( tr_peerConnection * c, short mode )
-{
-    tr_setBufferEventMode( c->handle, c->bufev, mode );
+tr_peerConnectionSetIOMode( tr_peerConnection * c, short enable, short disable )
+{
+    tr_setBufferEventMode( c->handle, c->bufev, enable, disable );
 }
 
@@ -192 +193 @@
         canReadWrapper( c->bufev, c );
     else
-        tr_peerConnectionSetIOMode( c, EV_READ );
+        tr_peerConnectionSetIOMode( c, EV_READ, EV_WRITE );
 }
 
@@ -338 +339 @@
     {
         case PEER_ENCRYPTION_PLAINTEXT:
+            fprintf( stderr, "writing %d plaintext bytes to outbuf...\n", byteCount );
             evbuffer_add( outbuf, bytes, byteCount );
             break;
 
         case PEER_ENCRYPTION_RC4:
+            fprintf( stderr, "encrypting and writing %d bytes to outbuf...\n", byteCount );
             tmp = tr_new( uint8_t, byteCount );
             tr_cryptoEncrypt( conn->crypto, byteCount, bytes, tmp );
@@ -382 +385 @@
     {
         case PEER_ENCRYPTION_PLAINTEXT:
-            fprintf( stderr, "reading %d plaintext bytes from peer...\n", byteCount );
+            fprintf( stderr, "reading %d plaintext bytes from inbuf...\n", byteCount );
             evbuffer_remove(  inbuf, bytes, byteCount );
             break;
 
         case PEER_ENCRYPTION_RC4:
-            fprintf( stderr, "reading and decrypting %d bytes from peer...\n", byteCount );
+            fprintf( stderr, "reading and decrypting %d bytes from inbuf...\n", byteCount );
             evbuffer_remove(  inbuf, bytes, byteCount );
             tr_cryptoDecrypt( conn->crypto, byteCount, bytes, bytes );

branches/encryption/libtransmission/peer-connection.h

@@ -97 +97 @@
 
 void  tr_peerConnectionSetIOMode ( tr_peerConnection   * connection,
-                                   short                 mode );
+                                   short                 enable_mode,
+                                   short                 disable_mode );
 
 void  tr_peerConnectionReadOrWait( tr_peerConnection * connection );

branches/encryption/libtransmission/trevent.c

@@ -94 +94 @@
         case 'd': /* event_del */
             read( fd, &event, sizeof(struct event*) );
-            tr_dbg( "read del event from pipe: event is %p", event );
             event_del( event );
             tr_free( event );
@@ -102 +101 @@
             read( fd, &event, sizeof(struct event*) );
             read( fd, &interval, sizeof(struct timeval) );
-            tr_dbg( "read event from pipe: event.ev_arg is %p", event->ev_arg );
             event_add( event, &interval );
             break;
@@ -111 +109 @@
             read( fd, &type, sizeof(enum evhttp_cmd_type) );
             read( fd, &uri, sizeof(char*) );
-            tr_dbg( "read http req from pipe: req.cb_arg is %p", req->cb_arg );
             evhttp_make_request( evcon, req, type, uri );
             tr_free( uri );
@@ -118 +115 @@
         case 'm': /* set bufferevent mode */
             read( fd, &bufev, sizeof(struct evhttp_request*) );
+            mode = 0;
             read( fd, &mode, sizeof(short) );
             bufferevent_enable( bufev, mode );
-            bufferevent_disable( bufev, mode==EV_READ ? EV_WRITE : EV_READ );
+            mode = 0;
+            read( fd, &mode, sizeof(short) );
+            bufferevent_disable( bufev, mode );
             break;
 
@@ -127 +127 @@
             read( fd, &buf, sizeof(char*) );
             read( fd, &buflen, sizeof(size_t) );
-            bufferevent_enable( bufev, EV_WRITE );
-            bufferevent_disable( bufev, EV_READ );
             bufferevent_write( bufev, buf, buflen );
             tr_free( buf );
@@ -284 +282 @@
 tr_setBufferEventMode( struct tr_handle   * handle,
                        struct bufferevent * bufev,
-                       short                mode )
+                       short                mode_enable,
+                       short                mode_disable )
 {
     const char ch = 'm';
@@ -293 +292 @@
     write( fd, &ch, 1 );
     write( fd, &bufev, sizeof(struct bufferevent*) );
-    write( fd, &mode, sizeof(short) );
-    tr_lockUnlock( lock );
-}
-
+    write( fd, &mode_enable, sizeof(short) );
+    write( fd, &mode_disable, sizeof(short) );
+    tr_lockUnlock( lock );
+}

branches/encryption/libtransmission/trevent.h

@@ -51 +51 @@
 void tr_setBufferEventMode( struct tr_handle   * tr_handle,
                             struct bufferevent * bufferEvent,
-                            short                mode );
+                            short                mode_enable,
+                            short                mode_disable );
 
 #endif