Changeset 11903

Timestamp:

Feb 18, 2011, 12:23:51 AM (12 years ago)

Author:

jch

Message:

Modify peer-io to work with UTP sockets.

This is not supposed to work yet -- it just adds new fields to the data
structures to get the UTP code to compile.

Location:

trunk/libtransmission

Files:

• peer-io.c (modified) (10 diffs)
• peer-io.h (modified) (2 diffs)
• peer-mgr.c (modified) (5 diffs)
• peer-mgr.h (modified) (2 diffs)
• session.c (modified) (1 diff)

trunk/libtransmission/peer-io.c

@@ -26 +26 @@
 #include <event2/event.h>
 #include <event2/bufferevent.h>
+#include "utp.h"
 
 #include "transmission.h"
@@ -368 +369 @@
               tr_bool            isIncoming,
               tr_bool            isSeed,
-              int                socket )
+              int                socket,
+              struct UTPSocket * utp_socket)
 {
     tr_peerIo * io;
@@ -377 +379 @@
     assert( tr_isBool( isSeed ) );
     assert( tr_amInEventThread( session ) );
+    assert( (socket < 0) == (utp_socket != NULL) );
 
     if( socket >= 0 ) {
@@ -392 +395 @@
     io->port = port;
     io->socket = socket;
+    io->utp_socket = utp_socket;
     io->isIncoming = isIncoming != 0;
     io->timeCreated = tr_time( );
     io->inbuf = evbuffer_new( );
     io->outbuf = evbuffer_new( );
-    io->event_read = event_new( session->event_base, io->socket, EV_READ, event_read_cb, io );
-    io->event_write = event_new( session->event_base, io->socket, EV_WRITE, event_write_cb, io );
     tr_bandwidthConstruct( &io->bandwidth, session, parent );
     tr_bandwidthSetPeer( &io->bandwidth, io );
     dbgmsg( io, "bandwidth is %p; its parent is %p", &io->bandwidth, parent );
+
+    if( io->socket >= 0 ) {
+        io->event_read = event_new( session->event_base,
+                                    io->socket, EV_READ, event_read_cb, io );
+        io->event_write = event_new( session->event_base,
+                                     io->socket, EV_WRITE, event_write_cb, io );
+    }
 
     return io;
@@ -410 +419 @@
                       const tr_address  * addr,
                       tr_port             port,
-                      int                 fd )
+                      int                 fd,
+                      struct UTPSocket  * utp_socket )
 {
     assert( session );
     assert( tr_isAddress( addr ) );
-    assert( fd >= 0 );
-
-    return tr_peerIoNew( session, parent, addr, port, NULL, TRUE, FALSE, fd );
+
+    return tr_peerIoNew( session, parent, addr, port, NULL, TRUE, FALSE, 
+                         fd, utp_socket );
 }
 
@@ -437 +447 @@
 
     return fd < 0 ? NULL
-                  : tr_peerIoNew( session, parent, addr, port, torrentHash, FALSE, isSeed, fd );
+                  : tr_peerIoNew( session, parent, addr, port,
+                                  torrentHash, FALSE, isSeed, fd, NULL );
 }
 
@@ -450 +461 @@
     assert( io->session != NULL );
     assert( io->session->events != NULL );
+
+    if( io->socket < 0 )
+        return;
+
+    assert( io->session->events != NULL );
     assert( event_initialized( io->event_read ) );
     assert( event_initialized( io->event_write ) );
-
-    if( io->socket < 0 )
-        return;
 
     if( ( event & EV_READ ) && ! ( io->pendingEvents & EV_READ ) )
@@ -476 +489 @@
     assert( tr_amInEventThread( io->session ) );
     assert( io->session != NULL );
+
+    if( io->socket < 0 )
+        return;
+
     assert( io->session->events != NULL );
     assert( event_initialized( io->event_read ) );
@@ -533 +550 @@
     evbuffer_free( io->outbuf );
     evbuffer_free( io->inbuf );
-    tr_netClose( io->session, io->socket );
+    if( io->socket >= 0 )
+        tr_netClose( io->session, io->socket );
+    if( io->utp_socket != NULL )
+        UTP_Close( io->utp_socket );
     tr_cryptoFree( io->crypto );
     tr_list_free( &io->outbuf_datatypes, tr_free );
@@ -640 +660 @@
     event_disable( io, EV_READ | EV_WRITE );
 
-    if( io->socket >= 0 )
+    if( io->socket >= 0 ) {
         tr_netClose( session, io->socket );
+        io->socket = -1;
+    }
+    if( io->utp_socket != NULL ) {
+        UTP_Close(io->utp_socket);
+        io->utp_socket = NULL;
+    }
 
     event_free( io->event_read );

trunk/libtransmission/peer-io.h

@@ -84 +84 @@
     tr_port               port;
     int                   socket;
+    struct UTPSocket      *utp_socket;
 
     int                   refCount;
@@ -126 +127 @@
                                   const struct tr_address * addr,
                                   tr_port                   port,
-                                  int                       socket );
+                                  int                       socket,
+                                  struct UTPSocket *        utp_socket );
 
 void tr_peerIoRefImpl           ( const char              * file,

trunk/libtransmission/peer-mgr.c

@@ -18 +18 @@
 
 #include <event2/event.h>
+#include "utp.h"
 
 #include "transmission.h"
@@ -2008 +2009 @@
                        tr_address * addr,
                        tr_port      port,
-                       int          socket )
+                       int          socket,
+                       struct UTPSocket * utp_socket )
 {
     tr_session * session;
@@ -2020 +2022 @@
     {
         tr_dbg( "Banned IP address \"%s\" tried to connect to us", tr_ntop_non_ts( addr ) );
-        tr_netClose( session, socket );
+        if(socket >= 0)
+            tr_netClose( session, socket );
+        else
+            UTP_Close( utp_socket );
     }
     else if( getExistingHandshake( &manager->incomingHandshakes, addr ) )
     {
-        tr_netClose( session, socket );
+        if(socket >= 0)
+            tr_netClose( session, socket );
+        else
+            UTP_Close( utp_socket );
     }
     else /* we don't have a connection to them yet... */
@@ -2031 +2039 @@
         tr_handshake * handshake;
 
-        io = tr_peerIoNewIncoming( session, session->bandwidth, addr, port, socket );
+        io = tr_peerIoNewIncoming( session, session->bandwidth, addr, port, socket, utp_socket );
 
         handshake = tr_handshakeNew( io,
@@ -2613 +2621 @@
 
         pch = stat->flagStr;
+        if( peer->io->utp_socket != NULL) *pch++ = 'T';
         if( t->optimistic == peer ) *pch++ = 'O';
         if( stat->isDownloadingFrom ) *pch++ = 'D';

trunk/libtransmission/peer-mgr.h

@@ -35 +35 @@
  */
 
+struct UTPSocket;
 struct tr_peer_stat;
 struct tr_torrent;
@@ -164 +165 @@
                             tr_address  * addr,
                             tr_port       port,
-                            int           socket );
+                            int           socket,
+                            struct UTPSocket *utp_socket );
 
 tr_pex * tr_peerMgrCompactToPex( const void    * compact,

trunk/libtransmission/session.c

@@ -195 +195 @@
         tr_deepLog( __FILE__, __LINE__, NULL, "new incoming connection %d (%s)",
                    clientSocket, tr_peerIoAddrStr( &clientAddr, clientPort ) );
-        tr_peerMgrAddIncoming( session->peerMgr, &clientAddr, clientPort, clientSocket );
+        tr_peerMgrAddIncoming( session->peerMgr, &clientAddr, clientPort,
+                               clientSocket, NULL );
     }
 }