[or-cvs] [tor/master] Warn when hibernation and low-port on non-windows is configured

[Nick Mathewson]

Author: Sebastian Hahn <sebastian at torproject.org>
Date: Tue, 12 May 2009 19:48:08 +0200
Subject: Warn when hibernation and low-port on non-windows is configured
Commit: a28215a150818b11e128f5f5aeb44e53a40d5af7

This addresses the first part of bug 918. Users are now warned when
they try to use hibernation in combination with a port below 1024
when they're not on Windows. We don't want to die here, because
people might run Tor as root, use a capabilities system or some
other platform that will allow them to re-attach low ports.

Wording suggested by Marian
---
 src/or/config.c |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/src/or/config.c b/src/or/config.c
index 35f5134..71dd391 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -3013,6 +3013,18 @@ options_validate(or_options_t *old_options, or_options_t *options,
     REJECT("TransPort and TransListenAddress are disabled in this build.");
 #endif
 
+#ifndef MS_WINDOWS
+    if (options->AccountingMax &&
+        (options->DirPort < 1024 || options->ORPort < 1024))
+      log(LOG_WARN, LD_CONFIG,
+          "You have set AccountingMax to use hibernation. You have also "
+          "chosen a low DirPort or OrPort. This combination can make Tor stop "
+          "working when it tries to re-attach the port after a period of "
+          "hibernation. Please choose a different port or turn off "
+          "hibernation unless you know this combination will work on your "
+          "platform.");
+#endif
+
   if (options->ExcludeExitNodes || options->ExcludeNodes) {
     options->_ExcludeExitNodesUnion = routerset_new();
     routerset_union(options->_ExcludeExitNodesUnion,options->ExcludeExitNodes);
-- 
1.5.6.5