Changeset 3248 for trunk/libtransmission/peer-mgr.c

Timestamp:

Oct 1, 2007, 5:32:34 AM (15 years ago)

Author:

charles

Message:

ensure TR_PEER_FROM_INCOMING peers get peer atoms. this should fix BentMyWookie?'s crash.

File:

• trunk/libtransmission/peer-mgr.c (modified) (5 diffs)

trunk/libtransmission/peer-mgr.c

@@ -865 +865 @@
 
 static void
+ensureAtomExists( Torrent * t, const struct in_addr * addr, uint16_t port, uint8_t flags, uint8_t from )
+{
+    if( !peerIsKnown( t, addr ) )
+    {
+        struct peer_atom * a = tr_new( struct peer_atom, 1 );
+        a->addr = *addr;
+        a->port = port;
+        a->flags = flags;
+        a->from = from;
+        a->time = 0;
+fprintf( stderr, "torrent [%s] getting a new atom: %s\n", t->tor->info.name, tr_peerIoAddrStr(&a->addr,a->port) );
+        tr_ptrArrayInsertSorted( t->pool, a, comparePeerAtoms );
+    }
+}
+
+static void
 myHandshakeDoneCB( tr_handshake    * handshake,
                    tr_peerIo       * io,
@@ -921 +937 @@
     {
         tr_peer * peer = getPeer( t, in_addr );
+        uint16_t port;
+        const struct in_addr * addr = tr_peerIoGetAddress( io,  &port );
+        ensureAtomExists( t, addr, port, 0, TR_PEER_FROM_INCOMING );
         if( peer->msgs != NULL ) { /* we already have this peer */
             tr_peerIoFree( io );
@@ -973 +992 @@
 }
 
-static void
-maybeAddNewAtom( Torrent * t, const struct in_addr * addr, uint16_t port, uint8_t flags, uint8_t from )
-{
-    if( !peerIsKnown( t, addr ) )
-    {
-        struct peer_atom * a = tr_new( struct peer_atom, 1 );
-        a->addr = *addr;
-        a->port = port;
-        a->flags = flags;
-        a->from = from;
-        a->time = 0;
-fprintf( stderr, "torrent [%s] getting a new atom: %s\n", t->tor->info.name, tr_peerIoAddrStr(&a->addr,a->port) );
-        tr_ptrArrayInsertSorted( t->pool, a, comparePeerAtoms );
-    }
-}
-
 void
 tr_peerMgrAddPex( tr_peerMgr     * manager,
@@ -1003 +1006 @@
     t = getExistingTorrent( manager, torrentHash );
     for( end=pex+pexCount; pex!=end; ++pex )
-        maybeAddNewAtom( t, &pex->in_addr, pex->port, pex->flags, from );
+        ensureAtomExists( t, &pex->in_addr, pex->port, pex->flags, from );
     reconnectSoon( t );
 
@@ -1029 +1032 @@
         memcpy( &addr, walk, 4 ); walk += 4;
         memcpy( &port, walk, 2 ); walk += 2;
-        maybeAddNewAtom( t, &addr, port, 0, from );
+        ensureAtomExists( t, &addr, port, 0, from );
     }
     reconnectSoon( t );