Changeset 78

Timestamp:

01/12/06 20:02:07 (3 years ago)

Author:

edmanm

Message:

Add support for the SIGNAL keyword;
Fix two potential segfaults.

Location:

trunk/src/control

Files:

• torcontrol.cpp (modified) (3 diffs)
• torcontrol.h (modified) (2 diffs)

trunk/src/control/torcontrol.cpp

@@ -138 +138 @@
   if (_controlConn.send(cmd, reply, errmsg)) {
     ReplyLine line = reply.getLine();
-    if (line.getStatus() == "250") {
-      return true;
+    if (line.getStatus() != "250") {
+      if (errmsg) {
+        *errmsg = line.getMessage();
+      }
+      return false;
     }
   }
-  return false;
+  return true;
 }
 
@@ -167 +170 @@
     foreach (ReplyLine line, reply.getLines()) {
       if (line.getStatus() != "250") {
-        *errmsg = line.getMessage();
+        if (errmsg) {
+          *errmsg = line.getMessage();
+        }
         return false;
       }
@@ -194 +199 @@
 }
 
+/** Sends a signal to Tor */
+bool
+TorControl::signal(Signal sig, QString *errmsg)
+{
+  ControlCommand cmd("SIGNAL");
+  ControlReply reply;
+  QString sigtype;
+  
+  /* Convert the signal to the correct string */
+  switch (sig) {
+    case Reload:   sigtype = "RELOAD"; break;
+    case Shutdown: sigtype = "SHUTDOWN"; break;
+    case Dump:     sigtype = "DUMP"; break;
+    case Debug:    sigtype = "DEBUG"; break;
+    case Halt:     sigtype = "HALT"; break;
+    default: return false; break;
+  }
+  
+  /* Send and check the response */
+  if (_controlConn.send(cmd, reply, errmsg)) {
+    ReplyLine line = reply.getLine();
+    if (line.getStatus() != "250") {
+      if (errmsg) {
+        *errmsg = line.getMessage();
+      }
+      return false;
+    }
+  }
+  return true;
+}
+
 /** Ask Tor for its version */
 QString

trunk/src/control/torcontrol.h

@@ -36 +36 @@
   
 public:
+  /** Signals that can be sent by the controller */
+  enum Signal {
+    Reload,
+    Shutdown,
+    Dump,
+    Debug,
+    Halt
+  };
+  
   /** Default constructor */
   TorControl();
@@ -69 +78 @@
   bool getInfo(QString key, QString &val, QString *errmsg = 0);
 
+  /** Sends a signal to Tor */
+  bool signal(Signal sig, QString *errmsg = 0);
+  
   /** Ask Tor for its version */
   QString getTorVersion(QString *errmsg = 0);