cassidy/GlobalProtect-openconnect
1
0
Fork 0
mirror of https://github.com/yuezk/GlobalProtect-openconnect.git synced 2025-04-02 18:31:50 -04:00
Code Issues Projects Releases Wiki Activity

Fix parsing of Gateways and Priority Rules (#35)

Browse Source 
* Fix gateways and priority rules parsing

* Removing comment with dead code

Co-authored-by: Raphael Sant'Anna <raphael.santanna@exame.com>
This commit is contained in:
Raphael Sant'Anna 2020-10-31 22:55:27 -03:00 committed by GitHub
parent d91fad089f
commit c14a6ad1d2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
GPClient/gpclient.cpp
View File

@ -69,7 +69,7 @@ void GPClient::initSystemTrayIcon()
connect(systemTrayIcon, &QSystemTrayIcon::activated, this, &GPClient::onSystemTrayActivated); connect(systemTrayIcon, &QSystemTrayIcon::activated, this, &GPClient::onSystemTrayActivated);
connect(gatewaySwitchMenu, &QMenu::triggered, this, &GPClient::onGatewayChanged); connect(gatewaySwitchMenu, &QMenu::triggered, this, &GPClient::onGatewayChanged);
openAction = contextMenu->addAction(QIcon::fromTheme("window-new"), "Open", this, &GPClient::activiate); openAction = contextMenu->addAction(QIcon::fromTheme("window-new"), "Open", this, &GPClient::activate);
connectAction = contextMenu->addAction(QIcon::fromTheme("preferences-system-network"), "Connect", this, &GPClient::doConnect); connectAction = contextMenu->addAction(QIcon::fromTheme("preferences-system-network"), "Connect", this, &GPClient::doConnect);
contextMenu->addMenu(gatewaySwitchMenu); contextMenu->addMenu(gatewaySwitchMenu);
contextMenu->addSeparator(); contextMenu->addSeparator();
@ -167,7 +167,7 @@ void GPClient::onSystemTrayActivated(QSystemTrayIcon::ActivationReason reason)
switch (reason) { switch (reason) {
case QSystemTrayIcon::Trigger: case QSystemTrayIcon::Trigger:
case QSystemTrayIcon::DoubleClick: case QSystemTrayIcon::DoubleClick:
this->activiate(); this->activate();
break; break;
default: default:
break; break;
@ -209,7 +209,7 @@ void GPClient::doConnect()
// Display the main window if portal is empty // Display the main window if portal is empty
if (portal.isEmpty()) { if (portal.isEmpty()) {
activiate(); activate();
return; return;
} }
@ -351,7 +351,7 @@ void GPClient::onGatewayFail(const QString &msg)
updateConnectionStatus(VpnStatus::disconnected); updateConnectionStatus(VpnStatus::disconnected);
} }
void GPClient::activiate() void GPClient::activate()
{ {
activateWindow(); activateWindow();
showNormal(); showNormal();

2
GPClient/gpclient.h
View File

@ -20,7 +20,7 @@ public:
GPClient(QWidget *parent = nullptr); GPClient(QWidget *parent = nullptr);
~GPClient(); ~GPClient();
void activiate(); void activate();
private slots: private slots:
void on_connectButton_clicked(); void on_connectButton_clicked();

2
GPClient/main.cpp
View File

@ -31,7 +31,7 @@ int main(int argc, char *argv[])
GPClient w; GPClient w;
w.show(); w.show();
QObject::connect(&app, &SingleApplication::instanceStarted, &w, &GPClient::activiate); QObject::connect(&app, &SingleApplication::instanceStarted, &w, &GPClient::activate);
return app.exec(); return app.exec();
} }

14
GPClient/portalconfigresponse.cpp
View File

@ -65,6 +65,14 @@ QList<GPGateway> PortalConfigResponse::parseGateways(QXmlStreamReader &xmlReader
QList<GPGateway> gateways; QList<GPGateway> gateways;
while (xmlReader.name() != "external"){
xmlReader.readNext();
}
while (xmlReader.name() != "list"){
xmlReader.readNext();
}
while (xmlReader.name() != xmlGateways || !xmlReader.isEndElement()) { while (xmlReader.name() != xmlGateways || !xmlReader.isEndElement()) {
xmlReader.readNext(); xmlReader.readNext();
// Parse the gateways -> external -> list -> entry // Parse the gateways -> external -> list -> entry
@ -89,13 +97,15 @@ QMap<QString, int> PortalConfigResponse::parsePriorityRules(QXmlStreamReader &xm
QMap<QString, int> priorityRules; QMap<QString, int> priorityRules;
while (xmlReader.name() != "priority-rule" || !xmlReader.isEndElement()) { while ((xmlReader.name() != "priority-rule" || !xmlReader.isEndElement()) && !xmlReader.hasError()) {
xmlReader.readNext(); xmlReader.readNext();
if (xmlReader.name() == "entry" && xmlReader.isStartElement()) { if (xmlReader.name() == "entry" && xmlReader.isStartElement()) {
QString ruleName = xmlReader.attributes().value("name").toString(); QString ruleName = xmlReader.attributes().value("name").toString();
// Read the priority tag // Read the priority tag
xmlReader.readNextStartElement(); while (xmlReader.name() != "priority"){
xmlReader.readNext();
}
int ruleValue = xmlReader.readElementText().toUInt(); int ruleValue = xmlReader.readElementText().toUInt();
priorityRules.insert(ruleName, ruleValue); priorityRules.insert(ruleName, ruleValue);
} }