Bug fixes:

- auto install tap
- share connectionState
- service crash fix

client/protocols/openvpnprotocol.cpp

@@ -1,5 +1,7 @@
 #include <QCoreApplication>
 #include <QFileInfo>
+#include <QProcess>
+#include <QRegularExpression>
 #include <QTcpSocket>
 
 #include "communicator.h"
@@ -106,6 +108,15 @@ void OpenVpnProtocol::writeCommand(const QString& command)
     }
 }
 
+void OpenVpnProtocol::updateRouteGateway(QString line)
+{
+    line = line.split("ROUTE_GATEWAY", QString::SkipEmptyParts).at(1);
+    if (!line.contains("/")) return;
+    m_routeGateway = line.split("/", QString::SkipEmptyParts).first();
+    m_routeGateway.replace(" ", "");
+    qDebug() << "Set VPN route gateway" << m_routeGateway;
+}
+
 QString OpenVpnProtocol::openVpnExecPath() const
 {
 #ifdef Q_OS_WIN
@@ -209,6 +220,7 @@ void OpenVpnProtocol::onReadyReadDataFromManagementServer()
             if (line.contains("CONNECTED,SUCCESS")) {
                 sendByteCount();
                 stopTimeoutTimer();
+                updateVpnGateway();
                 setConnectionState(VpnProtocol::ConnectionState::Connected);
                 continue;
             } else if (line.contains("EXITING,SIGTER")) {
@@ -220,6 +232,10 @@ void OpenVpnProtocol::onReadyReadDataFromManagementServer()
             }
         }
 
+        if (line.contains("ROUTE_GATEWAY")) {
+            updateRouteGateway(line);
+        }
+
         if (line.contains("FATAL")) {
             if (line.contains("tap-windows6 adapters on this system are currently in use or disabled")) {
                 emit protocolError(ErrorCode::OpenVpnAdaptersInUseError);
@@ -259,4 +275,46 @@ void OpenVpnProtocol::onOpenVpnProcessFinished(int exitCode)
     setConnectionState(VpnProtocol::ConnectionState::Disconnected);
 }
 
+void OpenVpnProtocol::updateVpnGateway()
+{
+    QProcess ipconfig;
+    ipconfig.start("ipconfig", QStringList() << "/all");
+    ipconfig.waitForStarted();
+    ipconfig.waitForFinished();
 
+    QString d = ipconfig.readAll();
+    d.replace("\r", "");
+    //qDebug().noquote() << d;
+
+    QStringList adapters = d.split(":\n");
+
+    bool isTapV9Present = false;
+    QString tapV9;
+    for (int i = 0; i < adapters.size(); ++i) {
+        if (adapters.at(i).contains("TAP-Windows Adapter V9")) {
+            isTapV9Present = true;
+            tapV9 = adapters.at(i);
+            break;
+        }
+    }
+    if (!isTapV9Present) {
+        m_vpnGateway = "";
+    }
+
+    QStringList lines = tapV9.split("\n");
+    for (int i = 0; i < lines.size(); ++i) {
+        if (!lines.at(i).contains("DHCP")) continue;
+
+        QRegularExpression re("(: )([\\d\\.]+)($)");
+        QRegularExpressionMatch match = re.match(lines.at(i));
+
+        if (match.hasMatch()) {
+            qDebug().noquote() << "Current VPN Gateway IP Address: " << match.captured(0);
+            m_vpnGateway = match.captured(2);
+            return;
+        }
+        else continue;
+    }
+
+    m_vpnGateway = "";
+}

client/protocols/openvpnprotocol.h

@@ -46,6 +46,11 @@ protected:
     QString m_configFileName;
     QTimer m_openVpnStateSigTermHandlerTimer;
     bool m_requestFromUserToStop;
+
+
+private:
+    void updateRouteGateway(QString line);
+    void updateVpnGateway();
 };
 
 #endif // OPENVPNPROTOCOL_H

client/protocols/vpnprotocol.cpp

@@ -94,6 +94,16 @@ void VpnProtocol::setConnectionState(VpnProtocol::ConnectionState state)
     emit connectionStateChanged(m_connectionState);
 }
 
+QString VpnProtocol::vpnGateway() const
+{
+    return m_vpnGateway;
+}
+
+QString VpnProtocol::routeGateway() const
+{
+    return m_routeGateway;
+}
+
 QString VpnProtocol::textConnectionState(ConnectionState connectionState)
 {
     switch (connectionState) {

client/protocols/vpnprotocol.h

@@ -35,6 +35,9 @@ public:
     QString textConnectionState() const;
     void setLastError(ErrorCode lastError);
 
+    QString routeGateway() const;
+    QString vpnGateway() const;
+
 signals:
     void bytesChanged(quint64 receivedBytes, quint64 sentBytes);
     void connectionStateChanged(VpnProtocol::ConnectionState state);
@@ -54,12 +57,15 @@ protected:
     static Communicator* m_communicator;
 
     ConnectionState m_connectionState;
+    QString m_routeGateway;
+    QString m_vpnGateway;
 
 private:
     QTimer* m_timeoutTimer;
     ErrorCode m_lastError;
     quint64 m_receivedBytes;
     quint64 m_sentBytes;
+
 };
 
 #endif // VPNPROTOCOL_H