fanhuadesenlinnn/EZ4Connect
1
0
Fork 0
mirror of https://github.com/chenx-dust/EZ4Connect.git synced 2026-09-20 10:23:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: fix system proxy settings on windows

Browse Source
This commit is contained in:
Chenx Dust
2025-01-11 00:08:54 +08:00
parent 515a79ed0f
commit 11fba48975
3 changed files with 52 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
settingwindow/settingwindow.cpp
View File

@@ -143,7 +143,7 @@ void SettingWindow::loadSettings()
ui->routeCheckBox->setChecked(settings->value("ZJUConnect/Route", false).toBool());
ui->secondaryDnsLineEdit->setText(settings->value("ZJUConnect/SecondaryDNS", "").toString());
ui->shadowsocksUrlLineEdit->setText(settings->value("ZJUConnect/ShadowsocksUrl", "").toString());
ui->systemProxyBypassLineEdit->setText(settings->value("ZJUConnect/SystemProxyBypass", "localhost;127.*;::1").toString());
ui->systemProxyBypassLineEdit->setText(settings->value("ZJUConnect/SystemProxyBypass", "localhost").toString());
ui->keepAliveCheckBox->setChecked(settings->value("ZJUConnect/KeepAlive", true).toBool());
ui->tunCheckBox->setChecked(settings->value("ZJUConnect/TunMode", false).toBool());
ui->dnsHijackCheckBox->setChecked(settings->value("ZJUConnect/DNSHijack", false).toBool());

60
utils/proxysettings.cpp
View File

@@ -24,15 +24,7 @@ void windowsSetProxyForAllConnections(const QString &proxyServer, const QString
unsigned long optionListSize = sizeof(INTERNET_PER_CONN_OPTION_LIST);
optionsArr[1].dwOption = INTERNET_PER_CONN_FLAGS;
optionsArr[1].Value.dwValue = 0;
if (proxyServer != "")
{
optionsArr[1].Value.dwValue = PROXY_TYPE_DIRECT | PROXY_TYPE_PROXY;
}
else
{
optionsArr[1].Value.dwValue = PROXY_TYPE_DIRECT;
}
optionsArr[1].Value.dwValue = PROXY_TYPE_DIRECT | PROXY_TYPE_PROXY;
optionsArr[0].dwOption = INTERNET_PER_CONN_PROXY_SERVER;
auto *proxyServerWStr = (wchar_t *)calloc(sizeof(wchar_t), proxyServer.length() + 1);
@@ -89,6 +81,54 @@ void windowsSetProxyForAllConnections(const QString &proxyServer, const QString
#endif
}
void windowsClearProxyForAllConnections()
{
#if defined(Q_OS_WINDOWS)
INTERNET_PER_CONN_OPTION_LIST optionList;
INTERNET_PER_CONN_OPTION optionsArr[1];
unsigned long optionListSize = sizeof(INTERNET_PER_CONN_OPTION_LIST);
optionsArr[0].dwOption = INTERNET_PER_CONN_FLAGS;
optionsArr[0].Value.dwValue = PROXY_TYPE_DIRECT;
optionList.dwSize = sizeof(INTERNET_PER_CONN_OPTION_LIST);
optionList.pszConnection = nullptr;
optionList.dwOptionCount = 1;
optionList.dwOptionError = 0;
optionList.pOptions = optionsArr;
InternetSetOption(nullptr, INTERNET_OPTION_PER_CONNECTION_OPTION, &optionList, optionListSize);
DWORD dwCb = 0;
DWORD dwRet = ERROR_SUCCESS;
DWORD dwEntries = 0;
LPRASENTRYNAME lpRasEntryName = nullptr;
dwRet = RasEnumEntries(nullptr, nullptr, lpRasEntryName, &dwCb, &dwEntries);
if (dwRet == ERROR_BUFFER_TOO_SMALL)
{
lpRasEntryName = (LPRASENTRYNAME)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, dwCb);
if (lpRasEntryName == nullptr)
return;
lpRasEntryName[0].dwSize = sizeof(RASENTRYNAME);
dwRet = RasEnumEntries(nullptr, nullptr, lpRasEntryName, &dwCb, &dwEntries);
if (ERROR_SUCCESS == dwRet)
{
for (DWORD i = 0; i < dwEntries; i++)
{
optionList.pszConnection = lpRasEntryName[i].szEntryName;
InternetSetOption(nullptr, INTERNET_OPTION_PER_CONNECTION_OPTION, &optionList, optionListSize);
}
}
HeapFree(GetProcessHeap(), 0, lpRasEntryName);
}
#endif
}
QStringList macOSGetActiveNetworkServices()
{
#if defined(Q_OS_MACOS)
@@ -465,7 +505,7 @@ void Utils::setSystemProxy(int http_port, int socks_port, const QString &bypass)
void Utils::clearSystemProxy()
{
#if defined(Q_OS_WINDOWS)
windowsSetProxyForAllConnections("", "");
windowsClearProxyForAllConnections();
#elif defined(Q_OS_MACOS)
QStringList activeServices = macOSGetActiveNetworkServices();
for (const QString &service : activeServices)

2
zjuconnectmode.cpp
View File

@@ -219,7 +219,7 @@ void MainWindow::initZjuConnect()
Utils::setSystemProxy(settings->value("ZJUConnect/HttpPort", 11081).toInt(),
settings->value("ZJUConnect/Socks5Port", 11080).toInt(),
settings->value("ZJUConnect/SystemProxyBypass", "localhost;127.*;::1").toString());
settings->value("ZJUConnect/SystemProxyBypass", "localhost").toString());
ui->pushButton2->setText("清除系统代理");
isSystemProxySet = true;
}