Commit ebaf8fc9 authored by Chris Knadle's avatar Chris Knadle
Browse files

debian/patches: remove 48-systemd-workaround.diff, incorporated upstream

parent 074aa339
Description: systemd workaround -- patch to enable both IPv4 and IPv6 if
mumble-server is unable to query network interfaces
Origin: https://github.com/mkrautz/mumble/commit/a9b9dfe5e91e4a272a644869dcbda8b62560255a
Bug-Mumble: https://github.com/mumble-voip/mumble/issues/1629
Bug-Debian: http://bugs.debian.org/780300
Author: Christopher Knadle <Chris.Knadle@coredump.us>
Last-Updated: 2017-08-06
--- a/src/murmur/Meta.cpp
+++ b/src/murmur/Meta.cpp
@@ -210,30 +210,45 @@
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;
-
- 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;
+ 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;
+ }
}
- }
+
+ ++nif;
+ }
+ }
+
+ if (nif == 0) {
+ qWarning("Meta: Could not determine IPv4/IPv6 support via network interfaces, assuming support for both.");
+ hasipv6 = true;
+ hasipv4 = true;
}
+
if (hasipv6) {
qlBind << QHostAddress(QHostAddress::AnyIPv6);
#ifdef Q_OS_UNIX
......@@ -5,7 +5,6 @@
35-add-dpkg-buildflags.diff
44-add-speechd-header.diff
46-var-run-to-run.diff
48-systemd-workaround.diff
50-zeroc-ice-lib-move.diff
52-use-update-rc.d-for-disable.diff
54-fix-boost-ftbfs.diff
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment