Changeset 7419 for trunk/libtransmission/handshake.c

Timestamp:

Dec 16, 2008, 10:08:17 PM (12 years ago)

Author:

charles

Message:

(trunk libT) really fuck up the peer i/o code. also this breaks the mac build until someone removes iobuf.c from libtransmission's list of files.

File:

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

trunk/libtransmission/handshake.c

@@ -25 +25 @@
 #include "crypto.h"
 #include "handshake.h"
-#include "iobuf.h"
 #include "peer-io.h"
 #include "peer-mgr.h"
@@ -1005 +1004 @@
 
 static ReadState
-canRead( struct tr_iobuf * iobuf, void * arg, size_t * piece )
+canRead( struct tr_peerIo * io, void * arg, size_t * piece )
 {
     tr_handshake    * handshake = arg;
-    struct evbuffer * inbuf = tr_iobuf_input( iobuf );
+    struct evbuffer * inbuf = tr_peerIoGetReadBuffer( io );
     ReadState         ret;
     tr_bool           readyForMore = TRUE;
@@ -1115 +1114 @@
 
 static void
-gotError( struct tr_iobuf  * iobuf UNUSED,
-          short              what,
-          void             * arg )
+gotError( tr_peerIo  * io UNUSED,
+          short        what,
+          void       * arg )
 {
     tr_handshake * handshake = (tr_handshake *) arg;
@@ -1165 +1164 @@
     handshake->doneUserData = doneUserData;
     handshake->session = tr_peerIoGetSession( io );
-    tr_peerIoSetTimeoutSecs( io, 15 );
 
     tr_peerIoSetIOFuncs( handshake->io, canRead, NULL, gotError, handshake );