Changes of Revision 26 - OVPN

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_08__15_45_33.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/ipc/linux/IPCAppLinux.cpp	124	warn	V560 A part of conditional expression is always false: !replyString.
-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/sentrysdk.cpp	1	err	V008 Unable to start the analysis on this file.

ovpn_2.4.0.orig.tar.gz/pvs-logs/pvs-tasks-client-2022_12_08__16_48_28.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/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/sentrysdk.cpp	1	err	V008 Unable to start the analysis on this file.
+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-ovpn-daemon-2022_12_08__15_45_51.log Deleted

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

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

@@ -15,10 +15,10 @@
 #
 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>_=(=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>_=('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>_=(=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
+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

ovpn_2.4.0.orig.tar.gz/scripts/logs-parsing.sh Changed

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

@@ -78,7 +78,7 @@
 OpenVpnManager::start() {
 
     startListeningServer();
-    qDebug() << "OpenVpnManager: Listening server started";
+    qDebug() << "{OpenVpnManager} Listening server started";
 }
 
 //-----------------------------------------------------------------------------
@@ -99,7 +99,7 @@
     TemporaryFile file;
     file.setAutoRemove(false);
     if (!file.open()) {
-        qCritical() << "OpenVpnManager: Cannot open file for writing!";
+        qCritical() << "{OpenVpnManager} Cannot open file for writing!";
         return;
     }
 
@@ -117,12 +117,12 @@
         if (TunnelUp == state() && m_socket->isOpen() && m_socket->isWritable()) {
             this->sendCommand(command);
         } else {
-            qCritical() << "OpenVpnManager: onCommand: Unable to send command" << command << Qt::endl
+            qCritical() << "{OpenVpnManager} onCommand: Unable to send command" << command << Qt::endl
                         << "\t\tDump socket status: Error/ErrorString/State:" << m_socket->error()
                         << m_socket->errorString() << m_socket->state();
         }
     } else {
-        qDebug() << "OpenVpnManager: onCommand: Skip command" << command
+        qDebug() << "{OpenVpnManager} onCommand: Skip command" << command
                  << ": Socket or Management Interface is not ready...";
     }
 }
@@ -142,11 +142,11 @@
 
     if (m_server->isListening()) {
         m_server->close();
-        qDebug() << "OpenVpnManager: ShutdownTunnel: listen server closed";
+        qDebug() << "{OpenVpnManager} ShutdownTunnel: listen server closed";
     }
 
     if (!m_socket) {
-        qDebug() << "OpenVpnManager: ShutdownTunnel: Management Interface socket is null";
+        qDebug() << "{OpenVpnManager} ShutdownTunnel: Management Interface socket is null";
         needForcedStop = true;
         m_isClosed = true;
         setState(TunnelDown);
@@ -154,24 +154,24 @@
     }
 
     const auto socketState = m_socket->state();
-    qDebug() << "OpenVpnManager: Attempting to shutdown tunnel, socket state" << socketState;
-    qDebug() << "OpenVpnManager: BEGIN";
+    qDebug() << "{OpenVpnManager} Attempting to shutdown tunnel, socket state" << socketState;
+    qDebug() << "{OpenVpnManager} BEGIN";
 
     if (socketState == QTcpSocket::ConnectedState) {
-        qDebug() << "OpenVpnManager: Send SIGTERM to openvpn";
+        qDebug() << "{OpenVpnManager} Send SIGTERM to openvpn";
         this->sendCommand("signal SIGTERM", true);
         m_socket->disconnectFromHost();
 
         m_isClosed = true;
 
         setState(TunnelDown);
-        qDebug() << "OpenVpnManager: END";
+        qDebug() << "{OpenVpnManager} END";
         return true;
     } else {
-        qDebug() << "OpenVpnManager: Socket state was not connected";
+        qDebug() << "{OpenVpnManager} Socket state was not connected";
     }
 
-    qDebug() << "OpenVpnManager: END";
+    qDebug() << "{OpenVpnManager} END";
 
     return false;
 }
@@ -180,25 +180,25 @@
 bool
 OpenVpnManager::softwareReset(bool useSigUsr1) {
     if (!m_socket) {
-        qDebug() << "OpenVpnManager: ShutdownTunnel: Management Interface socket is null";
+        qDebug() << "{OpenVpnManager} ShutdownTunnel: Management Interface socket is null";
         return false;
     }
 
     const QAbstractSocket::SocketState socketState = m_socket->state();
-    qDebug() << "OpenVpnManager: Attempting to do software reset, socket state" << socketState;
+    qDebug() << "{OpenVpnManager} Attempting to do software reset, socket state" << socketState;
 
     if (m_server->isListening()) {
         m_server->close();
-        qDebug() << "OpenVpnManager: ShutdownTunnel: listen server closed";
+        qDebug() << "{OpenVpnManager} ShutdownTunnel: listen server closed";
     }
 
 
     if (socketState == QTcpSocket::ConnectedState) {
-        qDebug() << "OpenVpnManager: Send SIGUSR1 to openvpn";
+        qDebug() << "{OpenVpnManager} Send SIGUSR1 to openvpn";
         this->sendCommand(QString("signal %1").arg(useSigUsr1 ? "SIGUSR1" : "SIGHUP"), true);
         return true;
     } else {
-        qDebug() << "OpenVpnManager: Socket state was not connected";
+        qDebug() << "{OpenVpnManager} Socket state was not connected";
     }
     return false;
 }
@@ -209,17 +209,17 @@
     m_server->setMaxPendingConnections(1);
 
     QObject::connect(m_server, &QTcpServer::acceptError, &(QAbstractSocket::SocketError socketError) {
-        qDebug() << "OpenVpnManager: acceptError:" << socketError;
+        qDebug() << "{OpenVpnManager} acceptError:" << socketError;
     });
 
     QObject::connect(m_server, &QTcpServer::newConnection, this, &() {
         m_isClosed = false;
-        qDebug() << "OpenVpnManager: New connection";
+        qDebug() << "{OpenVpnManager} New connection";
         m_socket = m_server->nextPendingConnection();
         m_server->close();
 
         QObject::connect(m_socket, &QTcpSocket::disconnected, &() {
-            //            qDebug() << "OpenVpnManager: QTcpSocket::disconnected: start";
+            //            qDebug() << "{OpenVpnManager} QTcpSocket::disconnected: start";
 
             auto socket = m_socket;
             socket->deleteLater();
@@ -227,7 +227,7 @@
         });
 
         QObject::connect(m_socket, &QTcpSocket::connected, &() {
-            qDebug() << "OpenVpnManager: QTcpSocket::connected:" << m_socket;
+            qDebug() << "{OpenVpnManager} QTcpSocket::connected:" << m_socket;
         });
 
         QObject::connect(m_socket, SIGNAL(readyRead()), this, SLOT(onReadyRead()));
@@ -238,10 +238,10 @@
     });
 
     if (!m_server->listen(QHostAddress(m_host), m_port)) {
-        qCritical() << "OpenVpnManager: Start: server listen error:" << m_host << m_port << m_server->serverError()
+        qCritical() << "{OpenVpnManager} Start: server listen error:" << m_host << m_port << m_server->serverError()
                     << m_server->errorString();
     } else {
-        qDebug() << "OpenVpnManager: Listening for incoming connection on" << m_host << m_port;
+        qDebug() << "{OpenVpnManager} Listening for incoming connection on" << m_host << m_port;
         emit listenStarted();
     }
 }
@@ -254,10 +254,10 @@
         if (QString::fromStdString(data.toStdString()) == ENTER_PASSWORD) {
             QString password = m_passwordData + "\r\n";
             qint64 sentBytes = m_socket->write(password.toUtf8());
-            qDebug() << "OpenVpnManager: Sent initial data:" << ((sentBytes < 0) ? "false" : "true");
+            qDebug() << "{OpenVpnManager} Sent initial data:" << ((sentBytes < 0) ? "false" : "true");
             return;
         }
-        qDebug() << "OpenVpnManager: onReadyRead: readyRead was emited, but can't read line:" << m_socket->error()
+        qDebug() << "{OpenVpnManager} onReadyRead: readyRead was emited, but can't read line:" << m_socket->error()
                  << m_socket->errorString();
     }
 
@@ -276,7 +276,7 @@
 //-----------------------------------------------------------------------------
 void
 OpenVpnManager::onError(QAbstractSocket::SocketError socketError) {
-    qCritical() << "OpenVpnManager: Can't connect to management interface. Error: " << socketError;
+    qCritical() << "{OpenVpnManager} Can't connect to management interface. Error: " << socketError;
 
     if (m_isClosed) {
         return;
@@ -297,32 +297,32 @@
 #ifdef EXTRA_LOGGING_ENABLED
     auto printManagement = &line() {
         if (line.contains(MANAGEMENT)) {
-            qDebug().noquote() << "OpenVpnManager: SocketHandler: Management:" << line;
+            qDebug().noquote() << "{OpenVpnManager} SocketHandler: Management:" << line;
         }
     };
 
     auto stateLogger = &line() {
         if (line.contains("CONNECTING")) {
-            qDebug() << "OpenVpnManager: SocketHandler: stateLogger: CONNECTING: OpenVPN's initial state.";
+            qDebug() << "{OpenVpnManager} SocketHandler: stateLogger: CONNECTING: OpenVPN's initial state.";
         } else if (line.contains("WAIT")) {
-            qDebug() << "OpenVpnManager: socketHandler: stateLogger: WAIT: (Client only) Waiting for initial response "
+            qDebug() << "{OpenVpnManager} socketHandler: stateLogger: WAIT: (Client only) Waiting for initial response "
                         "from server.";
         } else if (line.contains("AUTH")) {
-            qDebug() << "OpenVpnManager: socketHandler: stateLogger: AUTH: (Client only) Authenticating with server.";
+            qDebug() << "{OpenVpnManager} socketHandler: stateLogger: AUTH: (Client only) Authenticating with server.";
         } else if (line.contains("GET_CONFIG")) {
-            qDebug() << "OpenVpnManager: socketHandler: stateLogger: GET_CONFIG: (Client only) Downloading "
+            qDebug() << "{OpenVpnManager} socketHandler: stateLogger: GET_CONFIG: (Client only) Downloading "
                         "configuration options from server.";
         } else if (line.contains("ASSIGN_IP")) {
-            qDebug() << "OpenVpnManager: socketHandler: stateLogger: ASSIGN_IP: Assigning IP address to virtual "
+            qDebug() << "{OpenVpnManager} socketHandler: stateLogger: ASSIGN_IP: Assigning IP address to virtual "
                         "network interface.";
         } else if (line.contains("ADD_ROUTES")) {
-            qDebug() << "OpenVpnManager: socketHandler: stateLogger: ADD_ROUTES: Adding routes to system.";
+            qDebug() << "{OpenVpnManager} socketHandler: stateLogger: ADD_ROUTES: Adding routes to system.";
         } else if (line.contains("CONNECTED")) {
-            qDebug() << "OpenVpnManager: socketHandler: stateLogger: CONNECTED: Initialization Sequence Completed.";
+            qDebug() << "{OpenVpnManager} socketHandler: stateLogger: CONNECTED: Initialization Sequence Completed.";
         } else if (line.contains("RECONNECTING")) {
-            qDebug() << "OpenVpnManager: socketHandler: stateLogger: RECONNECTING: A restart has occurred.";
+            qDebug() << "{OpenVpnManager} socketHandler: stateLogger: RECONNECTING: A restart has occurred.";
         } else if (line.contains("EXITING")) {
-            qDebug() << "OpenVpnManager: socketHandler: stateLogger: EXITING: A graceful exit is in progress.";
+            qDebug() << "{OpenVpnManager} socketHandler: stateLogger: EXITING: A graceful exit is in progress.";
         }
     };
     Q_UNUSED(stateLogger)
@@ -335,18 +335,18 @@
     // On-connected handlers
     //
     if (line.startsWith(LOG_RECORD)) {
-        qDebug().noquote() << "OpenVpnManager: Log   record:" << line;
+        qDebug().noquote() << "{OpenVpnManager} Log   record:" << line;
         logHandler(line);
     } else if (line.startsWith(STATE_RECORD)) {
-        qDebug().noquote() << "OpenVpnManager: State record:" << line;
+        qDebug().noquote() << "{OpenVpnManager} State record:" << line;
         stateHandler(line);
     }
 
     else if (line.startsWith(BYTECOUNT_SUCCESS)) {
 #ifdef QT_DEBUG
-        qDebug() << "OpenVpnManager: Bytecount interval successfully activated " << line << "";
+        qDebug() << "{OpenVpnManager} Bytecount interval successfully activated " << line << "";
 #else
-        qDebug() << "OpenVpnManager: Bytecount interval successfully activated";
+        qDebug() << "{OpenVpnManager} Bytecount interval successfully activated";
 #endif
         emit bytecountActivated();
     }
@@ -356,17 +356,17 @@
             QStringList list = line.split(BYTECOUNT_ENTRY, Qt::SkipEmptyParts);
             if (list.count() == 0) {
                 qDebug() << "\t"
-                         << "OpenVpnManager: bytecountHandler: Wrong message format:" << BYTECOUNT_ENTRY
+                         << "{OpenVpnManager} bytecountHandler: Wrong message format:" << BYTECOUNT_ENTRY
                          << "was not found.";
             } else if (list.count() != 1) {
                 qDebug() << "\t"
-                         << "OpenVpnManager: bytecountHandler: Wrong message format:" << BYTECOUNT_ENTRY
+                         << "{OpenVpnManager} bytecountHandler: Wrong message format:" << BYTECOUNT_ENTRY
                          << "appeared more than once:" << list.count();
             }
 #ifdef DEBUG_LOG_PARSER
             else {
                 qDebug() << "\t"
-                         << "OpenVpnManager: bytecountHandler: Initial parsing successful. Message count:"
+                         << "{OpenVpnManager} bytecountHandler: Initial parsing successful. Message count:"
                          << list.count();
             }
 #endif
@@ -375,11 +375,11 @@
             if (msgList.count() == 2) {
                 emit this->bytecount(msgList0.toLongLong(), msgList1.toLongLong());
             } else {
-                qDebug() << "OpenVpnManager: Bytecount handler: Unexpected message format: Message body:" << msgList;
+                qDebug() << "{OpenVpnManager} Bytecount handler: Unexpected message format: Message body:" << msgList;
             }
         };
 #ifdef EXTRA_LOGGING_ENABLED
-        qDebug() << "OpenVpnManager: BYTECOUNT_ENTRY:" << line;
+        qDebug() << "{OpenVpnManager} BYTECOUNT_ENTRY:" << line;
 #endif
         bytecountHandler();
     }
@@ -388,9 +388,9 @@
     // Connect/Disconnect handlers
     //
     else if (line.startsWith(WELCOME)) {
-        qDebug().noquote() << "OpenVpnManager: WELCOME:" << line;
+        qDebug().noquote() << "{OpenVpnManager} WELCOME:" << line;
     } else if (line.startsWith(HOLD_RELEASE_WAITING)) {
-        qDebug().noquote() << "OpenVpnManager: HOLD_RELEASE_SUCCESS:" << line;
+        qDebug().noquote() << "{OpenVpnManager} HOLD_RELEASE_SUCCESS:" << line;
 
         // Some delay to prevent endless reconnection when "RECONNECTING, network-unreachable..."
         // Else log file will grow very fast
@@ -410,13 +410,13 @@
         lastReply = QDateTime::currentDateTime();
 
     } else if (line.startsWith(AUTH_REQUEST)) {
-        qDebug().noquote() << "OpenVpnManager:" << line;
+        qDebug().noquote() << "{OpenVpnManager}" << line;
 
         auto command = QString("username 'Auth' %1\n").arg(m_username);
         m_socket->write(command.toUtf8());
-        qDebug() << "OpenVpnManager: Username was entered by user";
+        qDebug() << "{OpenVpnManager} Username was entered by user";
     } else if (line.startsWith(USERNAME_SUCCESS)) {
-        qDebug().noquote() << "OpenVpnManager:" << line;
+        qDebug().noquote() << "{OpenVpnManager}" << line;
 
         // make sure quotes are allowed in the password:
         QString upass = m_password;
@@ -425,19 +425,19 @@
 
         auto command = QString("password 'Auth' \"%1\"\n").arg(upass);
         m_socket->write(command.toUtf8());
-        qDebug() << "OpenVpnManager: Password was entered by user";
+        qDebug() << "{OpenVpnManager} Password was entered by user";
     } else if (line.startsWith(AUTH_FAILED)) {
-        qDebug().noquote() << "OpenVpnManager:" << line;
+        qDebug().noquote() << "{OpenVpnManager}" << line;
         setState(TunnelError);
         this->sendCommand("exit");
         m_socket->disconnectFromHost();
     } else if (line.startsWith(LOG_ON_SUCCESS)) {
-        qDebug().noquote() << "OpenVpnManager: LOG_ON_SUCCESS:" << line;
+        qDebug().noquote() << "{OpenVpnManager} LOG_ON_SUCCESS:" << line;
     }
 
 #ifdef LOGGING_LINE_ANY_ENABLED
     else {
-        qDebug() << "OpenVpnManager: socketHandler: LINE ANY:"
+        qDebug() << "{OpenVpnManager} socketHandler: LINE ANY:"
                  << "\n\t" << line;
     }
 #endif
@@ -450,7 +450,7 @@
         int startIndex = line.indexOf(",,") + 2;
         int endIndex = line.indexOf(",,,,");
         if (startIndex == -1 || endIndex == -1) {
-            qWarning() << "OpenVpnManager: stateHandler: STATE_ASSIGN_IP error: Can't parse OpenVPN process state:"
+            qWarning() << "{OpenVpnManager} stateHandler: STATE_ASSIGN_IP error: Can't parse OpenVPN process state:"
                        << line;
             return;
         }
@@ -463,22 +463,22 @@
         if (testAddress.setAddress(ip) && !testAddress.isNull()) {
             emit assignIpV4(ip);
         } else {
-            qWarning() << "OpenVpnManager: stateHandler: STATE_ASSIGN_IP error: Can't validate IPv4 address:" << ip;
+            qWarning() << "{OpenVpnManager} stateHandler: STATE_ASSIGN_IP error: Can't validate IPv4 address:" << ip;
             return;
         }
     } else if (line.contains(STATE_CONNECTED)) {
-        qWarning() << "OpenVpnManager: stateHandler: State connected not supported anymore:" << STATE_CONNECTED;
+        qWarning() << "{OpenVpnManager} stateHandler: State connected not supported anymore:" << STATE_CONNECTED;
     } else if (line.contains(STATE_RECONNECTING)) {
         setState(TunnelReconnecting);
     } else if (line.contains(STATE_ERROR)) {
         setState(TunnelError);
         // m_socket->disconnectFromHost();
         // this->sendCommand("exit");
-        qWarning() << "OpenVpnManager: stateHandler: State error: " << line;
+        qWarning() << "{OpenVpnManager} stateHandler: State error: " << line;
     }
 #ifdef UNKNOWN_LOGGING_ENABLED
     else {
-        qDebug() << "OpenVpnManager: stateHandler: Unknown:" << line;
+        qDebug() << "{OpenVpnManager} stateHandler: Unknown:" << line;
     }
 #endif
 }
@@ -570,10 +570,10 @@
         emit dnsIPv6Pushed(connection.isDNSIPv6Valid());
 
     } else if (line.contains(STATE_UDPV4) && line.contains(ASSIGNIP_ERROR_PATTERN)) {
-        qDebug() << "OpenVpnManager: Can't assign requested address";
+        qDebug() << "{OpenVpnManager} Can't assign requested address";
         emit assignIpError();
     } else if (getLogField(line, 2) == INIT_SEQ_COMPLETED) {
-        qDebug() << "OpenVpnManager: logHandler:" << INIT_SEQ_COMPLETED;
+        qDebug() << "{OpenVpnManager} logHandler:" << INIT_SEQ_COMPLETED;
         setState(TunnelUp);
     } else if (line.contains(ROUTE_GATEWAY)) {
         //">LOG:1586771137,,ROUTE_GATEWAY 192.168.80.2/255.255.255.0 I=7 HWADDR=00:50:56:3d:f5:57"
@@ -613,7 +613,7 @@
     }
 #ifdef UNKNOWN_LOGGING_ENABLED
     else {
-        qDebug() << "OpenVpnManager: logHandler: Unknown:" << line;
+        qDebug() << "{OpenVpnManager} logHandler: Unknown:" << line;
     }
 #endif
 }
@@ -625,21 +625,21 @@
     QString cmdDebug = cmd.contains("password") ? cmd.left(16) + "...\n" : cmd;
 #endif
     if (cmd.isEmpty())
-        qDebug() << "OpenVpnManager: (Management Interface) sendCommand: The command that about to send is empty";
+        qDebug() << "{OpenVpnManager} (Management Interface) sendCommand: The command that about to send is empty";
 #ifdef EXTRA_LOGGING_ENABLED
     else
-        qDebug() << "OpenVpnManager: (Management Interface) sendCommand:" << cmdDebug;
+        qDebug() << "{OpenVpnManager} (Management Interface) sendCommand:" << cmdDebug;
 #endif
 
     if (!m_socket->isOpen()) {
-        qWarning() << "OpenVpnManager: sendCommand: socket is not open" << m_socket->error() << m_socket->errorString();
+        qWarning() << "{OpenVpnManager} sendCommand: socket is not open" << m_socket->error() << m_socket->errorString();
     }
     if (!m_socket->isValid()) {
-        qWarning() << "OpenVpnManager: sendCommand: socket is not valid" << m_socket->error()
+        qWarning() << "{OpenVpnManager} sendCommand: socket is not valid" << m_socket->error()
                    << m_socket->errorString();
     }
     if (!m_socket->isWritable()) {
-        qWarning() << "OpenVpnManager: sendCommand: socket is not open" << m_socket->error() << m_socket->errorString();
+        qWarning() << "{OpenVpnManager} sendCommand: socket is not open" << m_socket->error() << m_socket->errorString();
     }
 
     QTextStream out(m_socket);
@@ -650,7 +650,7 @@
     }
 #ifdef EXTRA_LOGGING_ENABLED
     else {
-        qDebug() << "OpenVpnManager: sendCommand: socket write should be successful. SendCommand:" << cmdDebug;
+        qDebug() << "{OpenVpnManager} sendCommand: socket write should be successful. SendCommand:" << cmdDebug;
     }
 #endif
 }