Changes of Revision 17 - 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__08_51_39.log Changed

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

ovpn_2.4.0.orig.tar.gz/pvs-logs/pvs-tasks-ovpn-daemon-2022_12_07__08_51_58.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>_=('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>_=('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>_=(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>_=(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>_=(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

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

@@ -29,25 +29,43 @@
 source "${SCRIPT_FOLDER}/helpers.sh"
 
 # Catch errors
-set -o errtrace
-trap 'err_trap  $@' ERR
+# set -o errtrace
+# trap 'err_trap  $@' ERR
 
 
 # -----------------------------------------------------------------------------
+check_part() {
+    if  z"${2}" == "z" ; then
+        echo "${1}" >> "${SKIP_FILE}"
+        return 128
+    fi 
+
+    return 0
+}
+
+# -----------------------------------------------------------------------------
 process_line() {
     DT=$(echo ${1} | awk -F'' '{print $2}')
+    check_part "${1}" "${DT}" || return
+
     TYPE=$(echo ${1} | awk -F'' '{print $4}')
+    check_part "${1}" "${TYPE}" || return
+
     MESSAGE_FULL=$(echo ${1} | awk -F'' '{print $6}')
     SUBMODULE=$(echo ${MESSAGE_FULL} | awk -F'{}' '{print $2}')
-    MESSAGE=$(echo ${MESSAGE_FULL} | awk -F'{}' '{print $3}')
-    echo "Date/Time,Type,Module,Submodule,Message" > "${CSV_FILE}"
-    # echo ">>> DT = ${DT}    TYPE = ${TYPE}   SUBMODULE = ${SUBMODULE}   MESSAGE = ${MESSAGE}"
+    check_part "${1}" "${SUBMODULE}" || return
+
+    MESSAGE=$(echo ${MESSAGE_FULL} | awk -F'{}' '{print $3 $4 $5 $6}')
+    MESSAGE=${MESSAGE//,/_}
+    check_part "${1}" "${MESSAGE}" || return
+
+    echo "${DT},${TYPE},"${2}",${SUBMODULE},${MESSAGE}" >> "${CSV_FILE}"
 }
 
 # -----------------------------------------------------------------------------
 process_log_file() {
     while read p; do
-        process_line "$p"
+        process_line "$p" "application"
     done <"${1}"
 }
 
@@ -72,9 +90,16 @@
 readonly ARTIFACTS_DIR="${ARTIFACTS_BASE_DIR}"
 mkdir -p "${ARTIFACTS_DIR}"
 readonly CSV_FILE="${ARTIFACTS_DIR}/${DT_STR}.csv"
+readonly SKIP_FILE="${ARTIFACTS_DIR}/${DT_STR}_skip.txt"
 
 # Start logs processing
+TITLE="Logs processing"
+_start "${TITLE}"
+
 echo "Date/Time,Type,Module,Submodule,Message" > "${CSV_FILE}"
+echo "--- SKIPPED DATA ---" > "${SKIP_FILE}"
 pushd "${ARTIFACTS_DIR}"
 process_logs_dir "${LOGS_DIR}"
 popd
+
+_finish "${TITLE}"

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

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

@@ -280,7 +280,7 @@
 //-----------------------------------------------------------------------------
 void
 QmlApp::onIddleTimerTimeout() {
-    qDebug().noquote().nospace() << "QmlApp: Iddle timeout";
+    qDebug().noquote().nospace() << "{QmlApp} Iddle timeout";
 
     processRegularEvents();
 }
@@ -331,7 +331,7 @@
         DataCenterList datacenterList =
                 m_networkApi->dataCenterList().dataCenterListForCountry(settings->location(), QString());
         if (datacenterList.isEmpty()) {
-            qDebug().noquote().nospace() << QString("QmlApp: The country code '%1' does not exists, removing from list")
+            qDebug().noquote().nospace() << QString("{QmlApp} The country code '%1' does not exists, removing from list")
                                                     .arg(settings->location());
             settings->setLocation(QString());
         }
@@ -460,7 +460,7 @@
 
     OvpnSe::Ovpn::UserSettings *userSettings = userSettingsObject();
     if (!userSettings) {
-        qDebug().noquote().nospace() << "QmlApp: ReadFromKeychainStorage: userSettings is null";
+        qDebug().noquote().nospace() << "{QmlApp} ReadFromKeychainStorage: userSettings is null";
         emit credentialsDataReaded(m_userName, m_password);
         return;
     }
@@ -499,7 +499,7 @@
     QJsonDocument keyChainDocument = QJsonDocument::fromJson(rawData, &jsonError);
     if (jsonError.error != QJsonParseError::NoError) {
         qDebug().noquote().nospace()
-                << QString("QmlApp: Cannot parse JSON document. Error: '%1'").arg(jsonError.errorString());
+                << QString("{QmlApp} Cannot parse JSON document. Error: '%1'").arg(jsonError.errorString());
         return;
     }
 
@@ -513,7 +513,7 @@
 QmlApp::writeToKeyChainStorage() {
     OvpnSe::Ovpn::UserSettings *userSettings = userSettingsObject();
     if (!userSettings) {
-        qDebug().noquote().nospace() << "QmlApp::writeToKeyChainStorage: userSettings is null";
+        qDebug().noquote().nospace() << "{QmlApp}:writeToKeyChainStorage: userSettings is null";
         return;
     }
 
@@ -799,7 +799,7 @@
         }
 
         int pingData = m_serverListModel->pingDataForIp(dataCenter.pingAddress());
-        qDebug().noquote().nospace() << QString("QmlApp: Datacenter in %1: ").arg(dataCenter.countryName())
+        qDebug().noquote().nospace() << QString("{QmlApp} Datacenter in %1: ").arg(dataCenter.countryName())
                                      << dataCenter.slug() << ", " << dataCenter.pingAddress()
                                      << QString(", %1ms").arg(pingData);
         if (pingData < m_serverListModel->pingDataForIp((dataCenterListselectedDatacenterIndex).pingAddress())) {
@@ -818,14 +818,14 @@
     }
 
     if (selectedDatacenterIndex < 0) {
-        qDebug().noquote().nospace() << QString("QmlApp: Critical, can't find datacenter with lowest ping");
+        qDebug().noquote().nospace() << QString("{QmlApp} Critical, can't find datacenter with lowest ping");
         return Server();
     }
 
     // 2. Get datacenter with lowest ping
     const DataCenter &dataCenter = dataCenterListselectedDatacenterIndex;
 
-    qDebug().noquote().nospace() << "QmlApp: Datacenter with lowest ping: " << dataCenter.slug() << ", "
+    qDebug().noquote().nospace() << "{QmlApp} Datacenter with lowest ping: " << dataCenter.slug() << ", "
                                  << dataCenter.pingAddress()
                                  << QString(", %1ms").arg(m_serverListModel->pingDataForIp(dataCenter.pingAddress()));
 
@@ -869,7 +869,7 @@
     const QString serverLocation = addonIPv4 ? settings->tmpLocation() : location;
 
     if (locationIsAuto && !addonIPv4) {
-        qDebug().noquote().nospace() << "QmlApp: Selected location: Auto";
+        qDebug().noquote().nospace() << "{QmlApp} Selected location: Auto";
         selectedServer =
                 findBestServerInternal(m_networkApi->dataCenterList().removeDevDataCenters(), theSecondAfterBest);
 
@@ -878,13 +878,13 @@
         }
 
     } else if (locationIsManual) {
-        qDebug().noquote().nospace() << "QmlApp: Selected location: Manually";
+        qDebug().noquote().nospace() << "{QmlApp} Selected location: Manually";
 
         selectedServer = m_networkApi->dataCenterList().serverByServerName(serverName);
 
     } else { // Best server in country
         const QString countryName = DataCenter::countryCodeToCountryName(serverLocation);
-        qDebug().noquote().nospace() << "QmlApp: Selected location: Best server in country: " << countryName;
+        qDebug().noquote().nospace() << "{QmlApp} Selected location: Best server in country: " << countryName;
 
         // Get datacenter list for this country
         DataCenterList dataCenterList = m_networkApi->dataCenterList().dataCenterListForCountry(
@@ -898,7 +898,7 @@
     }
 
     qDebug().noquote().nospace()
-            << QString("QmlApp: Selected server: %1 (%2) ").arg(selectedServer.name()).arg(selectedServer.ip());
+            << QString("{QmlApp} Selected server: %1 (%2) ").arg(selectedServer.name()).arg(selectedServer.ip());
 
     return selectedServer.valid();
 }
@@ -963,13 +963,13 @@
     }
 
     if (!updateEntryServer(theSecondAfterBest)) {
-        qDebug().noquote().nospace() << "QmlApp: Critical error, can't find selected server";
+        qDebug().noquote().nospace() << "{QmlApp} Critical error, can't find selected server";
         return false;
     }
 
     if (UserInfo::Addon::Multihop == static_cast<UserInfo::Addon>(settings->addon())) {
         if (!updateExitServer(theSecondAfterBest)) {
-            qDebug().noquote().nospace() << "QmlApp: Critical error, can't find selected exit server";
+            qDebug().noquote().nospace() << "{QmlApp} Critical error, can't find selected exit server";
             return false;
         }
 
@@ -1011,7 +1011,7 @@
 QmlApp::connectToVpn(bool manually) {
     m_abortConnectionAttemptAutomatically = manually;
 
-    qDebug().noquote() << QString("QmlApp: Connect to VPN (abort connection attempt automatically: %1)")
+    qDebug().noquote() << QString("{QmlApp} Connect to VPN (abort connection attempt automatically: %1)")
                                   .arg(Utils::BoolToString(m_abortConnectionAttemptAutomatically));
 
     //
@@ -1066,10 +1066,10 @@
                        ovpn->setProperty("tcp", false);
                    }
 
-                   qDebug().noquote().nospace() << QString("QmlApp: Start connection to VPN : %1 (%2)")
+                   qDebug().noquote().nospace() << QString("{QmlApp} Start connection to VPN : %1 (%2)")
                                                            .arg(selectedServerIp())
                                                            .arg(ports().toStringList().join(","));
-                   qDebug() << "QmlApp: DNS Servers : IPv4 = " << ipv4DNS << " : IPv6 = " << ipv6DNS;
+                   qDebug() << "{QmlApp} DNS Servers : IPv4 = " << ipv4DNS << " : IPv6 = " << ipv6DNS;
 
                    updateQmlProperties();
 
@@ -1696,7 +1696,7 @@
         onRequestAllDataCenterServersFinished(true, 0);
     }
 
-    qDebug().noquote().nospace() << QString("QmlApp: Check Internet Connection Finished: %1, %2")
+    qDebug().noquote().nospace() << QString("{QmlApp} Check Internet Connection Finished: %1, %2")
                                             .arg(Utils::BoolToString(success))
                                             .arg(Utils::BoolToString(networkMaintenanceMode));