[vidalia-svn] r2948: Another oops.. more things relocated (vidalia/branches/exit-country/src/vidalia/config)

[cviecco@xxxxxxxxxxxxxxxxxxx]

Author: cviecco
Date: 2008-08-08 11:54:29 -0400 (Fri, 08 Aug 2008)
New Revision: 2948

Modified:
   vidalia/branches/exit-country/src/vidalia/config/networksettings.cpp
   vidalia/branches/exit-country/src/vidalia/config/networksettings.h
Log:
Another oops.. more things relocated


Modified: vidalia/branches/exit-country/src/vidalia/config/networksettings.cpp
===================================================================
--- vidalia/branches/exit-country/src/vidalia/config/networksettings.cpp	2008-08-08 15:41:51 UTC (rev 2947)
+++ vidalia/branches/exit-country/src/vidalia/config/networksettings.cpp	2008-08-08 15:54:29 UTC (rev 2948)
@@ -29,10 +29,6 @@
 #define SETTING_UPDATE_BRIDGES      "UpdateBridgesFromAuthority"
 #define SETTING_TUNNEL_DIR_CONNS    "TunnelDirConns"
 #define SETTING_PREFER_TUNNELED_DIR_CONNS "PreferTunneledDirConns"
-#define SETTING_USE_EXIT_NODE_POLICY "UseExitNodePolicy"
-#define SETTING_EXIT_NODE_LIST       "ExitNodes"
-#define SETTING_USE_EXCLUDE_NODE_POLICY "UseExcludeNodePolicy"
-#define SETTING_EXCLUDE_NODE_LIST    "ExcludeNodes"
 
 
 /** Default constructor */
@@ -51,11 +47,6 @@
   setDefault(SETTING_TUNNEL_DIR_CONNS,  true);
   setDefault(SETTING_REACHABLE_ADDRESSES,
     QStringList() << "*:80" << "*:443");
-//  setDefault(SETTING_USE_NODE_POLICY ,  false);
-  setDefault(SETTING_USE_EXIT_NODE_POLICY ,  false);
-  setDefault(SETTING_EXIT_NODE_LIST, 
-    QStringList() << "blutmagie" << "chaoscomputerclub23");
-  setDefault(SETTING_USE_EXCLUDE_NODE_POLICY ,  false);
 }
 
 /** Applies the current network configuration settings to Tor. If
@@ -70,18 +61,6 @@
   conf.insert(SETTING_REACHABLE_ADDRESSES,
     (getFascistFirewall() ? 
       localValue(SETTING_REACHABLE_ADDRESSES).toStringList().join(",") : "")); 
- 
-  if(getUseExitNodePolicy()){
-    conf.insert(SETTING_EXIT_NODE_LIST,
-        localValue(SETTING_EXIT_NODE_LIST).toStringList().join(","));
-    conf.insert("StrictExitNodes","1");
-  }else{
-    //very bad!, need to find better way...
-    conf.insert("StrictExitNodes","0");
-    conf.insert(SETTING_EXIT_NODE_LIST,"");
-  }
-  conf.insert(SETTING_EXCLUDE_NODE_LIST,
-        localValue(SETTING_EXCLUDE_NODE_LIST).toStringList().join(","));
 
   conf.insert(SETTING_HTTP_PROXY,
     (getUseHttpProxy() ? localValue(SETTING_HTTP_PROXY).toString() : ""));
@@ -320,63 +299,5 @@
 }
 
 
-/** Returns true if Tor should use network policies for its nodes
- * network. */
-bool 
-NetworkSettings::getUseExitNodePolicy(){
-  return value(SETTING_USE_EXIT_NODE_POLICY).toBool();
-}
 
-/** Sets to <b>useNodePolicy</b> whether Tor should try
- to use node policies to access the newtowk. */
-void 
-NetworkSettings::setUseExitNodePolicy(bool useNodePolicy){
-  setValue(SETTING_USE_EXIT_NODE_POLICY, useNodePolicy);
-}
 
-/** Returns a list of bridge nodes Tor should use. */
-QStringList
-NetworkSettings::getExitNodeList()
-{
-  return value(SETTING_EXIT_NODE_LIST).toStringList();
-}
-
-/** Sets to <b>bridgeList</b> the list of bridge nodes Tor should use. */
-void
-NetworkSettings::setExitNodeList(const QStringList &exitNodeList)
-{
-  setValue(SETTING_EXIT_NODE_LIST, exitNodeList);
-}
-
-
-bool
-NetworkSettings::getUseExcludeNodePolicy(){
-  //return value(SETTING_USE_EXCLUDE_NODE_POLICY).toBool();
-  return localValue(SETTING_USE_EXCLUDE_NODE_POLICY).toBool();
-}
-
-/** Sets to <b>useNodePolicy</b> whether Tor should try
- to use node policies to access the newtowk. */
-void
-NetworkSettings::setUseExcludeNodePolicy(bool useNodeExcludePolicy){
-  setValue(SETTING_USE_EXCLUDE_NODE_POLICY, useNodeExcludePolicy);
-}
-
-
-
-/** Returns a list of bridge nodes Tor should use. */
-QStringList
-NetworkSettings::getExcludeNodeList()
-{
-  return value(SETTING_EXCLUDE_NODE_LIST).toStringList();
-}
-
-/** Sets to <b>bridgeList</b> the list of bridge nodes Tor should use. */
-void
-NetworkSettings::setExcludeNodeList(const QStringList &excludeNodeList)
-{
-  setValue(SETTING_EXCLUDE_NODE_LIST, excludeNodeList);
-}
-
-
-

Modified: vidalia/branches/exit-country/src/vidalia/config/networksettings.h
===================================================================
--- vidalia/branches/exit-country/src/vidalia/config/networksettings.h	2008-08-08 15:41:51 UTC (rev 2947)
+++ vidalia/branches/exit-country/src/vidalia/config/networksettings.h	2008-08-08 15:54:29 UTC (rev 2948)
@@ -115,40 +115,8 @@
   bool getTunnelDirConns();
 
 
-/*
-  // determines if vidalia should try to manage Tor's Nodes
-  bool getUseNodePolicy();
-  void setUseNodePolicy(bool useNodePolicy);
-*/
 
-  /** Returns true if vidalia should manage Tor's exit nodes
-   * network. */
-  bool getUseExitNodePolicy();
-  /** Sets to <b>useNodePolicy</b> whether Tor should try
-   to use node policies to access the newtowk. */
-  void setUseExitNodePolicy(bool useNodePolicy);
 
-
-  /** Returns a list of bridge nodes Tor should use. */
-  QStringList getExitNodeList();
-  /** Sets to <b>bridgeList</b> the list of bridge nodes Tor should use. */
-  void setExitNodeList(const QStringList &exitNodeList);
-
-    /** Returns true if vidalia should manage Tor's exit nodes
-   * network. */
-  bool getUseExcludeNodePolicy();
-  /** Sets to <b>useNodePolicy</b> whether Tor should try
-   to use node policies to access the newtowk. */
-  void setUseExcludeNodePolicy(bool useExcludeNodePolicy);
-
-
-
-  /** Returns Tor should use. */
-  QStringList getExcludeNodeList();
-  /** Sets to ould use. */
-  void setExcludeNodeList(const QStringList &excludeNodeList);
-
-
 };
 
 #endif