[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[vidalia-svn] r2324: Add a 'ProxyExecutable' configuration option to launch a pro (in vidalia/trunk: . src/vidalia src/vidalia/config)

To: vidalia-svn@xxxxxxxx
Subject: [vidalia-svn] r2324: Add a 'ProxyExecutable' configuration option to launch a pro (in vidalia/trunk: . src/vidalia src/vidalia/config)
From: edmanm@xxxxxxxxxxxxxxxxxxx
Date: Thu, 24 Jan 2008 20:53:25 -0500 (EST)
Delivered-to: archiver@xxxxxxxx
Delivered-to: vidalia-svn-outgoing@xxxxxxxx
Delivered-to: vidalia-svn@xxxxxxxx
Delivery-date: Thu, 24 Jan 2008 20:53:32 -0500
Reply-to: vidalia-svn@xxxxxxxxxxxxx
Sender: owner-vidalia-svn@xxxxxxxxxxxxx
Author: edmanm
Date: 2008-01-24 20:53:24 -0500 (Thu, 24 Jan 2008)
New Revision: 2324

Added:
   vidalia/trunk/src/vidalia/helperprocess.cpp
   vidalia/trunk/src/vidalia/helperprocess.h
Removed:
   vidalia/trunk/src/vidalia/browserprocess.cpp
   vidalia/trunk/src/vidalia/browserprocess.h
Modified:
   vidalia/trunk/
   vidalia/trunk/CHANGELOG
   vidalia/trunk/src/vidalia/CMakeLists.txt
   vidalia/trunk/src/vidalia/config/vidaliasettings.cpp
   vidalia/trunk/src/vidalia/config/vidaliasettings.h
   vidalia/trunk/src/vidalia/mainwindow.cpp
   vidalia/trunk/src/vidalia/mainwindow.h
Log:
 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/>.



Property changes on: vidalia/trunk
___________________________________________________________________
 svk:merge ticket from /local/vidalia/trunk [r81] on 90112fd6-a33b-4cea-8d39-48ff1d78625c

Modified: vidalia/trunk/CHANGELOG
===================================================================
--- vidalia/trunk/CHANGELOG	2008-01-25 01:53:10 UTC (rev 2323)
+++ vidalia/trunk/CHANGELOG	2008-01-25 01:53:24 UTC (rev 2324)
@@ -35,6 +35,9 @@
   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
     or streams are currently selected. Suggested by Andrew Lewman.
   o Rename the 'Relay' settings page to the 'Sharing' settings page.

Modified: vidalia/trunk/src/vidalia/CMakeLists.txt
===================================================================
--- vidalia/trunk/src/vidalia/CMakeLists.txt	2008-01-25 01:53:10 UTC (rev 2323)
+++ vidalia/trunk/src/vidalia/CMakeLists.txt	2008-01-25 01:53:24 UTC (rev 2324)
@@ -182,7 +182,7 @@
   vclicklabel.cpp
   vidaliawindow.cpp
   vmessagebox.cpp
-  browserprocess.cpp
+  helperprocess.cpp
 )
 qt4_wrap_cpp(vidalia_SRCS
   vidalia.h
@@ -191,7 +191,7 @@
   vclicklabel.h
   vidaliawindow.h
   vmessagebox.h
-  browserprocess.h
+  helperprocess.h
 )
 
 ## Specify all the Qt Designer .ui files
@@ -288,3 +288,4 @@
   install(FILES vidalia.desktop DESTINATION share/applications)
 endif(NOT WIN32 AND NOT APPLE)
 
+

Deleted: vidalia/trunk/src/vidalia/browserprocess.cpp

Deleted: vidalia/trunk/src/vidalia/browserprocess.h

Modified: vidalia/trunk/src/vidalia/config/vidaliasettings.cpp
===================================================================
--- vidalia/trunk/src/vidalia/config/vidaliasettings.cpp	2008-01-25 01:53:10 UTC (rev 2323)
+++ vidalia/trunk/src/vidalia/config/vidaliasettings.cpp	2008-01-25 01:53:24 UTC (rev 2324)
@@ -43,6 +43,7 @@
 #define SETTING_DATA_DIRECTORY      "DataDirectory"
 #define SETTING_SHOW_MAINWINDOW_AT_START  "ShowMainWindowAtStart"
 #define SETTING_BROWSER_EXECUTABLE  "BrowserExecutable"
+#define SETTING_PROXY_EXECUTABLE  "ProxyExecutable"
 
 #if defined(Q_OS_WIN32)
 #define STARTUP_REG_KEY        "Software\\Microsoft\\Windows\\CurrentVersion\\Run"
@@ -74,6 +75,7 @@
   setDefault(SETTING_RUN_TOR_AT_START, true);
   setDefault(SETTING_SHOW_MAINWINDOW_AT_START, true);
   setDefault(SETTING_BROWSER_EXECUTABLE, "");
+  setDefault(SETTING_PROXY_EXECUTABLE, "");
 }
 
 /** Gets the currently preferred language code for Vidalia. */
@@ -186,3 +188,18 @@
   setValue(SETTING_BROWSER_EXECUTABLE, browserExecutable);
 }
 
+/** 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);
+}

Modified: vidalia/trunk/src/vidalia/config/vidaliasettings.h
===================================================================
--- vidalia/trunk/src/vidalia/config/vidaliasettings.h	2008-01-25 01:53:10 UTC (rev 2323)
+++ vidalia/trunk/src/vidalia/config/vidaliasettings.h	2008-01-25 01:53:24 UTC (rev 2324)
@@ -78,6 +78,14 @@
   /** Sets the location and name of the web browser executable to the given string.
    * 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);
 };
 
 #endif

Added: vidalia/trunk/src/vidalia/helperprocess.cpp
===================================================================
--- vidalia/trunk/src/vidalia/helperprocess.cpp	                        (rev 0)
+++ vidalia/trunk/src/vidalia/helperprocess.cpp	2008-01-25 01:53:24 UTC (rev 2324)
@@ -0,0 +1,64 @@
+/****************************************************************
+ *  This file was originally written by Steven J. Murdoch, and 
+ *  modified by Matt Edman. It is distributed under the following
+ *  license:
+ *
+ *  Copyright (C) 2007, Matt Edman
+ *  Copyright (C) 2007, Steven J. Murdoch 
+ *                      <http://www.cl.cam.ac.uk/users/sjm217/>
+ *
+ *  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.
+ ****************************************************************/
+
+/**
+ * \file helperprocess.cpp
+ * \version $Id$
+ * \brief Invokes a web browser process (originally by Steven. J. Murdoch)
+ */
+
+#include <QString>
+  
+#include "helperprocess.h"
+
+
+/** Default constructor */
+HelperProcess::HelperProcess(QObject *parent)
+: QProcess(parent)
+{
+  // Call error handling routine on errors
+  QObject::connect(this, SIGNAL(error(QProcess::ProcessError)),
+                   this, SLOT(onError(QProcess::ProcessError)));
+}
+
+/** Start the specified application. */
+void
+HelperProcess::start(const QString &app, const QStringList &args) 
+{
+  // Start the specified application
+  QProcess::start(app, args, QIODevice::ReadOnly | QIODevice::Text);
+}
+
+/** Invoked when underlying QProcess fails. */
+void
+HelperProcess::onError(QProcess::ProcessError error)
+{
+  // Pass up error messages on startup, but ignore the rest
+  if (error == QProcess::FailedToStart) {
+    emit startFailed(errorString());
+  }
+}
+
+


Property changes on: vidalia/trunk/src/vidalia/helperprocess.cpp
___________________________________________________________________
Name: svn:keywords
   + Id
Name: svn:eol-style
   + native

Added: vidalia/trunk/src/vidalia/helperprocess.h
===================================================================
--- vidalia/trunk/src/vidalia/helperprocess.h	                        (rev 0)
+++ vidalia/trunk/src/vidalia/helperprocess.h	2008-01-25 01:53:24 UTC (rev 2324)
@@ -0,0 +1,57 @@
+/****************************************************************
+ *  This file was originally written by Steven J. Murdoch, and 
+ *  modified by Matt Edman. It is distributed under the following
+ *  license:
+ * 
+ *  Copyright (C) 2007, Matt Edman
+ *  Copyright (C) 2007, Steven J. Murdoch 
+ *                      <http://www.cl.cam.ac.uk/users/sjm217/>
+ *
+ *  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.
+ ****************************************************************/
+
+/**
+ * \file helperprocess.cpp
+ * \version $Id$ 
+ * \brief Invokes a web browser process (originally by Steven. J. Murdoch)
+ */
+
+#ifndef _HELPERPROCESS_H
+#define _HELPERPROCESS_H
+
+#include <QProcess>
+
+
+class HelperProcess : public QProcess
+{
+  Q_OBJECT
+
+public:
+  /** Default constructor */
+  HelperProcess(QObject *parent = 0);
+  /** Start the specified application. */
+  void start(const QString &app, const QStringList &args);
+
+private slots:
+  /** Invoked when underlying QProcess fails. */
+  void onError(QProcess::ProcessError error);
+
+signals:
+  /** Invoked when start() fails. */
+  void startFailed(const QString &errorMessage);
+};
+
+#endif


Property changes on: vidalia/trunk/src/vidalia/helperprocess.h
___________________________________________________________________
Name: svn:keywords
   + Id
Name: svn:eol-style
   + native

Modified: vidalia/trunk/src/vidalia/mainwindow.cpp
===================================================================
--- vidalia/trunk/src/vidalia/mainwindow.cpp	2008-01-25 01:53:10 UTC (rev 2323)
+++ vidalia/trunk/src/vidalia/mainwindow.cpp	2008-01-25 01:53:24 UTC (rev 2324)
@@ -147,13 +147,18 @@
   _torControl->setEvent(TorEvents::ClientStatus,  this, true);
   _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 */
   connect(vApp, SIGNAL(running()), this, SLOT(running()));
   connect(vApp, SIGNAL(shutdown()), this, SLOT(shutdown()));
@@ -226,6 +231,9 @@
     /* If we're supposed to start Tor when Vidalia starts, then do it now */
     start();
   }
+
+  /* Start the proxy server, if configured */
+  startProxy();
 }
 
 /** Terminate the Tor process if it is being run under Vidalia, disconnect all
@@ -238,6 +246,12 @@
     _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();
+  }
+
   /* Disconnect all of the TorControl object's signals */
   QObject::disconnect(_torControl, 0, 0, 0);
 
@@ -438,6 +452,29 @@
               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);
+}
+
 /** Updates the UI to reflect Tor's current <b>status</b>. Returns the
  * previously set TorStatus value.*/
 MainWindow::TorStatus
@@ -1151,3 +1188,4 @@
   return "Unknown";
 }
 
+

Modified: vidalia/trunk/src/vidalia/mainwindow.h
===================================================================
--- vidalia/trunk/src/vidalia/mainwindow.h	2008-01-25 01:53:10 UTC (rev 2323)
+++ vidalia/trunk/src/vidalia/mainwindow.h	2008-01-25 01:53:24 UTC (rev 2324)
@@ -40,7 +40,7 @@
 #include "help/browser/helpbrowser.h"
 #include "network/netviewer.h"
 #include "ui_mainwindow.h"
-#include "browserprocess.h"
+#include "helperprocess.h"
 
 
 class MainWindow : public VidaliaWindow
@@ -112,6 +112,8 @@
   void onBrowserFinished(int exitCode, QProcess::ExitStatus exitStatus);
   /** 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:
   enum TorStatus {
@@ -138,6 +140,8 @@
   TorStatus updateTorStatus(TorStatus status);
   /** 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);
   /** Authenticates Vidalia to Tor's control port. */
@@ -175,8 +179,10 @@
   ConfigDialog* _configDialog;
   /** 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. */
   QString _controlPassword;
@@ -200,3 +206,4 @@
 
 #endif
 
+
Prev by Author: [vidalia-svn] r2323: Small fix to notbobfischer's patch in r2321. (in vidalia/trunk: . src/util)
Next by Author: [vidalia-svn] r2326: Fix a doxygen tag so it stops yelling at me. I still love yo (in vidalia/trunk: . src/vidalia)
Previous by thread: [vidalia-svn] r2323: Small fix to notbobfischer's patch in r2321. (in vidalia/trunk: . src/util)
Next by thread: [vidalia-svn] r2325: Ticket #323 link error in help/content/en/config.html fixed (vidalia/trunk/src/vidalia/help/content/en)
Index(es):
- Author
- Thread