d4708/qBittorrent
1
0
Fork 0
mirror of https://github.com/d47081/qBittorrent.git synced 2025-02-05 03:14:44 +00:00
Code Issues Projects Releases Wiki Activity

Fix connection problems when a specific interface/ip is configured.

Browse Source 
Closes #7235.
Bug related to #7099 and Qt.
This commit is contained in:
sledgehammer999 2017-08-13 00:58:22 +03:00
parent 25eb2edb86
commit 7bb9c69c08
No known key found for this signature in database
GPG Key ID: 6E4A2D025B7CC9A2
1 changed files with 68 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -41,6 +41,7 @@
#include <QString> #include <QString>
#include <QThread> #include <QThread>
#include <QTimer> #include <QTimer>
#include <QUuid>
#include <cstdlib> #include <cstdlib>
#include <queue> #include <queue>
@ -92,6 +93,14 @@
#include "tracker.h" #include "tracker.h"
#include "trackerentry.h" #include "trackerentry.h"
#ifdef Q_OS_WIN
#include <iphlpapi.h>
#endif
#if _WIN32_WINNT < 0x0600
using NETIO_STATUS = LONG;
#endif
static const char PEER_ID[] = "qB"; static const char PEER_ID[] = "qB";
static const char RESUME_FOLDER[] = "BT_backup"; static const char RESUME_FOLDER[] = "BT_backup";
static const char USER_AGENT[] = "qBittorrent/" QBT_VERSION_2; static const char USER_AGENT[] = "qBittorrent/" QBT_VERSION_2;
@ -109,6 +118,10 @@ namespace
void torrentQueuePositionTop(const libt::torrent_handle &handle); void torrentQueuePositionTop(const libt::torrent_handle &handle);
void torrentQueuePositionBottom(const libt::torrent_handle &handle); void torrentQueuePositionBottom(const libt::torrent_handle &handle);
#ifdef Q_OS_WIN
QString convertIfaceNameToGuid(const QString &name);
#endif
inline SettingsStorage *settings() { return SettingsStorage::instance(); } inline SettingsStorage *settings() { return SettingsStorage::instance(); }
QStringMap map_cast(const QVariantMap &map) QStringMap map_cast(const QVariantMap &map)
@ -1103,6 +1116,10 @@ void Session::configure(libtorrent::settings_pack &settingsPack)
{ {
Logger* const logger = Logger::instance(); Logger* const logger = Logger::instance();
#ifdef Q_OS_WIN
QString chosenIP;
#endif
if (m_listenInterfaceChanged) { if (m_listenInterfaceChanged) {
const ushort port = this->port(); const ushort port = this->port();
std::pair<int, int> ports(port, port); std::pair<int, int> ports(port, port);
@ -1132,11 +1149,31 @@ void Session::configure(libtorrent::settings_pack &settingsPack)
.arg(ip).arg(port) .arg(ip).arg(port)
, Log::INFO); , Log::INFO);
settingsPack.set_str(libt::settings_pack::listen_interfaces, interfacesStr); settingsPack.set_str(libt::settings_pack::listen_interfaces, interfacesStr);
#ifdef Q_OS_WIN
chosenIP = ip;
#endif
break; break;
} }
} }
#ifdef Q_OS_WIN
// On Vista+ versions and after Qt 5.5 QNetworkInterface::name() returns
// the interface's Luid and not the GUID.
// Libtorrent expects GUIDs for the 'outgoing_interfaces' setting.
if (!networkInterface().isEmpty()) {
QString guid = convertIfaceNameToGuid(networkInterface());
if (!guid.isEmpty()) {
settingsPack.set_str(libt::settings_pack::outgoing_interfaces, guid.toStdString());
}
else {
settingsPack.set_str(libt::settings_pack::outgoing_interfaces, chosenIP.toStdString());
LogMsg(tr("Could not get GUID of configured network interface. Binding to IP %1").arg(chosenIP)
, Log::WARNING);
}
}
#else
settingsPack.set_str(libt::settings_pack::outgoing_interfaces, networkInterface().toStdString()); settingsPack.set_str(libt::settings_pack::outgoing_interfaces, networkInterface().toStdString());
#endif
m_listenInterfaceChanged = false; m_listenInterfaceChanged = false;
} }
@ -2510,10 +2547,10 @@ QString Session::networkInterface() const
return m_networkInterface; return m_networkInterface;
} }
void Session::setNetworkInterface(const QString &interface) void Session::setNetworkInterface(const QString &iface)
{ {
if (interface != networkInterface()) { if (iface != networkInterface()) {
m_networkInterface = interface; m_networkInterface = iface;
configureListeningInterface(); configureListeningInterface();
} }
} }
@ -4104,4 +4141,32 @@ namespace
qDebug() << Q_FUNC_INFO << " fails: " << exc.what(); qDebug() << Q_FUNC_INFO << " fails: " << exc.what();
} }
} }
#ifdef Q_OS_WIN
QString convertIfaceNameToGuid(const QString &name)
{
// Under Windows XP or on Qt version <= 5.5 'name' will be a GUID already.
QUuid uuid(name);
if (!uuid.isNull())
return uuid.toString().toUpper(); // Libtorrent expects the GUID in uppercase
using PCONVERTIFACENAMETOLUID = NETIO_STATUS (WINAPI *)(const WCHAR *, PNET_LUID);
PCONVERTIFACENAMETOLUID ConvertIfaceNameToLuid = reinterpret_cast<PCONVERTIFACENAMETOLUID>(::GetProcAddress(::GetModuleHandleW(L"Iphlpapi.dll"), "ConvertInterfaceNameToLuidW"));
if (!ConvertIfaceNameToLuid) return QString();
using PCONVERTIFACELUIDTOGUID = NETIO_STATUS (WINAPI *)(const NET_LUID *, GUID *);
PCONVERTIFACELUIDTOGUID ConvertIfaceLuidToGuid = reinterpret_cast<PCONVERTIFACELUIDTOGUID>(::GetProcAddress(::GetModuleHandleW(L"Iphlpapi.dll"), "ConvertInterfaceLuidToGuid"));
if (!ConvertIfaceLuidToGuid) return QString();
NET_LUID luid;
LONG res = ConvertIfaceNameToLuid(name.toStdWString().c_str(), &luid);
if (res == 0) {
GUID guid;
if (ConvertIfaceLuidToGuid(&luid, &guid) == 0)
return QUuid(guid).toString().toUpper();
}
return QString();
}
#endif
} }