From a0fff80248cfebc346436a1d402618a8a63807ac Mon Sep 17 00:00:00 2001 From: Jordan Lee Date: Sat, 7 Jun 2014 15:07:51 +0000 Subject: [PATCH] (trunk, libT) #5711: add support for BitTorrent client peer-id --- libtransmission/clients-test.c | 3 +++ libtransmission/clients.c | 6 +++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/libtransmission/clients-test.c b/libtransmission/clients-test.c index 35187b939..53b2871f3 100644 --- a/libtransmission/clients-test.c +++ b/libtransmission/clients-test.c @@ -28,6 +28,9 @@ main (void) TEST_CLIENT ("-TR111Z-", "Transmission 1.11+"); TEST_CLIENT ("O1008132", "Osprey 1.0.0"); TEST_CLIENT ("TIX0193-", "Tixati 1.93"); + TEST_CLIENT ("-UT341\0-", "\xc2\xb5Torrent 3.4.1"); + TEST_CLIENT ("-BT791\0-", "BitTorrent 7.9.1"); + TEST_CLIENT ("-BT791B-", "BitTorrent 7.9.1 (Beta)"); /* gobbledygook */ TEST_CLIENT ("-IIO\x10\x2D\x04-", "-IIO%10-%04-"); diff --git a/libtransmission/clients.c b/libtransmission/clients.c index ba60b6e0f..a45ee103e 100644 --- a/libtransmission/clients.c +++ b/libtransmission/clients.c @@ -163,12 +163,16 @@ tr_clientForId (char * buf, size_t buflen, const void * id_in) tr_snprintf (buf, buflen, "Transmission %d.%02d%s", strint (id+3,1), strint (id+4,2), id[6]=='Z' || id[6]=='X' ? "+" : ""); } - else if (!memcmp (id+1, "UT", 2)) { tr_snprintf (buf, buflen, "\xc2\xb5Torrent %d.%d.%d%s", strint (id+3,1), strint (id+4,1), strint (id+5,1), getMnemonicEnd (id[6])); } + else if (!memcmp (id+1, "BT", 2)) + { + tr_snprintf (buf, buflen, "BitTorrent %d.%d.%d%s", + strint (id+3,1), strint (id+4,1), strint (id+5,1), getMnemonicEnd (id[6])); + } else if (!memcmp (id+1, "UM", 2)) { tr_snprintf (buf, buflen, "\xc2\xb5Torrent Mac %d.%d.%d%s",