Changeset 84 for trunk/src/control/controlconnection.cpp

Timestamp:

01/13/06 23:32:35 (3 years ago)

Author:

edmanm

Message:

Use QAbstractSocket's isValid() method to determine if the control socket is
connected;
Check if the socket is ready for reading and writing before sending or
receiving;
Update the control test code for the method names I changed back in revision
75;
The authenticate() method in TorControl? will handle loading controller
authentication tokens itself, once it's implemented. (maybe)

Files:

• trunk/src/control/controlconnection.cpp (modified) (3 diffs)

trunk/src/control/controlconnection.cpp

@@ -57 +57 @@
 {
   disconnectFromHost();
-  if (!waitForDisconnected(-1)) {
-    if (errmsg) {
-      *errmsg =
-        QString("Error disconnecting socket. [%1]").arg(errorString());
+  if (state() != QAbstractSocket::UnconnectedState) {
+    if (!waitForDisconnected(-1)) {
+      if (errmsg) {
+        *errmsg =
+          QString("Error disconnecting socket. [%1]").arg(errorString());
+      }
+      return false;
     }
-    return false;
   }
   return true;
@@ -77 +79 @@
 ControlConnection::sendCommand(ControlCommand cmd, QString *errmsg)
 {
+  if (!isValid()) {
+    return false;
+  }
+  
   /* Format the control command */
   QString strCmd = cmd.toString();
@@ -109 +115 @@
   QChar c;
   QString line;
+
+  if (!isValid()) {
+    return false;
+  }
 
   /* The implementation below is based on the Java control library from Tor */