Skip to content

fix(wireless): drop default MAC binding on connect #608

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
caixr23 wants to merge 1 commit into
base: master
Choose a base branch
from
+0 −12
Open

fix(wireless): drop default MAC binding on connect #608

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 0 additions & 9 deletions net-view/operation/private/netwirelessconnect.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -400,15 +400,6 @@ void NetWirelessConnect::activateConnection()
conn = findConnectionByUuid(m_connectionSettings->uuid());
}

// 默认设置Mac地址
NetworkManager::WirelessSetting::Ptr wirelessSetting = m_connectionSettings->setting(NetworkManager::Setting::Wireless).dynamicCast<NetworkManager::WirelessSetting>();
if (wirelessSetting) {
QString macAddress = m_device->realHwAdr();
macAddress.remove(":");
wirelessSetting->setMacAddress(QByteArray::fromHex(macAddress.toUtf8()));
wirelessSetting->setInitialized(true);
}

// 工银瑞信的项目默认关闭自动连接的功能
if (ConfigSetting::instance()->enableAccountNetwork())
m_connectionSettings->setAutoconnect(false);
Expand Down
3 changes: 0 additions & 3 deletions src/impl/networkmanager/devicemanagerrealize.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -818,9 +818,6 @@ void WirelessDeviceManagerRealize::connectNetwork(const AccessPoints *accessPoin

NetworkManager::WirelessSetting::Ptr wirelessSetting = settings->setting(NetworkManager::Setting::Wireless).dynamicCast<NetworkManager::WirelessSetting>();
wirelessSetting->setSsid(accessPoint->ssid().toUtf8());
QString macAddress = m_device->permanentHardwareAddress();
macAddress.remove(":");
wirelessSetting->setMacAddress(QByteArray::fromHex(macAddress.toUtf8()));
wirelessSetting->setInitialized(true);
QVariantMap options;
options.insert("persist", "memory");
Expand Down
Loading