mirrors/mumble
2
0
Fork 0
mirror of https://github.com/mumble-voip/mumble.git synced 2025-10-26 11:19:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge PR #2908: Meta: enable both IPv4 and IPv6 if we're unable to query network interfaces.

Browse Source
This commit is contained in:
Mikkel Krautz 2017-03-05 22:05:12 +01:00 committed by GitHub
commit cb952e06f8
1 changed files with 32 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/murmur/Meta.cpp
View File

@ -206,30 +206,44 @@ void MetaParams::read(QString fname) {
if (qlBind.isEmpty()) {
bool hasipv6 = false;
bool hasipv4 = false;
int nif = 0;
foreach(const QNetworkInterface &qni, QNetworkInterface::allInterfaces()) {
if (!(qni.flags() & QNetworkInterface::IsUp))
continue;
if (!(qni.flags() & QNetworkInterface::IsRunning))
continue;
if (qni.flags() & QNetworkInterface::IsLoopBack)
continue;
QList<QNetworkInterface> interfaces = QNetworkInterface::allInterfaces();
if (interfaces.isEmpty()) {
qWarning("Meta: Unable to acquire list of network interfaces.");
} else {
foreach(const QNetworkInterface &qni, interfaces) {
if (!(qni.flags() & QNetworkInterface::IsUp))
continue;
if (!(qni.flags() & QNetworkInterface::IsRunning))
continue;
if (qni.flags() & QNetworkInterface::IsLoopBack)
continue;
foreach(const QNetworkAddressEntry &qna, qni.addressEntries()) {
const QHostAddress &qha = qna.ip();
switch (qha.protocol()) {
case QAbstractSocket::IPv4Protocol:
hasipv4 = true;
break;
case QAbstractSocket::IPv6Protocol:
hasipv6 = true;
break;
default:
break;
foreach(const QNetworkAddressEntry &qna, qni.addressEntries()) {
const QHostAddress &qha = qna.ip();
switch (qha.protocol()) {
case QAbstractSocket::IPv4Protocol:
hasipv4 = true;
break;
case QAbstractSocket::IPv6Protocol:
hasipv6 = true;
break;
default:
break;
}
}
++nif;
}
}
if (nif == 0) {
qWarning("Meta: Could not determine IPv4/IPv6 support via network interfaces, assuming support for both.");
hasipv6 = true;
hasipv4 = true;
}
#if QT_VERSION >= 0x050000
if (hasipv6) {
if (SslServer::hasDualStackSupport() && hasipv4) {