[vidalia-svn] r2403: TunnelDirConns and PreferTunneledDirConns now default to 'he (in vidalia/trunk: . src/vidalia/config)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2008-03-13 00:34:19 -0400 (Thu, 13 Mar 2008)
New Revision: 2403

Modified:
   vidalia/trunk/
   vidalia/trunk/src/vidalia/config/networkpage.cpp
   vidalia/trunk/src/vidalia/config/networkpage.ui
   vidalia/trunk/src/vidalia/config/networksettings.cpp
Log:
 r196@lysithea:  edmanm | 2008-03-13 00:34:13 -0400
 TunnelDirConns and PreferTunneledDirConns now default to 'hell yes.' Also, now
 we don't check the 'My ISP blocks connections to the Tor network' box simply
 because those options are enabled. Checking that box still does enable
 encrypted dir connections on older Tors. Also remove the '(optional)' from the
 'Tor Bridge Settings' frame, since it doesn't really make sense anymore.



Property changes on: vidalia/trunk
___________________________________________________________________
 svk:merge ticket from /local/vidalia/trunk [r196] on 90112fd6-a33b-4cea-8d39-48ff1d78625c

Modified: vidalia/trunk/src/vidalia/config/networkpage.cpp
===================================================================
--- vidalia/trunk/src/vidalia/config/networkpage.cpp	2008-03-13 03:36:11 UTC (rev 2402)
+++ vidalia/trunk/src/vidalia/config/networkpage.cpp	2008-03-13 04:34:19 UTC (rev 2403)
@@ -350,8 +350,7 @@
   ui.lineReachablePorts->setText(reachablePortStrings.join(","));
 
   /* Load bridge settings */
-  ui.chkUseBridges->setChecked(settings.getUseBridges() 
-                                || settings.getTunnelDirConns());
+  ui.chkUseBridges->setChecked(settings.getUseBridges()); 
   ui.listBridges->clear();
   ui.listBridges->addItems(settings.getBridgeList());
 }

Modified: vidalia/trunk/src/vidalia/config/networkpage.ui
===================================================================
--- vidalia/trunk/src/vidalia/config/networkpage.ui	2008-03-13 03:36:11 UTC (rev 2402)
+++ vidalia/trunk/src/vidalia/config/networkpage.ui	2008-03-13 04:34:19 UTC (rev 2403)
@@ -259,7 +259,7 @@
       </size>
      </property>
      <property name="title" >
-      <string>Tor Bridge Settings (optional)</string>
+      <string>Tor Bridge Settings</string>
      </property>
      <layout class="QVBoxLayout" >
       <property name="margin" >

Modified: vidalia/trunk/src/vidalia/config/networksettings.cpp
===================================================================
--- vidalia/trunk/src/vidalia/config/networksettings.cpp	2008-03-13 03:36:11 UTC (rev 2402)
+++ vidalia/trunk/src/vidalia/config/networksettings.cpp	2008-03-13 04:34:19 UTC (rev 2403)
@@ -44,7 +44,7 @@
   setDefault(SETTING_USE_BRIDGES,       false);
   setDefault(SETTING_BRIDGE_LIST,       QStringList());
   setDefault(SETTING_FASCIST_FIREWALL,  false);
-  setDefault(SETTING_TUNNEL_DIR_CONNS,  false);
+  setDefault(SETTING_TUNNEL_DIR_CONNS,  true);
   setDefault(SETTING_REACHABLE_ADDRESSES,
     QStringList() << "*:80" << "*:443");
 }
@@ -56,7 +56,8 @@
 NetworkSettings::apply(QString *errmsg)
 {
   QMultiHash<QString, QString> conf;
-  
+  quint32 torVersion = torControl()->getTorVersion();
+
   conf.insert(SETTING_REACHABLE_ADDRESSES,
     (getFascistFirewall() ? 
       localValue(SETTING_REACHABLE_ADDRESSES).toStringList().join(",") : ""));
@@ -72,14 +73,18 @@
               localValue(SETTING_HTTPS_PROXY_AUTH).toString());
   
   if (getUseBridges()) {
+    /* We want to always enable TunnelDirConns and friends when using
+     * bridge relays. */
     conf.insert(SETTING_TUNNEL_DIR_CONNS, "1");
     conf.insert(SETTING_PREFER_TUNNELED_DIR_CONNS, "1");
-  } else {
+  } else if (torVersion <= 0x020021) {
+    /* TunnelDirConns is enabled by default on Tor >= 0.2.0.22-rc, so don't
+     * disable it if our Tor is recent enough. */
     conf.insert(SETTING_TUNNEL_DIR_CONNS, "0");
     conf.insert(SETTING_PREFER_TUNNELED_DIR_CONNS, "0");
   }
   
-  if (torControl()->getTorVersion() >= 0x020003) {
+  if (torVersion >= 0x020003) {
     /* Do the bridge stuff only on Tor >= 0.2.0.3-alpha */
     QStringList bridges = localValue(SETTING_BRIDGE_LIST).toStringList();
     if (getUseBridges() && !bridges.isEmpty()) {