Options are taken from the configuration dialogue and passed through to

[openvpnui.git] / src / vpncontrol.cpp

diff --git a/src/vpncontrol.cpp b/src/vpncontrol.cpp
index a519dce..1935194 100644 (file)
--- a/src/vpncontrol.cpp
+++ b/src/vpncontrol.cpp
@@ -86,7 +86,6 @@ void VPNControl::setServer(const QString &value)
     emit serverChanged(server);
 }
 
-
 void VPNControl::vpnConnect() {
     if (vpnProcess != NULL) {
         printf ("Process already running.\n");
@@ -95,11 +94,8 @@ void VPNControl::vpnConnect() {
         printf ("Connect\n");
 
         vpnProcess = new QProcess();
-        //QString program = "/home/nemo/Documents/Development/Projects/Stooge/stooge";
         QString program = "openvpn";
-        QStringList arguments;
-        arguments << "/home/nemo/Documents/Configure/OpenVPN/client.ovpn";
-
+        collectArguments ();
         vpnProcess->setReadChannel(QProcess::StandardOutput);
         connect(vpnProcess, SIGNAL(error(QProcess::ProcessError)), this, SLOT(readError(QProcess::ProcessError)));
         connect(vpnProcess, SIGNAL(readyRead()), this, SLOT(readData()));
@@ -109,9 +105,53 @@ void VPNControl::vpnConnect() {
         vpnProcess->start(program, arguments);
         vpnProcess->closeWriteChannel();
         setStatus(VPNSTATUS_INITIALISING);
+        arguments.clear();
+    }
+}
+
+void VPNControl::collectArguments () {
+    arguments.clear();
+
+    addArgument("config", "/home/nemo/Documents/Configure/OpenVPN/config.ovpn");
+    addArgument("remote", server);
+    addArgument("port", QString::number(port));
+    addOption("comp-lzo", compressed);
+    if (useTLS) {
+        addArgument("tls-auth", "/home/nemo/Documents/Configure/OpenVPN/ta.key");
+        addValue(QString::number(tlsDirection));
+    }
+    addArgument("ca", "/home/nemo/Documents/Configure/OpenVPN/ca.crt");
+    addArgument("cert", "/home/nemo/Documents/Configure/OpenVPN/Jolla.crt");
+    addArgument("key", "/home/nemo/Documents/Configure/OpenVPN/Jolla.key");
+}
+
+void VPNControl::addArgument (QString key, QString value) {
+    QString argument;
+
+    argument = "--" + key;
+    arguments.append(argument);
+    if (value != "") {
+        arguments.append(value);
     }
 }
 
+void VPNControl::addArgument (QString key) {
+    QString argument;
+
+    argument = "--" + key;
+    arguments.append(argument);
+}
+
+void VPNControl::addOption (QString key, bool add) {
+    if (add) {
+        addArgument (key);
+    }
+}
+
+void VPNControl::addValue (QString key) {
+    arguments.append(key);
+}
+
 void VPNControl::vpnDisconnect() {
     if (vpnProcess != NULL) {
         printf ("Disconnect\n");