mirror
/
transmission
mirror of https://github.com/transmission/transmission
1
0
Fork 0
Code Issues Releases Wiki Activity

(libT) better handling of Shad0w-style peer ids that don't have trailing dashes, such as Osprey Permaseed

This commit is contained in:
Charles Kerr 2008-10-01 18:11:28 +00:00
parent 23d8a4f615
commit 60f84b35d9
2 changed files with 41 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libtransmission/clients-test.c
View File

@ -36,6 +36,7 @@ main( void )
TEST_CLIENT( "-TR0006-", "Transmission 0.6" );
TEST_CLIENT( "-TR0072-", "Transmission 0.72" );
TEST_CLIENT( "-TR111Z-", "Transmission 1.11+" );
TEST_CLIENT( "O1008132", "Osprey 1.0.0" );
TEST_CLIENT(
"\x65\x78\x62\x63\x00\x38\x7A\x44\x63\x10\x2D\x6E\x9A\xD6\x72\x3B\x33\x9F\x35\xA9",

70
libtransmission/clients.c
View File

@ -32,6 +32,17 @@ charint( char ch )
return 0;
}
static int
getShadowInt( char ch, int * setme )
{
const char * str = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz.-";
const char * pch = strchr( str, ch );
if( !pch )
return 0;
*setme = pch - str;
return 1;
}
static int
strint( const void * pch,
int span )
@ -430,35 +441,6 @@ tr_clientForId( char * buf,
return;
}
/* Shad0w-style */
if( !memcmp( &id[4], "----", 4 ) || !memcmp( &id[4], "--0", 3 ) )
{
switch( *id )
{
case 'A':
three_digits( buf, buflen, "ABC", id + 1 ); break;
case 'O':
three_digits( buf, buflen, "Osprey", id + 1 ); break;
case 'Q':
three_digits( buf, buflen, "BTQueue", id + 1 ); break;
case 'R':
three_digits( buf, buflen, "Tribler", id + 1 ); break;
case 'S':
three_digits( buf, buflen, "Shad0w", id + 1 ); break;
case 'T':
three_digits( buf, buflen, "BitTornado", id + 1 ); break;
default:
break;
}
if( *buf ) return;
}
/* Mainline */
if( isMainlineStyle( id ) )
{
@ -548,6 +530,35 @@ tr_clientForId( char * buf,
tr_snprintf( buf, buflen, "BitSpirit %u", ( id[1] == 0 ? 1 : id[1] ) );
}
/* Shad0w-style */
{
int a, b, c;
if( strchr( "AOQRSTU", id[0] )
&& getShadowInt( id[1], &a )
&& getShadowInt( id[2], &b )
&& getShadowInt( id[3], &c ) )
{
const char * name = NULL;
switch( id[0] )
{
case 'A': name = "ABC"; break;
case 'O': name = "Osprey"; break;
case 'Q': name = "BTQueue"; break;
case 'R': name = "Tribler"; break;
case 'S': name = "Shad0w"; break;
case 'T': name = "BitTornado"; break;
case 'U': name = "UPnP NAT Bit Torrent"; break;
}
if( name )
{
tr_snprintf( buf, buflen, "%s %d.%d.%d", name, a, b, c );
return;
}
}
}
/* No match */
if( !*buf )
{
@ -565,4 +576,3 @@ tr_clientForId( char * buf,
evbuffer_free( out );
}
}