Merge remote branch 'openslx/mcastft' into input

Conflicts:
	CMakeLists.txt
	i18n/pvs_ar_JO.ts
	i18n/pvs_de_DE.ts
	i18n/pvs_es_MX.ts
	i18n/pvs_fr_FR.ts
	i18n/pvs_pl_PL.ts
	i18n/pvsmgr_ar_JO.ts
	i18n/pvsmgr_de_DE.ts
	i18n/pvsmgr_es_MX.ts
	i18n/pvsmgr_fr_FR.ts
	i18n/pvsmgr_pl_PL.ts
	icons/README
	pvsmgr.qrc
	src/gui/mainWindow.cpp
	src/pvs.cpp
	src/pvs.h
	src/pvsDaemon.cpp
	src/util/clientGUIUtils.h

1 files changed, 16 insertions, 2 deletions

diff --git a/src/net/pvsServiceBroadcast.cpp b/src/net/pvsServiceBroadcast.cpp
index cf15b5b..a861456 100644
--- a/src/net/pvsServiceBroadcast.cpp
+++ b/src/net/pvsServiceBroadcast.cpp
@@ -20,12 +20,22 @@
 #include <cassert>

 #include "src/util/serviceDiscoveryUtil.h"

 

+#include <QNetworkInterface>

+#include <QNetworkAddressEntry>

+

 PVSServiceBroadcast::PVSServiceBroadcast()

 {

     _announce = NULL;

     _timer = 0;

     _broadcaster.bind(SD_PORT_CONSOLE);

-    _everyone = QHostAddress(QHostAddress::Broadcast);

+

+    foreach (QNetworkInterface interface, QNetworkInterface::allInterfaces())

+        foreach (QNetworkAddressEntry entry, interface.addressEntries())

+            if (!entry.broadcast().isNull() && entry.broadcast().toString() != "127.255.255.255")

+                _everyone.append(entry.broadcast());

+

+    if (_everyone.isEmpty())

+        qDebug("ERROR: No broadcast address found");

 }

 

 PVSServiceBroadcast::~PVSServiceBroadcast()

@@ -47,5 +57,9 @@ void PVSServiceBroadcast::setFingerprint(QByteArray sha1)
 void PVSServiceBroadcast::timerEvent(QTimerEvent *event)

 {

     if (_announce == NULL) return;

-    _broadcaster.writeDatagram(*_announce, _everyone, SD_PORT_CLIENT);

+    foreach (QHostAddress bcast, _everyone)

+    {

+        qDebug("DEBUG: Broadcasting to %s:%i", qPrintable(bcast.toString()),SD_PORT_CLIENT);

+        _broadcaster.writeDatagram(*_announce, bcast, SD_PORT_CLIENT);

+    }

 }