[vidalia-svn] r2051: Always use an exit policy of "reject *:*" when running a bri (in trunk: . src/config src/gui/config)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2007-10-20 21:02:20 -0400 (Sat, 20 Oct 2007)
New Revision: 2051

Modified:
   trunk/
   trunk/src/config/serversettings.cpp
   trunk/src/gui/config/serverpage.cpp
Log:
 r2162@lysithea:  edmanm | 2007-10-20 20:44:51 -0400
 Always use an exit policy of "reject *:*" when running a bridge server.



Property changes on: trunk
___________________________________________________________________
 svk:merge ticket from /local/vidalia/trunk [r2162] on dc66be73-d13e-47ba-a267-8dc7cda68c65

Modified: trunk/src/config/serversettings.cpp
===================================================================
--- trunk/src/config/serversettings.cpp	2007-10-21 01:02:13 UTC (rev 2050)
+++ trunk/src/config/serversettings.cpp	2007-10-21 01:02:20 UTC (rev 2051)
@@ -99,7 +99,8 @@
                          : "0"));
   /* Server Exit Policy */
   conf.insert(SETTING_EXITPOLICY, 
-    localValue(SETTING_EXITPOLICY).toString());
+    (isBridgeEnabled() ? "reject *:*"
+                       : localValue(SETTING_EXITPOLICY).toString()));
   
   /* Server bandwidth settings */
   conf.insert((torVersion >= 0x020001 ? SETTING_RELAY_BANDWIDTH_RATE 

Modified: trunk/src/gui/config/serverpage.cpp
===================================================================
--- trunk/src/gui/config/serverpage.cpp	2007-10-21 01:02:13 UTC (rev 2050)
+++ trunk/src/gui/config/serverpage.cpp	2007-10-21 01:02:20 UTC (rev 2051)
@@ -165,6 +165,9 @@
 {
   enabled = (ui.rdoServerMode->isChecked() || ui.rdoBridgeMode->isChecked());
   ui.tabsMenu->setVisible(enabled);
+  
+  /* Disable the Exit Policies tab when bridge server mode is selected */
+  ui.tabsMenu->setTabEnabled(2, !ui.rdoBridgeMode->isChecked());
 }
 
 /** Returns true if the user has changed their server settings since the