Merge branch 'master' into devel/ceton

MythTV · Jul 18, 2012 · d933749 · d933749
2 parents 7f544d6 + b66f0cf
commit d933749
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 4 deletions.
diff --git a/mythtv/libs/libmythbase/serverpool.cpp b/mythtv/libs/libmythbase/serverpool.cpp
@@ -99,7 +99,7 @@ void ServerPool::SelectDefaultListen(bool force)
     QHostAddress config_v6(gCoreContext->GetSetting("BackendServerIP6"));
     bool v6IsSet = config_v6.isNull() ? true : false;
 #endif
-    bool allowLinkLocal = gCoreContext->GetNumSetting("AllowLinkLocal") > 0;
+    bool allowLinkLocal = gCoreContext->GetNumSetting("AllowLinkLocal", true) > 0;
 
     // loop through all available interfaces
     QList<QNetworkInterface> IFs = QNetworkInterface::allInterfaces();
@@ -229,7 +229,7 @@ void ServerPool::SelectDefaultListen(bool force)
                     LOG(VB_GENERAL, LOG_DEBUG,
                             QString("Adding link-local '%1' to address list.")
                                 .arg(ip.toString()));
-                    naList_4.append(*qnai);
+                    naList_6.append(*qnai);
                 }
 
                 else if (config_v6.isNull())
@@ -243,7 +243,7 @@ void ServerPool::SelectDefaultListen(bool force)
                             QString("Adding '%1' to address list.")
                                 .arg(PRETTYIP_(ip)));
 
-                    naList_4.append(*qnai);
+                    naList_6.append(*qnai);
                 }
 
                 else

diff --git a/mythtv/libs/libmythtv/AirPlay/mythraopconnection.h b/mythtv/libs/libmythtv/AirPlay/mythraopconnection.h
@@ -11,6 +11,8 @@
 #include <openssl/pem.h>
 #include <openssl/aes.h>
 
+#include "mythtvexp.h"
+
 extern "C" {
 #include "libavcodec/avcodec.h"
 #include "libavformat/avformat.h"
@@ -38,7 +40,7 @@ struct AudioPacket
     QList<AudioData> *data;
 };
 
-class MythRAOPConnection : public QObject
+class MTV_PUBLIC MythRAOPConnection : public QObject
 {
     Q_OBJECT
 

diff --git a/mythtv/programs/mythtv-setup/backendsettings.cpp b/mythtv/programs/mythtv-setup/backendsettings.cpp
@@ -41,6 +41,19 @@ static HostLineEdit *LocalServerIP6()
     return gc;
 }
 
+static HostCheckBox *UseLinkLocal()
+{
+    HostCheckBox *hc = new HostCheckBox("AllowLinkLocal");
+    hc->setLabel(QObject::tr("Listen on Link-Local addresses"));
+    hc->setValue(true);
+    hc->setHelpText(QObject::tr("Enable servers on this machine to listen on "
+                    "link-local addresses. These are auto-configured "
+                    "addresses and not accessible outside the local network. "
+                    "This must be enabled for anything requiring Bonjour to "
+                    "work."));
+    return hc;
+};
+
 static HostLineEdit *LocalServerPort()
 {
     HostLineEdit *gc = new HostLineEdit("BackendServerPort");
@@ -856,6 +869,10 @@ BackendSettings::BackendSettings() {
               new HorizontalConfigurationGroup(false, false, true, true);
     localIP6->addChild(LocalServerIP6());
     localServer->addChild(localIP6);
+    HorizontalConfigurationGroup *localUseLL =
+              new HorizontalConfigurationGroup(false, false, true, true);
+    localUseLL->addChild(UseLinkLocal());
+    localServer->addChild(localUseLL);
     HorizontalConfigurationGroup* localPorts =
               new HorizontalConfigurationGroup(false, false, true, true);
     localPorts->addChild(LocalServerPort());