Changeset 2954 for branches/encryption/libtransmission/peer-io.c

Timestamp:

Aug 31, 2007, 8:43:39 PM (15 years ago)

Author:

charles

Message:

add peer-mgr to act as the hub between { handshake, peer io, choking, incoming peers }

File:

• branches/encryption/libtransmission/peer-io.c (modified) (8 diffs)

branches/encryption/libtransmission/peer-io.c

@@ -31 +31 @@
 {
     struct tr_handle * handle;
-    struct tr_torrent * torrent;
 
     struct in_addr in_addr;
@@ -98 +97 @@
 tr_peerIoNew( struct tr_handle  * handle,
               struct in_addr    * in_addr,
-              struct tr_torrent * torrent,
+              const uint8_t     * torrentHash,
               int                 isIncoming,
               int                 socket )
@@ -104 +103 @@
     tr_peerIo * c;
     c = tr_new0( tr_peerIo, 1 );
-    c->torrent = torrent;
-    c->crypto = tr_cryptoNew( torrent ? torrent->info.hash : NULL, isIncoming );
+    c->crypto = tr_cryptoNew( torrentHash, isIncoming );
     c->handle = handle;
     c->in_addr = *in_addr;
@@ -132 +130 @@
                       struct in_addr    * in_addr,
                       int                 port,
-                      struct tr_torrent * torrent )
+                      const uint8_t     * torrentHash )
 {
     tr_peerIo * c;
@@ -139 +137 @@
     assert( in_addr != NULL );
     assert( port >= 0 );
-    assert( torrent != NULL );
-
-    c = tr_peerIoNew( handle, in_addr, torrent, 0,
+    assert( torrentHash != NULL );
+
+    c = tr_peerIoNew( handle, in_addr, torrentHash, 0,
                               tr_netOpenTCP( in_addr, port, 0 ) );
     c->port = port;
@@ -163 +161 @@
 
     return io->handle;
+}
+
+const struct in_addr*
+tr_peerIoGetAddress( const tr_peerIo * io, uint16_t * port )
+{
+    assert( io != NULL );
+
+    if( port != NULL )
+       *port = io->port;
+
+    return &io->in_addr;
 }
 
@@ -221 +230 @@
 
 void
-tr_peerIoSetTorrent( tr_peerIo  * io,
-                             struct tr_torrent  * torrent )
-{
-    io->torrent = torrent;
-
-    tr_cryptoSetTorrentHash( io->crypto, torrent->info.hash );
-}
-
-struct tr_torrent*
+tr_peerIoSetTorrentHash( tr_peerIo     * io,
+                         const uint8_t * hash )
+{
+    tr_cryptoSetTorrentHash( io->crypto, hash );
+}
+
+const uint8_t*
 tr_peerIoGetTorrent( tr_peerIo * io )
 {
-    return io->torrent;
-}
-
-/**
-***
-**/
-
-void
-tr_peerIoSetPeersId( tr_peerIo * io,
-                             const uint8_t     * peer_id )
+    return tr_cryptoGetTorrentHash( io->crypto );
+}
+
+/**
+***
+**/
+
+void
+tr_peerIoSetPeersId( tr_peerIo     * io,
+                     const uint8_t * peer_id )
 {
     assert( io != NULL );
@@ -265 +272 @@
 
 void
-tr_peerIoSetExtension( tr_peerIo * io,
-                               int                 extensions )
+tr_peerIoSetExtension( tr_peerIo   * io,
+                       int           extensions )
 {
     assert( io != NULL );