squidy/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent.git synced 2025-12-22 16:37:21 -06:00
Code Issues Packages Projects Releases Wiki Activity

Change back to the original names for the announce address

Browse Source 
Only allow ip's through that match the currenrly selected network interface and address
This commit is contained in:
Sjoerd van der Berg
2016-04-13 10:51:29 +02:00
committed by sledgehammer999
parent dc011a5599
commit ce2d42a264
5 changed files with 38 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -659,7 +659,7 @@ void Session::setSessionSettings()
// Include overhead in transfer limits
sessionSettings.rate_limit_ip_overhead = pref->includeOverheadInLimits();
// IP address to announce to trackers
sessionSettings.announce_ip = Utils::String::toStdString(pref->getAnnounceAddress());
sessionSettings.announce_ip = Utils::String::toStdString(pref->getNetworkAddress());
// Super seeding
sessionSettings.strict_super_seeding = pref->isSuperSeedingEnabled();
// * Max Half-open connections
@@ -1734,17 +1734,12 @@ const QStringList Session::getListeningIPs()
Logger* const logger = Logger::instance();
QStringList IPs;
//Take the override addresss
const QString networkAddr = pref->getNetworkAddress();
if ( !networkAddr.isEmpty()) {
IPs.append( networkAddr);
return IPs;
}
const QString ifaceName = pref->getNetworkInterface();
const QString ifaceAddr = pref->getNetworkInterfaceAddress();
const bool listenIPv6 = pref->getListenIPv6();
if (ifaceName.isEmpty()) {
//No interface name or address defined just use an empty list
if (ifaceName.isEmpty() && ifaceAddr.isEmpty()) {
IPs.append(QString());
return IPs;
}
@@ -1771,6 +1766,13 @@ const QStringList Session::getListeningIPs()
if ((!listenIPv6 && (protocol == QAbstractSocket::IPv6Protocol))
|| (listenIPv6 && (protocol == QAbstractSocket::IPv4Protocol)))
continue;
//If an iface address has been defined only allow ip's that match it to go through
if (!ifaceAddr.isEmpty()) {
if (ipString != ifaceAddr) {
continue;
}
}
IPs.append(ipString);
}

14
src/base/preferences.cpp
View File

@@ -1339,12 +1339,12 @@ QString Preferences::getNetworkInterfaceName() const
return value("Preferences/Connection/InterfaceName").toString();
}
void Preferences::setNetworkAddress(const QString& iface)
void Preferences::setNetworkInterfaceAddress(const QString& addr)
{
setValue("Preferences/Connection/InterfaceAddress", iface);
setValue("Preferences/Connection/InterfaceAddress", addr);
}
QString Preferences::getNetworkAddress() const
QString Preferences::getNetworkInterfaceAddress() const
{
return value("Preferences/Connection/InterfaceAddress").toString();
}
@@ -1364,14 +1364,14 @@ void Preferences::setListenIPv6(bool enable)
setValue("Preferences/Connection/InterfaceListenIPv6", enable);
}
QString Preferences::getAnnounceAddress() const
QString Preferences::getNetworkAddress() const
{
return value("Preferences/Connection/AnnounceAddress").toString();
return value("Preferences/Connection/InetAddress").toString();
}
void Preferences::setAnnounceAddress(const QString& addr)
void Preferences::setNetworkAddress(const QString& addr)
{
setValue("Preferences/Connection/AnnounceAddress", addr);
setValue("Preferences/Connection/InetAddress", addr);
}
bool Preferences::isAnonymousModeEnabled() const

8
src/base/preferences.h
View File

@@ -361,14 +361,14 @@ public:
void setMaxHalfOpenConnections(int value);
QString getNetworkInterface() const;
void setNetworkInterface(const QString& iface);
QString getNetworkAddress() const;
void setNetworkAddress(const QString& iface);
QString getNetworkInterfaceAddress() const;
void setNetworkInterfaceAddress(const QString& addr);
QString getNetworkInterfaceName() const;
void setNetworkInterfaceName(const QString& iface);
bool getListenIPv6() const;
void setListenIPv6(bool enable);
QString getAnnounceAddress() const;
void setAnnounceAddress(const QString& addr);
QString getNetworkAddress() const;
void setNetworkAddress(const QString& addr);
bool isAnonymousModeEnabled() const;
void enableAnonymousMode(bool enabled);
bool isSuperSeedingEnabled() const;