diff --git a/backend/linux/helper/firewallcontroller.cpp b/backend/linux/helper/firewallcontroller.cpp index b39d60d3..a6b31a7e 100644 --- a/backend/linux/helper/firewallcontroller.cpp +++ b/backend/linux/helper/firewallcontroller.cpp @@ -75,8 +75,9 @@ void FirewallController::disable() } -void FirewallController::setSplitTunnelingEnabled(bool isEnabled, bool isExclude) +void FirewallController::setSplitTunnelingEnabled(bool isConnected, bool isEnabled, bool isExclude) { + connected_ = isConnected; splitTunnelEnabled_ = isEnabled; splitTunnelExclude_ = isExclude; @@ -103,7 +104,7 @@ void FirewallController::removeInclusiveRules() void FirewallController::setSplitTunnelExceptions(const std::vector &ips) { - if (!splitTunnelEnabled_) { + if (!connected_ || !splitTunnelEnabled_) { removeInclusiveRules(); removeExclusiveRules(); splitTunnelIps_ = ips; diff --git a/backend/linux/helper/firewallcontroller.h b/backend/linux/helper/firewallcontroller.h index ed0679e2..a299c6cf 100644 --- a/backend/linux/helper/firewallcontroller.h +++ b/backend/linux/helper/firewallcontroller.h @@ -17,14 +17,15 @@ class FirewallController bool enabled(const std::string &tag); void getRules(bool ipv6, std::string *outRules); - void setSplitTunnelingEnabled(bool isEnabled, bool isExclude); + void setSplitTunnelingEnabled(bool isConnected, bool isEnabled, bool isExclude); void setSplitTunnelExceptions(const std::vector &ips); private: - FirewallController() : enabled_(false) {}; + FirewallController() : enabled_(false), connected_(false), splitTunnelEnabled_(false), splitTunnelExclude_(true) {}; ~FirewallController() { disable(); }; bool enabled_; + bool connected_; bool splitTunnelEnabled_; bool splitTunnelExclude_; std::vector splitTunnelIps_; diff --git a/backend/linux/helper/split_tunneling/hostnames_manager/hostnames_manager.cpp b/backend/linux/helper/split_tunneling/hostnames_manager/hostnames_manager.cpp index d3d44ebe..a953e322 100644 --- a/backend/linux/helper/split_tunneling/hostnames_manager/hostnames_manager.cpp +++ b/backend/linux/helper/split_tunneling/hostnames_manager/hostnames_manager.cpp @@ -45,6 +45,7 @@ void HostnamesManager::disable() isEnabled_ = false; } dnsResolver_.cancelAll(); + FirewallController::instance().setSplitTunnelExceptions(std::vector()); Logger::instance().out("HostnamesManager::disable(), end"); } diff --git a/backend/linux/helper/split_tunneling/split_tunneling.cpp b/backend/linux/helper/split_tunneling/split_tunneling.cpp index 7c2e13b8..2962e9ab 100644 --- a/backend/linux/helper/split_tunneling/split_tunneling.cpp +++ b/backend/linux/helper/split_tunneling/split_tunneling.cpp @@ -46,7 +46,7 @@ void SplitTunneling::setSplitTunnelingParams(bool isActive, bool isExclude, cons void SplitTunneling::updateState() { - FirewallController::instance().setSplitTunnelingEnabled(isSplitTunnelActive_, isExclude_); + FirewallController::instance().setSplitTunnelingEnabled(connectStatus_.isConnected, isSplitTunnelActive_, isExclude_); if (connectStatus_.isConnected && isSplitTunnelActive_) { if (isExclude_) { diff --git a/backend/mac/helper/firewallcontroller.cpp b/backend/mac/helper/firewallcontroller.cpp index ed2557d9..cd62d2de 100644 --- a/backend/mac/helper/firewallcontroller.cpp +++ b/backend/mac/helper/firewallcontroller.cpp @@ -61,8 +61,9 @@ bool FirewallController::enabled() return (output.find("Status: Enabled") != std::string::npos); } -void FirewallController::setSplitTunnelingEnabled(bool isEnabled, bool isExclude) +void FirewallController::setSplitTunnelingEnabled(bool isConnected, bool isEnabled, bool isExclude) { + connected_ = isConnected; splitTunnelEnabled_ = isEnabled; splitTunnelExclude_ = isExclude; @@ -78,7 +79,7 @@ void FirewallController::setSplitTunnelExceptions(const std::vector std::string ipStr = "table persist { "; - if (!splitTunnelEnabled_) { + if (!connected_ || !splitTunnelEnabled_) { // If split tunneling is disabled, treat this table as if there are no IPs ipStr += " }\n"; } else if (splitTunnelExclude_) { diff --git a/backend/mac/helper/firewallcontroller.h b/backend/mac/helper/firewallcontroller.h index d7bfd4bf..aa61a5c7 100644 --- a/backend/mac/helper/firewallcontroller.h +++ b/backend/mac/helper/firewallcontroller.h @@ -15,17 +15,17 @@ class FirewallController bool enable(const std::string &rules, const std::string &table, const std::string &group); bool enabled(); void disable(bool keepPfEnabled = false); - void setSplitTunnelingEnabled(bool isEnabled, bool isExclude); + void setSplitTunnelingEnabled(bool isConnected, bool isEnabled, bool isExclude); void setSplitTunnelExceptions(const std::vector &ips); void getRules(const std::string &table, const std::string &group, std::string *outRules); private: - FirewallController() : enabled_(false) {}; + FirewallController() : enabled_(false), connected_(false), splitTunnelEnabled_(false), splitTunnelExclude_(true) {}; ~FirewallController() { disable(); }; bool enabled_; + bool connected_; bool splitTunnelEnabled_; bool splitTunnelExclude_; std::vector splitTunnelIps_; }; - diff --git a/backend/mac/helper/helper-info.plist b/backend/mac/helper/helper-info.plist index d0357ed6..4e632861 100644 --- a/backend/mac/helper/helper-info.plist +++ b/backend/mac/helper/helper-info.plist @@ -9,7 +9,7 @@ CFBundleName WindscribeHelper CFBundleVersion - 56 + 57 NSHumanReadableCopyright Copyright © 2023 Windscribe Limited. All rights reserved. LSMinimumSystemVersion diff --git a/backend/mac/helper/ip_hostnames/ip_hostnames_manager.cpp b/backend/mac/helper/ip_hostnames/ip_hostnames_manager.cpp index c9c2b49c..61c8c14e 100644 --- a/backend/mac/helper/ip_hostnames/ip_hostnames_manager.cpp +++ b/backend/mac/helper/ip_hostnames/ip_hostnames_manager.cpp @@ -30,6 +30,7 @@ void IpHostnamesManager::disable() return; } + FirewallController::instance().setSplitTunnelExceptions(std::vector()); ipRoutes_.clear(); isEnabled_ = false; } diff --git a/backend/mac/helper/split_tunneling/split_tunneling.cpp b/backend/mac/helper/split_tunneling/split_tunneling.cpp index b325612c..3cb1f09d 100644 --- a/backend/mac/helper/split_tunneling/split_tunneling.cpp +++ b/backend/mac/helper/split_tunneling/split_tunneling.cpp @@ -46,7 +46,7 @@ void SplitTunneling::setSplitTunnelingParams(bool isActive, bool isExclude, cons void SplitTunneling::updateState() { - FirewallController::instance().setSplitTunnelingEnabled(isSplitTunnelActive_, isExclude_); + FirewallController::instance().setSplitTunnelingEnabled(connectStatus_.isConnected, isSplitTunnelActive_, isExclude_); if (connectStatus_.isConnected && isSplitTunnelActive_) { if (isExclude_) { diff --git a/client/common/changelog.txt b/client/common/changelog.txt index 3357d3b3..91eca16e 100644 --- a/client/common/changelog.txt +++ b/client/common/changelog.txt @@ -1,3 +1,17 @@ +2.8.4 (28/11/2023) +All: + * Fixed UI issue where search tab may overlay other tabs. #811 + * Fixed UI screen transition issues when anti-abuse is triggered. #817 + * Upgraded to OpenVPN 2.6.8. #759 +Windows: + * Fixed custom OpenVPN configs fail to connect. This was due to a bug in OpenVPN 2.6.7. #759 +macOS: + * Fixed firewall not blocking traffic while disconnected in split inclusive mode #748 +Linux: + * Fixed firewall not blocking traffic while disconnected in split inclusive mode #748 + * Removed "Docked"/"Pinned" feature from preferences. #241 + + 2.8.3 (24/11/2023) All: * Improved anti-censorship feature. Feature automatically enabled for first-run users in censored countries. #770 diff --git a/client/common/version/windscribe_version.h b/client/common/version/windscribe_version.h index 11bb80b0..5791801c 100644 --- a/client/common/version/windscribe_version.h +++ b/client/common/version/windscribe_version.h @@ -2,7 +2,7 @@ #define WINDSCRIBE_MAJOR_VERSION 2 #define WINDSCRIBE_MINOR_VERSION 8 -#define WINDSCRIBE_BUILD_VERSION 3 +#define WINDSCRIBE_BUILD_VERSION 4 // only one of these should be enabled; neither -> stable //#define WINDSCRIBE_IS_BETA diff --git a/client/gui/backend/preferences/preferences.cpp b/client/gui/backend/preferences/preferences.cpp index aab3796d..0fb1c849 100644 --- a/client/gui/backend/preferences/preferences.cpp +++ b/client/gui/backend/preferences/preferences.cpp @@ -154,7 +154,12 @@ void Preferences::setBackgroundSettings(const types::BackgroundSettings &backgro bool Preferences::isDockedToTray() const { + // no longer supported on Linux +#ifdef Q_OS_LINUX + return false; +#else return guiSettings_.isDockedToTray; +#endif } void Preferences::setDockedToTray(bool b) diff --git a/client/gui/generalmessagecontroller.cpp b/client/gui/generalmessagecontroller.cpp index 40a79244..23d5423f 100644 --- a/client/gui/generalmessagecontroller.cpp +++ b/client/gui/generalmessagecontroller.cpp @@ -25,7 +25,7 @@ void GeneralMessageController::showMessage(const QString &icon, const QString &t return; } - MainWindowController::WINDOW_ID source = controller_->currentWindow(); + MainWindowController::WINDOW_ID source = controller_->currentWindowAfterAnimation(); if (source == MainWindowController::WINDOW_ID_LOGOUT || source == MainWindowController::WINDOW_ID_EXIT) { source = controller_->windowBeforeExit(); } @@ -42,6 +42,7 @@ void GeneralMessageController::showMessage(const QString &icon, const QString &t source = MainWindowController::WINDOW_ID_CONNECT; } } + showMessage(new GeneralMessage(icon, title, desc, acceptText, rejectText, tertiaryText, acceptFunc, rejectFunc, tertiaryFunc, source, flags, learnMoreUrl)); } diff --git a/client/gui/locationswindow/widgetlocations/locationstab.cpp b/client/gui/locationswindow/widgetlocations/locationstab.cpp index f533ddde..294f59b9 100644 --- a/client/gui/locationswindow/widgetlocations/locationstab.cpp +++ b/client/gui/locationswindow/widgetlocations/locationstab.cpp @@ -275,7 +275,9 @@ void LocationsTab::mouseReleaseEvent(QMouseEvent *event) { // Currently this should only handle non-search icons // qCDebug(LOG_USER) << "Clicked tab: " << curTabMouseOver_; - changeTab(curTabMouseOver_); + if (!searchTabSelected_) { + changeTab(curTabMouseOver_); + } } } } diff --git a/client/gui/mainwindow.cpp b/client/gui/mainwindow.cpp index 7f2051ae..fea31b02 100644 --- a/client/gui/mainwindow.cpp +++ b/client/gui/mainwindow.cpp @@ -71,7 +71,6 @@ MainWindow::MainWindow() : bMousePressed_(false), bMoveEnabled_(true), signOutReason_(SIGN_OUT_UNDEFINED), - bDisconnectFromTrafficExceed_(false), isInitializationAborted_(false), isLoginOkAndConnectWindowVisible_(false), revealingConnectWindow_(false), @@ -1782,7 +1781,6 @@ void MainWindow::onBackendSessionStatusChanged(const types::SessionStatus &sessi if ((!selectedLocation_->locationdId().isCustomConfigsLocation()) && (backend_->currentConnectState() == CONNECT_STATE_CONNECTED || backend_->currentConnectState() == CONNECT_STATE_CONNECTING)) { - bDisconnectFromTrafficExceed_ = true; backend_->sendDisconnect(); mainWindowController_->changeWindow(MainWindowController::WINDOW_ID_UPGRADE); } @@ -3503,7 +3501,6 @@ void MainWindow::setVariablesToInitState() isLoginOkAndConnectWindowVisible_ = false; bNotificationConnectedShowed_ = false; bytesTransferred_ = 0; - bDisconnectFromTrafficExceed_ = false; backend_->getPreferencesHelper()->setIsExternalConfigMode(false); } diff --git a/client/gui/mainwindow.h b/client/gui/mainwindow.h index eb5387d9..95d77b19 100644 --- a/client/gui/mainwindow.h +++ b/client/gui/mainwindow.h @@ -333,8 +333,6 @@ private slots: BlockConnect blockConnect_; FreeTrafficNotificationController *freeTrafficNotificationController_; - bool bDisconnectFromTrafficExceed_; - bool isInitializationAborted_; bool isLoginOkAndConnectWindowVisible_; static constexpr int TIME_BEFORE_SHOW_SHUTDOWN_WINDOW = 1500; // ms diff --git a/client/gui/mainwindowcontroller.cpp b/client/gui/mainwindowcontroller.cpp index c9839e57..25dde8cd 100644 --- a/client/gui/mainwindowcontroller.cpp +++ b/client/gui/mainwindowcontroller.cpp @@ -410,6 +410,15 @@ MainWindowController::WINDOW_ID MainWindowController::currentWindow() return curWindow_; } +MainWindowController::WINDOW_ID MainWindowController::currentWindowAfterAnimation() +{ + if (queueWindowChanges_.empty()) { + return curWindow_; + } + // Return the final window to be shown after animations + return queueWindowChanges_.last(); +} + MainWindowController::WINDOW_ID MainWindowController::windowBeforeExit() { return windowBeforeExit_; @@ -1885,7 +1894,8 @@ void MainWindowController::gotoUpdateWindow() void MainWindowController::gotoUpgradeWindow() { - WS_ASSERT(curWindow_ == WINDOW_ID_CONNECT); + WS_ASSERT(curWindow_ == WINDOW_ID_CONNECT || + curWindow_ == WINDOW_ID_GENERAL_MESSAGE); isAtomicAnimationActive_ = true; curWindow_ = WINDOW_ID_UPGRADE; @@ -1898,6 +1908,9 @@ void MainWindowController::gotoUpgradeWindow() connectWindow_->setClickable(false); bottomInfoWindow_->setClickable(false); + shadowManager_->setVisible(ShadowManager::SHAPE_ID_GENERAL_MESSAGE, false); + generalMessageWindow_->hide(); + functionOnAnimationFinished_ = [this]() { upgradeAccountWindow_->setOpacity(0.0); connectWindow_->stackBefore(upgradeAccountWindow_); @@ -1929,6 +1942,7 @@ void MainWindowController::gotoGeneralMessageWindow() curWindow_ == WINDOW_ID_LOGGING_IN || curWindow_ == WINDOW_ID_CONNECT || curWindow_ == WINDOW_ID_UPDATE || + curWindow_ == WINDOW_ID_UPGRADE || curWindow_ == WINDOW_ID_LOGOUT || curWindow_ == WINDOW_ID_EXIT); @@ -1977,6 +1991,7 @@ void MainWindowController::gotoGeneralMessageWindow() loginWindow_->stackBefore(generalMessageWindow_); initWindow_->stackBefore(generalMessageWindow_); loggingInWindow_->stackBefore(generalMessageWindow_); + upgradeAccountWindow_->stackBefore(generalMessageWindow_); generalMessageWindow_->show(); QPropertyAnimation *anim = new QPropertyAnimation(this); diff --git a/client/gui/mainwindowcontroller.h b/client/gui/mainwindowcontroller.h index 364c1af4..a7ac1e06 100644 --- a/client/gui/mainwindowcontroller.h +++ b/client/gui/mainwindowcontroller.h @@ -68,6 +68,7 @@ class MainWindowController : public QObject bool isPreferencesVisible(); bool isNewsFeedVisible(); WINDOW_ID currentWindow(); + WINDOW_ID currentWindowAfterAnimation(); WINDOW_ID windowBeforeExit(); void changeWindow(WINDOW_ID windowId); diff --git a/client/gui/preferenceswindow/generalwindow/generalwindowitem.cpp b/client/gui/preferenceswindow/generalwindow/generalwindowitem.cpp index 6668f4e2..cab97b5c 100644 --- a/client/gui/preferenceswindow/generalwindow/generalwindowitem.cpp +++ b/client/gui/preferenceswindow/generalwindow/generalwindowitem.cpp @@ -80,6 +80,7 @@ GeneralWindowItem::GeneralWindowItem(ScalableGraphicsObject *parent, Preferences addItem(hideFromDockGroup_); #endif +#ifndef Q_OS_LINUX dockedGroup_ = new PreferenceGroup(this); checkBoxDockedToTray_ = new ToggleItem(dockedGroup_); checkBoxDockedToTray_->setIcon(ImageResourcesSvg::instance().getIndependentPixmap("preferences/DOCKED")); @@ -87,6 +88,7 @@ GeneralWindowItem::GeneralWindowItem(ScalableGraphicsObject *parent, Preferences connect(checkBoxDockedToTray_, &ToggleItem::stateChanged, this, &GeneralWindowItem::onDockedToTrayChanged); dockedGroup_->addItem(checkBoxDockedToTray_); addItem(dockedGroup_); +#endif showNotificationsGroup_ = new PreferenceGroup(this); checkBoxShowNotifications_ = new ToggleItem(showNotificationsGroup_); @@ -230,7 +232,9 @@ void GeneralWindowItem::onIsShowNotificationsClicked(bool b) void GeneralWindowItem::onIsDockedToTrayPreferencesChanged(bool b) { +#ifndef Q_OS_LINUX checkBoxDockedToTray_->setState(b); +#endif } void GeneralWindowItem::onDockedToTrayChanged(bool b) @@ -313,10 +317,7 @@ void GeneralWindowItem::onLanguageChanged() hideFromDockGroup_->setDescription(tr("Don't show the Windscribe icon in dock.")); checkBoxHideFromDock_->setCaption(tr("Hide from Dock")); #endif -#if defined(Q_OS_LINUX) - dockedGroup_->setDescription(tr("Do not allow the Windscribe window to be moved.")); - checkBoxDockedToTray_->setCaption(tr("Pinned")); -#else +#if !defined(Q_OS_LINUX) dockedGroup_->setDescription(tr("Pin Windscribe near the system tray or menu bar.")); checkBoxDockedToTray_->setCaption(tr("Docked")); #endif diff --git a/client/gui/translations/ws_desktop_ar.ts b/client/gui/translations/ws_desktop_ar.ts index d84764a9..3ef84e97 100644 --- a/client/gui/translations/ws_desktop_ar.ts +++ b/client/gui/translations/ws_desktop_ar.ts @@ -1333,14 +1333,6 @@ If the problem persists after a restart, please send a debug log and open a supp Tray Icon Color لون أيقونة الدرج - - Do not allow the Windscribe window to be moved. - لا تسمح بتحريك نافذة Windscribe. - - - Pinned - المثبته - PreferencesWindow::HelpWindowItem diff --git a/client/gui/translations/ws_desktop_cs.ts b/client/gui/translations/ws_desktop_cs.ts index b0233ef5..bbe664ca 100644 --- a/client/gui/translations/ws_desktop_cs.ts +++ b/client/gui/translations/ws_desktop_cs.ts @@ -1333,14 +1333,6 @@ Pokud problém přetrvává i po restartování, odešlete protokol ladění, ot Tray Icon Color Barva ikony na hlavním panelu - - Do not allow the Windscribe window to be moved. - Nedovolte, aby se okno Windscribe pohybovalo. - - - Pinned - Přišpendlený - PreferencesWindow::HelpWindowItem diff --git a/client/gui/translations/ws_desktop_de.ts b/client/gui/translations/ws_desktop_de.ts index 4ce0a389..0be11125 100644 --- a/client/gui/translations/ws_desktop_de.ts +++ b/client/gui/translations/ws_desktop_de.ts @@ -1333,14 +1333,6 @@ Wenn das Problem nach einem Neustart weiterhin besteht, senden Sie bitte ein Deb Tray Icon Color Farbe des Tray-Symbols - - Do not allow the Windscribe window to be moved. - Lassen Sie nicht zu, dass das Windscribe-Fenster verschoben wird. - - - Pinned - Angeheftet - PreferencesWindow::HelpWindowItem diff --git a/client/gui/translations/ws_desktop_en.ts b/client/gui/translations/ws_desktop_en.ts index 1358108c..800e2c96 100644 --- a/client/gui/translations/ws_desktop_en.ts +++ b/client/gui/translations/ws_desktop_en.ts @@ -1333,14 +1333,6 @@ If the problem persists after a restart, please send a debug log and open a supp Tray Icon Color Tray Icon Color - - Do not allow the Windscribe window to be moved. - Do not allow the Windscribe window to be moved. - - - Pinned - Pinned - PreferencesWindow::HelpWindowItem diff --git a/client/gui/translations/ws_desktop_es.ts b/client/gui/translations/ws_desktop_es.ts index 4bb6254d..7176a6b1 100644 --- a/client/gui/translations/ws_desktop_es.ts +++ b/client/gui/translations/ws_desktop_es.ts @@ -1333,14 +1333,6 @@ Si el problema persiste después de un reinicio, envía un registro de depuraci Tray Icon Color Color del icono de la bandeja - - Do not allow the Windscribe window to be moved. - No permitas que se mueva la ventana de Windscribe. - - - Pinned - Fijado - PreferencesWindow::HelpWindowItem diff --git a/client/gui/translations/ws_desktop_fa.ts b/client/gui/translations/ws_desktop_fa.ts index 858af85f..9c964658 100644 --- a/client/gui/translations/ws_desktop_fa.ts +++ b/client/gui/translations/ws_desktop_fa.ts @@ -1333,14 +1333,6 @@ If the problem persists after a restart, please send a debug log and open a supp Tray Icon Color رنگ شمایل سینی - - Do not allow the Windscribe window to be moved. - اجازه ندهید که پنجره Windscribe منتقل شود. - - - Pinned - دوخته - PreferencesWindow::HelpWindowItem diff --git a/client/gui/translations/ws_desktop_fr.ts b/client/gui/translations/ws_desktop_fr.ts index 6e257998..6b17ddfa 100644 --- a/client/gui/translations/ws_desktop_fr.ts +++ b/client/gui/translations/ws_desktop_fr.ts @@ -1333,14 +1333,6 @@ Si le problème persiste après un redémarrage, envoyez un journal de débogage Tray Icon Color Couleur de l’icône du bac - - Do not allow the Windscribe window to be moved. - N’autorisez pas le déplacement de la fenêtre Windscribe. - - - Pinned - Épinglé - PreferencesWindow::HelpWindowItem diff --git a/client/gui/translations/ws_desktop_hi.ts b/client/gui/translations/ws_desktop_hi.ts index 646eacd3..b2b03fc1 100644 --- a/client/gui/translations/ws_desktop_hi.ts +++ b/client/gui/translations/ws_desktop_hi.ts @@ -1333,14 +1333,6 @@ If the problem persists after a restart, please send a debug log and open a supp Tray Icon Color ट्रे आइकन रंग - - Do not allow the Windscribe window to be moved. - विंडसाइड विंडो को स्थानांतरित करने की अनुमति न दें। - - - Pinned - टिकी - PreferencesWindow::HelpWindowItem diff --git a/client/gui/translations/ws_desktop_id.ts b/client/gui/translations/ws_desktop_id.ts index 8c3f1df3..5febf78e 100644 --- a/client/gui/translations/ws_desktop_id.ts +++ b/client/gui/translations/ws_desktop_id.ts @@ -1333,14 +1333,6 @@ Jika masalah berlanjut setelah restart, silakan kirim log debug dan buka tiket d Tray Icon Color Warna Ikon Baki - - Do not allow the Windscribe window to be moved. - Jangan biarkan jendela Windscribe dipindahkan. - - - Pinned - Disematkan - PreferencesWindow::HelpWindowItem diff --git a/client/gui/translations/ws_desktop_it.ts b/client/gui/translations/ws_desktop_it.ts index 9f462729..43bdcce4 100644 --- a/client/gui/translations/ws_desktop_it.ts +++ b/client/gui/translations/ws_desktop_it.ts @@ -1333,14 +1333,6 @@ Se il problema persiste dopo un riavvio, inviare un registro di debug e aprire u Tray Icon Color Colore dell'icona del vassoio - - Do not allow the Windscribe window to be moved. - Non permettere che la finestra di Windscribe venga spostata. - - - Pinned - Appuntato - PreferencesWindow::HelpWindowItem diff --git a/client/gui/translations/ws_desktop_ja.ts b/client/gui/translations/ws_desktop_ja.ts index 80a7ce28..f2b6ec1c 100644 --- a/client/gui/translations/ws_desktop_ja.ts +++ b/client/gui/translations/ws_desktop_ja.ts @@ -1333,14 +1333,6 @@ If the problem persists after a restart, please send a debug log and open a supp Tray Icon Color トレイアイコンの色 - - Do not allow the Windscribe window to be moved. - Windscribeウィンドウを移動させないでください。 - - - Pinned - 固定 - PreferencesWindow::HelpWindowItem diff --git a/client/gui/translations/ws_desktop_ko.ts b/client/gui/translations/ws_desktop_ko.ts index 0a99c85e..d892dc67 100644 --- a/client/gui/translations/ws_desktop_ko.ts +++ b/client/gui/translations/ws_desktop_ko.ts @@ -1333,14 +1333,6 @@ If the problem persists after a restart, please send a debug log and open a supp Tray Icon Color 트레이 아이콘 색상 - - Do not allow the Windscribe window to be moved. - Windscribe 창을 이동하지 마십시오. - - - Pinned - 고정 - PreferencesWindow::HelpWindowItem diff --git a/client/gui/translations/ws_desktop_pl.ts b/client/gui/translations/ws_desktop_pl.ts index 75ff35b5..82e0cc0a 100644 --- a/client/gui/translations/ws_desktop_pl.ts +++ b/client/gui/translations/ws_desktop_pl.ts @@ -1333,14 +1333,6 @@ Jeśli problem nadal występuje po ponownym uruchomieniu, wyślij dziennik debug Tray Icon Color Kolor ikony zasobnika - - Do not allow the Windscribe window to be moved. - Nie pozwól, aby okno Windscribe zostało przesunięte. - - - Pinned - Przypięte - PreferencesWindow::HelpWindowItem diff --git a/client/gui/translations/ws_desktop_pt.ts b/client/gui/translations/ws_desktop_pt.ts index d213d4c6..a8803046 100644 --- a/client/gui/translations/ws_desktop_pt.ts +++ b/client/gui/translations/ws_desktop_pt.ts @@ -1333,14 +1333,6 @@ Se o problema persistir após uma reinicialização, envie um log de depuração Tray Icon Color Cor do ícone da bandeja - - Do not allow the Windscribe window to be moved. - Não permita que a janela do Windscribe seja movida. - - - Pinned - Fixo - PreferencesWindow::HelpWindowItem diff --git a/client/gui/translations/ws_desktop_ru.ts b/client/gui/translations/ws_desktop_ru.ts index 322a6eba..5c5895c8 100644 --- a/client/gui/translations/ws_desktop_ru.ts +++ b/client/gui/translations/ws_desktop_ru.ts @@ -1333,14 +1333,6 @@ If the problem persists after a restart, please send a debug log and open a supp Tray Icon Color Цвет значка в трее - - Do not allow the Windscribe window to be moved. - Не позволяйте перемещать окно Windscribe. - - - Pinned - Закрепленных - PreferencesWindow::HelpWindowItem diff --git a/client/gui/translations/ws_desktop_tr.ts b/client/gui/translations/ws_desktop_tr.ts index 4c370011..1d3c61a3 100644 --- a/client/gui/translations/ws_desktop_tr.ts +++ b/client/gui/translations/ws_desktop_tr.ts @@ -1333,14 +1333,6 @@ Yeniden başlatmanın ardından sorun devam ederse lütfen bir hata ayıklama g Tray Icon Color Tepsi Simgesi Rengi - - Do not allow the Windscribe window to be moved. - Windscribe penceresinin hareket ettirilmesine izin vermeyin. - - - Pinned - Sabitlenmiş - PreferencesWindow::HelpWindowItem diff --git a/client/gui/translations/ws_desktop_uk.ts b/client/gui/translations/ws_desktop_uk.ts index f147547b..7d642106 100644 --- a/client/gui/translations/ws_desktop_uk.ts +++ b/client/gui/translations/ws_desktop_uk.ts @@ -1333,14 +1333,6 @@ If the problem persists after a restart, please send a debug log and open a supp Tray Icon Color Колір піктограми в треї - - Do not allow the Windscribe window to be moved. - Не дозволяйте переміщати вікно Windscribe. - - - Pinned - Закріплені - PreferencesWindow::HelpWindowItem diff --git a/client/gui/translations/ws_desktop_vi.ts b/client/gui/translations/ws_desktop_vi.ts index 9d54484f..fd5ddf6a 100644 --- a/client/gui/translations/ws_desktop_vi.ts +++ b/client/gui/translations/ws_desktop_vi.ts @@ -1333,14 +1333,6 @@ Nếu sự cố vẫn tiếp diễn sau khi khởi động lại, vui lòng gử Tray Icon Color Màu biểu tượng khay - - Do not allow the Windscribe window to be moved. - Không cho phép di chuyển cửa sổ Windscribe. - - - Pinned - Pinned - PreferencesWindow::HelpWindowItem diff --git a/client/gui/translations/ws_desktop_zh-CN.ts b/client/gui/translations/ws_desktop_zh-CN.ts index 07eaa1cf..43ea6669 100644 --- a/client/gui/translations/ws_desktop_zh-CN.ts +++ b/client/gui/translations/ws_desktop_zh-CN.ts @@ -1333,14 +1333,6 @@ If the problem persists after a restart, please send a debug log and open a supp Tray Icon Color 托盘图标颜色 - - Do not allow the Windscribe window to be moved. - 不允许移动 Windscribe 窗口。 - - - Pinned - 寄托 - PreferencesWindow::HelpWindowItem diff --git a/client/gui/translations/ws_desktop_zh-TW.ts b/client/gui/translations/ws_desktop_zh-TW.ts index ffb20fa0..be30cbed 100644 --- a/client/gui/translations/ws_desktop_zh-TW.ts +++ b/client/gui/translations/ws_desktop_zh-TW.ts @@ -1333,14 +1333,6 @@ If the problem persists after a restart, please send a debug log and open a supp Tray Icon Color 托盤圖示顏色 - - Do not allow the Windscribe window to be moved. - 不允許行動 Windscribe 視窗。 - - - Pinned - 寄託 - PreferencesWindow::HelpWindowItem diff --git a/tools/deps/custom_openvpn/src/openvpn/options.c b/tools/deps/custom_openvpn/src/openvpn/options.c index b50df4f0..1db60200 100644 --- a/tools/deps/custom_openvpn/src/openvpn/options.c +++ b/tools/deps/custom_openvpn/src/openvpn/options.c @@ -598,7 +598,7 @@ static const char usage_message[] = " Windows Certificate System Store.\n" #endif "--tls-cipher l : A list l of allowable TLS ciphers separated by : (optional).\n" - "--tls-ciphersuites l: A list of allowed TLS 1.3 cipher suites seperated by : (optional)\n" + "--tls-ciphersuites l: A list of allowed TLS 1.3 cipher suites separated by : (optional)\n" " : Use --show-tls to see a list of supported TLS ciphers (suites).\n" "--tls-cert-profile p : Set the allowed certificate crypto algorithm profile\n" " (default=legacy).\n" @@ -1372,6 +1372,7 @@ tuntap_options_copy_dns(struct options *o) { msg(M_WARN, "WARNING: couldn't copy all --dns search-domains to --dhcp-option"); } + tt->dhcp_options |= DHCP_OPTIONS_DHCP_REQUIRED; } if (dns->servers) @@ -1409,6 +1410,7 @@ tuntap_options_copy_dns(struct options *o) { msg(M_WARN, "WARNING: couldn't copy all --dns server addresses to --dhcp-option"); } + tt->dhcp_options |= DHCP_OPTIONS_DHCP_OPTIONAL; } } #else /* if defined(_WIN32) || defined(TARGET_ANDROID) */ @@ -2483,10 +2485,10 @@ options_postprocess_verify_ce(const struct options *options, if (options->tuntap_options.dhcp_options & DHCP_OPTIONS_DHCP_REQUIRED) { - const char *prefix = "Some dhcp-options require DHCP server"; + const char *prefix = "Some --dhcp-option or --dns options require DHCP server"; if (options->windows_driver != WINDOWS_DRIVER_TAP_WINDOWS6) { - msg(M_USAGE, "%s, which is not supported by selected %s driver", + msg(M_USAGE, "%s, which is not supported by the selected %s driver", prefix, print_windows_driver(options->windows_driver)); } else if (options->tuntap_options.ip_win32_type != IPW32_SET_DHCP_MASQ diff --git a/tools/vars/openvpn.yml b/tools/vars/openvpn.yml index 6f510890..abd249c6 100644 --- a/tools/vars/openvpn.yml +++ b/tools/vars/openvpn.yml @@ -3,5 +3,5 @@ # Copyright (c) 2020-2023, Windscribe Limited. All rights reserved. # ------------------------------------------------------------------------------ variables: - VERSION_OPENVPN: '2.6.7' + VERSION_OPENVPN: '2.6.8' ARTIFACT_OPENVPN: 'openvpn.zip'