From 739132ec82a3c4630e8223bb75e6d3fc370f078a Mon Sep 17 00:00:00 2001 From: sledgehammer999 Date: Tue, 2 Sep 2014 14:36:51 +0300 Subject: [PATCH] Don't use IPv4 addresses when the user has enabled IPv6 address in the settings. Conflicts: src/qtlibtorrent/qbtsession.cpp src/smtp.cpp --- src/qtlibtorrent/qbtsession.cpp | 8 +++++--- src/smtp.cpp | 6 ++++-- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/qtlibtorrent/qbtsession.cpp b/src/qtlibtorrent/qbtsession.cpp index 04cfdb89d..c9d6a36e8 100755 --- a/src/qtlibtorrent/qbtsession.cpp +++ b/src/qtlibtorrent/qbtsession.cpp @@ -2016,7 +2016,8 @@ void QBtSession::setListeningPort(int port) { QString ip; qDebug("This network interface has %d IP addresses", network_iface.addressEntries().size()); foreach (const QNetworkAddressEntry &entry, network_iface.addressEntries()) { - if (!listen_ipv6 && (entry.ip().protocol() == QAbstractSocket::IPv6Protocol)) + if ((!listen_ipv6 && (entry.ip().protocol() == QAbstractSocket::IPv6Protocol)) + || (listen_ipv6 && (entry.ip().protocol() == QAbstractSocket::IPv4Protocol))) continue; qDebug("Trying to listen on IP %s (%s)", qPrintable(entry.ip().toString()), qPrintable(iface_name)); #if LIBTORRENT_VERSION_NUM >= 1600 @@ -2027,9 +2028,10 @@ void QBtSession::setListeningPort(int port) { #endif ip = entry.ip().toString(); addConsoleMessage(tr("qBittorrent is trying to listen on interface %1 port: TCP/%2", "e.g: qBittorrent is trying to listen on interface 192.168.0.1 port: TCP/6881").arg(ip).arg(QString::number(port)), "blue"); - break; + return; } - } + } + addConsoleMessage(tr("qBittorrent didn't find an %1 local address to listen on", "qBittorrent didn't find an IPv4 local address to listen on").arg(listen_ipv6 ? "IPv6" : "IPv4"), "red"); } // Set download rate limit diff --git a/src/smtp.cpp b/src/smtp.cpp index 4239dfa0b..242f3c7f4 100644 --- a/src/smtp.cpp +++ b/src/smtp.cpp @@ -87,7 +87,8 @@ QByteArray determineLocalAddress() if (iface_name.isEmpty()) { foreach (const QHostAddress& addr, QNetworkInterface::allAddresses()) { if (addr == QHostAddress::LocalHost || addr == QHostAddress::LocalHostIPv6 - || (!listen_ipv6 && (addr.protocol() == QAbstractSocket::IPv6Protocol))) + || (!use_ipv6 && (addr.protocol() == QAbstractSocket::IPv6Protocol)) + || (use_ipv6 && (addr.protocol() == QAbstractSocket::IPv4Protocol))) continue; address = addr.toString().toLatin1(); break; @@ -100,7 +101,8 @@ QByteArray determineLocalAddress() foreach (const QNetworkAddressEntry &entry, network_iface.addressEntries()) { if (entry.ip() == QHostAddress::LocalHost || entry.ip() == QHostAddress::LocalHostIPv6 - || (!listen_ipv6 && (entry.ip().protocol() == QAbstractSocket::IPv6Protocol))) + || (!use_ipv6 && (entry.ip().protocol() == QAbstractSocket::IPv6Protocol)) + || (use_ipv6 && (entry.ip().protocol() == QAbstractSocket::IPv4Protocol))) continue; address = entry.ip().toString().toLatin1();