d4708/qBittorrent
1
0
Fork 0
mirror of https://github.com/d47081/qBittorrent.git synced 2025-01-11 15:27:54 +00:00
Code Issues Projects Releases Wiki Activity

Call setListeningPort() when state of network interface changes (closes qbittorrent/qBittorrent#475, closes qbittorrent/qBittorrent#3072)

Browse Source
This commit is contained in:
Pawel Polewicz 2015-06-15 00:06:56 +02:00
parent fb22940639
commit f108e67dcc
2 changed files with 33 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/core/bittorrent/session.cpp
View File

@ -202,6 +202,12 @@ Session::Session(QObject *parent)
configure(); configure();
connect(pref, SIGNAL(changed()), SLOT(configure())); connect(pref, SIGNAL(changed()), SLOT(configure()));
// Network configuration monitor
connect(&m_networkManager, SIGNAL(onlineStateChanged(bool)), SLOT(networkOnlineStateChanged(bool)));
connect(&m_networkManager, SIGNAL(configurationAdded(const QNetworkConfiguration&)), SLOT(networkConfigurationChange(const QNetworkConfiguration&)));
connect(&m_networkManager, SIGNAL(configurationRemoved(const QNetworkConfiguration&)), SLOT(networkConfigurationChange(const QNetworkConfiguration&)));
connect(&m_networkManager, SIGNAL(configurationChanged(const QNetworkConfiguration&)), SLOT(networkConfigurationChange(const QNetworkConfiguration&)));
m_resumeDataTimer->start(); m_resumeDataTimer->start();
// initialize PortForwarder instance // initialize PortForwarder instance
@ -483,7 +489,7 @@ void Session::configure()
const unsigned short newListenPort = pref->getSessionPort(); const unsigned short newListenPort = pref->getSessionPort();
if (oldListenPort != newListenPort) { if (oldListenPort != newListenPort) {
qDebug("Session port changes in program preferences: %d -> %d", oldListenPort, newListenPort); qDebug("Session port changes in program preferences: %d -> %d", oldListenPort, newListenPort);
setListeningPort(newListenPort); setListeningPort();
} }
// * Save path // * Save path
@ -1458,12 +1464,28 @@ void Session::setAppendExtension(bool append)
} }
} }
void Session::networkOnlineStateChanged(const bool online)
{
Logger::instance()->addMessage(tr("System network status changed to %1", "e.g: System network status changed to ONLINE").arg(online ? tr("ONLINE") : tr("OFFLINE")), Log::INFO);
}
void Session::networkConfigurationChange(const QNetworkConfiguration& cfg)
{
const QString configuredInterfaceName = Preferences::instance()->getNetworkInterface();
const QString changedInterface = cfg.name();
if (configuredInterfaceName.isEmpty() || configuredInterfaceName == changedInterface) {
Logger::instance()->addMessage(tr("Network configuration of %1 has changed, refreshing session binding", "e.g: Network configuration of tun0 has changed, refreshing session binding").arg(changedInterface), Log::INFO);
setListeningPort();
}
}
// Set the ports range in which is chosen the port // Set the ports range in which is chosen the port
// the BitTorrent session will listen to // the BitTorrent session will listen to
void Session::setListeningPort(int port) void Session::setListeningPort()
{ {
qDebug() << Q_FUNC_INFO << port;
Preferences* const pref = Preferences::instance(); Preferences* const pref = Preferences::instance();
const unsigned short port = pref->getSessionPort();
qDebug() << Q_FUNC_INFO << port;
Logger* const logger = Logger::instance(); Logger* const logger = Logger::instance();
std::pair<int,int> ports(port, port); std::pair<int,int> ports(port, port);

9
src/core/bittorrent/session.h
View File

@ -36,6 +36,7 @@
#include <QVector> #include <QVector>
#include <QMutex> #include <QMutex>
#include <QWaitCondition> #include <QWaitCondition>
#include <QNetworkConfigurationManager>
#include "core/tristatebool.h" #include "core/tristatebool.h"
#include "core/types.h" #include "core/types.h"
@ -227,6 +228,10 @@ namespace BitTorrent
void handleRedirectedToMagnet(const QString &url, const QString &magnetUri); void handleRedirectedToMagnet(const QString &url, const QString &magnetUri);
void switchToAlternativeMode(bool alternative); void switchToAlternativeMode(bool alternative);
// Session reconfiguration triggers
void networkOnlineStateChanged(const bool online);
void networkConfigurationChange(const QNetworkConfiguration&);
private: private:
explicit Session(QObject *parent = 0); explicit Session(QObject *parent = 0);
~Session(); ~Session();
@ -242,7 +247,7 @@ namespace BitTorrent
void setProxySettings(libtorrent::proxy_settings proxySettings); void setProxySettings(libtorrent::proxy_settings proxySettings);
void adjustLimits(); void adjustLimits();
void adjustLimits(libtorrent::session_settings &sessionSettings); void adjustLimits(libtorrent::session_settings &sessionSettings);
void setListeningPort(int port); void setListeningPort();
void setDefaultSavePath(const QString &path); void setDefaultSavePath(const QString &path);
void setDefaultTempPath(const QString &path = QString()); void setDefaultTempPath(const QString &path = QString());
void preAllocateAllFiles(bool b); void preAllocateAllFiles(bool b);
@ -356,6 +361,8 @@ namespace BitTorrent
QWaitCondition m_alertsWaitCondition; QWaitCondition m_alertsWaitCondition;
QVector<libtorrent::alert *> m_alerts; QVector<libtorrent::alert *> m_alerts;
QNetworkConfigurationManager m_networkManager;
static Session *m_instance; static Session *m_instance;
}; };
} }