Custom routing done

ShadowSocks enabled by default

client/protocols/vpnprotocol.h

@@ -3,30 +3,29 @@
 
 #include <QObject>
 #include <QString>
+#include <QJsonObject>
 
 #include "core/defs.h"
 using namespace amnezia;
 
 class QTimer;
-class Communicator;
 
 class VpnProtocol : public QObject
 {
     Q_OBJECT
 
 public:
-    explicit VpnProtocol(const QString& args = QString(), QObject* parent = nullptr);
+    explicit VpnProtocol(const QJsonObject& configuration, QObject* parent = nullptr);
     virtual ~VpnProtocol() override = default;
 
-    enum class ConnectionState {Unknown, Disconnected, Preparing, Connecting, Connected, Disconnecting, TunnelReconnecting, Error};
+    enum ConnectionState {Unknown, Disconnected, Preparing, Connecting, Connected, Disconnecting, Reconnecting, Error};
+    Q_ENUM(ConnectionState)
 
-    static Communicator* communicator();
     static QString textConnectionState(ConnectionState connectionState);
-    //static void initializeCommunicator(QObject* parent = nullptr);
 
 
-    virtual bool onConnected() const;
-    virtual bool onDisconnected() const;
+    virtual bool isConnected() const;
+    virtual bool isDisconnected() const;
     virtual ErrorCode start() = 0;
     virtual void stop() = 0;
 
@@ -54,18 +53,17 @@ protected:
     virtual void setBytesChanged(quint64 receivedBytes, quint64 sentBytes);
     virtual void setConnectionState(VpnProtocol::ConnectionState state);
 
-    //static Communicator* m_communicator;
-
     ConnectionState m_connectionState;
     QString m_routeGateway;
     QString m_vpnGateway;
 
+    QJsonObject m_rawConfig;
+
 private:
     QTimer* m_timeoutTimer;
     ErrorCode m_lastError;
     quint64 m_receivedBytes;
     quint64 m_sentBytes;
-
 };
 
 #endif // VPNPROTOCOL_H