Changeset 1261

Timestamp:

Dec 19, 2006, 3:22:46 AM (16 years ago)

Author:

livings124

Message:

better identification of clients with weird formats that might conflict with others

File:

• trunk/libtransmission/clients.c (modified) (6 diffs)

trunk/libtransmission/clients.c

@@ -41 +41 @@
 {
     char * ret = NULL;
-
+    
+    /* Azureus style */
     if( id[0] == '-' && id[7] == '-' )
     {
@@ -108 +109 @@
                       charToInt( id[5] ) * 10 + charToInt( id[6] ) );
         }
-    }
-    else if( !memcmp( &id[4], "----", 4 ) || !memcmp( &id[4], "--00", 4 ) )
+        
+        if( ret )
+        {
+            return ret;
+        }
+    }
+    
+    /* Different formatting per client */
+    if( !memcmp( &id[4], "----", 4 ) || !memcmp( &id[4], "--00", 4 ) )
     {
         if( id[0] == 'T' )
@@ -121 +129 @@
                         charToInt( id[2] ), charToInt( id[3] ) );
         }
-    }
-    else if( id[0] == 'M' && id[2] == '-' && id[7] == '-' )
+        
+        if( ret )
+        {
+            return ret;
+        }
+    }
+    if( id[0] == 'M' && id[2] == '-' && id[7] == '-' )
     {
         if( id[4] == '-' && id[6] == '-' )
@@ -132 +145 @@
             asprintf( &ret, "BitTorrent %c.%c%c.%c", id[1], id[3], id[4], id[6] );
         }
-    }
-    else if( id[0] == 'Q' && id[2] == '-' && id[7] == '-' )
+        
+        if( ret )
+        {
+            return ret;
+        }
+    }
+    if( id[0] == 'Q' && id[2] == '-' && id[7] == '-' )
     {
         if( id[4] == '-' && id[6] == '-' )
@@ -143 +161 @@
             asprintf( &ret, "Queen Bee %c.%c%c.%c", id[1], id[3], id[4], id[6] );
         }
-    }
-    else if( !memcmp( id, "exbc", 4 ) )
+        
+        if( ret )
+        {
+            return ret;
+        }
+    }
+    
+    /* All versions of each client are formatted the same */
+    if( !memcmp( id, "exbc", 4 ) )
     {
         asprintf( &ret, "%s %d.%02d",
@@ -173 +198 @@
     }
 
+    /* No match */
     if( !ret )
     {