summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2006-10-02 20:10:41 +0000
committerNick Mathewson <nickm@torproject.org>2006-10-02 20:10:41 +0000
commit4e6dbf96cea26d37801c4cbf2aa83f6ed588c905 (patch)
tree22539a07473311e86a4b84587b66fc5e08db7a47
parent89fd4fdbe28dd063f846752939f3f0530b6973e3 (diff)
downloadtor-4e6dbf96cea26d37801c4cbf2aa83f6ed588c905.tar.gz
tor-4e6dbf96cea26d37801c4cbf2aa83f6ed588c905.zip
Backport from (as-yet-unpushed) branch: add names for newer (svk st) v0 control commands, to avoid possibility of v0-controller-caused crash on systems that freak out on printf("%s",NULL).
svn:r8575
-rw-r--r--ChangeLog3
-rw-r--r--src/or/control.c3
2 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index e9d2158afa..2740d93cb2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,9 @@ Changes in version 0.1.1.25 - 2006-10-?? [ongoing]
- We were building exactly the wrong circuits when we anticipated
hidden service requirements, meaning Tor would have to build all
its circuits on demand.
+ - Avoid possibility of controller-triggered crash when misusing certain
+ commands from a v0 controller on platforms that do not handle
+ printf("%s",NULL) gracefully.
Changes in version 0.1.1.24 - 2006-09-29
diff --git a/src/or/control.c b/src/or/control.c
index 7faeff8e7e..769b09d966 100644
--- a/src/or/control.c
+++ b/src/or/control.c
@@ -101,6 +101,9 @@ static const char * CONTROL0_COMMANDS[_CONTROL0_CMD_MAX_RECOGNIZED+1] = {
"postdescriptor",
"fragmentheader",
"fragment",
+ "redirectstream",
+ "closestream",
+ "closecircuit",
};
/** Bitfield: The bit 1&lt;&lt;e is set if <b>any</b> open control