work around problem with multicast addresses

In Windows, using setMulticastInterface() is not sufficient. One need to bind on each address, else the first address found is used. Bump version to v0.9.2.
fbx · Oct 26, 2014 · 3b416a2 · 3b416a2
1 parent f7e21f5
commit 3b416a2
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/Freebox.pluginspec.in b/Freebox.pluginspec.in
@@ -1,4 +1,4 @@
-<plugin name=\"Freebox\" version=\"0.9.1\" compatVersion=\"0.9.0\">
+<plugin name=\"Freebox\" version=\"0.9.2\" compatVersion=\"0.9.0\">
     <vendor>Freebox SAS</vendor>
     <copyright>(C) Freebox 2014</copyright>
     <license>LGPL-2.1</license>

diff --git a/ssdp/ssdpclient.cc b/ssdp/ssdpclient.cc
@@ -49,7 +49,9 @@ void Client::start(const QString &nt)
 
     foreach(QNetworkInterface iface, QNetworkInterface::allInterfaces()) {
         mListeners << new UdpListener(iface);
-        mSearches << new Search(iface, nt);
+        foreach(QHostAddress addr, iface.allAddresses()) {
+            mSearches << new Search(iface, addr, nt);
+        }
     }
 
     foreach(UdpListener *l, mListeners) {

diff --git a/ssdp/ssdpsearch.cc b/ssdp/ssdpsearch.cc
@@ -27,13 +27,14 @@ namespace Freebox {
 namespace Ssdp {
 
 Search::Search(const QNetworkInterface &iface,
+               const QHostAddress &addr,
                const QString &st,
                QObject *parent) :
     UdpSocket(parent),
     mIface(iface),
     mSt(st)
 {
-    if (!bind()) {
+    if (!bind(addr)) {
         qWarning() << "failed bind for SSDP search:" << errorString();
         return;
     }

diff --git a/ssdp/ssdpsearch.hh b/ssdp/ssdpsearch.hh
@@ -31,6 +31,7 @@ class Search : public UdpSocket
 {
 public:
     Search(const QNetworkInterface &iface,
+           const QHostAddress &addr,
            const QString &st,
            QObject *parent = 0);