[vidalia-svn] r2628: Make the duration of the timeout used in the call to upnpDis (in vidalia: . branches/upnp/src/vidalia/config)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2008-05-31 20:51:59 -0400 (Sat, 31 May 2008)
New Revision: 2628

Modified:
   vidalia/
   vidalia/branches/upnp/src/vidalia/config/upnpcontrol.cpp
   vidalia/branches/upnp/src/vidalia/config/upnpcontrol.h
   vidalia/branches/upnp/src/vidalia/config/upnpcontrolthread.h
Log:
 r394@thebe:  edmanm | 2008-05-30 22:28:20 -0400
 Make the duration of the timeout used in the call to upnpDiscover() available
 via UPNPControl::discoverTimeout().



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

Modified: vidalia/branches/upnp/src/vidalia/config/upnpcontrol.cpp
===================================================================
--- vidalia/branches/upnp/src/vidalia/config/upnpcontrol.cpp	2008-05-30 23:58:27 UTC (rev 2627)
+++ vidalia/branches/upnp/src/vidalia/config/upnpcontrol.cpp	2008-06-01 00:51:59 UTC (rev 2628)
@@ -134,4 +134,11 @@
   }
 }
 
+/** Returns the number of milliseconds to wait for devices to respond
+ * when attempting to discover UPnP-enabled IGDs. */
+int
+UPNPControl::discoverTimeout() const
+{
+  return UPNPControlThread::UPNPCONTROL_DISCOVER_TIMEOUT;
+}
 

Modified: vidalia/branches/upnp/src/vidalia/config/upnpcontrol.h
===================================================================
--- vidalia/branches/upnp/src/vidalia/config/upnpcontrol.h	2008-05-30 23:58:27 UTC (rev 2627)
+++ vidalia/branches/upnp/src/vidalia/config/upnpcontrol.h	2008-06-01 00:51:59 UTC (rev 2628)
@@ -58,6 +58,10 @@
   /** Returns a QString describing the type of error that occurred last. */
   QString errorString() const;
 
+  /** Returns the number of milliseconds to wait for devices to respond
+   * when attempting to discover UPnP-enabled IGDs. */
+  int discoverTimeout() const;
+  
 signals:
   /** Emitted when a UPnP error occurs. */
   void error(UPNPControl::UPNPError error);

Modified: vidalia/branches/upnp/src/vidalia/config/upnpcontrolthread.h
===================================================================
--- vidalia/branches/upnp/src/vidalia/config/upnpcontrolthread.h	2008-05-30 23:58:27 UTC (rev 2627)
+++ vidalia/branches/upnp/src/vidalia/config/upnpcontrolthread.h	2008-06-01 00:51:59 UTC (rev 2628)
@@ -34,6 +34,10 @@
   Q_OBJECT
 
 public:
+  /** Specifies the number of milliseconds to wait for devices to respond
+   * when attempting to discover UPnP-enabled IGDs. */
+  static const int UPNPCONTROL_DISCOVER_TIMEOUT = 2000;
+
   /** Constructor. <b>control</b> will be used for retrieving the desired port
    * forwarding state. */
   UPNPControlThread(UPNPControl *control);