Changes of Revision 20 - 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_07__12_45_11.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_07__14_37_54.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_07__12_45_30.log Deleted

ovpn_2.4.0.orig.tar.gz/pvs-logs/pvs-tasks-ovpn-daemon-2022_12_07__14_38_11.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>_=( -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>_=(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>_=('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>_=(=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>_=('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>_=(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>_=(=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>_=(=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>_=('8PPU>_}'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/debug.cpp Changed

@@ -23,8 +23,9 @@
 QString Debug::m_ovpnLogName;
 QMutex Debug::m_mutex;
 
-void debugMessageHandler(QtMsgType type, const QMessageLogContext& context, const QString& msg)
-{
+// ----------------------------------------------------------------------------
+void
+debugMessageHandler(QtMsgType type, const QMessageLogContext &context, const QString &msg) {
     // Disable some string...
     if (msg.startsWith("QObject::startTimer: Timers cannot have negative intervals")) {
         return;
@@ -39,17 +40,17 @@
     bool isOK = false;
     {
         QMutexLocker mutexLocker(&Debug::m_mutex);
- #ifdef DEBUG_CONSOLE
+#ifdef DEBUG_CONSOLE
         std::cout << qFormatLogMessage(type, context, msg).toStdString() << std::endl << std::flush;
         isOK = true;
- #else
-         if (!Debug::m_clientLogTextStream.device() || !Debug::m_clientLogTextStream.device()->isOpen()) {
-             return;
-         }
-         Debug::m_clientLogTextStream << qFormatLogMessage(type, context, msg) << Qt::endl << Qt::flush;
-         isOK = Debug::m_clientLogTextStream.status() != QTextStream::WriteFailed;
+#else
+        if (!Debug::m_clientLogTextStream.device() || !Debug::m_clientLogTextStream.device()->isOpen()) {
+            return;
+        }
+        Debug::m_clientLogTextStream << qFormatLogMessage(type, context, msg) << Qt::endl << Qt::flush;
+        isOK = Debug::m_clientLogTextStream.status() != QTextStream::WriteFailed;
 
- #endif
+#endif
     }
 
     if (!isOK) {
@@ -59,18 +60,23 @@
             if (!Debug::m_clientLogTextStream.device() || !Debug::m_clientLogTextStream.device()->isOpen()) {
                 return;
             }
-            Debug::m_clientLogTextStream << qFormatLogMessage(QtWarningMsg, QMessageLogContext(), "--- Reloading log file ---") << Qt::endl << Qt::flush;
+            Debug::m_clientLogTextStream << qFormatLogMessage(
+                                                    QtWarningMsg, QMessageLogContext(), "--- Reloading log file ---")
+                                         << Qt::endl
+                                         << Qt::flush;
         }
     }
 }
 
-QString Debug::dateTimeFormatString()
-{
+// ----------------------------------------------------------------------------
+QString
+Debug::dateTimeFormatString() {
     return FORMAT_STRING;
 }
 
-void Debug::richLogMessage(const QString& message)
-{
+// ----------------------------------------------------------------------------
+void
+Debug::richLogMessage(const QString &message) {
     QMutexLocker mutexLocked(&m_mutex);
     if (!Debug::m_clientLogTextStream.device() || !Debug::m_clientLogTextStream.device()->isOpen()) {
         return;
@@ -90,8 +96,9 @@
     Debug::m_clientLogTextStream << qFormatLogMessage(type, context, line) << Qt::endl << Qt::flush;
 }
 
-void Debug::reOpenLog()
-{
+// ----------------------------------------------------------------------------
+void
+Debug::reOpenLog() {
     static int maxCount = 1000;
     static int reopenCount = 0;
 
@@ -112,8 +119,9 @@
     reopenCount++;
 }
 
-bool Debug::init()
-{
+// ----------------------------------------------------------------------------
+bool
+Debug::init() {
     QMutexLocker mutexLocker(&Debug::m_mutex);
     const QString path = Utils::GetAppDataLocation();
     QDir appDir(path);
@@ -137,12 +145,10 @@
     // Delete older log files
     auto clientLogsCount = 0;
     auto ovpnLogsCount = 0;
-    QFileInfoList logDirList = appDir.entryInfoList(
-                QDir::Files | QDir::NoDotAndDotDot,
-                QDir::Time);
+    QFileInfoList logDirList = appDir.entryInfoList(QDir::Files | QDir::NoDotAndDotDot, QDir::Time);
     for (auto fileInfo : logDirList) {
         if ((fileInfo.completeSuffix() == CLIENT_LOG_SUFFIX && ++clientLogsCount > MAX_LOG_FILES) ||
-                (fileInfo.completeSuffix() == OVPN_LOG_SUFFIX && ++ovpnLogsCount > MAX_LOG_FILES)) {
+            (fileInfo.completeSuffix() == OVPN_LOG_SUFFIX && ++ovpnLogsCount > MAX_LOG_FILES)) {
             appDir.remove(fileInfo.filePath());
         }
     }
@@ -153,7 +159,7 @@
     m_clientLogName = QString("%1.%2").arg(currentDateTime).arg(CLIENT_LOG_SUFFIX);
     m_ovpnLogName = QString("%1.%2").arg(currentDateTime).arg(OVPN_LOG_SUFFIX);
 
-    qSetMessagePattern("%{time yyyy-MM-dd hh:mm:ss} %{type} - %{message}");
+    qSetMessagePattern("%{time yyyy-MM-dd hh:mm:ss.zzz} %{type} - %{message}");
 
     m_clientLog.setFileName(appDir.filePath(m_clientLogName));
     if (!m_clientLog.open(QIODevice::WriteOnly | QIODevice::Append)) {
@@ -175,12 +181,12 @@
     return true;
 }
 
-QString Debug::getPathToOvpnLog()
-{
+// ----------------------------------------------------------------------------
+QString
+Debug::getPathToOvpnLog() {
     QString path = Utils::GetAppDataLocation();
     QDir appDir(path);
-    if (!appDir.exists(LOGS_DIR) || !appDir.cd(LOGS_DIR))
-    {
+    if (!appDir.exists(LOGS_DIR) || !appDir.cd(LOGS_DIR)) {
         qWarning() << "Debug: log directory doesn't exist or cd command error:" << path;
         return "";
     }
@@ -188,8 +194,9 @@
     return appDir.filePath(m_ovpnLogName);
 }
 
-QString Debug::getPathToClientLog()
-{
+// ----------------------------------------------------------------------------
+QString
+Debug::getPathToClientLog() {
     QString path = Utils::GetAppDataLocation();
     QDir appDir(path);
 
@@ -201,8 +208,9 @@
     return appDir.filePath(m_clientLogName);
 }
 
-QString Debug::getPathToLogsDir()
-{
+// ----------------------------------------------------------------------------
+QString
+Debug::getPathToLogsDir() {
     QString path = Utils::GetAppDataLocation();
     QDir appDir(path);
 
@@ -213,21 +221,22 @@
     return appDir.absolutePath();
 }
 
-bool Debug::fixOvpnLogPermissions()
-{
+// ----------------------------------------------------------------------------
+bool
+Debug::fixOvpnLogPermissions() {
     const auto ovpnLogPath = getPathToOvpnLog();
     if (ovpnLogPath.isEmpty())
         return false;
 
     QFile ovpnLog(ovpnLogPath);
-    if (!ovpnLog.open(QIODevice::ReadWrite))
-    {
-        qWarning() << "Debug: openvpn log file was not opened" << ovpnLogPath
-                   << ", error" << ovpnLog.error();
+    if (!ovpnLog.open(QIODevice::ReadWrite)) {
+        qWarning() << "Debug: openvpn log file was not opened" << ovpnLogPath << ", error" << ovpnLog.error();
         return false;
     }
 
     ovpnLog.close();
     return true;
 }
-}
+
+// ----------------------------------------------------------------------------
+} // namespace OvpnSe