Ticket #2031: myth-interface.patch

programs/mythbackend/httpstatus.

@@ -11 +11 @@
 #include "libmyth/mythcontext.h"
 #include "jobqueue.h"
 
 
-HttpStatus::HttpStatus(MainServer *parent, int port)
-          : QServerSocket(port, 1)
+HttpStatus::HttpStatus(MainServer *parent, const QString &sip, int port)
+          : QServerSocket(sip, port, 1)
 {
     m_parent = parent;
 }
 

programs/mythbackend/httpstatus.

@@ -11 +11 @@
 class HttpStatus : public QServerSocket
 {
     Q_OBJECT
   public:
-    HttpStatus(MainServer *parent, int port);
+    HttpStatus(MainServer *parent, const QString &sip, int port);
 
     void newConnection(int socket);
 
   private slots:

programs/mythbackend/main.

@@ -546 +546 @@
             return BACKEND_EXIT_OPENING_VLOCKFILE_ERROR;
         }
     }
 
-    new MainServer(ismaster, port, statusport, &tvList, sched, expirer);
+    new MainServer(ismaster, myip, port, statusport, &tvList, sched, expirer);
 
     if (ismaster)
     {
         QString WOLslaveBackends

programs/mythbackend/mainserver.

@@ -106 +106 @@
     QWaitCondition waitCond;
     bool threadlives;
 };
 
-MainServer::MainServer(bool master, int port, int statusport, 
+MainServer::MainServer(bool master, const QString &sip, int port, int statusport, 
                        QMap<int, EncoderLink *> *tvList,
                        Scheduler *sched, AutoExpire *expirer)
 {
     m_sched = sched;
@@ -130 +130 @@
     recordfileprefix = gContext->GetFilePrefix();
 
     masterBackendOverride = gContext->GetSetting("MasterBackendOverride", 0);
 
-    mythserver = new MythServer(port);
+    mythserver = new MythServer(sip,port);
     if (!mythserver->ok())
     {
-        VERBOSE(VB_IMPORTANT, QString("Failed to bind port %1. Exiting.")
-                .arg(port));
+        VERBOSE(VB_IMPORTANT, QString("Failed to bind to %1:%2. Exiting.")
+                .arg(sip)
+                .arg(port));
         exit(BACKEND_BUGGY_EXIT_NO_BIND_MAIN);
     }
 
     connect(mythserver, SIGNAL(newConnect(RefSocket *)), 
             SLOT(newConnection(RefSocket *)));
     connect(mythserver, SIGNAL(endConnect(RefSocket *)), 
             SLOT(endConnection(RefSocket *)));
 
-    statusserver = new HttpStatus(this, statusport);    
+    statusserver = new HttpStatus(this, sip, statusport);    
     if (!statusserver->ok())
     { 
-        VERBOSE(VB_IMPORTANT, QString("Failed to bind to port %1. Exiting.")
+        VERBOSE(VB_IMPORTANT, QString("Failed to bind to %1:%2. Exiting.")
+                .arg(sip)
                 .arg(statusport));
         exit(BACKEND_BUGGY_EXIT_NO_BIND_STATUS);
     }
 

programs/mythbackend/mainserver.

@@ -25 +25 @@
 class MainServer : public QObject
 {
     Q_OBJECT
   public:
-    MainServer(bool master, int port, int statusport, 
+    MainServer(bool master, const QString &sip, int port, int statusport, 
                QMap<int, EncoderLink *> *tvList,
                Scheduler *sched, AutoExpire *expirer);
 
    ~MainServer();

programs/mythbackend/server.

@@ -3 +3 @@
 using namespace std;
 
 #include "server.h"
 
-MythServer::MythServer(int port, QObject *parent)
-          : QServerSocket(port, 1, parent)
+MythServer::MythServer(const QString &sip, int port, QObject *parent)
+          : QServerSocket(sip, port, 1, parent)
 {
 }
 
 void MythServer::newConnection(int socket)

programs/mythbackend/server.

@@ -33 +33 @@
 class MythServer : public QServerSocket
 {
     Q_OBJECT
   public:
-    MythServer(int port, QObject *parent = 0);
+    MythServer(const QString &sip, int port, QObject *parent = 0);
 
     void newConnection(int socket);
 
   signals: