[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[vidalia-svn] r1487: Don't wait forever to receive a response from the little con (trunk/src/control)



Author: edmanm
Date: 2006-12-02 15:32:47 -0500 (Sat, 02 Dec 2006)
New Revision: 1487

Modified:
   trunk/src/control/controlsocket.cpp
Log:
Don't wait forever to receive a response from the little control protocol
version detection trick, in case we connect to a localhost:9051 that isn't
Tor.


Modified: trunk/src/control/controlsocket.cpp
===================================================================
--- trunk/src/control/controlsocket.cpp	2006-12-02 20:16:10 UTC (rev 1486)
+++ trunk/src/control/controlsocket.cpp	2006-12-02 20:32:47 UTC (rev 1487)
@@ -117,7 +117,7 @@
     return VersionUnknown;
   }
   while (bytesAvailable() < 4) {
-    if (!waitForReadyRead(-1)) {
+    if (!waitForReadyRead(CONN_TIMEOUT)) {
       return VersionUnknown;
     }
   }