[vidalia-svn] r2567: Undo the bits I didn't mean to stomp on in my last commit. (in vidalia: . branches/upnp/src/vidalia/config)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2008-05-09 01:15:38 -0400 (Fri, 09 May 2008)
New Revision: 2567

Modified:
   vidalia/
   vidalia/branches/upnp/src/vidalia/config/serversettings.cpp
   vidalia/branches/upnp/src/vidalia/config/serversettings.h
Log:
 r294@thebe:  edmanm | 2008-05-09 01:16:16 -0400
 Undo the bits I didn't mean to stomp on in my last commit.



Property changes on: vidalia
___________________________________________________________________
 svk:merge ticket from /local/vidalia [r294] on 45a62a8a-8088-484c-baad-c7b3e776dd32

Modified: vidalia/branches/upnp/src/vidalia/config/serversettings.cpp
===================================================================
--- vidalia/branches/upnp/src/vidalia/config/serversettings.cpp	2008-05-09 04:58:41 UTC (rev 2566)
+++ vidalia/branches/upnp/src/vidalia/config/serversettings.cpp	2008-05-09 05:15:38 UTC (rev 2567)
@@ -136,12 +136,10 @@
 {
   bool rc;
 
-  configurePortForwarding();
+  if (isUpnpEnabled())
+    configurePortForwarding();
+
   if (isServerEnabled()) {
-    /* Configure UPnP device to forward DirPort and OrPort */
-    /* TODO: does isServerEnabled() return true when a server is just set up? */
-    if (isUpnpEnabled())
-      configurePortForwarding(true, true);
     rc = torControl()->setConf(confValues(), errmsg);
   } else { 
     QStringList resetKeys;

Modified: vidalia/branches/upnp/src/vidalia/config/serversettings.h
===================================================================
--- vidalia/branches/upnp/src/vidalia/config/serversettings.h	2008-05-09 04:58:41 UTC (rev 2566)
+++ vidalia/branches/upnp/src/vidalia/config/serversettings.h	2008-05-09 05:15:38 UTC (rev 2567)
@@ -82,9 +82,8 @@
   /** Gets the maximum burst rate (in B/s) of this server. */
   quint32 getBandwidthBurstRate();
 
-  /** If <b>enable</b> is true, configure UPnP device to forward ORPort, otherwise
-   * remove mapping. */
-  void configurePortForwarding(bool enable, bool async);
+  /** Configure port forwarding. */
+  void configurePortForwarding();
 
   void cleanupPortForwarding();