d4708/qBittorrent
1
0
Fork 0
mirror of https://github.com/d47081/qBittorrent.git synced 2025-01-23 13:04:23 +00:00
Code Issues Projects Releases Wiki Activity

Migrate away from deprecated address::to_string(error_code)

Browse Source 
The other overload require users to handle exceptions themselves.
This commit is contained in:
Chocobo1 2020-09-07 14:20:35 +08:00
parent 25a47dadeb
commit 79bb8227d0
No known key found for this signature in database
GPG Key ID: 210D9C873253A68C
1 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/base/bittorrent/session.cpp
View File

@ -224,6 +224,17 @@ namespace
#endif #endif
} }
QString toString(const lt::address &address)
{
try {
return QString::fromLatin1(address.to_string().c_str());
}
catch (const std::exception &) {
// suppress conversion error
}
return {};
}
template <typename T> template <typename T>
struct LowerLimited struct LowerLimited
{ {
@ -4472,8 +4483,6 @@ void Session::handlePortmapAlert(const lt::portmap_alert *p)
void Session::handlePeerBlockedAlert(const lt::peer_blocked_alert *p) void Session::handlePeerBlockedAlert(const lt::peer_blocked_alert *p)
{ {
lt::error_code ec;
const std::string ip = p->endpoint.address().to_string(ec);
QString reason; QString reason;
switch (p->reason) { switch (p->reason) {
case lt::peer_blocked_alert::ip_filter: case lt::peer_blocked_alert::ip_filter:
@ -4496,17 +4505,16 @@ void Session::handlePeerBlockedAlert(const lt::peer_blocked_alert *p)
break; break;
} }
if (!ec) const QString ip {toString(p->endpoint.address())};
Logger::instance()->addPeer(QString::fromLatin1(ip.c_str()), true, reason); if (!ip.isEmpty())
Logger::instance()->addPeer(ip, true, reason);
} }
void Session::handlePeerBanAlert(const lt::peer_ban_alert *p) void Session::handlePeerBanAlert(const lt::peer_ban_alert *p)
{ {
lt::error_code ec; const QString ip {toString(p->endpoint.address())};
const std::string ip = p->endpoint.address().to_string(ec); if (!ip.isEmpty())
Logger::instance()->addPeer(ip, false);
if (!ec)
Logger::instance()->addPeer(QString::fromLatin1(ip.c_str()), false);
} }
void Session::handleUrlSeedAlert(const lt::url_seed_alert *p) void Session::handleUrlSeedAlert(const lt::url_seed_alert *p)
@ -4530,10 +4538,9 @@ void Session::handleUrlSeedAlert(const lt::url_seed_alert *p)
void Session::handleListenSucceededAlert(const lt::listen_succeeded_alert *p) void Session::handleListenSucceededAlert(const lt::listen_succeeded_alert *p)
{ {
const QString proto {toString(p->socket_type)}; const QString proto {toString(p->socket_type)};
lt::error_code ec;
LogMsg(tr("Successfully listening on IP: %1, port: %2/%3" LogMsg(tr("Successfully listening on IP: %1, port: %2/%3"
, "e.g: Successfully listening on IP: 192.168.0.1, port: TCP/6881") , "e.g: Successfully listening on IP: 192.168.0.1, port: TCP/6881")
.arg(p->address.to_string(ec).c_str(), proto, QString::number(p->port)), Log::INFO); .arg(toString(p->address), proto, QString::number(p->port)), Log::INFO);
// Force reannounce on all torrents because some trackers blacklist some ports // Force reannounce on all torrents because some trackers blacklist some ports
for (const lt::torrent_handle &torrent : m_nativeSession->get_torrents()) for (const lt::torrent_handle &torrent : m_nativeSession->get_torrents())
@ -4543,18 +4550,16 @@ void Session::handleListenSucceededAlert(const lt::listen_succeeded_alert *p)
void Session::handleListenFailedAlert(const lt::listen_failed_alert *p) void Session::handleListenFailedAlert(const lt::listen_failed_alert *p)
{ {
const QString proto {toString(p->socket_type)}; const QString proto {toString(p->socket_type)};
lt::error_code ec;
LogMsg(tr("Failed to listen on IP: %1, port: %2/%3. Reason: %4" LogMsg(tr("Failed to listen on IP: %1, port: %2/%3. Reason: %4"
, "e.g: Failed to listen on IP: 192.168.0.1, port: TCP/6881. Reason: already in use") , "e.g: Failed to listen on IP: 192.168.0.1, port: TCP/6881. Reason: already in use")
.arg(p->address.to_string(ec).c_str(), proto, QString::number(p->port) .arg(toString(p->address), proto, QString::number(p->port)
, QString::fromLocal8Bit(p->error.message().c_str())), Log::CRITICAL); , QString::fromLocal8Bit(p->error.message().c_str())), Log::CRITICAL);
} }
void Session::handleExternalIPAlert(const lt::external_ip_alert *p) void Session::handleExternalIPAlert(const lt::external_ip_alert *p)
{ {
lt::error_code ec;
LogMsg(tr("Detected external IP: %1", "e.g. Detected external IP: 1.1.1.1") LogMsg(tr("Detected external IP: %1", "e.g. Detected external IP: 1.1.1.1")
.arg(p->external_address.to_string(ec).c_str()), Log::INFO); .arg(toString(p->external_address)), Log::INFO);
} }
void Session::handleSessionStatsAlert(const lt::session_stats_alert *p) void Session::handleSessionStatsAlert(const lt::session_stats_alert *p)