Changeset 84 for trunk/src/control/torcontrol.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/torcontrol.cpp (modified) (4 diffs)

trunk/src/control/torcontrol.cpp

@@ -122 +122 @@
 TorControl::isConnected()
 {
-  return (_controlConn.state() == QAbstractSocket::ConnectedState);
+  return _controlConn.isValid();
 }
 
@@ -131 +131 @@
  */
 bool
-TorControl::authenticate(QByteArray token, QString *errmsg)
-{
-  ControlCommand cmd("AUTHENTICATE", QString(token));
+TorControl::authenticate(QString *errmsg)
+{
+  VidaliaSettings settings;
+  ControlCommand cmd("AUTHENTICATE", QString(settings.getAuthToken()));
   ControlReply reply;
 
@@ -182 +183 @@
       }
     }
+  } else {
+    /* Sending the control command failed */
+    return false;
   }
   return true;
@@ -195 +199 @@
   if (getInfo(map, errmsg)) {
     val = map.value(key);
+    return true;
   }
   return false;