Changeset 3433

Timestamp:

Oct 16, 2007, 3:14:07 AM (15 years ago)

Author:

charles

Message:

more tweaks

File:

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

trunk/libtransmission/peer-mgr.c

@@ -848 +848 @@
 ensureAtomExists( Torrent * t, const struct in_addr * addr, uint16_t port, uint8_t flags, uint8_t from )
 {
-    struct peer_atom * a = getExistingAtom( t, addr );
-
-    if( a == NULL )
-    {
+    if( getExistingAtom( t, addr ) == NULL )
+    {
+        struct peer_atom * a;
         a = tr_new0( struct peer_atom, 1 );
         a->addr = *addr;
         a->port = port;
         a->flags = flags;
+        a->from = from;
         tordbg( t, "got a new atom: %s", tr_peerIoAddrStr(&a->addr,a->port) );
         tr_ptrArrayInsertSorted( t->pool, a, comparePeerAtoms );
     }
-
-    a->from = from;
 }
 
@@ -873 +871 @@
     int ok = isConnected;
     uint16_t port;
-    const struct in_addr * in_addr;
+    const struct in_addr * addr;
     tr_peerMgr * manager = (tr_peerMgr*) vmanager;
     Torrent * t;
@@ -900 +898 @@
         torrentLock( t );
 
-    in_addr = tr_peerIoGetAddress( io, &port );
+    addr = tr_peerIoGetAddress( io, &port );
 
     if( !ok || !t || !t->isRunning )
     {
         tr_peerIoFree( io );
-
-        if( t )
-            ++getExistingAtom( t, in_addr )->numFails;
     }
     else /* looking good */
     {
-        uint16_t port;
-        const struct in_addr * addr = tr_peerIoGetAddress( io,  &port );
         struct peer_atom * atom;
         ensureAtomExists( t, addr, port, 0, TR_PEER_FROM_INCOMING );