Merge pull request #14504 from treysis/ipv6-outgoing-interfaces

Fix bad IPv6 address format for outgoingInterfaces

src/base/bittorrent/session.cpp

@@ -1457,12 +1457,14 @@ void Session::configureNetworkInterfaces(lt::settings_pack &settingsPack)
         const QHostAddress addr {ip};
         if (!addr.isNull())
         {
-            const QString ip = ((addr.protocol() == QAbstractSocket::IPv6Protocol)
+            const bool isIPv6 = (addr.protocol() == QAbstractSocket::IPv6Protocol);
-                          ? ('[' + Utils::Net::canonicalIPv6Addr(addr).toString() + ']')
+            const QString ip = isIPv6
-                          : addr.toString());
+                          ? Utils::Net::canonicalIPv6Addr(addr).toString()
-            endpoints << (ip + portString);
+                          : addr.toString();
+
+            endpoints << ((isIPv6 ? ('[' + ip + ']') : ip) + portString);
 
-            if ((ip != "0.0.0.0") && (ip != "[::]"))
+            if ((ip != QLatin1String("0.0.0.0")) && (ip != QLatin1String("::")))
                 outgoingInterfaces << ip;
         }
         else