Changeset 2324

Timestamp:

01/24/08 20:53:24 (12 months ago)

Author:

edmanm

Message:

r81@lysithea: edmanm | 2008-01-24 20:53:06 -0500
Add a 'ProxyExecutable?' configuration option to launch a proxy application
when Vidalia starts, and close it when Vidalia exits.
Patch from Steven J. Murdoch <http://www.cl.cam.ac.uk/users/sjm217/>.

Location:

vidalia/trunk

Files:

• CHANGELOG (modified) (1 diff)
• src/vidalia/CMakeLists.txt (modified) (3 diffs)
• src/vidalia/browserprocess.cpp (deleted)
• src/vidalia/browserprocess.h (deleted)
• src/vidalia/config/vidaliasettings.cpp (modified) (3 diffs)
• src/vidalia/config/vidaliasettings.h (modified) (1 diff)
• src/vidalia/helperprocess.cpp (added)
• src/vidalia/helperprocess.h (added)
• src/vidalia/mainwindow.cpp (modified) (5 diffs)
• src/vidalia/mainwindow.h (modified) (5 diffs)

vidalia/trunk/CHANGELOG

@@ -35 +35 @@
   o Add a 'BrowserExecutable' configuration option to launch a Web browser
     when Tor has built a circuit, and exit Vidalia when the browser is closed.
+    Patch from Steven J. Murdoch <http://www.cl.cam.ac.uk/users/sjm217/>.
+  o Add a 'ProxyExecutable' configuration option to launch a proxy application
+    when Vidalia starts, and close it when Vidalia exits.
     Patch from Steven J. Murdoch <http://www.cl.cam.ac.uk/users/sjm217/>.
   o Respond to the Delete key in the network map by closing whatever circuits

vidalia/trunk/src/vidalia/CMakeLists.txt

@@ -183 +183 @@
   vidaliawindow.cpp
   vmessagebox.cpp
-  browserprocess.cpp
+  helperprocess.cpp
 )
 qt4_wrap_cpp(vidalia_SRCS
@@ -192 +192 @@
   vidaliawindow.h
   vmessagebox.h
-  browserprocess.h
+  helperprocess.h
 )
 
@@ -289 +289 @@
 endif(NOT WIN32 AND NOT APPLE)
 
+

vidalia/trunk/src/vidalia/config/vidaliasettings.cpp

@@ -44 +44 @@
 #define SETTING_SHOW_MAINWINDOW_AT_START  "ShowMainWindowAtStart"
 #define SETTING_BROWSER_EXECUTABLE  "BrowserExecutable"
+#define SETTING_PROXY_EXECUTABLE  "ProxyExecutable"
 
 #if defined(Q_OS_WIN32)
@@ -75 +76 @@
   setDefault(SETTING_SHOW_MAINWINDOW_AT_START, true);
   setDefault(SETTING_BROWSER_EXECUTABLE, "");
+  setDefault(SETTING_PROXY_EXECUTABLE, "");
 }
 
@@ -187 +189 @@
 }
 
+/** Returns a fully-qualified path to the proxy server, including the
+ * executable name. */
+QString
+VidaliaSettings::getProxyExecutable() const
+{
+  return QDir::convertSeparators(value(SETTING_PROXY_EXECUTABLE).toString());
+}
+
+/** Sets the location and name of the proxy server executable to the given string.
+ * If set to the empty string, the proxy will not be started. */
+void
+VidaliaSettings::setProxyExecutable(const QString &proxyExecutable)
+{
+  setValue(SETTING_PROXY_EXECUTABLE, proxyExecutable);
+}

vidalia/trunk/src/vidalia/config/vidaliasettings.h

@@ -79 +79 @@
    * If set to the empty string, the browser will not be started. */
   void setBrowserExecutable(const QString &browserExecutable);
+
+  /** Returns a fully-qualified path to the proxy server, including the
+   * executable name. */
+  QString getProxyExecutable() const;
+
+  /** Sets the location and name of the proxy server executable to the given string.
+   * If set to the empty string, the proxy will not be started. */
+  void setProxyExecutable(const QString &proxyExecutable);
 };
 

vidalia/trunk/src/vidalia/mainwindow.cpp

@@ -148 +148 @@
   _torControl->setEvent(TorEvents::GeneralStatus, this, true);
 
-  /* Create a new BrowserProcess object, used to start the web browser */
-  _browserProcess = new BrowserProcess(this);
+  /* Create a new HelperProcess object, used to start the web browser */
+  _browserProcess = new HelperProcess(this);
   connect(_browserProcess, SIGNAL(finished(int, QProcess::ExitStatus)),
            this, SLOT(onBrowserFinished(int, QProcess::ExitStatus)));
   connect(_browserProcess, SIGNAL(startFailed(QString)),
            this, SLOT(onBrowserFailed(QString)));
+
+  /* Create a new HelperProcess object, used to start the proxy server */
+  _proxyProcess = new HelperProcess(this);
+  connect(_proxyProcess, SIGNAL(startFailed(QString)),
+           this, SLOT(onProxyFailed(QString)));
 
   /* Catch signals when the application is running or shutting down */
@@ -227 +232 @@
     start();
   }
+
+  /* Start the proxy server, if configured */
+  startProxy();
 }
 
@@ -237 +245 @@
     /* Kill our Tor process now */ 
     _torControl->stop();
+  }
+
+  if (_proxyProcess->state() != QProcess::NotRunning) {
+    /* Close the proxy server (Polipo ignores the WM_CLOSE event sent by
+     * terminate() so we have to kill() it) */
+    _proxyProcess->kill();
   }
 
@@ -436 +450 @@
   VMessageBox::warning(this, tr("Error starting web browser"),
               tr("Vidalia was unable to start the configured web browser"),
+              VMessageBox::Ok|VMessageBox::Default|VMessageBox::Escape);
+}
+
+/** Starts the proxy server, if appropriately configured */
+void MainWindow::startProxy()
+{
+  VidaliaSettings settings;
+  QString executable = settings.getProxyExecutable();
+  
+  if (!executable.isEmpty())
+    _proxyProcess->start(executable, QStringList());
+}
+
+/** Called when the proxy server fails to start, for example, because
+ * the path specified didn't lead to an executable. */
+void
+MainWindow::onProxyFailed(QString errmsg)
+{
+  Q_UNUSED(errmsg);
+ 
+  /* Display an error message and see if the user wants some help */
+  VMessageBox::warning(this, tr("Error starting proxy server"),
+              tr("Vidalia was unable to start the configured proxy server"),
               VMessageBox::Ok|VMessageBox::Default|VMessageBox::Escape);
 }
@@ -1152 +1189 @@
 }
 
+

vidalia/trunk/src/vidalia/mainwindow.h

@@ -41 +41 @@
 #include "network/netviewer.h"
 #include "ui_mainwindow.h"
-#include "browserprocess.h"
+#include "helperprocess.h"
 
 
@@ -113 +113 @@
   /** Called web the web browser failed to start */
   void onBrowserFailed(QString errmsg);
+  /** Called when the proxy server fails to start */
+  void onProxyFailed(QString errmsg);
   
 private:
@@ -139 +141 @@
   /** Starts the web browser, if appropriately configured */
   void startBrowser();
+  /** Starts the proxy server, if appropriately configured */
+  void startProxy();
   /** Converts a TorStatus enum value to a string for debug logging purposes. */
   QString toString(TorStatus status);
@@ -176 +180 @@
   /** A TorControl object that handles communication with Tor */
   TorControl* _torControl;
-  /** A BrowserProcess object that manages the web browser */
-  BrowserProcess* _browserProcess;
+  /** A HelperProcess object that manages the web browser */
+  HelperProcess* _browserProcess;
+  /** A HelperProcess object that manages the proxy server */
+  HelperProcess* _proxyProcess;
   /** Remembers the control password between when we start Tor with a hash of
    * the password and when we need to provide the password itself. */
@@ -201 +207 @@
 #endif
 
+