Release 1.4.6

GPClient/gpclient.cpp

@@ -153,7 +153,7 @@ void GPClient::populateGatewayMenu()
         if (g.name() == currentGatewayName) {
             iconImage = ":/images/radio_selected.png";
         }
-        gatewaySwitchMenu->addAction(QIcon(iconImage), g.name())->setData(i);
+        gatewaySwitchMenu->addAction(QIcon(iconImage), QString("%1 (%2)").arg(g.name(), g.address()))->setData(i);
     }
 }
 

GPClient/portalconfigresponse.cpp

@@ -93,15 +93,17 @@ void PortalConfigResponse::parseGateway(QXmlStreamReader &reader, GPGateway &gat
 
     auto finished = false;
     while (!finished) {
-        if (reader.name() == "entry") {
+        if (reader.name() == "entry" && reader.isStartElement()) {
             auto address = reader.attributes().value("name").toString();
             gateway.setAddress(address);
-        } else if (reader.name() == "description") { // gateway name
+        } else if (reader.name() == "description" && reader.isStartElement()) { // gateway name
             gateway.setName(reader.readElementText());
-        } else if (reader.name() == "priority-rule") { // priority rules
+        } else if (reader.name() == "priority-rule" && reader.isStartElement()) { // priority rules
             parsePriorityRule(reader, gateway);
         }
-        finished = !reader.readNextStartElement();
+
+        auto result = reader.readNext();
+        finished = result == QXmlStreamReader::Invalid || (reader.name() == "entry" && reader.isEndElement());
     }
 }
 
@@ -113,16 +115,19 @@ void PortalConfigResponse::parsePriorityRule(QXmlStreamReader &reader, GPGateway
 
     while (!finished) {
         // Parse the priority-rule -> entry
-        if (reader.name() == "entry") {
+        if (reader.name() == "entry" && reader.isStartElement()) {
             auto ruleName = reader.attributes().value("name").toString();
             // move to the priority value
-            while (reader.name() != "priority") {
+            while (reader.readNextStartElement()) {
-                reader.readNextStartElement();
+                if (reader.name() == "priority") {
-            }
                     auto priority = reader.readElementText().toInt();
                     priorityRules.insert(ruleName, priority);
+                    break;
                 }
-        finished = !reader.readNextStartElement();
+            }
+        }
+        auto result = reader.readNext();
+        finished = result == QXmlStreamReader::Invalid || (reader.name() == "priority-rule" && reader.isEndElement());
     }
 
     gateway.setPriorityRules(priorityRules);

VERSION

@@ -1 +1 @@
-1.4.5
+1.4.6

debian/changelog

@@ -1,3 +1,11 @@
+globalprotect-openconnect (1.4.6-1) unstable; urgency=medium
+
+  * Updated VERSION, Bumped 1.4.5 –> 1.4.6
+  * feat: display address in gateway menu item
+  * fix: fix bug of parsing the portal respponse
+
+ -- Kevin Yue <k3vinyue@gmail.com>  Wed, 01 Jun 2022 23:55:50 +0800
+
 globalprotect-openconnect (1.4.5-1) unstable; urgency=medium
 
   * Updated VERSION, Bumped 1.4.4 –> 1.4.5

packaging/aur/PKGBUILD

@@ -1,7 +1,7 @@
 # Maintainer: Keinv Yue <yuezk001@gmail.com>
 
-_pkgver="1.4.5"
+_pkgver="1.4.6"
-_commit="a489c5881bdc9d3565da0f2efac4963bec3f7069"
+_commit="b57fb993ca6cfb5e42cf77d2d26486ad40c32d23"
 pkgname=globalprotect-openconnect-git
 pkgver=${_pkgver}
 pkgrel=1

packaging/obs/globalprotect-openconnect.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Wed Jun  1 15:55:50 UTC 2022 - k3vinyue@gmail.com - 1.4.6
+
+- Update to 1.4.6
+  * Updated VERSION, Bumped 1.4.5 –> 1.4.6
+  * feat: display address in gateway menu item
+  * fix: fix bug of parsing the portal respponse
+
 -------------------------------------------------------------------
 Sun May 29 13:15:40 UTC 2022 - k3vinyue@gmail.com - 1.4.5
 

packaging/obs/globalprotect-openconnect.spec

@@ -1,5 +1,5 @@
 Name:           globalprotect-openconnect
-Version:        1.4.5
+Version:        1.4.6
 Release:        1
 Summary:        A GlobalProtect VPN client powered by OpenConnect
 Group:          Productivity/Networking/PPP