From ca61d21c6defb9553234c1fa5b0979c46542c676 Mon Sep 17 00:00:00 2001
From: Johann Latocha
Date: Sat, 28 Aug 2010 03:17:08 +0200
Subject: Enhancement #587

---
 src/gui/clientChatDialog.cpp     |   2 -
 src/gui/clientConfigDialog.cpp   |   2 -
 src/gui/clientFileSendDialog.cpp |   2 -
 src/gui/clientVNCViewer.cpp      |   2 -
 src/pvs.cpp                      |   9 ++-
 src/pvs.h                        |   2 +-
 src/pvsDaemon.cpp                | 132 +++++++++++++++++----------------------
 src/pvsgui.cpp                   |  34 +++++-----
 src/pvsgui.h                     |   1 -
 src/version.h                    |   4 +-
 10 files changed, 88 insertions(+), 102 deletions(-)

(limited to 'src')

diff --git a/src/gui/clientChatDialog.cpp b/src/gui/clientChatDialog.cpp
index 7c32790..163ac92 100644
--- a/src/gui/clientChatDialog.cpp
+++ b/src/gui/clientChatDialog.cpp
@@ -29,8 +29,6 @@ ClientChatDialog::ClientChatDialog(QWidget *parent) :
 
     // connect to D-Bus and get interface
     QDBusConnection dbus = QDBusConnection::sessionBus();
-    dbus.registerObject("/chat", this);
-    dbus.registerService("org.openslx.pvsgui");
     _ifaceDBus = new OrgOpenslxPvsInterface("org.openslx.pvs", "/", dbus, this);
     connect(_ifaceDBus, SIGNAL(chat_receive(QString, QString, QString)), this,
             SLOT(receive(QString, QString, QString)));
diff --git a/src/gui/clientConfigDialog.cpp b/src/gui/clientConfigDialog.cpp
index 3e1ee50..0ee5908 100644
--- a/src/gui/clientConfigDialog.cpp
+++ b/src/gui/clientConfigDialog.cpp
@@ -28,8 +28,6 @@ ClientConfigDialog::ClientConfigDialog(QWidget *parent) :
 
     // connect to D-Bus and get interface
     QDBusConnection dbus = QDBusConnection::sessionBus();
-    dbus.registerObject("/config", this);
-    dbus.registerService("org.openslx.pvsgui");
     _ifaceDBus = new OrgOpenslxPvsInterface("org.openslx.pvs", "/", dbus, this);
 
 }
diff --git a/src/gui/clientFileSendDialog.cpp b/src/gui/clientFileSendDialog.cpp
index ccb44b3..b4512c0 100644
--- a/src/gui/clientFileSendDialog.cpp
+++ b/src/gui/clientFileSendDialog.cpp
@@ -28,8 +28,6 @@ ClientFileSendDialog::ClientFileSendDialog(QWidget *parent) :
 
     // connect to D-Bus and get interface
     QDBusConnection dbus = QDBusConnection::sessionBus();
-    dbus.registerObject("/filesend", this);
-    dbus.registerService("org.openslx.pvsgui");
     _ifaceDBus = new OrgOpenslxPvsInterface("org.openslx.pvs", "/", dbus, this);
 
     // get current users name from backend
diff --git a/src/gui/clientVNCViewer.cpp b/src/gui/clientVNCViewer.cpp
index d6a218b..d794b0b 100644
--- a/src/gui/clientVNCViewer.cpp
+++ b/src/gui/clientVNCViewer.cpp
@@ -22,8 +22,6 @@ ClientVNCViewer::ClientVNCViewer(QWidget *parent) :
 {
     // connect to D-Bus and get interface
     QDBusConnection dbus = QDBusConnection::sessionBus();
-    dbus.registerObject("/vnc", this);
-    dbus.registerService("org.openslx.pvsgui");
     _ifaceDBus = new OrgOpenslxPvsInterface("org.openslx.pvs", "/", dbus, this);
     connect(_ifaceDBus, SIGNAL(project(QString, int, QString, bool, bool, int)),
             this, SLOT(open(QString, int, QString, bool, bool, int)));
diff --git a/src/pvs.cpp b/src/pvs.cpp
index 1c08be5..21b7bdf 100755
--- a/src/pvs.cpp
+++ b/src/pvs.cpp
@@ -53,8 +53,10 @@ PVS::PVS() :
     // connect to D-Bus
     new PvsAdaptor(this);
     QDBusConnection dbus = QDBusConnection::sessionBus();
-    dbus.registerObject("/", this);
-    dbus.registerService("org.openslx.pvs");
+    if (!dbus.registerObject("/", this))
+        qDebug("[ERROR] DBus: Could not register object");
+    if (!dbus.registerService("org.openslx.pvs"))
+        qDebug("[ERROR] DBus: Could not register service");
 
     _sdClient = new PVSServiceDiscovery(this);
 
@@ -552,9 +554,10 @@ int PVS::stopVNCScript()
     }
 }
 
-void PVS::start()
+bool PVS::start()
 {
     _pvsServerConnection->sendMessage(PVSMsg(PVSCOMMAND, "PROJECTING", "YES"));
+    return true;
 }
 
 void PVS::onConnected(QString name)
diff --git a/src/pvs.h b/src/pvs.h
index b6b5e65..1bb0747 100755
--- a/src/pvs.h
+++ b/src/pvs.h
@@ -69,7 +69,7 @@ public:
     void guiDelHost(QString host);
 
 public Q_SLOTS:
-    void start();
+    bool start();
     void quit();
     void chat_send(QString nick_to, QString nick_from, QString msg);
     QString chat_getNickname();
diff --git a/src/pvsDaemon.cpp b/src/pvsDaemon.cpp
index e9479df..b23bc57 100755
--- a/src/pvsDaemon.cpp
+++ b/src/pvsDaemon.cpp
@@ -9,14 +9,12 @@
 #include "src/core/pvsChatClient.h"
 
 PVS *mainClient = NULL;
-
-// This define works as a switch whether to run as deamon or regular app
-#define as_daemon
+QTextStream qout(stdout);
 
 /// VERSION_STRING is defined in src/version.h
 void printVersion(bool doExit)
 {
-
+    QTextStream qout(stdout);
     printf("Version:\t"VERSION_STRING"\n");
     if (doExit)
         exit(0);
@@ -25,30 +23,31 @@ void printVersion(bool doExit)
 /// outputs the full help text
 void printHelp()
 {
-    printf("**************************************************************\n");
-    printf("\nPool Video Switch Client\n");
-    printf("**************************************************************\n");
-    printVersion(false);
-    printf("**************************************************************\n");
-    printf("Usage:\tpoolVSClient <<option> <value>, ... >\n\n");
-    printf("Options:\n\n");
-    printf("-vncScriptFile <fullpath\\filename>\n\tSpecifies a custom location for the vnc-start/stop-script.\n\tIf not specified, ~/.pvs/pvs-vncsrv is expected.\n\n");
-    printf("-freq <seconds>\n\tSpecifies how long to wait until a reconnection attempt is made.\n\tDefault is 5.\n\n");
-    printf("-port <port>\n\tSpecifies on which port to run.\n\tDefault is %d.\n\n", SERVER_PORT_INT);
-    printf("-h or --help\n\t Shows this help text and exits.\n\n");
-    printf("-v or --version\n\t Shows the current version and exits.\n");
-    printf(
-        "-c <string command>:<string value> \n\t Sends the command and the optional value to a running PVS-Client.\n\t Command and value may not contain spaces or colons.\n\t The dividing colon is mandatory.\n");
-    printf("-commands: \n\tPrints out available commands to use with -c . \n ");
-    printf("**************************************************************\n");
+    qout << "**************************************************************\n";
+    qout << "Pool Video Switch Client\n";
+    qout << "**************************************************************\n";
+    qout << QObject::tr("Version: ") << VERSION_STRING << "\n";
+    qout << "**************************************************************\n";
+    qout << QObject::tr("Usage:") << "\tpoolVSClient " << QObject::tr("<<option> <value>, ... >") << "\n\n";
+    qout << QObject::tr("Options:") << "\n\n";
+    qout << QObject::tr("-vncScriptFile <fullpath\\filename>") << "\n\t" << QObject::tr("Specifies a custom location for the vnc-start/stop-script.")<< "\n\t" << QObject::tr("If not specified, /usr/bin/pvs-vncsrv is expected.") << "\n\n";
+    qout << QObject::tr("-freq <seconds>") << "\n\t" << QObject::tr("Specifies how long to wait until a reconnection attempt is made.") << "\n\t" << QObject::tr("Default is 5.") << "\n\n";
+    qout << QObject::tr("-port <port>") << "\n\t" << QObject::tr("Specifies on which port to run.") << "\n\t" << QObject::tr("Default is ") << SERVER_PORT_INT << ".\n\n";
+    qout << QObject::tr("-h or --help") << "\n\t" << QObject::tr("Shows this help text and exits.") << "\n\n";
+    qout << QObject::tr("-v or --version") << "\n\t" << QObject::tr("Shows the current version and exits.") << "\n";
+    qout << QObject::tr("-d or --daemon") << "\n\t" << QObject::tr("Start as daemon.") << "\n";
+    qout << QObject::tr("-c <string command>:<string value>") << "\n\t" << QObject::tr("Sends the command and the optional value to a running PVS-Client.") << "\n\t" << QObject::tr("Command and value may not contain spaces or colons.") << "\n\t" << QObject::tr("The dividing colon is mandatory.") << "\n";
+    qout << "-commands: \n\t" << QObject::tr("Prints out available commands to use with -c.") << "\n";
+    qout << "**************************************************************\n";
+    qout.flush();
     exit(0);
 }
 
 /// outputs a brief help text
 void printNotice()
 {
-    printf(
-        "Use -h or --help to get a listing of all options.\n-v or --version gives you the current version.\n\n");
+    qout << QObject::tr("Use -h or --help to get a listing of all options.\n-v or --version gives you the current version.\n\n");
+    qout.flush();
 }
 
 void printCommands()
@@ -64,6 +63,7 @@ void printCommands()
 ///
 int main(int argc, char** argv)
 {
+    bool daemon = false;
     int frequency = 5;
     int port = -1;
 
@@ -99,7 +99,6 @@ int main(int argc, char** argv)
         exit(0);
     }
 
-    printf("UDS Communicator is running.\n");
     int option_index = 0;
 
     while (1)
@@ -109,6 +108,7 @@ int main(int argc, char** argv)
             { "help", no_argument, 0, 'h' },
             { "commands", no_argument, 0, 'o' },
             { "version", no_argument, 0, 'v' },
+            { "daemon", no_argument, 0, 'd' },
             { "port", required_argument, 0, 'p' },
             { "freq", required_argument, 0, 'f' },
             { "client", required_argument, 0, 'e' },
@@ -117,7 +117,7 @@ int main(int argc, char** argv)
         };
         /* getopt_long stores the option index here. */
 
-        int c = getopt_long(argc, argv, "hvoc:f:e:s:p:", long_options,
+        int c = getopt_long(argc, argv, "hovdc:f:e:s:p:", long_options,
                             &option_index);
         option_index++;
         if (c == -1)
@@ -134,6 +134,9 @@ int main(int argc, char** argv)
         case 'v':
             printVersion(true);
             break;
+        case 'd':
+            daemon = true;
+            break;
         case 'c':
         {
             if (option_index + 1 < argc)
@@ -297,58 +300,41 @@ int main(int argc, char** argv)
     ConsoleLog setLogName(QString("log.client"));
     ConsoleLog writeLine(QString("PVS-Client started."));
 
-#ifdef as_daemon
-
-    /*Alex: neu schreiben als pvsdaemon_win32.cpp und minimieren in Task-Leiste*/
-    #ifndef __WIN32__
-    /* Our process ID and Session ID */
-    pid_t pid, sid;
-
-    /* Fork off the parent process */
-    pid = fork();
-    if (pid < 0)
+    if (daemon)
     {
-        exit(-1);
-    }
-    /* If we got a good PID, then
-     we can exit the parent process. */
-    if (pid > 0)
-    {
-        exit(0);
+        #ifndef __WIN32__
+        pid_t pid, sid; // our process ID and session ID
+
+        // fork off the parent process
+        pid = fork();
+        if (pid < 0)
+            exit(-1);
+
+        // if we got a good PID, then we can exit the parent process.
+        if (pid > 0)
+            exit(0);
+
+        // change the file mode mask
+        umask(0);
+
+        // create a new SID for the child process
+        sid = setsid();
+        if (sid < 0)
+            exit(-1);
+
+        // change the current working directory
+        if ((chdir("/")) < 0)
+            exit(-1);
+
+        // close out the standard file descriptors
+        close(STDIN_FILENO);
+        freopen ((QString(getHomeDir()).append(QString("/.pvs/dump"))).toUtf8()
+                .data(),"w",stdout);
+        //close(STDOUT_FILENO);
+        close(STDERR_FILENO);
+        #endif /*__WIN32__*/
     }
 
-    /* Change the file mode mask */
-    umask(0);
-
-    /* Open any logs here */
-
-    /* Create a new SID for the child process */
-    sid = setsid();
-    if (sid < 0)
-    {
-        /* Log the failure */
-        exit(-1);
-    }
-
-    /* Change the current working directory */
-    if ((chdir("/")) < 0)
-    {
-        /* Log the failure */
-        exit(-1);
-    }
-
-    /* Close out the standard file descriptors */
-    close(STDIN_FILENO);
-    freopen ((QString(getHomeDir()).append(QString("/.pvs/dump"))).toUtf8().data(),"w",stdout);
-    //close(STDOUT_FILENO);
-    close(STDERR_FILENO);
-    #endif /*__WIN32__*/
-    /* Daemon-specific initialization goes here */
-
-    /* The Big Loop */
-
-#endif
-
     mainClient = new PVS();
     PVSSettingsManager::getManager()->setConfigFile(getPolicyFilePath("clientconf"));
     com.getDispatcher()->addListener("*", mainClient, &PVS::onDaemonCommand);
diff --git a/src/pvsgui.cpp b/src/pvsgui.cpp
index b2f0a8f..0d89027 100644
--- a/src/pvsgui.cpp
+++ b/src/pvsgui.cpp
@@ -51,31 +51,37 @@ PVSGUI::PVSGUI(QWidget *parent) :
 
     // connect to D-Bus and get interface
     QDBusConnection dbus = QDBusConnection::sessionBus();
-    dbus.registerObject("/", this);
-    dbus.registerService("org.openslx.pvsgui");
     _ifaceDBus = new OrgOpenslxPvsInterface("org.openslx.pvs", "/", dbus, this);
-    _ifaceDBus->start(); // start pvs if not running
+    if (dbus.isConnected())
+        qDebug("[%s] Connection to DBus successful.", metaObject()->className());
+    else
+        qDebug("[%s] ERROR: Could not connect to DBus!", metaObject()->className());
 
-    // get available hosts
-    QDBusPendingReply<QStringList> reply0 = _ifaceDBus->getAvailableHosts();
+    // start pvs if not running
+    QDBusPendingReply<bool> reply0 = _ifaceDBus->start();
     reply0.waitForFinished();
-    QStringList hosts = reply0.value();
-    if (reply0.isValid() && !hosts.isEmpty())
+    if (reply0.isValid() && reply0.value())
+        qDebug("[%s] Connection to PVS daemon successful.", metaObject()->className());
+    else
+        qDebug("[%s] ERROR: Could not connect to PVS daemon!", metaObject()->className());
+
+    // get available hosts
+    QDBusPendingReply<QStringList> reply1 = _ifaceDBus->getAvailableHosts();
+    reply1.waitForFinished();
+    QStringList hosts = reply1.value();
+    if (reply1.isValid() && !hosts.isEmpty())
         foreach (QString host, hosts)
                 addHost(host);
 
     // already connected?
-    QDBusPendingReply<QString> reply1 = _ifaceDBus->isConnected();
-    reply1.waitForFinished();
-    QString host = reply1.value();
-    if (reply1.isValid() && host != "")
+    QDBusPendingReply<QString> reply2 = _ifaceDBus->isConnected();
+    reply2.waitForFinished();
+    QString host = reply2.value();
+    if (reply2.isValid() && host != "")
         connected(host);
     else
         disconnected();
 
-    if (dbus.isConnected())
-        qDebug("[%s] Connection to DBus successful!", metaObject()->className());
-
     // listen on port 29481 for incoming file transfers
     _serverSocket = new QTcpServer();
     _serverSocket->listen(QHostAddress::Any, 29481);
diff --git a/src/pvsgui.h b/src/pvsgui.h
index 90fe50e..ec7c6d7 100644
--- a/src/pvsgui.h
+++ b/src/pvsgui.h
@@ -30,7 +30,6 @@
 class PVSGUI: public QWidget, private Ui_ClientToolbarClass
 {
     Q_OBJECT
-    Q_CLASSINFO("D-Bus Interface", "org.openslx.pvsgui")
 
 public:
     PVSGUI(QWidget *parent = 0);
diff --git a/src/version.h b/src/version.h
index 69a3bde..9f1450d 100644
--- a/src/version.h
+++ b/src/version.h
@@ -1,2 +1,2 @@
-#define VERSION_STRING "2.0.2.0"
-#define VERSION_NUMBER 2020
+#define VERSION_STRING "2.0.3"
+#define VERSION_NUMBER 203
-- 
cgit v1.2.3-55-g7522