custom sitet pre release

.gitignore

@@ -5,7 +5,7 @@ AmneziaVPN.dmg
 AmneziaVPN.exe
 AmneziaVPN_*.exe
 deploy/build/*
-winbuild.bat
+winbuild*.bat
 
 # Qt-es
 /.qmake.cache

client/defines.h

@@ -4,6 +4,7 @@
 #define APPLICATION_NAME    "AmneziaVPN"
 #define SERVICE_NAME        "AmneziaVPN-service"
 #define ORGANIZATION_NAME   "AmneziaVPN.ORG"
-#define APP_VERSION         "1.6.1.0"
+#define APP_MAJOR_VERSION   "1.7.3"
+#define APP_VERSION         "1.7.3.0"
 
 #endif // DEFINES_H

client/platform_win/vpnclient.rc

@@ -3,11 +3,11 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 
 IDI_ICON1               ICON                    "../images/app.ico"
 
-#define VER_FILEVERSION             1,6,1,0
-#define VER_FILEVERSION_STR         "1.6.1.0\0"
+#define VER_FILEVERSION             1,7,0,0
+#define VER_FILEVERSION_STR         "1.7.0.0\0"
 
-#define VER_PRODUCTVERSION          1,6,1,0
-#define VER_PRODUCTVERSION_STR      "1.6.1.0\0"
+#define VER_PRODUCTVERSION          1,7,0,0
+#define VER_PRODUCTVERSION_STR      "1.7.0.0\0"
 
 #define VER_COMPANYNAME_STR         "AmneziaVPN"
 #define VER_FILEDESCRIPTION_STR     "AmneziaVPN"

client/protocols/openvpnovercloakprotocol.cpp

@@ -59,7 +59,7 @@ ErrorCode OpenVpnOverCloakProtocol::start()
 
     m_errorHandlerConnection = connect(&m_ckProcess, QOverload<int, QProcess::ExitStatus>::of(&QProcess::finished), this, [this](int exitCode, QProcess::ExitStatus exitStatus){
         qDebug().noquote() << "OpenVpnOverCloakProtocol finished, exitCode, exiStatus" << exitCode << exitStatus;
-        setConnectionState(VpnProtocol::ConnectionState::Disconnected);
+        setConnectionState(VpnProtocol::Disconnected);
         if (exitStatus != QProcess::NormalExit){
             emit protocolError(amnezia::ErrorCode::CloakExecutableCrashed);
             stop();

client/protocols/openvpnprotocol.cpp

@@ -28,16 +28,16 @@ void OpenVpnProtocol::stop()
 
     // TODO: need refactoring
     // sendTermSignal() will even return true while server connected ???
-    if ((m_connectionState == VpnProtocol::ConnectionState::Preparing) ||
-            (m_connectionState == VpnProtocol::ConnectionState::Connecting) ||
-            (m_connectionState == VpnProtocol::ConnectionState::Connected) ||
-            (m_connectionState == VpnProtocol::ConnectionState::Reconnecting)) {
+    if ((m_connectionState == VpnProtocol::Preparing) ||
+            (m_connectionState == VpnProtocol::Connecting) ||
+            (m_connectionState == VpnProtocol::Connected) ||
+            (m_connectionState == VpnProtocol::Reconnecting)) {
         if (!sendTermSignal()) {
             killOpenVpnProcess();
         }
         m_managementServer.stop();
         qApp->processEvents();
-        setConnectionState(VpnProtocol::ConnectionState::Disconnecting);
+        setConnectionState(VpnProtocol::Disconnecting);
     }
 }
 
@@ -125,9 +125,9 @@ void OpenVpnProtocol::updateRouteGateway(QString line)
 QString OpenVpnProtocol::openVpnExecPath() const
 {
 #ifdef Q_OS_WIN
-    return Utils::executable(QString("openvpn/%1/openvpn").arg(QSysInfo::buildCpuArchitecture()), true);
+    return Utils::executable("openvpn/openvpn", true);
 #else
-    return Utils::executable(QString("/openvpn"), true);
+    return Utils::executable("/openvpn", true);
 #endif
 }
 
@@ -233,14 +233,14 @@ void OpenVpnProtocol::onReadyReadDataFromManagementServer()
             if (line.contains("CONNECTED,SUCCESS")) {
                 sendByteCount();
                 stopTimeoutTimer();
-                setConnectionState(VpnProtocol::ConnectionState::Connected);
+                setConnectionState(VpnProtocol::Connected);
                 continue;
             } else if (line.contains("EXITING,SIGTER")) {
                 //openVpnStateSigTermHandler();
-                setConnectionState(VpnProtocol::ConnectionState::Disconnecting);
+                setConnectionState(VpnProtocol::Disconnecting);
                 continue;
             } else if (line.contains("RECONNECTING")) {
-                setConnectionState(VpnProtocol::ConnectionState::Reconnecting);
+                setConnectionState(VpnProtocol::Reconnecting);
                 continue;
             }
         }

client/protocols/shadowsocksvpnprotocol.cpp

@@ -53,7 +53,7 @@ ErrorCode ShadowSocksVpnProtocol::start()
 
     connect(&m_ssProcess, QOverload<int, QProcess::ExitStatus>::of(&QProcess::finished), this, [this](int exitCode, QProcess::ExitStatus exitStatus){
         qDebug().noquote() << "ShadowSocksVpnProtocol finished, exitCode, exiStatus" << exitCode << exitStatus;
-        setConnectionState(VpnProtocol::ConnectionState::Disconnected);
+        setConnectionState(VpnProtocol::Disconnected);
         if (exitStatus != QProcess::NormalExit){
             emit protocolError(amnezia::ErrorCode::ShadowSocksExecutableCrashed);
             stop();

client/ui/mainwindow.cpp

@@ -120,7 +120,7 @@ MainWindow::MainWindow(QWidget *parent) :
     connect(m_vpnConnection, SIGNAL(connectionStateChanged(VpnProtocol::ConnectionState)), this, SLOT(onConnectionStateChanged(VpnProtocol::ConnectionState)));
     connect(m_vpnConnection, SIGNAL(vpnProtocolError(amnezia::ErrorCode)), this, SLOT(onVpnProtocolError(amnezia::ErrorCode)));
 
-    onConnectionStateChanged(VpnProtocol::ConnectionState::Disconnected);
+    onConnectionStateChanged(VpnProtocol::Disconnected);
 
     if (m_settings.isAutoConnect() && m_settings.defaultServerIndex() >= 0) {
         QTimer::singleShot(1000, this, [this](){
@@ -350,6 +350,9 @@ void MainWindow::keyPressEvent(QKeyEvent *event)
     case Qt::Key_Q:
         qApp->quit();
         break;
+//    case Qt::Key_0:
+//        *((char*)-1) = 'x';
+//        break;
     case Qt::Key_H:
         selectedServerIndex = m_settings.defaultServerIndex();
         selectedDockerContainer = m_settings.defaultContainer(selectedServerIndex);
@@ -891,38 +894,38 @@ void MainWindow::onConnectionStateChanged(VpnProtocol::ConnectionState state)
     setTrayState(state);
 
     switch (state) {
-    case VpnProtocol::ConnectionState::Disconnected:
+    case VpnProtocol::Disconnected:
         onBytesChanged(0,0);
         ui->pushButton_connect->setChecked(false);
         pushButtonConnectEnabled = true;
         radioButtonsModeEnabled = true;
         break;
-    case VpnProtocol::ConnectionState::Preparing:
+    case VpnProtocol::Preparing:
         pushButtonConnectEnabled = false;
         radioButtonsModeEnabled = false;
         break;
-    case VpnProtocol::ConnectionState::Connecting:
+    case VpnProtocol::Connecting:
         pushButtonConnectEnabled = false;
         radioButtonsModeEnabled = false;
         break;
-    case VpnProtocol::ConnectionState::Connected:
+    case VpnProtocol::Connected:
         pushButtonConnectEnabled = true;
         radioButtonsModeEnabled = false;
         break;
-    case VpnProtocol::ConnectionState::Disconnecting:
+    case VpnProtocol::Disconnecting:
         pushButtonConnectEnabled = false;
         radioButtonsModeEnabled = false;
         break;
-    case VpnProtocol::ConnectionState::Reconnecting:
+    case VpnProtocol::Reconnecting:
         pushButtonConnectEnabled = true;
         radioButtonsModeEnabled = false;
         break;
-    case VpnProtocol::ConnectionState::Error:
+    case VpnProtocol::Error:
         ui->pushButton_connect->setChecked(false);
         pushButtonConnectEnabled = true;
         radioButtonsModeEnabled = true;
         break;
-    case VpnProtocol::ConnectionState::Unknown:
+    case VpnProtocol::Unknown:
         pushButtonConnectEnabled = true;
         radioButtonsModeEnabled = true;
     }
@@ -976,7 +979,7 @@ void MainWindow::setupTray()
     });
 
     m_tray.setContextMenu(m_menu);
-    setTrayState(VpnProtocol::ConnectionState::Disconnected);
+    setTrayState(VpnProtocol::Disconnected);
 
     m_tray.show();
 
@@ -1129,27 +1132,31 @@ void MainWindow::setupSitesPageConnections()
         QItemSelectionModel* selection = ui->tableView_sites->selectionModel();
         if (!selection) return;
 
-        QModelIndexList indexes = selection->selectedRows();
+        {
+            QModelIndexList indexesSites = selection->selectedRows(0);
 
             QStringList sites;
-        for (const QModelIndex &index : indexes) {
+            for (const QModelIndex &index : indexesSites) {
                 sites.append(index.data().toString());
             }
 
             m_settings.removeVpnSites(mode, sites);
+        }
+
+
+        if (m_vpnConnection->connectionState() == VpnProtocol::Connected) {
+            QModelIndexList indexesIps = selection->selectedRows(1);
+
+            QStringList ips;
+            for (const QModelIndex &index : indexesIps) {
+                ips.append(index.data().toString());
+            }
+
+            m_vpnConnection->deleteRoutes(ips);
+            m_vpnConnection->flushDns();
+        }
+
         updateSitesPage();
-
-        //    if (m_vpnConnection->connectionState() == VpnProtocol::ConnectionState::Connected) {
-        //        if (IpcClient::Interface()) IpcClient::Interface()->routeDelete(ipToDelete, "");
-        //        if (IpcClient::Interface()) IpcClient::Interface()->flushDns();
-        //    }
-
-
-//        if (m_vpnConnection->connectionState() == VpnProtocol::ConnectionState::Connected) {
-//            if (IpcClient::Interface())
-//                IpcClient::Interface()->routeDelete(m_vpnConnection->vpnProtocol()->vpnGateway(),
-//                    QStringList() << ip);
-//        }
     });
 
     connect(ui->pushButton_sites_import, &QPushButton::clicked, this, [this](){
@@ -1174,6 +1181,10 @@ void MainWindow::setupSitesPageConnections()
         }
 
         m_settings.addVpnIps(mode, ips);
+
+        m_vpnConnection->addRoutes(QStringList() << ips);
+        m_vpnConnection->flushDns();
+
         updateSitesPage();
     });
 }
@@ -1678,32 +1689,32 @@ void MainWindow::setTrayState(VpnProtocol::ConnectionState state)
 {
     QString resourcesPath = ":/images/tray/%1";
 
-    m_trayActionDisconnect->setEnabled(state == VpnProtocol::ConnectionState::Connected);
-    m_trayActionConnect->setEnabled(state == VpnProtocol::ConnectionState::Disconnected);
+    m_trayActionDisconnect->setEnabled(state == VpnProtocol::Connected);
+    m_trayActionConnect->setEnabled(state == VpnProtocol::Disconnected);
 
     switch (state) {
-    case VpnProtocol::ConnectionState::Disconnected:
+    case VpnProtocol::Disconnected:
         setTrayIcon(QString(resourcesPath).arg(DisconnectedTrayIconName));
         break;
-    case VpnProtocol::ConnectionState::Preparing:
+    case VpnProtocol::Preparing:
         setTrayIcon(QString(resourcesPath).arg(DisconnectedTrayIconName));
         break;
-    case VpnProtocol::ConnectionState::Connecting:
+    case VpnProtocol::Connecting:
         setTrayIcon(QString(resourcesPath).arg(DisconnectedTrayIconName));
         break;
-    case VpnProtocol::ConnectionState::Connected:
+    case VpnProtocol::Connected:
         setTrayIcon(QString(resourcesPath).arg(ConnectedTrayIconName));
         break;
-    case VpnProtocol::ConnectionState::Disconnecting:
+    case VpnProtocol::Disconnecting:
         setTrayIcon(QString(resourcesPath).arg(DisconnectedTrayIconName));
         break;
-    case VpnProtocol::ConnectionState::Reconnecting:
+    case VpnProtocol::Reconnecting:
         setTrayIcon(QString(resourcesPath).arg(DisconnectedTrayIconName));
         break;
-    case VpnProtocol::ConnectionState::Error:
+    case VpnProtocol::Error:
         setTrayIcon(QString(resourcesPath).arg(ErrorTrayIconName));
         break;
-    case VpnProtocol::ConnectionState::Unknown:
+    case VpnProtocol::Unknown:
     default:
         setTrayIcon(QString(resourcesPath).arg(DisconnectedTrayIconName));
     }
@@ -1759,7 +1770,10 @@ void MainWindow::onConnectWorker(int serverIndex, const ServerCredentials &crede
     ui->pushButton_connect->setChecked(true);
     qApp->processEvents();
 
-    ErrorCode errorCode = m_vpnConnection->connectToVpn(serverIndex, credentials, container, containerConfig);
+    ErrorCode errorCode = m_vpnConnection->connectToVpn(
+        serverIndex, credentials, container, containerConfig
+    );
+
     if (errorCode) {
         //ui->pushButton_connect->setChecked(false);
         QMessageBox::critical(this, APPLICATION_NAME, errorString(errorCode));
@@ -1810,11 +1824,8 @@ void MainWindow::onPushButtonAddCustomSitesClicked()
     const auto &cbProcess = [this, mode](const QString &newSite, const QString &ip) {
         m_settings.addVpnSite(mode, newSite, ip);
 
-        if (m_vpnConnection->connectionState() == VpnProtocol::ConnectionState::Connected) {
-            if (IpcClient::Interface())
-                IpcClient::Interface()->routeAddList(m_vpnConnection->vpnProtocol()->vpnGateway(),
-                    QStringList() << ip);
-        }
+        m_vpnConnection->addRoutes(QStringList() << ip);
+        m_vpnConnection->flushDns();
 
         updateSitesPage();
     };
@@ -1886,6 +1897,12 @@ void MainWindow::updateAppSettingsPage()
 
     ui->lineEdit_network_settings_dns1->setText(m_settings.primaryDns());
     ui->lineEdit_network_settings_dns2->setText(m_settings.secondaryDns());
+
+    QString ver = QString("%1: %2 (%3)")
+            .arg(tr("Software version"))
+            .arg(QString(APP_MAJOR_VERSION))
+            .arg(__DATE__);
+    ui->label_app_settings_version->setText(ver);
 }
 
 void MainWindow::updateGeneralSettingPage()
@@ -2049,7 +2066,7 @@ void MainWindow::updateSharingPage(int serverIndex, const ServerCredentials &cre
     selectedDockerContainer = container;
     selectedServerIndex = serverIndex;
 
-    const QJsonObject &containerConfig = m_settings.containerConfig(serverIndex, container);
+    //const QJsonObject &containerConfig = m_settings.containerConfig(serverIndex, container);
 
     for (QWidget *page : {
          ui->page_share_amnezia,

client/ui/mainwindow.ui

@@ -274,7 +274,7 @@ QPushButton:hover {
       <string notr="true"/>
      </property>
      <property name="currentIndex">
-      <number>10</number>
+      <number>13</number>
      </property>
      <widget class="QWidget" name="page_start">
       <widget class="QLabel" name="label_25">
@@ -4035,7 +4035,7 @@ background: #211966;
         <string>Check for updates</string>
        </property>
       </widget>
-      <widget class="QLabel" name="label_6">
+      <widget class="QLabel" name="label_app_settings_version">
        <property name="geometry">
         <rect>
          <x>30</x>
@@ -4045,7 +4045,7 @@ background: #211966;
         </rect>
        </property>
        <property name="text">
-        <string>Software version: 1.7.0 (18.05.2021)</string>
+        <string>Software version: X.X.X (01.06.2021)</string>
        </property>
       </widget>
       <widget class="QCheckBox" name="checkBox_app_settings_start_minimized">
@@ -5549,8 +5549,8 @@ QToolBox::tab:hover {
          <rect>
           <x>0</x>
           <y>0</y>
-          <width>360</width>
-          <height>360</height>
+          <width>100</width>
+          <height>30</height>
          </rect>
         </property>
         <property name="styleSheet">
@@ -5677,8 +5677,8 @@ background: #282932;
          <rect>
           <x>0</x>
           <y>0</y>
-          <width>360</width>
-          <height>360</height>
+          <width>100</width>
+          <height>30</height>
          </rect>
         </property>
         <attribute name="label">
@@ -5873,8 +5873,8 @@ background: #282932;
          <rect>
           <x>0</x>
           <y>0</y>
-          <width>360</width>
-          <height>360</height>
+          <width>100</width>
+          <height>30</height>
          </rect>
         </property>
         <attribute name="label">
@@ -6039,8 +6039,8 @@ background: #282932;
          <rect>
           <x>0</x>
           <y>0</y>
-          <width>360</width>
-          <height>360</height>
+          <width>100</width>
+          <height>30</height>
          </rect>
         </property>
         <property name="styleSheet">
@@ -6263,8 +6263,8 @@ color: #15CDCB;
          <rect>
           <x>0</x>
           <y>0</y>
-          <width>360</width>
-          <height>360</height>
+          <width>100</width>
+          <height>30</height>
          </rect>
         </property>
         <attribute name="label">

client/utils.cpp

@@ -195,9 +195,27 @@ QString Utils::netMaskFromIpWithSubnet(const QString ip)
 
 QString Utils::ipAddressFromIpWithSubnet(const QString ip)
 {
+    if (ip.count(".") != 3) return "";
     return ip.split("/").first();
 }
 
+QStringList Utils::summarizeRoutes(const QStringList &ips, const QString cidr)
+{
+//    QMap<int, int>
+//    QHostAddress
+
+//    QMap<QString, QStringList> subnets; // <"a.b", <list subnets>>
+
+//    for (const QString &ip : ips) {
+//        if (ip.count(".") != 3) continue;
+
+//        const QStringList &parts = ip.split(".");
+//        subnets[parts.at(0) + "." + parts.at(1)].append(ip);
+//    }
+
+    return QStringList();
+}
+
 #ifdef Q_OS_WIN
 // Inspired from http://stackoverflow.com/a/15281070/1529139
 // and http://stackoverflow.com/q/40059902/1529139

client/utils.h

@@ -42,6 +42,8 @@ public:
     static QString netMaskFromIpWithSubnet(const QString ip);
     static QString ipAddressFromIpWithSubnet(const QString ip);
 
+    static QStringList summarizeRoutes(const QStringList &ips, const QString cidr);
+
 #ifdef Q_OS_WIN
     static bool signalCtrl(DWORD dwProcessId, DWORD dwCtrlEvent);
 #endif

client/vpnconnection.cpp

@@ -40,22 +40,26 @@ void VpnConnection::onBytesChanged(quint64 receivedBytes, quint64 sentBytes)
 void VpnConnection::onConnectionStateChanged(VpnProtocol::ConnectionState state)
 {
     if (IpcClient::Interface()) {
-        if (state == VpnProtocol::ConnectionState::Connected && IpcClient::Interface()){
+        if (state == VpnProtocol::Connected){
             IpcClient::Interface()->flushDns();
 
             if (m_settings.routeMode() == Settings::VpnOnlyForwardSites) {
-                IpcClient::Interface()->routeDelete("0.0.0.0", m_vpnProtocol->vpnGateway());
-
+                IpcClient::Interface()->routeDeleteList(m_vpnProtocol->vpnGateway(), QStringList() << "0.0.0.0");
+                //qDebug() << "VpnConnection::onConnectionStateChanged :: adding custom routes, count:" << forwardIps.size();
+            }
             IpcClient::Interface()->routeAddList(m_vpnProtocol->vpnGateway(),
                 QStringList() << m_settings.primaryDns() << m_settings.secondaryDns());
 
-                const QStringList &forwardIps = m_settings.getVpnIps(Settings::VpnOnlyForwardSites);
-                qDebug() << "VpnConnection::onConnectionStateChanged :: adding custom routes, count:" << forwardIps.size();
 
-                IpcClient::Interface()->routeAddList(m_vpnProtocol->vpnGateway(), forwardIps);
+            if (m_settings.routeMode() == Settings::VpnOnlyForwardSites) {
+                IpcClient::Interface()->routeAddList(m_vpnProtocol->vpnGateway(), m_settings.getVpnIps(Settings::VpnOnlyForwardSites));
             }
+            else if (m_settings.routeMode() == Settings::VpnAllExceptSites) {
+                IpcClient::Interface()->routeAddList(m_vpnProtocol->routeGateway(), m_settings.getVpnIps(Settings::VpnAllExceptSites));
             }
-        else if (state == VpnProtocol::ConnectionState::Error) {
+
+        }
+        else if (state == VpnProtocol::Error) {
             IpcClient::Interface()->flushDns();
 
             if (m_settings.routeMode() == Settings::VpnOnlyForwardSites) {
@@ -72,6 +76,35 @@ QSharedPointer<VpnProtocol> VpnConnection::vpnProtocol() const
     return m_vpnProtocol;
 }
 
+void VpnConnection::addRoutes(const QStringList &ips)
+{
+    if (connectionState() == VpnProtocol::Connected && IpcClient::Interface()) {
+        if (m_settings.routeMode() == Settings::VpnOnlyForwardSites) {
+            IpcClient::Interface()->routeAddList(m_vpnProtocol->vpnGateway(), ips);
+        }
+        else if (m_settings.routeMode() == Settings::VpnAllExceptSites) {
+            IpcClient::Interface()->routeAddList(m_vpnProtocol->routeGateway(), ips);
+        }
+    }
+}
+
+void VpnConnection::deleteRoutes(const QStringList &ips)
+{
+    if (connectionState() == VpnProtocol::Connected && IpcClient::Interface()) {
+        if (m_settings.routeMode() == Settings::VpnOnlyForwardSites) {
+            IpcClient::Interface()->routeDeleteList(vpnProtocol()->vpnGateway(), ips);
+        }
+        else if (m_settings.routeMode() == Settings::VpnAllExceptSites) {
+            IpcClient::Interface()->routeDeleteList(m_vpnProtocol->routeGateway(), ips);
+        }
+    }
+}
+
+void VpnConnection::flushDns()
+{
+    if (IpcClient::Interface()) IpcClient::Interface()->flushDns();
+}
+
 ErrorCode VpnConnection::lastError() const
 {
     if (!m_vpnProtocol.data()) {
@@ -197,11 +230,12 @@ ErrorCode VpnConnection::createVpnConfiguration(int serverIndex,
     return ErrorCode::NoError;
 }
 
-ErrorCode VpnConnection::connectToVpn(int serverIndex, const ServerCredentials &credentials, DockerContainer container, const QJsonObject &containerConfig)
+ErrorCode VpnConnection::connectToVpn(int serverIndex,
+    const ServerCredentials &credentials, DockerContainer container, const QJsonObject &containerConfig)
 {
     qDebug() << "СonnectToVpn, Route mode is" << m_settings.routeMode();
 
-    emit connectionStateChanged(VpnProtocol::ConnectionState::Connecting);
+    emit connectionStateChanged(VpnProtocol::Connecting);
 
     ServerController::setupServerFirewall(credentials);
 
@@ -214,42 +248,42 @@ ErrorCode VpnConnection::connectToVpn(int serverIndex, const ServerCredentials &
     if (container == DockerContainer::None || container == DockerContainer::OpenVpn) {
         ErrorCode e = createVpnConfiguration(serverIndex, credentials, DockerContainer::OpenVpn, containerConfig);
         if (e) {
-            emit connectionStateChanged(VpnProtocol::ConnectionState::Error);
+            emit connectionStateChanged(VpnProtocol::Error);
             return e;
         }
 
         m_vpnProtocol.reset(new OpenVpnProtocol(m_vpnConfiguration));
         e = static_cast<OpenVpnProtocol *>(m_vpnProtocol.data())->checkAndSetupTapDriver();
         if (e) {
-            emit connectionStateChanged(VpnProtocol::ConnectionState::Error);
+            emit connectionStateChanged(VpnProtocol::Error);
             return e;
         }
     }
     else if (container == DockerContainer::OpenVpnOverShadowSocks) {
         ErrorCode e = createVpnConfiguration(serverIndex, credentials, DockerContainer::OpenVpnOverShadowSocks, containerConfig);
         if (e) {
-            emit connectionStateChanged(VpnProtocol::ConnectionState::Error);
+            emit connectionStateChanged(VpnProtocol::Error);
             return e;
         }
 
         m_vpnProtocol.reset(new ShadowSocksVpnProtocol(m_vpnConfiguration));
         e = static_cast<OpenVpnProtocol *>(m_vpnProtocol.data())->checkAndSetupTapDriver();
         if (e) {
-            emit connectionStateChanged(VpnProtocol::ConnectionState::Error);
+            emit connectionStateChanged(VpnProtocol::Error);
             return e;
         }
     }
     else if (container == DockerContainer::OpenVpnOverCloak) {
         ErrorCode e = createVpnConfiguration(serverIndex, credentials, DockerContainer::OpenVpnOverCloak, containerConfig);
         if (e) {
-            emit connectionStateChanged(VpnProtocol::ConnectionState::Error);
+            emit connectionStateChanged(VpnProtocol::Error);
             return e;
         }
 
         m_vpnProtocol.reset(new OpenVpnOverCloakProtocol(m_vpnConfiguration));
         e = static_cast<OpenVpnProtocol *>(m_vpnProtocol.data())->checkAndSetupTapDriver();
         if (e) {
-            emit connectionStateChanged(VpnProtocol::ConnectionState::Error);
+            emit connectionStateChanged(VpnProtocol::Error);
             return e;
         }
     }
@@ -276,10 +310,9 @@ void VpnConnection::disconnectFromVpn()
     if (IpcClient::Interface()) {
         IpcClient::Interface()->flushDns();
 
-        if (m_settings.routeMode() == Settings::VpnOnlyForwardSites) {
+        // delete cached routes
         IpcClient::Interface()->clearSavedRoutes();
     }
-    }
 
     if (!m_vpnProtocol.data()) {
         return;
@@ -289,7 +322,7 @@ void VpnConnection::disconnectFromVpn()
 
 VpnProtocol::ConnectionState VpnConnection::connectionState()
 {
-    if (!m_vpnProtocol) return VpnProtocol::ConnectionState::Disconnected;
+    if (!m_vpnProtocol) return VpnProtocol::Disconnected;
     return m_vpnProtocol->connectionState();
 }
 

client/vpnconnection.h

@@ -33,16 +33,21 @@ public:
     ErrorCode createVpnConfiguration(int serverIndex,
         const ServerCredentials &credentials, DockerContainer container, const QJsonObject &containerConfig);
 
-    ErrorCode connectToVpn(int serverIndex, const ServerCredentials &credentials, DockerContainer container, const QJsonObject &containerConfig);
+    ErrorCode connectToVpn(int serverIndex,
+        const ServerCredentials &credentials, DockerContainer container, const QJsonObject &containerConfig);
+
     void disconnectFromVpn();
 
     bool isConnected() const;
     bool isDisconnected() const;
 
     VpnProtocol::ConnectionState connectionState();
-
     QSharedPointer<VpnProtocol> vpnProtocol() const;
 
+    void addRoutes(const QStringList &ips);
+    void deleteRoutes(const QStringList &ips);
+    void flushDns();
+
 signals:
     void bytesChanged(quint64 receivedBytes, quint64 sentBytes);
     void connectionStateChanged(VpnProtocol::ConnectionState state);
@@ -60,6 +65,7 @@ protected:
 private:
     Settings m_settings;
     QJsonObject m_vpnConfiguration;
+    QJsonObject m_routeMode;
 
 };
 

deploy/build_windows.bat

@@ -4,9 +4,6 @@ CHCP 1252
 
 REM %VAR:"=% mean dequoted %VAR%
 
-set QT_BIN_DIR="c:\Qt\5.14.2\msvc2017\bin"
-set QIF_BIN_DIR="c:\Qt\Tools\QtInstallerFramework\4.0\bin"
-
 set PATH=%QT_BIN_DIR:"=%;%PATH%
 
 echo "Using Qt in %QT_BIN_DIR%"
@@ -16,9 +13,9 @@ REM Hold on to current directory
 set PROJECT_DIR=%cd%
 set SCRIPT_DIR=%PROJECT_DIR:"=%\deploy
 
+set WORK_DIR=%SCRIPT_DIR:"=%\build_%BUILD_ARCH:"=%
 rmdir /Q /S %WORK_DIR%
 mkdir %SCRIPT_DIR:"=%\build
-set WORK_DIR=%SCRIPT_DIR:"=%\build
 
 
 set APP_NAME=AmneziaVPN
@@ -26,7 +23,7 @@ set APP_FILENAME=%APP_NAME:"=%.exe
 set APP_DOMAIN=org.amneziavpn.package
 set RELEASE_DIR=%WORK_DIR:"=%
 set OUT_APP_DIR=%RELEASE_DIR:"=%\client\release
-set DEPLOY_DATA_DIR=%SCRIPT_DIR:"=%\data\windows
+set DEPLOY_DATA_DIR=%SCRIPT_DIR:"=%\data\windows\x%BUILD_ARCH:"=%
 set INSTALLER_DATA_DIR=%RELEASE_DIR:"=%\installer\packages\%APP_DOMAIN:"=%\data
 set PRO_FILE_PATH=%PROJECT_DIR:"=%\%APP_NAME:"=%.pro
 set QMAKE_STASH_FILE=%PROJECT_DIR:"=%\.qmake_stash

deploy/data/windows/x64/easyrsa/COPYING.html

@@ -0,0 +1,21 @@
+<h1>Easy-RSA -- A Shell-based CA Utility</h1>
+<p>Copyright (C) 2013 by the Open-Source OpenVPN development community</p>
+<h2>Easy-RSA 3 license: GPLv2</h2>
+<p>All the Easy-RSA code contained in this project falls under a GPLv2 license with
+full text available in the Licensing/ directory. Additional components used by
+this project fall under additional licenses:</p>
+<h2>Additional licenses for external components</h2>
+<p>The following components are under different licenses; while not part of the
+Easy-RSA source code, these components are used by Easy-RSA or provided in
+platform distributions as described below:</p>
+<h3>OpenSSL</h3>
+<p>OpenSSL is not linked by Easy-RSA, nor is it currently provided in any release
+  package by Easy-RSA. However, Easy-RSA is tightly coupled with OpenSSL, so
+  effective use of this code will require your acceptance and installation of
+  OpenSSL.</p>
+<h3>Additional Windows Components</h3>
+<p>The Windows binary package includes mksh/Win32 and unxutils binary components,
+  with full licensing details available in the distro/windows/Licensing/
+  subdirectory of this project. mksh/Win32 is under a MirOS license (with some
+  additional component licenses present there) and unxutils is under a GPLv2
+  license.</p>

deploy/data/windows/x64/easyrsa/COPYING.md

@@ -0,0 +1,33 @@
+Easy-RSA -- A Shell-based CA Utility
+====================================
+
+Copyright (C) 2013 by the Open-Source OpenVPN development community
+
+Easy-RSA 3 license: GPLv2
+-------------------------
+
+All the Easy-RSA code contained in this project falls under a GPLv2 license with
+full text available in the Licensing/ directory. Additional components used by
+this project fall under additional licenses:
+
+Additional licenses for external components
+-------------------------------------------
+
+The following components are under different licenses; while not part of the
+Easy-RSA source code, these components are used by Easy-RSA or provided in
+platform distributions as described below:
+
+### OpenSSL
+
+  OpenSSL is not linked by Easy-RSA, nor is it currently provided in any release
+  package by Easy-RSA. However, Easy-RSA is tightly coupled with OpenSSL, so
+  effective use of this code will require your acceptance and installation of
+  OpenSSL.
+
+### Additional Windows Components
+
+  The Windows binary package includes mksh/Win32 and unxutils binary components,
+  with full licensing details available in the distro/windows/Licensing/
+  subdirectory of this project. mksh/Win32 is under a MirOS license (with some
+  additional component licenses present there) and unxutils is under a GPLv2
+  license.

deploy/data/windows/x64/easyrsa/EasyRSA-Start.bat

@@ -0,0 +1,2 @@
+@echo OFF
+bin\sh.exe bin\easyrsa-shell-init.sh

deploy/data/windows/x64/easyrsa/Licensing/LICENSE-OpenSSL.txt

@@ -0,0 +1,125 @@
+
+  LICENSE ISSUES
+  ==============
+
+  The OpenSSL toolkit stays under a double license, i.e. both the conditions of
+  the OpenSSL License and the original SSLeay license apply to the toolkit.
+  See below for the actual license texts.
+
+  OpenSSL License
+  ---------------
+
+/* ====================================================================
+ * Copyright (c) 1998-2018 The OpenSSL Project.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    openssl-core@openssl.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay@cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh@cryptsoft.com).
+ *
+ */
+
+ Original SSLeay License
+ -----------------------
+
+/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
+ * All rights reserved.
+ *
+ * This package is an SSL implementation written
+ * by Eric Young (eay@cryptsoft.com).
+ * The implementation was written so as to conform with Netscapes SSL.
+ * 
+ * This library is free for commercial and non-commercial use as long as
+ * the following conditions are aheared to.  The following conditions
+ * apply to all code found in this distribution, be it the RC4, RSA,
+ * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
+ * included with this distribution is covered by the same copyright terms
+ * except that the holder is Tim Hudson (tjh@cryptsoft.com).
+ * 
+ * Copyright remains Eric Young's, and as such any Copyright notices in
+ * the code are not to be removed.
+ * If this package is used in a product, Eric Young should be given attribution
+ * as the author of the parts of the library used.
+ * This can be in the form of a textual message at program startup or
+ * in documentation (online or textual) provided with the package.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *    "This product includes cryptographic software written by
+ *     Eric Young (eay@cryptsoft.com)"
+ *    The word 'cryptographic' can be left out if the rouines from the library
+ *    being used are not cryptographic related :-).
+ * 4. If you include any Windows specific code (or a derivative thereof) from 
+ *    the apps directory (application code) you must include an acknowledgement:
+ *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
+ * 
+ * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * 
+ * The licence and distribution terms for any publically available version or
+ * derivative of this code cannot be changed.  i.e. this code cannot simply be
+ * copied and put under another distribution licence
+ * [including the GNU Public Licence.]
+ */
+

deploy/data/windows/x64/easyrsa/Licensing/gpl-2.0.txt

@@ -0,0 +1,340 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+                            NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.
+