squidy/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent.git synced 2025-12-19 15:07:22 -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

30
src/gui/advancedsettings.cpp
View File

@@ -47,8 +47,8 @@ enum AdvSettingsRows
QBITTORRENT_HEADER,
// network interface
NETWORK_IFACE,
//Optional bind address
NETWORK_ADDRESS,
//Optional network address
NETWORK_IFACE_ADDRESS,
NETWORK_LISTEN_IPV6,
// behavior
SAVE_RESUME_DATA_INTERVAL,
@@ -85,7 +85,7 @@ enum AdvSettingsRows
// tracker
TRACKER_EXCHANGE,
ANNOUNCE_ALL_TRACKERS,
ANNOUNCE_ADDRESS,
NETWORK_ADDRESS,
ROW_COUNT
};
@@ -148,18 +148,18 @@ void AdvancedSettings::saveAdvancedSettings()
}
// Listen on IPv6 address
pref->setListenIPv6(cb_listen_ipv6.isChecked());
// Network address
// Interface address
QHostAddress ifaceAddr(txt_iface_address.text().trimmed());
if (ifaceAddr.isNull())
pref->setNetworkInterfaceAddress("");
else
pref->setNetworkInterfaceAddress(ifaceAddr.toString());
// Network Announce address
QHostAddress networkAddr(txt_network_address.text().trimmed());
if (networkAddr.isNull())
pref->setNetworkAddress("");
else
pref->setNetworkAddress(networkAddr.toString());
// Announce address
QHostAddress announceAddr(txt_announce_address.text().trimmed());
if (announceAddr.isNull())
pref->setAnnounceAddress("");
else
pref->setAnnounceAddress(announceAddr.toString());
// Program notification
MainWindow * const mainWindow = static_cast<Application*>(QCoreApplication::instance())->mainWindow();
@@ -294,12 +294,12 @@ void AdvancedSettings::loadAdvancedSettings()
// Listen on IPv6 address
cb_listen_ipv6.setChecked(pref->getListenIPv6());
addRow(NETWORK_LISTEN_IPV6, tr("Listen on IPv6 address (requires restart)"), &cb_listen_ipv6);
// Network address
// Network interface address
txt_iface_address.setText(pref->getNetworkInterfaceAddress());
addRow(NETWORK_IFACE_ADDRESS, tr("Optional IP Address to bind to (requires restart)"), &txt_iface_address);
// Announce address
txt_network_address.setText(pref->getNetworkAddress());
addRow(NETWORK_ADDRESS, tr("IP Address to bind to( requires restart))"), &txt_network_address);
// Network address
txt_announce_address.setText(pref->getAnnounceAddress());
addRow(ANNOUNCE_ADDRESS, tr("IP Address to report to trackers (requires restart)"), &txt_announce_address);
addRow(NETWORK_ADDRESS, tr("IP Address to report to trackers (requires restart)"), &txt_network_address);
// Program notifications
const MainWindow * const mainWindow = static_cast<Application*>(QCoreApplication::instance())->mainWindow();