Changeset 84

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)

Location:

trunk/src/control

Files:

• controlconnection.cpp (modified) (3 diffs)
• test/control_test.cpp (modified) (4 diffs)
• torcontrol.cpp (modified) (4 diffs)
• torcontrol.h (modified) (1 diff)

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 */

trunk/src/control/test/control_test.cpp

@@ -38 +38 @@
   
   /* Start Tor */
-  if (!control.startTor(&errmsg)) {
+  if (!control.start(&errmsg)) {
     qDebug() << "Could not start Tor:" << errmsg;
     return -1;
@@ -48 +48 @@
   if (!control.connect(&errmsg)) {
     qDebug() << "Could not connect to Tor:" << errmsg;
-    control.stopTor();
+    control.stop();
     return -1;
   } else {
@@ -55 +55 @@
 
   /* Authenticate */
-  if (control.authenticate(QByteArray(), &errmsg)) {
+  if (control.authenticate(&errmsg)) {
     qDebug() << "Authentication Successful...";
     
@@ -71 +71 @@
   /* Disconnect the control socket and stop Tor */
   control.disconnect();
-  control.stopTor();
+  control.stop();
   
   return 0;

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;

trunk/src/control/torcontrol.h

@@ -70 +70 @@
 
   /** Sends an authentication token to Tor */
-  bool authenticate(QByteArray token, QString *errmsg = 0);
+  bool authenticate(QString *errmsg = 0);
 
   /** Sends a GETINFO message to Tor based on the given keys */