github/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent synced 2025-07-06 13:11:25 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Rework the listening IP/interface selection code

Browse source 
Closes #11561
This commit is contained in:
sledgehammer999 2019-12-06 02:24:49 +02:00
parent d051519eff
commit 8200ef6bd5
No known key found for this signature in database
GPG key ID: 6E4A2D025B7CC9A2
9 changed files with 198 additions and 163 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/webui/api/appcontroller.cpp
View file

@ -259,8 +259,6 @@ void AppController::preferencesAction()
data["current_network_interface"] = session->networkInterface();
// Current network interface address
data["current_interface_address"] = BitTorrent::Session::instance()->networkInterfaceAddress();
// Listen on IPv6 address
data["listen_on_ipv6_address"] = session->isIPv6Enabled();
// Save resume data interval
data["save_resume_data_interval"] = static_cast<double>(session->saveResumeDataInterval());
// Recheck completed torrents
@ -654,9 +652,6 @@ void AppController::setPreferencesAction()
const QHostAddress ifaceAddress {it.value().toString().trimmed()};
session->setNetworkInterfaceAddress(ifaceAddress.isNull() ? QString {} : ifaceAddress.toString());
}
// Listen on IPv6 address
if (hasKey("listen_on_ipv6_address"))
session->setIPv6Enabled(it.value().toBool());
// Save resume data interval
if (hasKey("save_resume_data_interval"))
session->setSaveResumeDataInterval(it.value().toInt());
@ -767,14 +762,22 @@ void AppController::networkInterfaceAddressListAction()
const QString ifaceName = params().value("iface");
QJsonArray addressList;
const auto appendAddress = [&addressList](const QHostAddress &addr)
{
if (addr.protocol() == QAbstractSocket::IPv6Protocol)
addressList.append(Utils::Net::canonicalIPv6Addr(addr).toString());
else
addressList.append(addr.toString());
};
if (ifaceName.isEmpty()) {
for (const QHostAddress &ip : asConst(QNetworkInterface::allAddresses()))
addressList.append(ip.toString());
for (const QHostAddress &addr : asConst(QNetworkInterface::allAddresses()))
appendAddress(addr);
}
else {
const QNetworkInterface iface = QNetworkInterface::interfaceFromName(ifaceName);
for (const QNetworkAddressEntry &entry : asConst(iface.addressEntries()))
addressList.append(entry.ip().toString());
appendAddress(entry.ip());
}
setResult(addressList);