Commit 5883f5d2 authored by Tomas Touceda's avatar Tomas Touceda
Browse files

Merge branch 'bug4598_disableauto' into alpha

parents 44260099 6d73fded

changes/bug4598

0 → 100644
+2 −0
Original line number Diff line number Diff line 
  o Explicitly disable SocksPort auto by setting it to its default

    (9050). Fixes bug 4598.
 
 No newline at end of file

src/vidalia/config/AdvancedPage.ui

+1 −1
Original line number Diff line number Diff line
@@ -240,7 +240,7 @@ 
          </property>

         </widget>

        </item>

        <item row="2" column="2">

        <item row="3" column="2">

         <widget class="QCheckBox" name="chkAuto">

          <property name="text">

           <string>Configure ControlPort automatically</string>

src/vidalia/config/TorSettings.cpp

+6 −0
Original line number Diff line number Diff line
@@ -59,6 +59,7 @@ 
#define TOR_ARG_DATA_DIRECTORY  "DataDirectory"

#define TOR_ARG_HASHED_PASSWORD "HashedControlPassword"

#define TOR_ARG_COOKIE_AUTH     "CookieAuthentication"

#define TOR_ARG_SOCKSPORT       "SocksPort"



/** Generate random control passwords of 16 characters */

#define PASSWORD_LEN    16
@@ -106,6 +107,11 @@ TorSettings::apply(QString *errmsg) 
  conf.insert(SETTING_CONTROL_PORT,

              localValue(SETTING_CONTROL_PORT).toString());



  if(localValue(SETTING_AUTOCONTROL).toBool())

    conf.insert(TOR_ARG_SOCKSPORT, "auto");

  else

    conf.insert(TOR_ARG_SOCKSPORT, "9050");

  

  AuthenticationMethod authMethod = 

    toAuthenticationMethod(localValue(SETTING_AUTH_METHOD).toString());

  switch (authMethod) {