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

fix: parse utorrent peer-id version components as hex (#2411)

This commit is contained in:
Charles Kerr 2022-01-16 10:27:23 -06:00 committed by GitHub
parent be1e46383d
commit 2c09e99515
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 28 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
libtransmission/clients.cc
View File

@ -92,12 +92,12 @@ auto constexpr charints = std::array<std::string_view, 256>{
"x", "x", "x", "x", "x", "x", "x", "x", "x", "x", "x", "x", "x", "x", "x", "x" }
};
int strint(void const* pch, int span)
int strint(void const* pch, int span, int base = 0)
{
char tmp[64];
memcpy(tmp, pch, span);
tmp[span] = '\0';
return strtol(tmp, nullptr, 0);
return strtol(tmp, nullptr, base);
}
constexpr std::string_view getMnemonicEnd(uint8_t ch)
@ -442,15 +442,35 @@ void transmission_formatter(char* buf, size_t buflen, std::string_view name, tr_
}
}
constexpr void utorrent_formatter(char* buf, size_t buflen, std::string_view name, tr_peer_id_t id)
void utorrent_formatter(char* buf, size_t buflen, std::string_view name, tr_peer_id_t id)
{
if (id[7] == '-')
{
buf_append(buf, buflen, name, ' ', id[3], '.', id[4], '.', id[5], getMnemonicEnd(id[6]));
buf_append(
buf,
buflen,
name,
' ',
strint(&id[3], 1, 16),
'.',
strint(&id[4], 1, 16),
'.',
strint(&id[5], 1, 16),
getMnemonicEnd(id[6]));
}
else // uTorrent replaces the trailing dash with an extra digit for longer version numbers
{
buf_append(buf, buflen, name, ' ', id[3], '.', id[4], '.', id[5], id[6], getMnemonicEnd(id[6]));
buf_append(
buf,
buflen,
name,
' ',
strint(&id[3], 1, 16),
'.',
strint(&id[4], 1, 16),
'.',
strint(&id[5], 2, 10),
getMnemonicEnd(id[7]));
}
}

5
tests/libtransmission/clients-test.cc
View File

@ -25,7 +25,7 @@ TEST(Client, clientForId)
std::string_view expected_client;
};
auto constexpr Tests = std::array<LocalTest, 37>{
auto constexpr Tests = std::array<LocalTest, 38>{
{ { "-AZ8421-"sv, "Azureus / Vuze 8.4.2.1"sv },
{ "-BC0241-"sv, "BitComet 2.41"sv }, // two major, two minor
{ "-BI2300-"sv, "BiglyBT 2.3.0.0"sv },
@ -50,6 +50,7 @@ TEST(Client, clientForId)
{ "-TR0072-"sv, "Transmission 0.72"sv },
{ "-TR111Z-"sv, "Transmission 1.11+"sv },
{ "-UT341\0-"sv, "\xc2\xb5Torrent 3.4.1"sv },
{ "-UT7a5\0-"sv, "\xc2\xb5Torrent 7.10.5"sv },
{ "-UW110Q-"sv, "\xc2\xb5Torrent Web 1.1.0"sv },
{ "-UW1110Q"sv, "\xc2\xb5Torrent Web 1.1.10"sv }, // wider version
{ "-WS1000-"sv, "HTTP Seed"sv },
@ -73,6 +74,6 @@ TEST(Client, clientForId)
auto buf = std::array<char, 128>{};
tr_clientForId(buf.data(), buf.size(), peer_id);
EXPECT_EQ(test.expected_client, buf.data());
EXPECT_EQ(test.expected_client, std::string_view{ buf.data() });
}
}