Changes of Revision 14

ovpn.spec Changed

ovpn_2.4.0.orig.tar.gz/VER_IID Changed

ovpn_2.4.0.orig.tar.gz/pvs-logs/pvs-tasks-client-2022_12_06__10_19_52.log Deleted

@@ -1,8 +0,0 @@
-pvs-studio.com/en/docs/warnings/	1	err	Help: The documentation for all analyzer warnings is available here: https://pvs-studio.com/en/docs/warnings/.
-client/utils/sentrysdk.cpp	1	err	V008 Unable to start the analysis on this file.
-client/utils/network/linux/NetworkControllerLinux.cpp	56	warn	V576 Incorrect format. Consider checking the third actual argument of the 'sscanf' function. It's dangerous to use string specifier without width specification. Buffer overflow is possible.
-client/utils/network/linux/NetworkControllerLinux.cpp	56	warn	V576 Incorrect format. Consider checking the fourth actual argument of the 'sscanf' function. A pointer to the unsigned long type is expected.
-client/utils/network/linux/NetworkControllerLinux.cpp	56	warn	V576 Incorrect format. Consider checking the fifth actual argument of the 'sscanf' function. A pointer to the unsigned long type is expected.
-client/utils/network/linux/NetworkControllerLinux.cpp	66	warn	V547 Expression 'file' is always true.
-client/utils/network/linux/NetworkControllerLinux.cpp	99	err	V547 Expression 'family == 2' is always true.
-client/utils/ipc/linux/IPCAppLinux.cpp	124	warn	V560 A part of conditional expression is always false: !replyString.

ovpn_2.4.0.orig.tar.gz/pvs-logs/pvs-tasks-client-2022_12_06__15_39_46.log Added

@@ -0,0 +1,8 @@
+pvs-studio.com/en/docs/warnings/	1	err	Help: The documentation for all analyzer warnings is available here: https://pvs-studio.com/en/docs/warnings/.
+client/utils/ipc/linux/IPCAppLinux.cpp	124	warn	V560 A part of conditional expression is always false: !replyString.
+client/utils/sentrysdk.cpp	1	err	V008 Unable to start the analysis on this file.
+client/utils/network/linux/NetworkControllerLinux.cpp	56	warn	V576 Incorrect format. Consider checking the third actual argument of the 'sscanf' function. It's dangerous to use string specifier without width specification. Buffer overflow is possible.
+client/utils/network/linux/NetworkControllerLinux.cpp	56	warn	V576 Incorrect format. Consider checking the fourth actual argument of the 'sscanf' function. A pointer to the unsigned long type is expected.
+client/utils/network/linux/NetworkControllerLinux.cpp	56	warn	V576 Incorrect format. Consider checking the fifth actual argument of the 'sscanf' function. A pointer to the unsigned long type is expected.
+client/utils/network/linux/NetworkControllerLinux.cpp	66	warn	V547 Expression 'file' is always true.
+client/utils/network/linux/NetworkControllerLinux.cpp	99	err	V547 Expression 'family == 2' is always true.

ovpn_2.4.0.orig.tar.gz/pvs-logs/pvs-tasks-ovpn-daemon-2022_12_06__10_20_11.log Deleted

ovpn_2.4.0.orig.tar.gz/pvs-logs/pvs-tasks-ovpn-daemon-2022_12_06__15_40_03.log Added

ovpn_2.4.0.orig.tar.gz/pvs-logs/pvs.log Changed

@@ -14,11 +14,11 @@
 #
 #
 d99cf3ba-6fcd-43f9-9260-1179fa3a9bed
-r-vUVbw<6y|D3 h22y|D3xy|D3(L8Pu(j-o2U9wah>>ua(9h-2_=(Mokv~{U-(S(ouUP(_u=so8kw'2-u>o(=a'(8vk>w_UuP8>('8PPU>_=(=uo_>=}'kky|D3uaa8ay|D3rSSXy|D3g>U92uco8c=oUaocoLucU>U2f=-=c8>coL-=c -2u}y|D3 U2=uy|D3Sy|D3y|D3y|D3y|D3xy|D3
-r-vUVbw<6y|D3 h22y|D3xy|D3(L8Pu(j-o2U9wah>>ua(9h-2_=(Mokv~{U-(S(ouUP(_u=so8kw'2-u>o(=a'(8vk>w_UuP8>('8PPU>_=(s-228vk>}'kky|D3uaa8ay|D3rSSXy|D3g>U92uco8c=oUaocoLucU>U2f=-=c8>coL-=c -2u}y|D3 U2=uy|D3Sy|D3y|D3y|D3y|D3xy|D3
 r-vUVbw<6y|D3 h22y|D3xy|D3(L8Pu(j-o2U9wah>>ua(9h-2_=(Mokv~{U-(S(ouUP(_u=so8kw'2-u>o(=a'(8vk>w_UuP8>('8PPU>_=('8PPU>_=}'kky|D3uaa8ay|D3rSSXy|D3g>U92uco8c=oUaocoLucU>U2f=-=c8>coL-=c -2u}y|D3 U2=uy|D3Sy|D3y|D3y|D3y|D3xy|D3
-r-vUVbw<6y|D3 h22y|D3xy|D3(L8Pu(j-o2U9wah>>ua(9h-2_=(Mokv~{U-(S(ouUP(_u=so8kw'2-u>o(=a'(8vk>w_UuP8>('8PPU>_=( -auU22}'kky|D3uaa8ay|D3rSSXy|D3g>U92uco8c=oUaocoLucU>U2f=-=c8>coL-=c -2u}y|D3 U2=uy|D3Sy|D3y|D3y|D3y|D3xy|D3
+r-vUVbw<6y|D3 h22y|D3xy|D3(L8Pu(j-o2U9wah>>ua(9h-2_=(Mokv~{U-(S(ouUP(_u=so8kw'2-u>o(=a'(8vk>w_UuP8>('8PPU>_=(=uo_>=}'kky|D3uaa8ay|D3rSSXy|D3g>U92uco8c=oUaocoLucU>U2f=-=c8>coL-=c -2u}y|D3 U2=uy|D3Sy|D3y|D3y|D3y|D3xy|D3
+r-vUVbw<6y|D3 h22y|D3xy|D3(L8Pu(j-o2U9wah>>ua(9h-2_=(Mokv~{U-(S(ouUP(_u=so8kw'2-u>o(=a'(8vk>w_UuP8>('8PPU>_=(=oUao8vk>}'kky|D3uaa8ay|D3rSSXy|D3g>U92uco8c=oUaocoLucU>U2f=-=c8>coL-=c -2u}y|D3 U2=uy|D3Sy|D3y|D3y|D3y|D3xy|D3
 r-vUVbw<6y|D3 h22y|D3xy|D3(L8Pu(j-o2U9wah>>ua(9h-2_=(Mokv~{U-(S(ouUP(_u=so8kw'2-u>o(=a'(8vk>w_UuP8>('8PPU>_=('8PPU>_}'kky|D3uaa8ay|D3rSSXy|D3g>U92uco8c=oUaocoLucU>U2f=-=c8>coL-=c -2u}y|D3 U2=uy|D3Sy|D3y|D3y|D3y|D3xy|D3
 r-vUVbw<6y|D3 h22y|D3xy|D3(L8Pu(j-o2U9wah>>ua(9h-2_=(Mokv~{U-(S(ouUP(_u=so8kw'2-u>o(=a'(8vk>w_UuP8>('8PPU>_=(28j8  }'kky|D3uaa8ay|D3rSSXy|D3g>U92uco8c=oUaocoLucU>U2f=-=c8>coL-=c -2u}y|D3 U2=uy|D3Sy|D3y|D3y|D3y|D3xy|D3
+r-vUVbw<6y|D3 h22y|D3xy|D3(L8Pu(j-o2U9wah>>ua(9h-2_=(Mokv~{U-(S(ouUP(_u=so8kw'2-u>o(=a'(8vk>w_UuP8>('8PPU>_=( -auU22}'kky|D3uaa8ay|D3rSSXy|D3g>U92uco8c=oUaocoLucU>U2f=-=c8>coL-=c -2u}y|D3 U2=uy|D3Sy|D3y|D3y|D3y|D3xy|D3
+r-vUVbw<6y|D3 h22y|D3xy|D3(L8Pu(j-o2U9wah>>ua(9h-2_=(Mokv~{U-(S(ouUP(_u=so8kw'2-u>o(=a'(8vk>w_UuP8>('8PPU>_=(s-228vk>}'kky|D3uaa8ay|D3rSSXy|D3g>U92uco8c=oUaocoLucU>U2f=-=c8>coL-=c -2u}y|D3 U2=uy|D3Sy|D3y|D3y|D3y|D3xy|D3
 r-vUVbw<6y|D3 h22y|D3xy|D3(L8Pu(j-o2U9wah>>ua(9h-2_=(Mokv~{U-(S(ouUP(_u=so8kw'2-u>o(=a'(8vk>w_UuP8>('8PPU>_=(=o8k8vk>}'kky|D3uaa8ay|D3rSSXy|D3g>U92uco8c=oUaocoLucU>U2f=-=c8>coL-=c -2u}y|D3 U2=uy|D3Sy|D3y|D3y|D3y|D3xy|D3
-r-vUVbw<6y|D3 h22y|D3xy|D3(L8Pu(j-o2U9wah>>ua(9h-2_=(Mokv~{U-(S(ouUP(_u=so8kw'2-u>o(=a'(8vk>w_UuP8>('8PPU>_=(=oUao8vk>}'kky|D3uaa8ay|D3rSSXy|D3g>U92uco8c=oUaocoLucU>U2f=-=c8>coL-=c -2u}y|D3 U2=uy|D3Sy|D3y|D3y|D3y|D3xy|D3

ovpn_2.4.0.orig.tar.gz/src/client/application.cpp Changed

@@ -86,7 +86,7 @@
 
 void
 Application::systemRequestToCloseApp(bool disableTapControllerReset) {
-    qDebug() << "Application: System request to close app with feature " << disableTapControllerReset;
+    qDebug() << "{Application} System request to close app with feature " << disableTapControllerReset;
 
 #ifdef Q_OS_WIN
     m_remoteTapController->setDisableResetAtShutdown(disableTapControllerReset);
@@ -120,11 +120,11 @@
 #ifdef Q_OS_LINUX
         QString cmd = "kill -9 " + QString::number(QCoreApplication::applicationPid());
         QProcess::startDetached(cmd);
-        qDebug() << "Application:: Force quit with command: " << cmd;
+        qDebug() << "{Application}: Force quit with command: " << cmd;
 #endif
     }
 
-    qDebug() << "Application: ----------- GOOD BYE -----------";
+    qDebug() << "{Application} ----------- GOOD BYE -----------";
 }
 
 Application &
@@ -146,7 +146,7 @@
 
     Application::m_powerState = state;
 
-    qDebug() << "Application: On power suspend OVPN, client is suspended because of system suspension operation";
+    qDebug() << "{Application} On power suspend OVPN, client is suspended because of system suspension operation";
 }
 
 bool
@@ -156,14 +156,14 @@
 
 void
 Application::clean() {
-    qDebug() << "Application: Clean started";
+    qDebug() << "{Application} Clean started";
 #ifdef Q_OS_WIN
     m_remoteTapController->setDisableResetAtShutdown(true);
 #endif
 
     m_fwController->clean();
 
-    qDebug() << "Application: Clean finished";
+    qDebug() << "{Application} Clean finished";
 }
 
 bool
@@ -175,7 +175,7 @@
     m_remoteTapController = new RemoteTapController(m_daemonProxy);
 #endif
 
-    qDebug() << "Application: DaemonProxy started, waiting for connection";
+    qDebug() << "{Application} DaemonProxy started, waiting for connection";
     QObject::connect(m_daemonProxy,
                      SIGNAL(initialConnectionStatusChanged()),
                      this,
@@ -233,7 +233,7 @@
         m_mainWindow->startProcessing();
     });
 
-    qDebug() << "Application: Created main window";
+    qDebug() << "{Application} Created main window";
 
     m_trayIcon->setPossibleConnect(false);
     QObject::connect(
@@ -296,7 +296,7 @@
     }
     initialized = true;
 
-    qDebug() << "Application: Got answer from DaemonProxy, continue";
+    qDebug() << "{Application} Got answer from DaemonProxy, continue";
 
 #ifdef Q_OS_WIN
     m_route = new Route(&m_ovpn, m_daemonProxy, m_daemonProxy);
@@ -307,9 +307,9 @@
 
 void
 Application::checkLinuxPackageUpdates() {
-    qInfo().noquote().nospace() << "Application: checkLinuxPackageUpdates 1";
+    qInfo().noquote().nospace() << "{Application} checkLinuxPackageUpdates 1";
 #if OVPN_LINUX_PACKAGE
-    qInfo().noquote().nospace() << "Application: checkLinuxPackageUpdates 2";
+    qInfo().noquote().nospace() << "{Application} checkLinuxPackageUpdates 2";
     m_updater.setDaemonProxy(m_daemonProxy);
     QMetaObject::invokeMethod(this, "checkForUpdates", Qt::QueuedConnection);
 #endif
@@ -317,7 +317,7 @@
 
 void
 Application::onDaemonProxyConnected() {
-    qDebug().nospace().noquote() << "Application: Daemon proxy connected, got after reconnect state: "
+    qDebug().nospace().noquote() << "{Application} Daemon proxy connected, got after reconnect state: "
                                  << m_daemonProxyInReconnectState << ", prev "
                                  << OvpnProcess::getStateLongDescription(savedVPNState);
 
@@ -326,7 +326,7 @@
     if ((savedVPNState == OvpnProcess::Disconnecting) && m_wakeUpSignalSent) {
         savedVPNState = OvpnProcess::Stopped;
 
-        qDebug().nospace().noquote() << "Application: Restoring state (Windows)";
+        qDebug().nospace().noquote() << "{Application} Restoring state (Windows)";
 
         if (m_settings.isKillSwitchPersistent()) {
             m_fwController->setMode(m_settings.killSwitch());
@@ -348,7 +348,7 @@
     m_daemonProxyInReconnectState = true;
 
     if (savedVPNState == OvpnProcess::Connected) {
-        qDebug() << "Application: trying to reconnect...";
+        qDebug() << "{Application} trying to reconnect...";
 
         if (m_settings.isKillSwitchPersistent()) {
             m_fwController->setMode(m_settings.killSwitch());
@@ -358,7 +358,7 @@
         m_fwController->forceStop();
         m_mainWindow->qmlApp()->sendConnectSignal();
 
-        qDebug() << "Application: On daemon-proxy connected finished";
+        qDebug() << "{Application} On daemon-proxy connected finished";
     }
 }
 
@@ -367,7 +367,7 @@
     m_daemonProxyInReconnectState = true;
 
     m_mainWindow->qmlApp()->setDaemonState(false);
-    qDebug() << "Application: Daemon proxy disconnected";
+    qDebug() << "{Application} Daemon proxy disconnected";
 }
 
 bool
@@ -456,7 +456,7 @@
     Parser &parser = Parser::Instance();
     QObject::connect(&parser, &Parser::pushReplyParsed, &(bool parsedSuccesfully) {
         if (parsedSuccesfully) {
-            qDebug() << "Application: PUSH-message parsed successfully";
+            qDebug() << "{Application} PUSH-message parsed successfully";
 
             ConnectionSettings &connectionSettings = ConnectionSettings::instance();
             Connection &connection = Connection::instance();
@@ -471,7 +471,7 @@
                 emit fireVpnIPReady(connection.ipv4());
             }
         } else {
-            qDebug() << "Application: PUSH parse failed:" << parser.errorString();
+            qDebug() << "{Application} PUSH parse failed:" << parser.errorString();
         }
     });
 
@@ -516,31 +516,31 @@
 
 void
 Application::dumpApplicationAndSystemInfo() {
-    qInfo() << "Application: Version:" << applicationVersion();
-    qInfo() << "Application: Branch:" << GIT_BRANCHNAME;
-    qInfo() << "Application: Revision:" << GIT_REVISION;
-    qInfo() << "Application: Settings local storage:" << m_settings.fileName();
+    qInfo() << "{Application} Version:" << applicationVersion();
+    qInfo() << "{Application} Branch:" << GIT_BRANCHNAME;
+    qInfo() << "{Application} Revision:" << GIT_REVISION;
+    qInfo() << "{Application} Settings local storage:" << m_settings.fileName();
 
     if (!m_scriptApp) {
         m_scriptApp = new ScriptApp;
     }
     const QVariantMap info = m_scriptApp->getPlatform();
     int releaseId = Application::releaseId();
-    qInfo().nospace().noquote() << "Application: Running on " << info.value("platform").toString() << " "
+    qInfo().nospace().noquote() << "{Application} Running on " << info.value("platform").toString() << " "
                                 << info.value("version").toString() << " (" << info.value("architecture").toString()
                                 << ")"
                                 << QString((releaseId == 0) ? QString()
                                                             : QString(", release Id " + QString::number(releaseId)));
 
     // info about 3rd libraries, tools and some system environment
-    qInfo().nospace().noquote() << "Application: Compiled with " << ExtVersion::info();
-    qInfo().nospace().noquote() << "Application: Current locale: " << QLocale::system().name();
+    qInfo().nospace().noquote() << "{Application} Compiled with " << ExtVersion::info();
+    qInfo().nospace().noquote() << "{Application} Current locale: " << QLocale::system().name();
     QString processorInfoSring = processorInfo();
     if (!processorInfoSring.isEmpty()) {
-        qInfo() << "Application: Processor used is" << processorInfoSring;
+        qInfo() << "{Application} Processor used is" << processorInfoSring;
     }
 
-    qInfo().noquote().nospace() << "Application: ovpn-daemon is running: " << ovpnDaemonIsRunning();
+    qInfo().noquote().nospace() << "{Application} ovpn-daemon is running: " << ovpnDaemonIsRunning();
 
     if (ovpnDaemonIsRunning()) {
         checkLinuxPackageUpdates();
@@ -600,7 +600,7 @@
 
 void
 Application::onConfirmUpdateDialogAccepted() {
-    qDebug() << "Application: Going to start update";
+    qDebug() << "{Application} Going to start update";
     m_needUpdate = true;
     m_mainWindow->requestToQuitApp();
 }
@@ -611,7 +611,7 @@
     QTimer::singleShot(0, &() {
         bool ok = m_remoteTapController->checkAndSetup();
         if (!ok) {
-            qDebug() << "Application: Check for tap device failed";
+            qDebug() << "{Application} Check for tap device failed";
         }
     });
 #endif
@@ -628,14 +628,14 @@
 // This should never be caused in the event of a normal application termination
 void
 Application::onQuitGuardTimerEvent() {
-    qDebug() << "Application: Quit guard timer event <>";
+    qDebug() << "{Application} Quit guard timer event <>";
     emit released();
     quit();
 }
 
 void
 Application::doQuit() {
-    qDebug() << "Application: Do quit";
+    qDebug() << "{Application} Do quit";
 
     if (quitState != QuitState::Started) {
         return;
@@ -680,15 +680,15 @@
     // don't allow any signals from RunGuard
     setInitialized(false);
 
-    qDebug() << "Application: Quit requested";
+    qDebug() << "{Application} Quit requested";
 
     if (quitState != QuitState::NotStarted) {
-        qDebug() << "Application: Quit procedure in progress, skipping..";
+        qDebug() << "{Application} Quit procedure in progress, skipping..";
         return;
     }
 
     if (Application::isSleep()) {
-        qDebug() << "Application: onQuitRequest. Application is still in sleep";
+        qDebug() << "{Application} onQuitRequest. Application is still in sleep";
         return;
     }
 
@@ -707,11 +707,11 @@
 
     quitState = QuitState::Started;
 
-    qDebug() << "Application: Current state " << OvpnProcess::getStateLongDescription(savedVPNState);
+    qDebug() << "{Application} Current state " << OvpnProcess::getStateLongDescription(savedVPNState);
     // Send 'disconnection' signal only if daemon is connected
     if ((savedVPNState != OvpnProcess::Stopped) && !emergencyQuit) {
 
-        qDebug() << "Application: Send signal to disconnect from VPN and close app";
+        qDebug() << "{Application} Send signal to disconnect from VPN and close app";
 #ifdef Q_OS_WIN
         if (WindowsEventFilter::systemQueryToEndSession()) {
             if (m_daemonProxy->isConnected()) {
@@ -762,7 +762,7 @@
 
     childFinalized = true;
 
-    qDebug() << "Application: Finalizing child objects finished";
+    qDebug() << "{Application} Finalizing child objects finished";
 }
 
 void
@@ -778,7 +778,7 @@
 #else
     if ((savedVPNState == OvpnProcess::Connected) || (savedVPNState == OvpnProcess::Started) ||
         (savedVPNState == OvpnProcess::Reconnecting)) {
-        qDebug() << "Application: Send disconnect signal";
+        qDebug() << "{Application} Send disconnect signal";
 
         m_fwController->keepProtectionWhenReconnecting();
 
@@ -793,7 +793,7 @@
     if (m_mainWindow->isVisible()) {
         m_windowMinimizedToSleep = true;
         m_mainWindow->hide();
-        qDebug() << "Application: Hide mainwindow";
+        qDebug() << "{Application} Hide mainwindow";
         printStatus();
     }
 
@@ -807,25 +807,25 @@
     }
 
     if ((savedVPNState == OvpnProcess::Stopped) && m_wakeUpSignalSent) {
-        qDebug() << "Application::restartAfterSleepTimerEvent: Reconnection: " << m_currentReconnectionId;
+        qDebug() << "{Application}:restartAfterSleepTimerEvent: Reconnection: " << m_currentReconnectionId;
         m_currentReconnectionId++;
         if (m_currentReconnectionId < reconnectionMaxCount) {
 
             // Check network availability and if network if broken
             bool networkIsAvailable = checkNetworkIsAvailableAfterWakeUp();
 
-            qDebug() << "Application: Network is available:" << networkIsAvailable;
+            qDebug() << "{Application} Network is available:" << networkIsAvailable;
             if (networkIsAvailable) {
-                qDebug() << "Application: Send signal to connect";
+                qDebug() << "{Application} Send signal to connect";
                 m_mainWindow->qmlApp()->sendConnectSignal();
                 m_needSendConnectSignalWin = false;
             } else {
-                qDebug() << "Application::restartAfterSleepTimerEvent: Waiting for network..";
+                qDebug() << "{Application}:restartAfterSleepTimerEvent: Waiting for network..";
                 QTimer::singleShot(m_wakeUpTimerValue, this, SLOT(restartAfterSleepTimerEvent()));
             }
         }
     } else {
-        qDebug() << "Application::restartAfterSleepTimerEvent: Waiting for wake up..";
+        qDebug() << "{Application}:restartAfterSleepTimerEvent: Waiting for wake up..";
         QTimer::singleShot(m_wakeUpTimerValue, this, SLOT(restartAfterSleepTimerEvent()));
     }
 }
@@ -837,7 +837,7 @@
     int attemptMax = 3;
 
     while (!(isOnline = Host().isOnline()) && ++attempt <= attemptMax) {
-        qDebug() << QString("Application: Internet connection test: Attempt %1/%2: The host is %3")
+        qDebug() << QString("{Application} Internet connection test: Attempt %1/%2: The host is %3")
                             .arg(attempt)
                             .arg(attemptMax)
                             .arg(OvpnSe::Utils::BoolToString(isOnline, OvpnSe::Utils::OO));
@@ -855,29 +855,29 @@
         m_windowMinimizedToSleep = false;
         m_mainWindow->showOnTop();
         QCoreApplication::processEvents();
-        qDebug().noquote() << "Application: processEvents, done";
+        qDebug().noquote() << "{Application} processEvents, done";
     }
 #endif
 
     if (m_powerState == Application::APS_NORMAL) {
-        qDebug().noquote() << "Application: On power resume, already in normal state";
+        qDebug().noquote() << "{Application} On power resume, already in normal state";
         return;
     }
 
 #ifndef Q_OS_WIN
-    qDebug().noquote() << "Application: On power resume, OVPN client is suspended because of system suspension "
+    qDebug().noquote() << "{Application} On power resume, OVPN client is suspended because of system suspension "
                           "operation (prepare), prev"
                        << OvpnProcess::getStateLongDescription(savedVPNState);
 
     m_mainWindow->refresh();
 
     if (savedVPNState == OvpnProcess::Connected) {
-        qDebug() << "Application: Previous VPN state was 'Connected";
+        qDebug() << "{Application} Previous VPN state was 'Connected";
 
         // Check network availability and if network if broken
         bool networkIsAvailable = checkNetworkIsAvailableAfterWakeUp();
 
-        qDebug() << "Application: Network is available:" << networkIsAvailable;
+        qDebug() << "{Application} Network is available:" << networkIsAvailable;
 
         if (!networkIsAvailable) {
             m_trayIcon->sendDisconnectSignal();
@@ -897,7 +897,7 @@
 
     // Restored normal state
     setPowerState(Application::APS_NORMAL);
-    qDebug() << "Application: On power resume, OVPN client is suspended because of system suspension operation "
+    qDebug() << "{Application} On power resume, OVPN client is suspended because of system suspension operation "
                 "(complete)";
 }
 
@@ -997,7 +997,7 @@
 
 void
 Application::onOvpnStateChanged(OvpnProcess::State state) {
-    qDebug().noquote() << "Application:" << OvpnProcess::getStateLongDescription(state)
+    qDebug().noquote() << "{Application}" << OvpnProcess::getStateLongDescription(state)
                        << "killswitch state: " << m_fwController->killSwitchEventFired();
 
     if (state == OvpnProcess::Prepare) {
@@ -1066,7 +1066,7 @@
 
     // Used to handle sleep/wake events
     if ((state == OvpnProcess::Stopped) && m_needSendConnectSignal) {
-        qDebug() << "Application: VPN state stopped and we will send the reconnect signal now (sleep/wake reconnect "
+        qDebug() << "{Application} VPN state stopped and we will send the reconnect signal now (sleep/wake reconnect "
                     "event)";
         m_needSendConnectSignal = false;
         m_mainWindow->qmlApp()->sendConnectSignal();
@@ -1095,7 +1095,7 @@
         if (!QFile::exists(testFile)) {
             return;
         }
-        qDebug() << "Application: TEST MODE ENABLED, start reconenction timer";
+        qDebug() << "{Application} TEST MODE ENABLED, start reconenction timer";
         QTimer::singleShot(10000, this, SLOT(testConnectionReconnectionTimer()));
     }
 #endif
@@ -1105,10 +1105,10 @@
 void
 Application::testConnectionReconnectionTimer() {
     if (savedVPNState == OvpnProcess::Connected) {
-        qDebug() << "Application: TEST MODE ENABLED, sendDisconnectSignal";
+        qDebug() << "{Application} TEST MODE ENABLED, sendDisconnectSignal";
         m_trayIcon->sendDisconnectSignal();
     } else if (savedVPNState == OvpnProcess::Stoped) {
-        qDebug() << "Application: TEST MODE ENABLED, sendConnectSignal";
+        qDebug() << "{Application} TEST MODE ENABLED, sendConnectSignal";
         m_mainWindow->qmlApp()->sendConnectSignal();
     }
 }
@@ -1191,7 +1191,7 @@
 
     if (!m_remoteTapController) {
         // Never?
-        qDebug() << "Application: FATAL ERROR: remoteTapController is missing?";
+        qDebug() << "{Application} FATAL ERROR: remoteTapController is missing?";
         return nullptr;
     }
     return m_remoteTapController;
@@ -1308,7 +1308,7 @@
     if ((savedVPNState == OvpnProcess::Connected) || (savedVPNState == OvpnProcess::Started) ||
         (savedVPNState == OvpnProcess::Prepare) || (savedVPNState == OvpnProcess::Reconnecting)) {
 
-        qDebug() << "Application: Send 'reconnect' signal due to " << (isRouteChange ? "DEFAULT ROUTE" : "AVAILABLE IPs") << " change";
+        qDebug() << "{Application} Send 'reconnect' signal due to " << (isRouteChange ? "DEFAULT ROUTE" : "AVAILABLE IPs") << " change";
 
         if ((isRouteChange && !m_settings.wireguardUse())
                 ||

ovpn_2.4.0.orig.tar.gz/src/client/debug.cpp Changed

ovpn_2.4.0.orig.tar.gz/src/client/mainwindow.cpp Changed

@@ -26,7 +26,7 @@
       m_connectedToVPN(false), m_exitStarted(false), m_systemQuitRequest(false), m_background(false) {
     m_ui->setupUi(this);
 
-    qDebug() << "MainWindow: initialize QML view";
+    qDebug() << "{MainWindow} initialize QML view";
     m_qmlApp = new QmlApp(daemonProxy, qmlObjects, needWebSock, windowHandle());
     setCentralWidget(m_qmlApp->quickWidget());
 
@@ -59,7 +59,7 @@
     // Only for Linux, because we are use WindowsEventFilter class to track these things
 #ifdef Q_OS_LINUX
     connect(qApp, SIGNAL(commitDataRequest(QSessionManager &)), SLOT(commitData(QSessionManager &)));
-    qDebug() << "MainWindow: Registered session manager";
+    qDebug() << "{MainWindow} Registered session manager";
 #endif
 }
 
@@ -72,7 +72,7 @@
 MainWindow::commitData(QSessionManager &manager) {
     Q_UNUSED(manager)
 
-    qDebug() << "MainWindow: Commit data";
+    qDebug() << "{MainWindow} Commit data";
     requestToQuitApp();
 }
 
@@ -95,7 +95,7 @@
 MainWindow::~MainWindow() {
     delete m_ui;
 
-    qDebug() << "MainWindow: Object deleted";
+    qDebug() << "{MainWindow} Object deleted";
 }
 
 void
@@ -119,14 +119,14 @@
 
 void
 MainWindow::onConfirmExitDialogAccepted() {
-    qDebug() << "MainWindow: OnConfirmExitDialogAccepted";
+    qDebug() << "{MainWindow} OnConfirmExitDialogAccepted";
     m_exitStarted = true;
     emit quitRequest();
 }
 
 void
 MainWindow::onDelayConfirmExitDialogShow() {
-    qDebug() << "MainWindow: Show confirmation dialog (by timer)";
+    qDebug() << "{MainWindow} Show confirmation dialog (by timer)";
     qmlApp()->showExitDialog();
     showOnTop();
 }
@@ -142,11 +142,11 @@
 void
 MainWindow::requestToQuitApp() {
     if (m_exitStarted) {
-        qDebug() << "MainWindow: Exit handler (system quit / user request) already in progress";
+        qDebug() << "{MainWindow} Exit handler (system quit / user request) already in progress";
         return;
     }
 
-    qDebug() << "MainWindow: Exit handler (system quit / user request),  started";
+    qDebug() << "{MainWindow} Exit handler (system quit / user request),  started";
 
     m_systemQuitRequest = true;
     exitApplication();
@@ -209,7 +209,7 @@
         return;
     }
 
-    qDebug() << "MainWindow: Start delay to show confirmation dialog";
+    qDebug() << "{MainWindow} Start delay to show confirmation dialog";
     m_timer->start(100);
 }
 
@@ -224,7 +224,7 @@
     m_windowMenu->addAction(
             "Quit",
             &() {
-                qDebug() << "MainWindow: Qt::ControlModifier + Qt::Key_Q";
+                qDebug() << "{MainWindow} Qt::ControlModifier + Qt::Key_Q";
                 exitApplication();
             },
             quitWindowKS);
@@ -233,7 +233,7 @@
     m_windowMenu->addAction(
             QObject::tr("Minimize"),
             &() {
-                qDebug() << "MainWindow: Qt::ControlModifier + Qt::Key_M";
+                qDebug() << "{MainWindow} Qt::ControlModifier + Qt::Key_M";
                 minimizeWindow();
             },
             minimizeKS);
@@ -242,7 +242,7 @@
     m_windowMenu->addAction(
             QObject::tr("Close"),
             &() {
-                qDebug() << "MainWindow: Qt::ControlModifier + Qt::Key_W";
+                qDebug() << "{MainWindow} Qt::ControlModifier + Qt::Key_W";
                 minimizeWindow();
             },
             closeWindowKS);
@@ -317,7 +317,7 @@
     // application.
 #ifdef Q_OS_WIN
     if (!isActiveWindow()) {
-        qDebug() << "MainWindow: force to show on top";
+        qDebug() << "{MainWindow} force to show on top";
         Qt::WindowFlags flags = windowFlags();
         setWindowFlags((flags | Qt::WindowStaysOnTopHint));
         showNormal();

ovpn_2.4.0.orig.tar.gz/src/client/mainwindow_win.cpp Changed

@@ -77,15 +77,15 @@
         const POWERBROADCAST_SETTING* setting = reinterpret_cast<const POWERBROADCAST_SETTING*>(lParam);
         switch (wParam) {
         case PBT_APMPOWERSTATUSCHANGE:
-            qDebug() << "MainWindow: PBT_APMPOWERSTATUSCHANGE";
+            qDebug() << "{MainWindow} PBT_APMPOWERSTATUSCHANGE";
             break;
         case PBT_APMRESUMEAUTOMATIC: {
-            qDebug() << "MainWindow: WM_POWERBROADCAST, PBT_APMRESUMEAUTOMATIC";
+            qDebug() << "{MainWindow} WM_POWERBROADCAST, PBT_APMRESUMEAUTOMATIC";
             //OvpnSe::Application::instance().onPowerResume();
             break;
         }
         case PBT_APMSUSPEND: {
-            qDebug() <<  "MainWindow: WM_POWERBROADCAST, PBT_APMSUSPEND";
+            qDebug() <<  "{MainWindow} WM_POWERBROADCAST, PBT_APMSUSPEND";
             //OvpnSe::Application::instance().onPowerSuspend();
             break;
         }
@@ -98,7 +98,7 @@
 
                 const DWORD* state = reinterpret_cast<const DWORD*>(&setting->Data);
                 if (*state != 0) {
-                    qDebug() << "MainWindow: GUID_LIDSWITCH_STATE_CHANGE, OPEN";
+                    qDebug() << "{MainWindow} GUID_LIDSWITCH_STATE_CHANGE, OPEN";
                     return true;
 
                     closeLidEventSent = false;
@@ -110,11 +110,11 @@
                     // event like on wakeup
                     OvpnSe::Application::instance().onPowerResume();
                 } else {
-                    qDebug() << "MainWindow: GUID_LIDSWITCH_STATE_CHANGE, CLOSE";
+                    qDebug() << "{MainWindow} GUID_LIDSWITCH_STATE_CHANGE, CLOSE";
                     return true;
 
                     if (!powerOptions.sleepOnCloseLid()) {
-                        qDebug() << "MainWindow: nothing to do when LID closed";
+                        qDebug() << "{MainWindow} nothing to do when LID closed";
                         return true;
                     }
 
@@ -139,7 +139,7 @@
 
 void MainWindow::initPlatformSpecific()
 {
-    qDebug() << "MainWindow: Register power events";
+    qDebug() << "{MainWindow} Register power events";
 
     // Register WindowProc function to handle Windows Power Events
     HWND mainWindowHandle = (HWND)QMainWindow::winId();
@@ -148,16 +148,16 @@
                                                            DEVICE_NOTIFY_WINDOW_HANDLE);
 
     if (!RegisterPowerSettingNotification(mainWindowHandle, &GUID_LIDSWITCH_STATE_CHANGE, DEVICE_NOTIFY_WINDOW_HANDLE)) {
-        qDebug() << "MainWindow: Cannot register GUID_LIDSWITCH_STATE_CHANGE power setting notification!";
+        qDebug() << "{MainWindow} Cannot register GUID_LIDSWITCH_STATE_CHANGE power setting notification!";
     }
 
 //    if (handle) {
 //       DefaultWindowProc = (WNDPROC) SetWindowLongPtr(mainWindowHandle, GWL_WNDPROC, (LONG_PTR)&WindowProc);
 //       if (!DefaultWindowProc) {
-//           qDebug() << "MainWindow: Unable to overide window procedure of the main window" << GetLastError();
+//           qDebug() << "{MainWindow} Unable to overide window procedure of the main window" << GetLastError();
 //       }
 //    } else {
-//        qDebug() << "MainWindow: RegisterPowerSettingNotification:" << GetLastError();
+//        qDebug() << "{MainWindow} RegisterPowerSettingNotification:" << GetLastError();
 //    }
 
     // Create a QThread that  will open a CreateEvent() event

ovpn_2.4.0.orig.tar.gz/src/client/ovpn/firewallcontroller.cpp Changed

@@ -33,7 +33,7 @@
 {
 #ifdef Q_OS_WIN
     if (!windowsFirewall.initialized()) {
-        qCritical() << "FireWallController: Cannot initialize WindowsFirewall object!";
+        qCritical() << "{FireWallController} Cannot initialize WindowsFirewall object!";
     }
 #endif
 }
@@ -47,7 +47,7 @@
 {
     if (killSwitchActivated()) {
         m_keepProtectionWhenReconnecting = true;
-        qDebug().noquote().nospace() << "FireWallController: Keep protection for reconnection";
+        qDebug().noquote().nospace() << "{FireWallController} Keep protection for reconnection";
     }
 }
 
@@ -91,7 +91,7 @@
 #if !OVPN_UNIT_TESTS
     QString updatedTag = OvpnSe::Utils::createKillSwitchTag(args);
 
-    qDebug().noquote().nospace() << "FireWallController: Start remote process, args '" << args << "', tag: '" << updatedTag << "'";
+    qDebug().noquote().nospace() << "{FireWallController} Start remote process, args '" << args << "', tag: '" << updatedTag << "'";
 
     auto process = new Utils::RemoteProcess(updatedTag);
 
@@ -99,20 +99,20 @@
     QObject::connect(m_daemonProxy, &DaemonProxyBase::processOutput, process, &Utils::RemoteProcess::onProcessOutput);
 
     QObject::connect(process, &Utils::RemoteProcess::errorOccurred, &(int errorCode) {
-        qWarning() << "FireWallController: firewall error:" << errorCode;
+        qWarning() << "{FireWallController} firewall error:" << errorCode;
     });
 
     QObject::connect(process, &Utils::RemoteProcess::errorOccurred, &, process, processName, args() {
-        qDebug() << "FireWallController: Deleting the process: " << processName << args;
+        qDebug() << "{FireWallController} Deleting the process: " << processName << args;
         process->deleteLater();
     });
 
     // On finished handler, step 1 - run callback
     QObject::connect(process, &Utils::RemoteProcess::finished, &, processName, args, onRemoteProcessFinishedCallback(int exitStatus) {
-        qDebug().noquote().nospace() << "FireWallController: Finished remote, args: '" << args << "', exitStatus: " << exitStatus;
+        qDebug().noquote().nospace() << "{FireWallController} Finished remote, args: '" << args << "', exitStatus: " << exitStatus;
 
         if (exitStatus != EXIT_SUCCESS) {
-            qWarning() << "FireWallController: The process finished. Exit status:" << exitStatus << processName << args;
+            qWarning() << "{FireWallController} The process finished. Exit status:" << exitStatus << processName << args;
         }
         onRemoteProcessFinishedCallback(exitStatus == EXIT_SUCCESS);
     });
@@ -124,7 +124,7 @@
     });
 
     QObject::connect(process, &QObject::destroyed, &, processName, args() {
-        //qDebug() << "FireWallController: The process deleted: " << processName << args;
+        //qDebug() << "{FireWallController} The process deleted: " << processName << args;
     });
 
     process->start(args);
@@ -145,7 +145,7 @@
 {
     static bool was_activation = false;
 
-    qDebug() << "FireWallController: Request to change KillSwitch state, activate:" << activate;
+    qDebug() << "{FireWallController} Request to change KillSwitch state, activate:" << activate;
     if (!activate && !was_activation && deactivateKillSwitchInProgress()) {
         return;
     }
@@ -154,12 +154,12 @@
 
     if (!m_needForceResetKillSwitch) {
         if (0 == killSwitchMode()){
-            qDebug() << "FireWallController: KillSwitch disabled in settings, skipping";
+            qDebug() << "{FireWallController} KillSwitch disabled in settings, skipping";
             return;
         }
     }
 
-    qDebug().nospace().noquote() << QString("FireWallController: %1 KillSwitch, force flag: %2")
+    qDebug().nospace().noquote() << QString("{FireWallController} %1 KillSwitch, force flag: %2")
                                     .arg(activate ? "Activating" : "Deactivating")
                                     .arg(m_needForceResetKillSwitch);
 
@@ -217,7 +217,7 @@
 
 void FireWallController::setKillSwitchActivated(bool killSwitchActivated, const QString& stateString)
 {
-    qDebug().noquote().nospace() << "FireWallController: Set KillSwitch activated, current: " << m_killSwitchActivated
+    qDebug().noquote().nospace() << "{FireWallController} Set KillSwitch activated, current: " << m_killSwitchActivated
                                  << ", new state: " << killSwitchActivated
                                  << ", state string: " << stateString;
 
@@ -233,7 +233,7 @@
         emit killswitchState(stateString);
     }
 
-    qDebug().noquote().nospace() << "FireWallController: New state is active: " << killSwitchActivated << ", state string: " << stateString;
+    qDebug().noquote().nospace() << "{FireWallController} New state is active: " << killSwitchActivated << ", state string: " << stateString;
 }
 
 bool FireWallController::networkSettingsChangedAfterReconnect() const
@@ -254,7 +254,7 @@
 
 bool FireWallController::reconnect()
 {
-    qDebug().nospace().noquote() << "FireWallController: Reconnect, save current settings, OVPN IPv4: " << m_ovpnIp
+    qDebug().nospace().noquote() << "{FireWallController} Reconnect, save current settings, OVPN IPv4: " << m_ovpnIp
                                  << ", assigned IPv4: " << m_ovpnInternalIp
                                  << ", assigned IPv6: " << m_ovpnIpV6;
 
@@ -297,7 +297,7 @@
     }
     }
 
-    qDebug().noquote().nospace() << "FireWallController: KillSwitch is " << mode;
+    qDebug().noquote().nospace() << "{FireWallController} KillSwitch is " << mode;
 
     if (0 == killSwitchMode()) {
         return;
@@ -310,7 +310,7 @@
         // Check if  Windows Firewall managed by 3rd party application
         // We will send signal to QML-UI later
         if (!nativeFirewallManagedBySystem()) {
-            // qWarning() << "FireWallController: Killswitch can not work properly";
+            // qWarning() << "{FireWallController} Killswitch can not work properly";
         }
 #endif
         // Enable KillSwitch event, because user pressed "Connect" button
@@ -388,7 +388,7 @@
 
 void FireWallController::setIPv4ServerOvpn(const QString &ipv4addr)
 {
-    qDebug().nospace() << "FireWallController: setIPv4ServerOvpn, current IP address: "
+    qDebug().nospace() << "{FireWallController} setIPv4ServerOvpn, current IP address: "
                        <<  m_connection.state.connected.ipv4Server << ", new IP: " << ipv4addr;
 
     m_connection.state.connected.ipv4Server = QHostAddress(ipv4addr);
@@ -398,7 +398,7 @@
 {
     QDateTime now = QDateTime::currentDateTime();
     if (m_lastForceStopDateTime.isValid() && m_lastForceStopDateTime.secsTo(now) < 5) {
-        qDebug() << "FireWallController: Operation in progress, skipping";
+        qDebug() << "{FireWallController} Operation in progress, skipping";
         return true;
     }
     m_lastForceStopDateTime = now;
@@ -414,7 +414,7 @@
     bool killSwitchWasActive = killSwitchActivated();
 
     if (!firstInvoke)  {
-        qDebug() << "FireWallController: Force stop";
+        qDebug() << "{FireWallController} Force stop";
         this->deactivateKillSwitch();
     } else {
         firstInvoke = false;
@@ -478,7 +478,7 @@
         m_timestamp = time(0);
         emit killswitchState(QString("killswitchactive"));
 
-        qWarning() << "FireWallController: Killswitch was fired, internet connection will be blocked until killswitch is deactivated or until connection to the VPN tunnel is established.";
+        qWarning() << "{FireWallController} Killswitch was fired, internet connection will be blocked until killswitch is deactivated or until connection to the VPN tunnel is established.";
     }
 }
 
@@ -494,11 +494,11 @@
 {
 #ifdef Q_OS_WIN
     bool controlledBySystem = windowsFirewall.enabledAndManagedBySystem();
-    qDebug() << "FireWallController: Windows firewall enabled and managed by system:"  << controlledBySystem;
+    qDebug() << "{FireWallController} Windows firewall enabled and managed by system:"  << controlledBySystem;
     if (!controlledBySystem) {
         QStringList otherProductNames = windowsFirewall.managedByProduct();
         if (!otherProductNames.isEmpty()) {
-            qDebug() << "FireWallController: Windows firewall managed by: " << otherProductNames;
+            qDebug() << "{FireWallController} Windows firewall managed by: " << otherProductNames;
         }
         return false;
     }
@@ -519,7 +519,7 @@
 
 void FireWallController::remoteProcessCallbackHandler(bool activate, bool exitSuccess)
 {
-    qDebug().noquote().nospace() << "FireWallController: Remote process, activate: " << activate << ", status: " << exitSuccess;
+    qDebug().noquote().nospace() << "{FireWallController} Remote process, activate: " << activate << ", status: " << exitSuccess;
 
     QString stateString;
     if (activate) {

ovpn_2.4.0.orig.tar.gz/src/client/ovpn/networktest.cpp Changed

ovpn_2.4.0.orig.tar.gz/src/client/ovpn/openvpn/openvpnprovider.cpp Changed

@@ -114,7 +114,7 @@
         content.replace("dhcp-renew", "");
     }
 
-    qDebug() << "OvpnProcess: Option dhcp-renew is set:" << needSetDhcpRenewOption;
+    qDebug() << "{OvpnProcess} Option dhcp-renew is set:" << needSetDhcpRenewOption;
 
     // By default, the client uses the OS standard rcvbuf/sndbuf, but there is currently
     // a bug in Windows 7 where it is set to a much lower value than the OS default which
@@ -136,17 +136,17 @@
     m_authFile->write(authContent.toLocal8Bit());
     m_authFile->flush();
     QString authConfLine = QString("auth-user-pass %1").arg(m_authFile->fileName());
-    qDebug() << "OvpnProcess: UnpackConfiguration: auth-user-pass:" << authConfLine;
+    qDebug() << "{OvpnProcess} UnpackConfiguration: auth-user-pass:" << authConfLine;
     content.replace("auth-user-pass", authConfLine);
 #endif
     // add path to save logs
     m_logFileName = Debug::getPathToOvpnLog();
     if (m_logFileName.isEmpty()) {
-        qCritical() << "OvpnProcess: OpenVPN log path is empty";
+        qCritical() << "{OvpnProcess} OpenVPN log path is empty";
         return "";
     }
 
-    qDebug() << "OvpnProcess: OpenVPN log path:" << m_logFileName;
+    qDebug() << "{OvpnProcess} OpenVPN log path:" << m_logFileName;
 
     // Note: log path removed from openvpn config
     // and we will append to openVPN command line
@@ -162,7 +162,7 @@
     m_configFile->write(content.toLocal8Bit());
     m_configFile->flush();
 
-    qDebug().noquote().nospace() << QString("OvpnProcess: Unpack configuration: '%1', encryption: '%2'")
+    qDebug().noquote().nospace() << QString("{OvpnProcess} Unpack configuration: '%1', encryption: '%2'")
                                             .arg(QFileInfo(*m_configFile).absoluteFilePath())
                                             .arg(m_settings.encryptionMethod());

ovpn_2.4.0.orig.tar.gz/src/client/ovpn/ovpnprocess.cpp Changed

@@ -97,7 +97,7 @@
 void
 OvpnProcess::restart() {
 #if !OVPN_UNIT_TESTS
-    qDebug() << "OvpnProcess: Restart";
+    qDebug() << "{OvpnProcess} Restart";
     thread()->sleep(2);
 
     stop();
@@ -123,7 +123,7 @@
                         << OPENVPN_PORTS_CACHE_KEY;
         }
     } else {
-        qCritical() << "OvpnProcess: Internal cache does not contains key:" << OPENVPN_PORTS_CACHE_KEY;
+        qCritical() << "{OvpnProcess} Internal cache does not contains key:" << OPENVPN_PORTS_CACHE_KEY;
     }
 #endif
 }
@@ -180,8 +180,8 @@
 
     QObject::connect(m_manager.data(), SIGNAL(lineReaded(const QString &)), SLOT(onLogReaded(const QString &)));
     QObject::connect(m_manager.data(), &VpnManagerBase::listenStarted, &() {
-        qDebug() << "OvpnProcess: VpnManagerBase listen socket ready";
-        qDebug() << "OvpnProcess: OpenVPN file path:" << configFileName;
+        qDebug() << "{OvpnProcess} VpnManagerBase listen socket ready";
+        qDebug() << "{OvpnProcess} OpenVPN file path:" << configFileName;
         m_manager->generateAuthFile();
         m_process.startProcess(m_useWireguardFlag, configFileName, m_manager->passwordPath(), logFileName);
     });
@@ -194,7 +194,7 @@
 //-----------------------------------------------------------------------------
 void
 OvpnProcess::startProcess() {
-    qDebug() << "OvpnProcess: Start process: " << m_serverIp << m_configFile;
+    qDebug() << "{OvpnProcess} Start process: " << m_serverIp << m_configFile;
     QString logFileName;
     if (m_useWireguardFlag) {
         logFileName = m_wireguard->logPath();
@@ -227,11 +227,11 @@
     m_useWireguardFlag = useWireguard;
     m_mtu = mtu;
 #if !OVPN_UNIT_TESTS
-    qDebug().noquote() << "OvpnProcess: Start, attempting to connect." << getStateLongDescription(m_state);
+    qDebug().noquote() << "{OvpnProcess} Start, attempting to connect." << getStateLongDescription(m_state);
     m_maintenanceMode = maintenanceMode;
     m_ipv6Flag = ipv6;
     if (m_state == Prepare) {
-        qDebug().noquote() << "OvpnProcess: Already in progress, skipping";
+        qDebug().noquote() << "{OvpnProcess} Already in progress, skipping";
         return true;
     }
 
@@ -243,12 +243,12 @@
 
     if (m_ovpnLocalCache.contains(OPENVPN_PORTS_CACHE_KEY)) {
         if (!m_ovpnLocalCache.remove(OPENVPN_PORTS_CACHE_KEY)) {
-            qDebug() << "OvpnProcess: The object " << OPENVPN_PORTS_CACHE_KEY << " was not found in the cache.";
+            qDebug() << "{OvpnProcess} The object " << OPENVPN_PORTS_CACHE_KEY << " was not found in the cache.";
         }
     }
 
     if (!m_ovpnLocalCache.insert(OPENVPN_PORTS_CACHE_KEY, new QVariant(ports))) {
-        qDebug() << "OvpnProcess: The object: " << OPENVPN_PORTS_CACHE_KEY << "," << ports.toStringList()
+        qDebug() << "{OvpnProcess} The object: " << OPENVPN_PORTS_CACHE_KEY << "," << ports.toStringList()
                  << " was not inserted into the cache.";
     }
 
@@ -272,18 +272,18 @@
     }
 
     if (m_configFile.isEmpty()) {
-        qCritical() << "OvpnProcess: Path to config file is empty. ";
+        qCritical() << "{OvpnProcess} Path to config file is empty. ";
         setState(State::Error);
         return false;
     }
 
     if (!QFile::exists(m_configFile)) {
-        qCritical().noquote().nospace() << "OvpnProcess: Configuration file does not exists!";
+        qCritical().noquote().nospace() << "{OvpnProcess} Configuration file does not exists!";
         setState(State::Error);
         return false;
     }
 
-    qDebug() << "OvpnProcess: Server IP:" << ip << ", Ports:" << portList;
+    qDebug() << "{OvpnProcess} Server IP:" << ip << ", Ports:" << portList;
 
     /// TODO: To investigate emit of the serverIpChanged in this place vs emit from the startProcess
     m_serverIp = ip;
@@ -360,7 +360,7 @@
 //-----------------------------------------------------------------------------
 bool
 OvpnProcess::stop() {
-    qDebug().noquote() << "OvpnProcess: Attempting to disconnect." << getStateLongDescription(m_state);
+    qDebug().noquote() << "{OvpnProcess} Attempting to disconnect." << getStateLongDescription(m_state);
 
     bool _stopCondition = Connected == m_state || Started == m_state || Reconnecting == m_state;
     _stopCondition = _stopCondition || Prepare == m_state;
@@ -371,7 +371,7 @@
 
         bool needForcedStop = false;
         if (m_manager && !m_manager->shutdownTunnel(needForcedStop)) {
-            qWarning() << "OvpnProcess: OpenVPN process is still running. Terminating process...";
+            qWarning() << "{OvpnProcess} OpenVPN process is still running. Terminating process...";
 
             m_process.disconnect(SIGNAL(allKilled()));
             m_process.killall();
@@ -407,7 +407,7 @@
     const auto state = OvpnRemoteProcess::RemoteProcessState::Running;
 
     if (m_process.state() == state && m_manager && Connected == m_state) {
-        qDebug() << "OvpnProcess: Disconnected from vpn server successfully";
+        qDebug() << "{OvpnProcess} Disconnected from vpn server successfully";
 
         m_process.disconnect(SIGNAL(error(int)));
         m_process.disconnect(SIGNAL(finished(int)));
@@ -418,7 +418,7 @@
 
         bool needForcedStop;
         if (!m_manager->shutdownTunnel(needForcedStop)) {
-            qWarning() << "OvpnProcess: Unable to shutdown tunnel, killing openvpn";
+            qWarning() << "{OvpnProcess} Unable to shutdown tunnel, killing openvpn";
             m_process.stop();
         }
     }
@@ -436,7 +436,7 @@
     m_state = value;
     const auto &stateDesc = OvpnProcess::getStateDescription(m_state);
 
-    qDebug().noquote() << "OvpnProcess: New " << getStateLongDescription(m_state);
+    qDebug().noquote() << "{OvpnProcess} New " << getStateLongDescription(m_state);
 
     emit nativeStateChanged(value);
     emit stateChanged(stateDesc);
@@ -493,7 +493,7 @@
 //-----------------------------------------------------------------------------
 void
 OvpnProcess::onProcessError(int err) {
-    qCritical() << "OvpnProcess: A process error has occurred" << err << m_process.errorString();
+    qCritical() << "{OvpnProcess} A process error has occurred" << err << m_process.errorString();
     setState(State::Error);
 }
 
@@ -534,7 +534,7 @@
 //-----------------------------------------------------------------------------
 void
 OvpnProcess::disconnectedFromDaemonProxy() {
-    qDebug() << "OvpnProcess: Disconnected from daemon proxy";
+    qDebug() << "{OvpnProcess} Disconnected from daemon proxy";
 
     // Disabled to test sleep/wake up events
     onProcessFinished(0);
@@ -543,7 +543,7 @@
 //-----------------------------------------------------------------------------
 void
 OvpnProcess::onProcessFinished(int exitCode) {
-    qDebug() << "OvpnProcess: Process finished successfully,"
+    qDebug() << "{OvpnProcess} Process finished successfully,"
              << "exit code:" << exitCode;
 
     if (m_state != State::Disconnecting) {
@@ -559,7 +559,7 @@
 //-----------------------------------------------------------------------------
 void
 OvpnProcess::onManagerStateChanged(const VpnManagerBase::State managerState) {
-    qDebug() << "OvpnProcess: VpnManagerBase, state changed to" << m_manager->stateString(managerState) << "("
+    qDebug() << "{OvpnProcess} VpnManagerBase, state changed to" << m_manager->stateString(managerState) << "("
              << managerState << ")";
 
     if (managerState == VpnManagerBase::ManagementInterfaceError) {
@@ -590,7 +590,7 @@
 void
 OvpnProcess::softwareReset() {
 #if !OVPN_UNIT_TESTS
-    qDebug() << "OvpnProcess: Software reset";
+    qDebug() << "{OvpnProcess} Software reset";
     if (m_manager) {
         bool useSigUsr1 = m_settings.tcp();
 #ifdef Q_OS_MACOS
@@ -604,7 +604,7 @@
 //-----------------------------------------------------------------------------
 void
 OvpnProcess::onNetworkTimeout() {
-    qDebug() << "OvpnProcess: network timeout (network connection is unavailable still)";
+    qDebug() << "{OvpnProcess} network timeout (network connection is unavailable still)";
 
     if (m_state == Reconnecting) {
         // Nothing good, restart all
@@ -618,7 +618,7 @@
 //-----------------------------------------------------------------------------
 void
 OvpnProcess::onPingFinished(bool available) {
-    qDebug() << "OvpnProcess: Pinging finished, network is avialable:" << available;
+    qDebug() << "{OvpnProcess} Pinging finished, network is avialable:" << available;
 
     if (!available) {
 
@@ -626,9 +626,9 @@
             const QString &stateString = OvpnProcess::getStateDescription(State::PingFail);
             emit stateChanged(stateString);
             m_pingFailAlreadySent = true;
-            qDebug() << "OvpnProcess: Pingfail event sent to front-end";
+            qDebug() << "{OvpnProcess} Pingfail event sent to front-end";
         } else {
-            qDebug() << "OvpnProcess: Pingfail event already sent to front-end, skipping...";
+            qDebug() << "{OvpnProcess} Pingfail event already sent to front-end, skipping...";
         }
 
 
@@ -642,7 +642,7 @@
     // network is available (borderline case)
     if (m_state == Reconnecting) {
         m_ping.stopTimeoutTimer();
-        qDebug() << "OvpnProcess: network is available again, trying to restart";
+        qDebug() << "{OvpnProcess} network is available again, trying to restart";
         softwareReset();
     }
 }
@@ -658,7 +658,7 @@
     }
 
     if (!signal.isEmpty()) {
-        qDebug() << "OvpnProcess: Send signal" << signal;
+        qDebug() << "{OvpnProcess} Send signal" << signal;
         emit monitorLogChanged(signal);
     }
 }
@@ -666,7 +666,7 @@
 //-----------------------------------------------------------------------------
 void
 OvpnProcess::onTcpChanged() {
-    qDebug().noquote().nospace() << QString("OvpnProcess: On TCP Changed, TCP 443 is %1 in client settings")
+    qDebug().noquote().nospace() << QString("{OvpnProcess} On TCP Changed, TCP 443 is %1 in client settings")
                                             .arg(Utils::BoolToString(m_tcpFlag, Utils::ED));
 }

ovpn_2.4.0.orig.tar.gz/src/client/ovpn/ping/ping_win2.cpp Changed

ovpn_2.4.0.orig.tar.gz/src/client/ovpn/statistic.cpp Changed

@@ -84,7 +84,7 @@
 void correction(RingArrayInstance* data, const quint16 interval, const char* intervalType, const char* storageType)
 {
     const auto& last = data->last();
-    qDebug() << "Statistics: Timestamp of latest" << storageType << "record" << last.Timestamp;
+    qDebug() << "{Statistics} Timestamp of latest" << storageType << "record" << last.Timestamp;
     if (last.Timestamp)
     {
         Statistic::Data tmp;
@@ -92,7 +92,7 @@
 
         const auto now = QDateTime::currentDateTimeUtc();
         uint timeUnits = (now.toSecsSinceEpoch() - last.Timestamp) / interval;
-        qDebug() << "Statistics: Count of" << intervalType <<
+        qDebug() << "{Statistics} Count of" << intervalType <<
                     "since last record of" << storageType << "data was stored" << timeUnits;
         if (timeUnits >= data->size())
         {
@@ -202,7 +202,7 @@
         }
         else
         {
-            qDebug() << "Statistics: session Ids is not equil. Item session id is" << item.SessionId
+            qDebug() << "{Statistics} session Ids is not equil. Item session id is" << item.SessionId
                      << ", current session id is" << m_currentSessionId
                      << ", item.TunTapReadBytes" << item.TunTapReadBytes
                      << ", item.TunTapWriteBytes" << item.TunTapWriteBytes
@@ -265,7 +265,7 @@
             // when when user restart OpenVPN connection several times during a one minute but
             // I'm not sure. So, as temorarelly solution I have added the following code
             if (in > m_dayDatai+1.TunTapWriteBytes) {
-                qWarning() << "Statistics: TunTapWriteBytes value less than 'in' value. m_dayDatai+1.TunTapWriteBytes ="
+                qWarning() << "{Statistics} TunTapWriteBytes value less than 'in' value. m_dayDatai+1.TunTapWriteBytes ="
                            << m_dayDatai+1.TunTapWriteBytes
                            << "m_dayDatai.TunTapWriteBytes ="
                            << m_dayDatai.TunTapWriteBytes
@@ -274,7 +274,7 @@
                 in = 0;
             }
             if (out > m_dayDatai+1.TunTapReadBytes) {
-                qWarning() << "Statistics: TunTapReadBytes value less than 'in' value. m_dayDatai+1.TunTapReadBytes ="
+                qWarning() << "{Statistics} TunTapReadBytes value less than 'in' value. m_dayDatai+1.TunTapReadBytes ="
                            << m_dayDatai+1.TunTapReadBytes
                            << "m_dayDatai.TunTapReadBytes ="
                            << m_dayDatai.TunTapReadBytes
@@ -382,7 +382,7 @@
     }
     else
     {
-        qWarning() << "Statistics: Can't open file" << path
+        qWarning() << "{Statistics} Can't open file" << path
                    << ", mode" << mode << ", error" << file.error();
     }
 }
@@ -438,13 +438,13 @@
 {
     if (m_pollingInterval)
     {
-        qDebug() << "Statistics: Speed polling is running already:" << m_pollingInterval << " sec";
+        qDebug() << "{Statistics} Speed polling is running already:" << m_pollingInterval << " sec";
         return;
     }
     m_pollingInterval = sec;
     m_pollingTickCount = 0;
 
-    qDebug() << "Statistics: Polling:" << sec << "s";
+    qDebug() << "{Statistics} Polling:" << sec << "s";
 }
 
 void Statistic::stopSpeedPolling()
@@ -452,7 +452,7 @@
     if (!m_pollingInterval)
         return;
 
-    qDebug() << "Statistics: Stop speed polling";
+    qDebug() << "{Statistics} Stop speed polling";
     m_pollingInterval = 0;
 }
 
@@ -503,7 +503,7 @@
     QObject::connect(ovpnManager, &VpnManagerBase::bytecountActivated, &() {
         const auto now = QDateTime::currentDateTimeUtc();
         m_currentSessionId = now.toSecsSinceEpoch();
-        qDebug() << "Statistics: bytecountActivated: change current session Id to" << m_currentSessionId;
+        qDebug() << "{Statistics} bytecountActivated: change current session Id to" << m_currentSessionId;
     });
     QObject::connect(ovpnManager, &VpnManagerBase::bytecount, this, &Statistic::onBytesCount);
 }
@@ -524,7 +524,7 @@
         makeDataEmpty(m_prevData);
         makeDataEmpty(m_curData);
 
-        qDebug() << "Statistics: change current session Id to" << m_currentSessionId;
+        qDebug() << "{Statistics} change current session Id to" << m_currentSessionId;
     }
 }
 
@@ -533,7 +533,7 @@
     if (0 == m_currentSessionId)
     {
         if (line.startsWith(BEGIN_STATISTIC_BLOCK))
-            qWarning() << "Statistics: Statistical data received before starting of new session";
+            qWarning() << "{Statistics} Statistical data received before starting of new session";
         return;
     }

ovpn_2.4.0.orig.tar.gz/src/client/ovpn/wireguard/wgmanager.cpp Changed

@@ -111,17 +111,17 @@
             QStringList list = line.split(BYTECOUNT_ENTRY, Qt::SkipEmptyParts);
             if (list.count() == 0) {
                 qDebug() << "\t"
-                         << "WireguardManager: bytecountHandler: Wrong message format:" << BYTECOUNT_ENTRY
+                         << "{WireguardManager} bytecountHandler: Wrong message format:" << BYTECOUNT_ENTRY
                          << "was not found.";
             } else if (list.count() != 1) {
                 qDebug() << "\t"
-                         << "WireguardManager: bytecountHandler: Wrong message format:" << BYTECOUNT_ENTRY
+                         << "{WireguardManager} bytecountHandler: Wrong message format:" << BYTECOUNT_ENTRY
                          << "appeared more than once:" << list.count();
             }
 #ifdef DEBUG_LOG_PARSER
             else {
                 qDebug() << "\t"
-                         << "WireguardManager: bytecountHandler: Initial parsing successful. Message count:"
+                         << "{WireguardManager} bytecountHandler: Initial parsing successful. Message count:"
                          << list.count();
             }
 #endif
@@ -130,23 +130,23 @@
             if (msgList.count() == 2) {
                 emit bytecount(msgList0.toLongLong(), msgList1.toLongLong());
             } else {
-                qDebug() << "WireguardManager: Bytecount handler: Unexpected message format: Message body:" << msgList;
+                qDebug() << "{WireguardManager} Bytecount handler: Unexpected message format: Message body:" << msgList;
             }
 #ifdef EXTRA_LOGGING_ENABLED
-            qDebug() << "WireguardManager: BYTECOUNT_ENTRY:" << line;
+            qDebug() << "{WireguardManager} BYTECOUNT_ENTRY:" << line;
 #endif
         } else if (line.startsWith(CONNECTED_ENTRY)) {
-            qDebug() << "WireguardManager: Received CONNECTED state";
+            qDebug() << "{WireguardManager} Received CONNECTED state";
             m_device = "";
             stateChanged(TunnelUp);
         } else if (line.startsWith(DISCONNECTED_ENTRY)) {
-            qDebug() << "WireguardManager: Received DISCONNECTED state";
+            qDebug() << "{WireguardManager} Received DISCONNECTED state";
             stateChanged(TunnelDown);
         } else if (line.contains(PUSH_ENTRY)) {
             auto &parser = Tunnel::Parser::Instance();
             parser.setPushLog(line);
         } else if (line.contains(ERROR_ENTRY)) {
-            qDebug() << "WireguardManager: Received ERROR state";
+            qDebug() << "{WireguardManager} Received ERROR state";
             stateChanged(TunnelError);
         } else if (line.contains(DEV_NAME_ENTRY)) {
             QStringList list = line.split(DEV_NAME_ENTRY, Qt::SkipEmptyParts);

ovpn_2.4.0.orig.tar.gz/src/client/qml/OvpnEventsListener.qml Changed

ovpn_2.4.0.orig.tar.gz/src/client/qmlcpp/addonlistmodel.cpp Changed

ovpn_2.4.0.orig.tar.gz/src/client/qmlcpp/datacenterlistmodel.cpp Changed

@@ -218,7 +218,7 @@
 
 void DataCenterListModel::updateModel()
 {
-    qDebug().noquote().nospace() << QString("%1: Request to update").arg(objectName());
+    qDebug().noquote().nospace() << QString("{%1} Request to update").arg(objectName());
 
     removeRows(0, rowCount());
 
@@ -308,7 +308,7 @@
     QString datacenterIp = dataCenterWithLowestPing();
     QString datacenterName = m_dataCenterList.countryNameByIp(datacenterIp);
 
-    qDebug().noquote().nospace() << QString("DataCenterListModel: Best datacenter in %1, ip: %2")
+    qDebug().noquote().nospace() << QString("{DataCenterListModel} Best datacenter in %1, ip: %2")
                                     .arg(datacenterName).arg(datacenterIp);
 
 
@@ -381,7 +381,7 @@
 QString DataCenterListModel::dataCenterWithLowestPing() const
 {
     if (!m_pingData.size()) {
-        qDebug() << "DataCenterListModel: Pings are not valid (waiting for data)";
+        qDebug() << "{DataCenterListModel} Pings are not valid (waiting for data)";
         return QString();
     }

ovpn_2.4.0.orig.tar.gz/src/client/qmlcpp/qmlapp.cpp Changed

ovpn_2.4.0.orig.tar.gz/src/client/tunnel/parser.cpp Changed

@@ -109,22 +109,22 @@
 void Parser::dumpPush()
 {
     const Connection& connection = Connection::instance();
-    qDebug() << "Parser: Dump PUSH-message data";
+    qDebug() << "{Parser} Dump PUSH-message data";
 #ifdef DEBUG_NETWORK
     if (!connection.ipv4().isEmpty())
-        qDebug() << "Parser: Assigned IPv4:" << connection.ipv4();
+        qDebug() << "{Parser} Assigned IPv4:" << connection.ipv4();
     if (!connection.ipv6().isEmpty())
-        qDebug() << "Parser: Assigned IPv6:" << connection.ipv6();
+        qDebug() << "{Parser} Assigned IPv6:" << connection.ipv6();
 #else
     if (!connection.ipv4().isEmpty())
-        qDebug() << "Parser: Assigned IPv4";
+        qDebug() << "{Parser} Assigned IPv4";
     if (!connection.ipv6().isEmpty())
-        qDebug() << "Parser: Assigned IPv6";
+        qDebug() << "{Parser} Assigned IPv6";
 #endif
     if (connection.IPv4DNSList().size())
-        qDebug() << "Parser: IPv4 DNS list:" << connection.IPv4DNSList();
+        qDebug() << "{Parser} IPv4 DNS list:" << connection.IPv4DNSList();
     if (connection.IPv6DNSList().size())
-        qDebug() << "Parser: IPv6 DNS list:" << connection.IPv6DNSList();
+        qDebug() << "{Parser} IPv6 DNS list:" << connection.IPv6DNSList();
 }
 
 }}}

ovpn_2.4.0.orig.tar.gz/src/client/tunnel/push.h Changed

ovpn_2.4.0.orig.tar.gz/src/client/utils/autostart.cpp Changed

@@ -75,22 +75,22 @@
 
 void Autostart::runAndWaitCommand(QProcess& process, const QString& command)
 {
-    qDebug() << "Application: onLaunchOnStartupChanged: Command to execute:" << command;
+    qDebug() << "{Application} onLaunchOnStartupChanged: Command to execute:" << command;
 
     process.start(command);
     process.waitForFinished();
 
     if (process.exitStatus() != QProcess::NormalExit) {
-        qDebug() << "Application: onLaunchOnStartupChanged: Command status:" << process.exitCode() << process.exitStatus() << process.error() << process.errorString();
+        qDebug() << "{Application} onLaunchOnStartupChanged: Command status:" << process.exitCode() << process.exitStatus() << process.error() << process.errorString();
     }
 
     QString output = process.readAll();
     if (!output.isEmpty()) {
-        qDebug() << "Application: onLaunchOnStartupChanged: Command output:" << output;
+        qDebug() << "{Application} onLaunchOnStartupChanged: Command output:" << output;
     }
 
     if (process.state() != QProcess::NotRunning) {
-        qWarning() << "Application: onLaunchOnStartupChanged: Command" << command << "was not finished. Forcing exit of process" << process.program();
+        qWarning() << "{Application} onLaunchOnStartupChanged: Command" << command << "was not finished. Forcing exit of process" << process.program();
         process.kill();
     }
 }

ovpn_2.4.0.orig.tar.gz/src/client/utils/daemonproxybase.cpp Changed

@@ -73,7 +73,7 @@
 //-----------------------------------------------------------------------------
 void
 DaemonProxyBase::emergencyQuit() {
-    qDebug() << "DaemonProxyBase: Emergency quit";
+    qDebug() << "{DaemonProxyBase} Emergency quit";
     _emergencyDisconnect();
 
     connectCheckTimer->stop();
@@ -101,7 +101,7 @@
     }
 
     if (!socketConnectedState) {
-        qDebug() << "DaemonProxyBase: Connection to ovpn-daemon is not valid, reconnection...";
+        qDebug() << "{DaemonProxyBase} Connection to ovpn-daemon is not valid, reconnection...";
         _reconnect();
     }
 }
@@ -118,7 +118,7 @@
 //-----------------------------------------------------------------------------
 void
 DaemonProxyBase::onConnected() {
-    qDebug() << "DaemonProxyBase: Connected to ovpn-daemon";
+    qDebug() << "{DaemonProxyBase} Connected to ovpn-daemon";
 
 #if 0
     // Clear command list at startup or reconnect
@@ -138,7 +138,7 @@
 
     while (!m_cmdList.isEmpty()) {
         const auto &cmd = m_cmdList.first();
-        qDebug() << "DaemonProxyBase: Send stored data:" << cmd;
+        qDebug() << "{DaemonProxyBase} Send stored data:" << cmd;
         sendTextMessage(cmd);
         m_cmdList.pop_front();
     }
@@ -150,7 +150,7 @@
 DaemonProxyBase::flush() {
 #ifdef ONLY_ONE_COMMAND_TO_FIREWALL
     if (!IPv6CommandToSend.isEmpty()) {
-        qDebug() << "DaemonProxyBase: Firewall flush command";
+        qDebug() << "{DaemonProxyBase} Firewall flush command";
         firewallIPv4CommandSent = false;
         sendCommand(IPv6CommandToSend);
     }
@@ -161,14 +161,14 @@
 void
 DaemonProxyBase::sendCommand(const QString &cmd) {
     if (cmd.isEmpty()) {
-        qDebug() << "DaemonProxyBase: Command is empty, skipping";
+        qDebug() << "{DaemonProxyBase} Command is empty, skipping";
     }
 
     if (socketConnectedState && _isValid()) {
 
 #ifdef ONLY_ONE_COMMAND_TO_FIREWALL
         if (firewallIPv4CommandSent && currentCommandIsFirewallIPv6Command(cmd)) {
-            qDebug() << "DaemonProxyBase: Firewall command is buffered";
+            qDebug() << "{DaemonProxyBase} Firewall command is buffered";
             IPv6CommandToSend = cmd;
             return;
         }
@@ -176,13 +176,13 @@
 
 #ifdef CHECK_KILLOVPN_COMMAND
         if (killOVpnCommandSent && currentCommandIsKillOvpnCommand(cmd)) {
-            qDebug() << "DaemonProxyBase: Killovpn command already sent, skipped";
+            qDebug() << "{DaemonProxyBase} Killovpn command already sent, skipped";
             return;
         }
 
         // safe checking
         if (killOVpnCommandSent && currentCommandIsStartOvpnCommand(cmd)) {
-            qDebug() << "DaemonProxyBase: Startovpn command is buffered";
+            qDebug() << "{DaemonProxyBase} Startovpn command is buffered";
             startOvpnCommandToSend = cmd;
             return;
         }
@@ -206,7 +206,7 @@
 #endif
 
     } else {
-        qDebug() << "DaemonProxyBase: Connection not available. Store:" << cmd;
+        qDebug() << "{DaemonProxyBase} Connection not available. Store:" << cmd;
         m_cmdList.push_back(cmd);
     }
 }
@@ -214,13 +214,13 @@
 //-----------------------------------------------------------------------------
 void
 DaemonProxyBase::onTextMessageReceived(const QString &message) {
-    qDebug() << "DaemonProxyBase: Receive:" << message;
+    qDebug() << "{DaemonProxyBase} Receive:" << message;
 
 #ifdef ONLY_ONE_COMMAND_TO_FIREWALL
     if (replyIsFinishedFirewallIPv4Command(message)) {
         firewallIPv4CommandSent = false;
         if (!IPv6CommandToSend.isEmpty()) {
-            qDebug() << "DaemonProxyBase: Send buffered Firewall command:" << IPv6CommandToSend;
+            qDebug() << "{DaemonProxyBase} Send buffered Firewall command:" << IPv6CommandToSend;
             sendCommand(IPv6CommandToSend);
         }
     }
@@ -232,7 +232,7 @@
         killOVpnCommandSent = false;
         checkKillOvpnreply = false;
         if (!startOvpnCommandToSend.isEmpty()) {
-            qDebug() << "DaemonProxyBase: Send buffered start ovpn command:" << startOvpnCommandToSend;
+            qDebug() << "{DaemonProxyBase} Send buffered start ovpn command:" << startOvpnCommandToSend;
             sendCommand(startOvpnCommandToSend);
         }
     }
@@ -240,7 +240,7 @@
     // check communication errors
     if (!killOVpnCommandSent && checkKillOvpnreply) {
         if (replyIsAnyKillOvpnCommand(message)) {
-            qDebug() << "DaemonProxyBase: Killovpn reply already got, skipping:" << message;
+            qDebug() << "{DaemonProxyBase} Killovpn reply already got, skipping:" << message;
             return;
         }
     }
@@ -314,7 +314,7 @@
 DaemonProxyBase::sendTextMessage(const QString &message) {
     QString cmd = QString("%1,%2").arg(messageId()).arg(message);
 
-    qDebug() << "DaemonProxyBase: Send command:" << cmd;
+    qDebug() << "{DaemonProxyBase} Send command:" << cmd;
 
     return _sendMessage(cmd);
 }

ovpn_2.4.0.orig.tar.gz/src/client/utils/daemonproxyipc.cpp Changed