Changeset 1650

Timestamp:

Apr 3, 2007, 6:22:58 PM (15 years ago)

Author:

joshe

Message:

Cache peer client name.
Don't create an 'unknown client' name with nonprintable characters.

Location:

trunk/libtransmission

Files:

• clients.c (modified) (2 diffs)
• internal.h (modified) (1 diff)
• peer.c (modified) (2 diffs)
• peer.h (modified) (1 diff)
• peeraz.h (modified) (1 diff)
• peerext.h (modified) (2 diffs)
• peerparse.h (modified) (4 diffs)
• torrent.c (modified) (2 diffs)
• transmission.h (modified) (1 diff)

trunk/libtransmission/clients.c

@@ -321 +321 @@
     if( !ret )
     {
-        if( id[0] != 0 )
+        if( isprint( id[0] ) && isprint( id[1] ) && isprint( id[2] ) &&
+            isprint( id[3] ) && isprint( id[4] ) && isprint( id[5] ) &&
+            isprint( id[6] ) && isprint( id[7] ) )
         {
             asprintf( &ret, "unknown client (%c%c%c%c%c%c%c%c)",
@@ -328 +330 @@
         else
         {
-            asprintf( &ret, "unknown client" );
+            asprintf( &ret, "unknown client (0x%02x%02x%02x%02x%02x%02x%02x%02x",
+                  id[0], id[1], id[2], id[3], id[4], id[5], id[6], id[7] );
         }
     }

trunk/libtransmission/internal.h

@@ -42 +42 @@
 #include <string.h>
 #include <unistd.h>
+#include <ctype.h>
 #include <errno.h>
 #include <limits.h>

trunk/libtransmission/peer.c

@@ -136 +136 @@
     tr_ratecontrol_t  * download;
     tr_ratecontrol_t  * upload;
+
+    char              * client;
 };
 
@@ -219 +221 @@
     tr_rcClose( peer->download );
     tr_rcClose( peer->upload );
+    free( peer->client );
     free( peer );
+}
+
+const char *
+tr_peerClient( tr_peer_t * peer )
+{
+    if( NULL == peer->client )
+    {
+        peer->client = tr_clientForId( peer->id );
+    }
+
+    return peer->client;
 }
 

trunk/libtransmission/peer.h

@@ -32 +32 @@
 tr_peer_t * tr_peerInit          ( struct in_addr, in_port_t, int sock, int );
 void        tr_peerDestroy       ( tr_peer_t * );
+const char *tr_peerClient        ( tr_peer_t * );
 void        tr_peerSetPrivate    ( tr_peer_t *, int );
 void        tr_peerSetTorrent    ( tr_peer_t *, tr_torrent_t * );

trunk/libtransmission/peeraz.h

@@ -360 +360 @@
     }
 
+#if 0 /* ugh, we have to deal with encoding if we do this */
+    /* get peer's client name */
+    sub  = tr_bencDictFind( &val, "client" );
+    sub2 = tr_bencDictFind( &val, "version" );
+    if( NULL != sub  && TYPE_STR == sub->type &&
+        NULL != sub2 && TYPE_STR == sub->type )
+    {
+        if( NULL == peer->client ||
+            ( 0 != strncmp( peer->client, sub->val.s.s, sub->val.s.i ) ||
+              ' ' != peer->client[sub->val.s.i] ||
+              0 != strcmp( peer->client + sub->val.s.i + 1, sub2->val.s.s ) ) )
+        {
+            client = NULL;
+            asprintf( &client, "%s %s", sub->val.s.s, sub2->val.s.s );
+            if( NULL != client )
+            {
+                free( peer->client );
+                peer->client = client;
+            }
+        }
+    }
+#endif
+
     /* get the peer's listening port */
     sub = tr_bencDictFind( &val, "tcp_port" );

trunk/libtransmission/peerext.h

@@ -220 +220 @@
 {
     benc_val_t val, * sub;
-    int dbgport, dbgpex;
+    int        dbgport, dbgpex;
 
     if( tr_bencLoad( buf, len, &val, NULL ) )
@@ -251 +251 @@
     }
 
+#if 0 /* ugh, we have to deal with encoding if we do this */
+    /* get peer's client name */
+    sub = tr_bencDictFind( &val, "v" );
+    if( NULL != sub && TYPE_STR == sub->type &&
+        ( NULL == peer->client || 0 != strcmp( sub->val.s.s, peer->client ) ) )
+    {
+        client = tr_bencStealStr( sub );
+        if( NULL != client )
+        {
+            free( peer->client );
+            peer->client = client;
+        }
+    }
+#endif
+
     /* get peer's listening port */
     sub = tr_bencDictFind( &val, "p" );

trunk/libtransmission/peerparse.h

@@ -585 +585 @@
     tr_info_t * inf = &tor->info;
     int         ii;
-    char      * client;
 
     if( memcmp( &peer->buf[28], inf->hash, SHA_DIGEST_LENGTH ) )
@@ -615 +614 @@
     }
 
-    client = tr_clientForId( (uint8_t *) peer->id );
     if( PEER_SUPPORTS_EXTENDED_MESSAGES( &peer->buf[20] ) )
     {
@@ -621 +619 @@
         peer->extStatus = EXTENDED_SUPPORTED;
         peer_dbg( "GET  handshake, ok (%s) extended messaging supported",
-                  client );
+                  tr_peerClient( peer ) );
     }
     else if( PEER_SUPPORTS_AZUREUS_PROTOCOL( &peer->buf[20] ) )
@@ -629 +627 @@
         peer->date    = tr_date();
         peer_dbg( "GET  handshake, ok (%s) will use azureus protocol",
-                  client );
+                  tr_peerClient( peer ) );
     }
     else
     {
         peer->status = PEER_STATUS_CONNECTED;
-        peer_dbg( "GET  handshake, ok (%s)", client );
-    }
-    free( client );
+        peer_dbg( "GET  handshake, ok (%s)", tr_peerClient( peer ) );
+    }
 
     return TR_OK;

trunk/libtransmission/torrent.c

@@ -498 +498 @@
             }
             
-            peers[i].client = tr_clientForId(tr_peerId(peer));
-            
+            peers[i].client        = tr_peerClient( peer );
             peers[i].isConnected   = tr_peerIsConnected( peer );
             peers[i].from          = tr_peerIsFrom( peer );
@@ -522 +521 @@
 }
 
-void tr_torrentPeersFree( tr_peer_stat_t * peers, int peerCount )
-{
-    int i;
-
+void tr_torrentPeersFree( tr_peer_stat_t * peers, int peerCount UNUSED )
+{
     if (peers == NULL)
         return;
-
-    for (i = 0; i < peerCount; i++)
-        free( peers[i].client );
 
     free( peers );

trunk/libtransmission/transmission.h

@@ -453 +453 @@
 {
     char    addr[INET_ADDRSTRLEN];
-    char *  client;
+    const char * client;
     
     int     isConnected;