Merge branch 'dev' into wireguard_embedded

service/server/main.cpp

@@ -6,15 +6,16 @@
 #include "systemservice.h"
 #include "utils.h"
 
+
 int runApplication(int argc, char** argv)
 {
     QCoreApplication app(argc,argv);
     LocalServer localServer;
-//    if (!localServer.isRunning()) {
-//        return -1;
-//    }
+
     return app.exec();
 }
+
+
 int main(int argc, char **argv)
 {
     Utils::initializePath(Utils::systemLogPath());
@@ -24,19 +25,15 @@ int main(int argc, char **argv)
     if (argc == 2) {
         qInfo() << "Started as console application";
         return runApplication(argc, argv);
-    } else {
+    }
+    else {
         qInfo() << "Started as system service";
 #ifdef Q_OS_WIN
         SystemService systemService(argc, argv);
         return systemService.exec();
-
 #else
-        //daemon(0,0);
-        return runApplication(argc, argv);
+    return runApplication(argc, argv);
 #endif
 
     }
-
-    // Never reached
-    return 0;
 }

service/server/server.pro

@@ -64,13 +64,6 @@ SOURCES += \
 
 include(../src/qtservice.pri)
 
-#CONFIG(release, debug|release) {
-#    DESTDIR = $$PWD/../../../AmneziaVPN-build/server/release
-#    MOC_DIR = $$DESTDIR
-#    OBJECTS_DIR = $$DESTDIR
-#    RCC_DIR = $$DESTDIR
-#}
-
 INCLUDEPATH += "$$PWD/../../client"
 
 REPC_SOURCE += ../../ipc/ipc_interface.rep

service/server/systemservice.cpp

@@ -12,10 +12,6 @@ void SystemService::start()
 {
     QCoreApplication* app = application();
     m_localServer  = new LocalServer();
-
-//    if (!m_localServer->isRunning()) {
-//        app->quit();
-//    }
 }
 
 void SystemService::stop()

service/service.pro

@@ -1,4 +1,4 @@
-!ios {
+!ios:!android {
     TEMPLATE=subdirs
     CONFIG += ordered
     include(common.pri)