mirror of
https://github.com/qbittorrent/qBittorrent.git
synced 2024-10-23 03:06:14 +03:00
Use new libtorrent 1.1.2+ utility function to generate client ID instead.
This commit is contained in:
parent
fcaca558a0
commit
729c80f910
1 changed files with 1 additions and 32 deletions
|
@ -45,7 +45,6 @@
|
||||||
#include <QTimer>
|
#include <QTimer>
|
||||||
|
|
||||||
#include <cstdlib>
|
#include <cstdlib>
|
||||||
#include <sstream>
|
|
||||||
#include <queue>
|
#include <queue>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
|
||||||
|
@ -195,36 +194,6 @@ namespace
|
||||||
|
|
||||||
template <typename T>
|
template <typename T>
|
||||||
LowerLimited<T> lowerLimited(T limit, T ret) { return LowerLimited<T>(limit, ret); }
|
LowerLimited<T> lowerLimited(T limit, T ret) { return LowerLimited<T>(limit, ret); }
|
||||||
|
|
||||||
#if LIBTORRENT_VERSION_NUM >= 10100
|
|
||||||
std::string makeFingerprint(const char* peerId, int major, int minor, int revision, int tag)
|
|
||||||
{
|
|
||||||
Q_ASSERT(peerId);
|
|
||||||
Q_ASSERT(major >= 0);
|
|
||||||
Q_ASSERT(minor >= 0);
|
|
||||||
Q_ASSERT(revision >= 0);
|
|
||||||
Q_ASSERT(tag >= 0);
|
|
||||||
Q_ASSERT(std::strlen(peerId) == 2);
|
|
||||||
|
|
||||||
auto versionToChar = [](int v) -> char
|
|
||||||
{
|
|
||||||
if (v >= 0 && v < 10) return static_cast<char>('0' + v);
|
|
||||||
if (v >= 10) return static_cast<char>('A' + (v - 10));
|
|
||||||
Q_ASSERT(false);
|
|
||||||
return '0';
|
|
||||||
};
|
|
||||||
|
|
||||||
std::ostringstream buf;
|
|
||||||
buf << '-'
|
|
||||||
<< peerId
|
|
||||||
<< versionToChar(major)
|
|
||||||
<< versionToChar(minor)
|
|
||||||
<< versionToChar(revision)
|
|
||||||
<< versionToChar(tag)
|
|
||||||
<< '-';
|
|
||||||
return buf.str();
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Session
|
// Session
|
||||||
|
@ -365,7 +334,7 @@ Session::Session(QObject *parent)
|
||||||
dispatchAlerts(alertPtr);
|
dispatchAlerts(alertPtr);
|
||||||
});
|
});
|
||||||
#else
|
#else
|
||||||
std::string peerId = makeFingerprint(PEER_ID, VERSION_MAJOR, VERSION_MINOR, VERSION_BUGFIX, VERSION_BUILD);
|
std::string peerId = libt::generate_fingerprint(PEER_ID, VERSION_MAJOR, VERSION_MINOR, VERSION_BUGFIX, VERSION_BUILD);
|
||||||
libt::settings_pack pack;
|
libt::settings_pack pack;
|
||||||
pack.set_int(libt::settings_pack::alert_mask, alertMask);
|
pack.set_int(libt::settings_pack::alert_mask, alertMask);
|
||||||
pack.set_str(libt::settings_pack::peer_fingerprint, peerId);
|
pack.set_str(libt::settings_pack::peer_fingerprint, peerId);
|
||||||
|
|
Loading…
Reference in a new issue