[tor-commits] [arm/release] Interpretor help for USEFEATURE

[atagar at torproject.org]

commit cf42e1c26689c569e93c4ebd41f33f95d4268de7
Author: Damian Johnson <atagar at torproject.org>
Date:   Sun Sep 18 21:30:59 2011 -0700

    Interpretor help for USEFEATURE
    
    This gives basic usage information and lists the options
---
 src/util/torInterpretor.py |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/src/util/torInterpretor.py b/src/util/torInterpretor.py
index 74559ba..d9f3e69 100644
--- a/src/util/torInterpretor.py
+++ b/src/util/torInterpretor.py
@@ -149,6 +149,9 @@ always on.
 Events include...
 """
 
+HELP_USEFEATURE = """Customizes the behavior of the control port. Options include...
+"""
+
 HELP_OPTIONS = {
   "HELP": ("/help [OPTION]", HELP_HELP),
   "WRITE": ("/write [PATH]", HELP_WRITE),
@@ -161,6 +164,7 @@ HELP_OPTIONS = {
   "RESETCONF": ("RESETCONF PARAM[=VALUE]", HELP_RESETCONF),
   "SIGNAL": ("SIGNAL SIG", HELP_SIGNAL),
   "SETEVENTS": ("SETEVENTS [EXTENDED] [EVENTS]", HELP_SETEVENTS),
+  "USEFEATURE": ("USEFEATURE OPTION", HELP_USEFEATURE),
 }
 
 class InterpretorClosed(Exception):
@@ -434,6 +438,11 @@ class ControlInterpretor:
                 lineContent += "%-20s" % entry
               
               outputEntry.append((lineContent + "\n", OUTPUT_FORMAT))
+        elif arg == "USEFEATURE":
+          # lists the feature options
+          featureOptions = torTools.getConn().getInfo("features/names")
+          if featureOptions:
+            outputEntry.append((featureOptions + "\n", OUTPUT_FORMAT))
       else:
         # check if this is a configuration option
         manEntry = torConfig.getConfigDescription(arg)