[tor-commits] [arm/release] Adding option for relaying without SOCKS port

[atagar at torproject.org]

commit fd39b3a97479694ae23b7f37bd9a8e43d13890ec
Author: Damian Johnson <atagar at torproject.org>
Date:   Mon Jun 27 09:59:12 2011 -0700

    Adding option for relaying without SOCKS port
---
 src/cli/wizard.py |    4 +++-
 src/settings.cfg  |    4 ++++
 2 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/src/cli/wizard.py b/src/cli/wizard.py
index 0d47de5..d2fb067 100644
--- a/src/cli/wizard.py
+++ b/src/cli/wizard.py
@@ -15,18 +15,20 @@ from util import enum, uiTools
 RelayType = enum.Enum("RELAY", "EXIT", "BRIDGE", "CLIENT")
 
 # all options that can be configured
-Options = enum.Enum("DIVIDER", "NICKNAME", "CONTACT", "NOTIFY", "BANDWIDTH", "LIMIT", "STARTUP", "NOTICE", "POLICY", "WEBSITES", "EMAIL", "IM", "MISC", "PLAINTEXT")
+Options = enum.Enum("DIVIDER", "NICKNAME", "CONTACT", "NOTIFY", "BANDWIDTH", "LIMIT", "CLIENT", "STARTUP", "NOTICE", "POLICY", "WEBSITES", "EMAIL", "IM", "MISC", "PLAINTEXT")
 RelayOptions = {RelayType.RELAY: (Options.NICKNAME,
                                   Options.CONTACT,
                                   Options.NOTIFY,
                                   Options.BANDWIDTH,
                                   Options.LIMIT,
+                                  Options.CLIENT,
                                   Options.STARTUP),
                 RelayType.EXIT:  (Options.NICKNAME,
                                   Options.CONTACT,
                                   Options.NOTIFY,
                                   Options.BANDWIDTH,
                                   Options.LIMIT,
+                                  Options.CLIENT,
                                   Options.STARTUP,
                                   Options.DIVIDER,
                                   Options.NOTICE,
diff --git a/src/settings.cfg b/src/settings.cfg
index 135b0e2..0ab57a2 100644
--- a/src/settings.cfg
+++ b/src/settings.cfg
@@ -346,6 +346,7 @@ wizard.message.relay Internal relays provide connections within the Tor network.
 wizard.message.exit Exits connect between the Tor network and the outside Internet. This is the most vitally important role you can take, but it also needs some forethought. Please read 'http://www.atagar.com/torExitTips/' before proceeding further to avoid any nasty surprises!
 
 wizard.toggle Notify => Yes, No
+wizard.toggle Client => Enabled, Disabled
 wizard.toggle Startup => Yes, No
 wizard.toggle Notice => Yes, No
 wizard.toggle Policy => Default, Custom
@@ -365,6 +366,7 @@ wizard.default Nickname => Unnamed
 wizard.default Notify => true
 wizard.default Bandwidth => 5 MB/s
 wizard.default Startup => true
+wizard.default Client => false
 wizard.default Notice => true
 wizard.default Policy => true
 wizard.default Websites => true
@@ -385,6 +387,7 @@ wizard.label.opt Contact => Contact Information
 wizard.label.opt Notify => Issue Notification
 wizard.label.opt Bandwidth => Relay Speed
 wizard.label.opt Limit => Monthly Limit
+wizard.label.opt Client => Client Usage
 wizard.label.opt Startup => Run At Startup
 wizard.label.opt Notice => Disclaimer Notice
 wizard.label.opt Policy => Exit Policy
@@ -404,6 +407,7 @@ wizard.description.opt Contact => Address we can contact you at if there's a pro
 wizard.description.opt Notify => Sends automated email notifications to the above address if your relay is unreachable or out of date. This service is provided by Tor Weather (https://weather.torproject.org/) and will send you a confirmation email before it's started.
 wizard.description.opt Bandwidth => Limit for the average rate at which you relay traffic.
 wizard.description.opt Limit => Maximum amount of traffic to relay each month. Some ISPs, like Comcast, cap their customer's Internet usage so this is an easy way of staying below that limit.
+wizard.description.opt Client => Enable this if you would like to use Tor yourself. This opens or closes the SOCKS port used by applications for connecting to Tor.
 wizard.description.opt Startup => Runs Tor in the background when the system starts.
 wizard.description.opt Notice => Provides a disclaimer that this is an exit on port 80 (http://www.atagar.com/exitNotice).
 wizard.description.opt Policy => Ports allowed to exit from your relay. The default policy allows for common services while limiting the chance of getting a DMCA takedown for torrent traffic (http://www.atagar.com/exitPolicy).