openkylin
/
kylin-nm
mirror of https://gitee.com/openkylin/kylin-nm.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

!39 企业网新增类型代码补全 

Merge pull request !39 from zy-yuan1/eap-append
This commit is contained in:
zhaoshixu 2023-04-21 01:31:29 +00:00 committed by Gitee
parent 9869981622 51128b08d5
commit 9c9462bd26
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
3 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/backend/dbus-interface/kywirelessnetresource.cpp
View File

@ -724,7 +724,7 @@ bool KyWirelessNetResource::getEnterPriseInfoFast(QString &uuid, KyEapMethodFast
info.m_anonIdentity = setting->anonymousIdentity(); info.m_anonIdentity = setting->anonymousIdentity();
info.m_pacProvisioning = (KyFastProvisioning)setting->phase1FastProvisioning(); info.m_pacProvisioning = (KyFastProvisioning)setting->phase1FastProvisioning();
info.m_pacFilePath = setting->caPath(); info.m_pacFilePath = setting->pacFile();
if (info.m_pacFilePath.left(7) == "file://") { if (info.m_pacFilePath.left(7) == "file://") {
info.m_pacFilePath = info.m_pacFilePath.mid(7); info.m_pacFilePath = info.m_pacFilePath.mid(7);
} }

15
src/frontend/netdetails/joinhiddenwifipage.cpp
View File

@ -216,9 +216,18 @@ void JoinHiddenWiFiPage::onBtnJoinClicked()
} else if (eapType == PEAP) { } else if (eapType == PEAP) {
m_secuWidget->updatePeapChange(m_info.peapInfo); m_secuWidget->updatePeapChange(m_info.peapInfo);
m_wirelessConnOpration->addAndActiveWirelessEnterPrisePeapConnect(m_info.peapInfo, connSettingInfo, m_devName, true); m_wirelessConnOpration->addAndActiveWirelessEnterPrisePeapConnect(m_info.peapInfo, connSettingInfo, m_devName, true);
} else if (eapType = TTLS) { } else if (eapType == TTLS) {
m_secuWidget->updateTtlsChange(m_info.ttlsInfo); m_secuWidget->updateTtlsChange(m_info.ttlsInfo);
m_wirelessConnOpration->addAndActiveWirelessEnterPriseTtlsConnect(m_info.ttlsInfo, connSettingInfo, m_devName, true); m_wirelessConnOpration->addAndActiveWirelessEnterPriseTtlsConnect(m_info.ttlsInfo, connSettingInfo, m_devName, true);
} else if (eapType == LEAP) {
m_secuWidget->updateLeapChange(m_info.leapInfo);
m_wirelessConnOpration->addAndActiveWirelessEnterPriseLeapConnect(m_info.leapInfo, connSettingInfo, m_devName, true);
} else if (eapType == PWD) {
m_secuWidget->updatePwdChange(m_info.pwdInfo);
m_wirelessConnOpration->addAndActiveWirelessEnterPrisePwdConnect(m_info.pwdInfo, connSettingInfo, m_devName, true);
} else if (eapType == FAST) {
m_secuWidget->updateFastChange(m_info.fastInfo);
m_wirelessConnOpration->addAndActiveWirelessEnterPriseFastConnect(m_info.fastInfo, connSettingInfo, m_devName, true);
} }
} else { } else {
m_secuWidget->updateSecurityChange(connSettingInfo); m_secuWidget->updateSecurityChange(connSettingInfo);
@ -242,9 +251,9 @@ void JoinHiddenWiFiPage::onSecuTypeChanged(const KySecuType &type)
void JoinHiddenWiFiPage::onEapTypeChanged(const KyEapMethodType &type) void JoinHiddenWiFiPage::onEapTypeChanged(const KyEapMethodType &type)
{ {
if (type == KyEapMethodType::TLS) { if (type == KyEapMethodType::TLS || type == KyEapMethodType::FAST) {
this->setFixedHeight(TLS_WINDOW_HEIGHT); this->setFixedHeight(TLS_WINDOW_HEIGHT);
} else if (type == KyEapMethodType::PEAP || type == KyEapMethodType::TTLS) { } else {
this->setFixedHeight(PEAP_WINDOW_HEIGHT); this->setFixedHeight(PEAP_WINDOW_HEIGHT);
} }
} }

8
src/frontend/netdetails/netdetail.cpp
View File

@ -528,6 +528,8 @@ void NetDetail::pagePadding(QString netName, bool isWlan)
securityPage->setPwdInfo(m_info.pwdInfo); securityPage->setPwdInfo(m_info.pwdInfo);
} else if (m_info.enterpriseType == FAST) { } else if (m_info.enterpriseType == FAST) {
securityPage->setFastInfo(m_info.fastInfo); securityPage->setFastInfo(m_info.fastInfo);
} else {
qWarning() << "[NetDetail] unknown enterprise connection type" << m_info.enterpriseType;
} }
} }
} }
@ -746,6 +748,8 @@ void NetDetail::initSecuData()
initPwdInfo(m_info); initPwdInfo(m_info);
} else if (m_info.enterpriseType == FAST){ } else if (m_info.enterpriseType == FAST){
initFastInfo(m_info); initFastInfo(m_info);
} else {
qWarning() << "[NetDetail] unknown enterprise connection type" << m_info.enterpriseType;
} }
break; break;
default: default:
@ -907,6 +911,8 @@ void NetDetail::updateWirelessEnterPriseConnect(KyEapMethodType enterpriseType)
} else if (enterpriseType == FAST) { } else if (enterpriseType == FAST) {
securityPage->updateFastChange(m_info.fastInfo); securityPage->updateFastChange(m_info.fastInfo);
m_wirelessConnOpration->updateWirelessEnterPriseFastConnect(m_uuid, m_info.fastInfo); m_wirelessConnOpration->updateWirelessEnterPriseFastConnect(m_uuid, m_info.fastInfo);
} else {
qWarning() << "[NetDetail] unknow enterprise connection type";
} }
} }
@ -1039,6 +1045,8 @@ bool NetDetail::createWirelessConnect()
qDebug() << "addAndConnect FAST connect"; qDebug() << "addAndConnect FAST connect";
m_wirelessConnOpration->addAndActiveWirelessEnterPriseFastConnect(m_info.fastInfo, connetSetting, m_deviceName, true); m_wirelessConnOpration->addAndActiveWirelessEnterPriseFastConnect(m_info.fastInfo, connetSetting, m_deviceName, true);
} }
} else {
qWarning() << "[NetDetail] unknown enterprise connection type" << enterpriseType;
} }
} else { } else {
securityPage->updateSecurityChange(connetSetting); securityPage->updateSecurityChange(connetSetting);