Changeset 9434

Timestamp:

Oct 29, 2009, 4:10:03 PM (13 years ago)

Author:

charles

Message:

(trunk libT) #2508 atom->port never updated

Location:

trunk/libtransmission

Files:

• peer-common.h (modified) (2 diffs)
• peer-mgr.c (modified) (22 diffs)
• peer-mgr.h (modified) (2 diffs)
• peer-msgs.c (modified) (4 diffs)
• tr-dht.c (modified) (2 diffs)
• tr-dht.h (modified) (1 diff)
• webseed.c (modified) (1 diff)

trunk/libtransmission/peer-common.h

@@ -49 +49 @@
     TR_PEER_CLIENT_GOT_ALLOWED_FAST,
     TR_PEER_CLIENT_GOT_SUGGEST,
+    TR_PEER_CLIENT_GOT_PORT,
     TR_PEER_PEER_GOT_DATA,
     TR_PEER_PEER_PROGRESS,
@@ -68 +69 @@
     tr_bool          wasPieceData; /* for GOT_DATA */
     tr_bool          uploadOnly;   /* for UPLOAD_ONLY */
+    tr_port          port;         /* for GOT_PORT */
 }
 tr_peer_event;

trunk/libtransmission/peer-mgr.c

@@ -131 +131 @@
 }
 
+static const char*
+tr_atomAddrStr( const struct peer_atom * atom )
+{
+    return tr_peerIoAddrStr( &atom->addr, atom->port );
+}
+
 struct tr_blockIterator
 {
@@ -261 +267 @@
 **/
 
+const tr_address *
+tr_peerAddress( const tr_peer * peer )
+{
+    return &peer->atom->addr;
+}
+
 static Torrent*
 getExistingTorrent( tr_peerMgr *    manager,
@@ -271 +283 @@
 
 static int
-peerCompare( const void * va, const void * vb )
-{
-    const tr_peer * a = va;
-    const tr_peer * b = vb;
-
-    return tr_compareAddresses( &a->addr, &b->addr );
+peerCompare( const void * a, const void * b )
+{
+    return tr_compareAddresses( tr_peerAddress( a ), tr_peerAddress( b ) );
 }
 
 static int
-peerCompareToAddr( const void * va, const void * vb )
-{
-    const tr_peer * a = va;
-
-    return tr_compareAddresses( &a->addr, vb );
+peerCompareToAddr( const void * a, const void * vb )
+{
+    return tr_compareAddresses( tr_peerAddress( a ), vb );
 }
 
@@ -320 +327 @@
 
 static tr_peer*
-peerConstructor( const tr_address * addr )
-{
-    tr_peer * p;
-    p = tr_new0( tr_peer, 1 );
-    p->addr = *addr;
-    return p;
+peerConstructor( struct peer_atom * atom )
+{
+    tr_peer * peer = tr_new0( tr_peer, 1 );
+    peer->atom = atom;
+    return peer;
 }
 
 static tr_peer*
-getPeer( Torrent          * torrent,
-         const tr_address * addr )
+getPeer( Torrent * torrent, struct peer_atom * atom )
 {
     tr_peer * peer;
@@ -336 +341 @@
     assert( torrentIsLocked( torrent ) );
 
-    peer = getExistingPeer( torrent, addr );
+    peer = getExistingPeer( torrent, &atom->addr );
 
     if( peer == NULL )
     {
-        peer = peerConstructor( addr );
+        peer = peerConstructor( atom );
         tr_ptrArrayInsertSorted( &torrent->peers, peer, peerCompare );
     }
@@ -929 +934 @@
 {
     tordbg( t, "increasing peer %s strike count to %d",
-            tr_peerIoAddrStr( &peer->addr,
-                              peer->port ), peer->strikes + 1 );
+            tr_atomAddrStr( peer->atom ), peer->strikes + 1 );
 
     if( ++peer->strikes >= MAX_BAD_PIECES_PER_PEER )
@@ -937 +941 @@
         atom->myflags |= MYFLAG_BANNED;
         peer->doPurge = 1;
-        tordbg( t, "banning peer %s", tr_peerIoAddrStr( &atom->addr, atom->port ) );
+        tordbg( t, "banning peer %s", tr_atomAddrStr( atom ) );
     }
 }
@@ -1064 +1068 @@
         }
 
+        case TR_PEER_CLIENT_GOT_PORT:
+            if( peer )
+                peer->atom->port = e->port;
+            break;
+
         case TR_PEER_CLIENT_GOT_SUGGEST:
             if( peer )
@@ -1109 +1118 @@
                 struct peer_atom * atom = peer->atom;
                 if( e->progress >= 1.0 ) {
-                    tordbg( t, "marking peer %s as a seed", tr_peerIoAddrStr( &atom->addr, atom->port ) );
+                    tordbg( t, "marking peer %s as a seed",
+                            tr_atomAddrStr( atom ) );
                     atom->flags |= ADDED_F_SEED_FLAG;
                 }
@@ -1176 +1186 @@
                 peer->doPurge = 1;
                 tordbg( t, "setting %s doPurge flag because we got an ERANGE, EMSGSIZE, or ENOTCONN error",
-                        tr_peerIoAddrStr( &peer->addr, peer->port ) );
+                        tr_atomAddrStr( peer->atom ) );
             }
             else 
@@ -1209 +1219 @@
         a->flags = flags;
         a->from = from;
-        tordbg( t, "got a new atom: %s", tr_peerIoAddrStr( &a->addr, a->port ) );
+        tordbg( t, "got a new atom: %s", tr_atomAddrStr( a ) );
         tr_ptrArrayInsertSorted( &t->pool, a, comparePeerAtoms );
     }
@@ -1286 +1296 @@
         {
             tordbg( t, "banned peer %s tried to reconnect",
-                    tr_peerIoAddrStr( &atom->addr, atom->port ) );
+                    tr_atomAddrStr( atom ) );
         }
         else if( tr_peerIoIsIncoming( io )
@@ -1302 +1312 @@
             else
             {
-                peer = getPeer( t, addr );
+                peer = getPeer( t, atom );
                 tr_free( peer->client );
 
@@ -1313 +1323 @@
                 }
 
-                peer->port = port;
-                peer->atom = atom;
                 peer->io = tr_handshakeStealIO( handshake ); /* this steals its refcount too, which is
                                                                 balanced by our unref in peerDestructor()  */
@@ -1494 +1502 @@
             {
                 tordbg( t, "peer %s contributed to corrupt piece (%d); now has %d strikes",
-                        tr_peerIoAddrStr( &peer->addr, peer->port ),
+                        tr_atomAddrStr( peer->atom ),
                         pieceIndex, (int)peer->strikes + 1 );
                 addStrike( t, peer );
@@ -1892 +1900 @@
         tr_peer_stat *           stat = ret + i;
 
-        tr_ntop( &peer->addr, stat->addr, sizeof( stat->addr ) );
+        tr_ntop( &atom->addr, stat->addr, sizeof( stat->addr ) );
         tr_strlcpy( stat->client, ( peer->client ? peer->client : "" ),
                    sizeof( stat->client ) );
-        stat->port               = ntohs( peer->port );
+        stat->port               = ntohs( peer->atom->port );
         stat->from               = atom->from;
         stat->progress           = peer->progress;
@@ -2119 +2127 @@
     {
         tordbg( t, "purging peer %s because its doPurge flag is set",
-                tr_peerIoAddrStr( &atom->addr, atom->port ) );
+                tr_atomAddrStr( atom ) );
         return TR_MUST_CLOSE;
     }
@@ -2142 +2150 @@
         {
             tordbg( t, "purging peer %s because we're both seeds",
-                    tr_peerIoAddrStr( &atom->addr, atom->port ) );
+                    tr_atomAddrStr( atom ) );
             return TR_MUST_CLOSE;
         }
@@ -2163 +2171 @@
         if( idleTime > limit ) {
             tordbg( t, "purging peer %s because it's been %d secs since we shared anything",
-                       tr_peerIoAddrStr( &atom->addr, atom->port ), idleTime );
+                       tr_atomAddrStr( atom ), idleTime );
             return TR_CAN_CLOSE;
         }
@@ -2296 +2304 @@
         {
             tordbg( t, "RECONNECT peer %d (%s) is in its grace period of %d seconds..",
-                    i, tr_peerIoAddrStr( &atom->addr, atom->port ), interval );
+                    i, tr_atomAddrStr( atom ), interval );
             continue;
         }
@@ -2407 +2415 @@
 
             tordbg( t, "Starting an OUTGOING connection with %s",
-                   tr_peerIoAddrStr( &atom->addr, atom->port ) );
+                   tr_atomAddrStr( atom ) );
 
             io = tr_peerIoNewOutgoing( mgr->session, mgr->session->bandwidth, &atom->addr, atom->port, t->tor->info.hash );
@@ -2414 +2422 @@
             {
                 tordbg( t, "peerIo not created; marking peer %s as unreachable",
-                        tr_peerIoAddrStr( &atom->addr, atom->port ) );
+                        tr_atomAddrStr( atom ) );
                 atom->myflags |= MYFLAG_UNREACHABLE;
             }

trunk/libtransmission/peer-mgr.h

@@ -88 +88 @@
 
     uint8_t                  encryption_preference;
-    tr_port                  port;
     tr_port                  dht_port;
-    tr_address               addr;
     struct tr_peerIo       * io;
     struct peer_atom       * atom;
@@ -110 +108 @@
 tr_peer;
 
+const tr_address * tr_peerAddress( const tr_peer * );
 
 int tr_pexCompare( const void * a, const void * b );

trunk/libtransmission/peer-msgs.c

@@ -413 +413 @@
 **/
 
-static const tr_peer_event blankEvent = { 0, 0, 0, 0, 0.0f, 0, 0, 0 };
+static const tr_peer_event blankEvent = { 0, 0, 0, 0, 0.0f, 0, 0, 0, 0 };
 
 static void
@@ -489 +489 @@
     e.eventType = TR_PEER_CLIENT_GOT_SUGGEST;
     e.pieceIndex = pieceIndex;
+    publish( msgs, &e );
+}
+
+static void
+fireClientGotPort( tr_peermsgs * msgs, tr_port port )
+{
+    tr_peer_event e = blankEvent;
+    e.eventType = TR_PEER_CLIENT_GOT_PORT;
+    e.port = port;
     publish( msgs, &e );
 }
@@ -1060 +1069 @@
     /* get peer's listening port */
     if( tr_bencDictFindInt( &val, "p", &i ) ) {
-        msgs->peer->port = htons( (uint16_t)i );
-        dbgmsg( msgs, "msgs->port is now %hu", msgs->peer->port );
+        fireClientGotPort( msgs, (tr_port)i );
+        dbgmsg( msgs, "peer's port is now %d", (int)i );
     }
 
@@ -1456 +1465 @@
             tr_peerIoReadUint16( msgs->peer->io, inbuf, &msgs->peer->dht_port );
             if( msgs->peer->dht_port > 0 )
-                tr_dhtAddNode( getSession(msgs), &msgs->peer->addr, msgs->peer->dht_port, 0 );
+                tr_dhtAddNode( getSession(msgs),
+                               tr_peerAddress( msgs->peer ),
+                               msgs->peer->dht_port, 0 );
             break;
 

trunk/libtransmission/tr-dht.c

@@ -53 +53 @@
 #ifdef WITHOUT_DHT
 
-  /* These are the stubs for when we're building without DHT support */
+  /**
+  *** These are the stubs for when we're building without DHT support
+  **/
+
   int tr_dhtInit( tr_session * session UNUSED,
                   tr_address * address UNUSED ) { return TR_DHT_STOPPED; }
+
   void tr_dhtUninit( tr_session * session UNUSED ) { }
+
   tr_bool tr_dhtEnabled( const tr_session * session UNUSED ) { return FALSE; }
+
   tr_port tr_dhtPort ( const tr_session * sesssion UNUSED ) { return 0; }
+
   int tr_dhtStatus( tr_session * session     UNUSED,
                     int        * setmeCount  UNUSED ) { return TR_DHT_STOPPED; }
-  int tr_dhtAddNode( tr_session * session    UNUSED,
-                     tr_address * addr       UNUSED,
-                     tr_port      port       UNUSED,
-                     tr_bool      bootstrap  UNUSED ) { return 0; }
+
+  int tr_dhtAddNode( tr_session       * session    UNUSED,
+                     const tr_address * addr       UNUSED,
+                     tr_port            port       UNUSED,
+                     tr_bool            bootstrap  UNUSED ) { return 0; }
+
   int tr_dhtAnnounce( tr_torrent * session UNUSED,
                       tr_bool announce UNUSED ) { return -1; }
@@ -320 +329 @@
 
 int
-tr_dhtAddNode(tr_session *ss, tr_address *address, tr_port port,
-              tr_bool bootstrap)
+tr_dhtAddNode( tr_session       * ss,
+               const tr_address * address,
+               tr_port            port,
+               tr_bool            bootstrap )
 {
     struct sockaddr_in sin;

trunk/libtransmission/tr-dht.h

@@ -33 +33 @@
 int tr_dhtStatus( tr_session *, int * setme_nodeCount );
 const char *tr_dhtPrintableStatus(int status);
-int tr_dhtAddNode( tr_session *, tr_address *, tr_port, tr_bool bootstrap );
+int tr_dhtAddNode( tr_session *, const tr_address *, tr_port, tr_bool bootstrap );
 int tr_dhtAnnounce( tr_torrent *, tr_bool announce );

trunk/libtransmission/webseed.c

@@ -52 +52 @@
 ***/
 
-static const tr_peer_event blankEvent = { 0, 0, 0, 0, 0.0f, 0, 0, 0 };
+static const tr_peer_event blankEvent = { 0, 0, 0, 0, 0.0f, 0, 0, 0, 0 };
 
 static void