Ported SOCKS5 proxy support from Snowglobe 1.5

8 files changed, 528 insertions, 21 deletions

diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index 00c30c1..3523c7f 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -2,7 +2,9 @@
 <llsd>
 <map>
 
-<!-- for Aurora Sim -->
+  <!-- BEGIN IMPRUDENCE-SPECIFIC SETTINGS -->
+  
+  <!-- begin Aurora-specific settings -->
 
   <key>TimeOffset</key>
   <map>
@@ -48,7 +50,8 @@
     <key>Value</key>
     <string>SLVoice</string>
   </map>
-  <!-- Imprudence-specific settings -->
+  
+  <!-- end Aurora-specific settings -->
 
   <key>AllowEditingOfTrees</key>
   <map>
@@ -1689,6 +1692,7 @@
   </map>
 
   <!-- Begin: Client Name Tag -->
+  
   <key>ShowClientColor</key>
   <map>
     <key>Comment</key>
@@ -2091,6 +2095,8 @@
   </map>
   
   <!-- End: Spellcheck & Translation -->
+  
+  <!-- Begin: RLVa -->
 
   <key>RestrainedLove</key>
   <map>
@@ -2268,6 +2274,93 @@
     <key>Value</key>
     <integer>1</integer>
   </map>
+
+  <!-- End: RLVa -->
+  
+  <!-- Begin: socks5 -->
+
+  <key>Socks5ProxyEnabled</key>
+  <map>
+    <key>Comment</key>
+    <string>Use Socks5 Proxy</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>0</integer>
+  </map>
+  <key>Socks5HttpProxyType</key>
+  <map>
+    <key>Comment</key>
+    <string>Proxy type to use for HTTP operations</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>String</string>
+    <key>Value</key>
+    <integer>None</integer>
+  </map>
+  <key>Socks5ProxyHost</key>
+  <map>
+    <key>Comment</key>
+    <string>Socks 5 Proxy Host</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>String</string>
+    <key>Value</key>
+    <string />
+  </map>
+  <key>Socks5ProxyPort</key>
+  <map>
+    <key>Comment</key>
+    <string>Socks 5 Proxy Port</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>U32</string>
+    <key>Value</key>
+    <integer>1080</integer>
+  </map>
+  <key>Socks5Username</key>
+  <map>
+    <key>Comment</key>
+    <string>Socks 5 Username</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>String</string>
+    <key>Value</key>
+    <string></string>
+  </map>
+  <key>Socks5Password</key>
+  <map>
+    <key>Comment</key>
+    <string>Socks 5 Password</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>String</string>
+    <key>Value</key>
+    <string></string>
+  </map>
+  <key>Socks5AuthType</key>
+  <map>
+    <key>Comment</key>
+    <string>Selected Auth mechanism for Socks5</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>String</string>
+    <key>Value</key>
+    <string>None</string>
+  </map>
+
+  <!-- End: socks5 -->
+
+  <!-- END IMPRUDENCE-SPECIFIC SETTINGS -->
+  
   <key>AFKTimeout</key>
   <map>
     <key>Comment</key>
@@ -3024,7 +3117,7 @@
   <key>BrowserProxyAddress</key>
   <map>
     <key>Comment</key>
-    <string>Address for the Web Proxy]</string>
+    <string>Address for the Web Proxy</string>
     <key>Persist</key>
     <integer>1</integer>
     <key>Type</key>
diff --git a/linden/indra/newview/llpanelnetwork.cpp b/linden/indra/newview/llpanelnetwork.cpp
index 16b9a76..a371962 100644
--- a/linden/indra/newview/llpanelnetwork.cpp
+++ b/linden/indra/newview/llpanelnetwork.cpp
@@ -34,14 +34,18 @@
 
 //file include
 #include "llpanelnetwork.h"
+#include "llstartup.h"
 
 // project includes
 #include "llcheckboxctrl.h"
+#include "llradiogroup.h"
 #include "lldirpicker.h"
 #include "lluictrlfactory.h"
 #include "llviewercontrol.h"
 #include "llviewerwindow.h"
 
+bool LLPanelNetwork::sSocksSettingsChanged;
+
 LLPanelNetwork::LLPanelNetwork()
 {
         LLUICtrlFactory::getInstance()->buildPanel(this, "panel_preferences_network.xml");
@@ -72,6 +76,31 @@ BOOL LLPanelNetwork::postBuild()
         childSetEnabled("xmlrpc_proxy_editor", gSavedSettings.getBOOL("XMLRPCProxyEnabled"));
         childSetEnabled("xmlrpc_proxy_port", gSavedSettings.getBOOL("XMLRPCProxyEnabled"));
 
+        // Socks 5 proxy settings, commit callbacks
+        childSetCommitCallback("socks5_proxy_enabled", onCommitSocks5ProxyEnabled, this);
+        childSetCommitCallback("socks5_auth", onSocksAuthChanged, this);
+
+        //Socks 5 proxy settings, saved data
+        childSetValue("socks5_proxy_enabled",   gSavedSettings.getBOOL("Socks5ProxyEnabled"));
+        childSetValue("socks5_http_proxy_type", gSavedSettings.getString("Socks5HttpProxyType"));
+
+        childSetValue("socks5_proxy_host",     gSavedSettings.getString("Socks5ProxyHost"));
+        childSetValue("socks5_proxy_port",     (F32)gSavedSettings.getU32("Socks5ProxyPort"));
+        childSetValue("socks5_proxy_username", gSavedSettings.getString("Socks5Username"));
+        childSetValue("socks5_proxy_password", gSavedSettings.getString("Socks5Password"));
+        childSetValue("socks5_auth", gSavedSettings.getString("Socks5AuthType"));
+
+        // Socks 5 proxy settings, check if settings modified callbacks
+        childSetCommitCallback("socks5_proxy_host", onSocksSettingsModified,this);
+        childSetCommitCallback("socks5_proxy_port", onSocksSettingsModified,this);
+        childSetCommitCallback("socks5_proxy_username", onSocksSettingsModified,this);
+        childSetCommitCallback("socks5_proxy_password", onSocksSettingsModified,this);
+        
+        // Socks 5 settings, Set all controls and labels enabled state
+        updateProxyEnabled(this, gSavedSettings.getBOOL("Socks5ProxyEnabled"), gSavedSettings.getString("Socks5AuthType"));
+
+        sSocksSettingsChanged = false;
+
         return TRUE;
 }
 
@@ -91,6 +120,28 @@ void LLPanelNetwork::apply()
         gSavedSettings.setBOOL("XMLRPCProxyEnabled", childGetValue("xmlrpc_proxy_enabled"));
         gSavedSettings.setString("XMLRPCProxyAddress", childGetValue("xmlrpc_proxy_editor"));
         gSavedSettings.setS32("XMLRPCProxyPort", childGetValue("xmlrpc_proxy_port"));
+
+        gSavedSettings.setBOOL("Socks5ProxyEnabled", childGetValue("socks5_proxy_enabled"));            
+        gSavedSettings.setString("Socks5HttpProxyType", childGetValue("socks5_http_proxy_type"));
+        gSavedSettings.setString("Socks5ProxyHost", childGetValue("socks5_proxy_host"));
+        gSavedSettings.setU32("Socks5ProxyPort", childGetValue("socks5_proxy_port").asInteger());
+
+        gSavedSettings.setString("Socks5AuthType", childGetValue("socks5_auth"));
+        gSavedSettings.setString("Socks5Username", childGetValue("socks5_proxy_username"));
+        gSavedSettings.setString("Socks5Password", childGetValue("socks5_proxy_password"));
+
+        if (sSocksSettingsChanged)
+        {
+                if (LLStartUp::getStartupState() != STATE_LOGIN_WAIT)
+                {
+                        LLNotifications::instance().add("ProxyNeedRestart");
+                }
+                else
+                {
+                        // Mark the socks class that it needs to update its connection
+                        LLSocks::getInstance()->updated();
+                }
+        }
 }
 
 void LLPanelNetwork::cancel()
@@ -167,4 +218,77 @@ void LLPanelNetwork::onCommitXMLRPCProxyEnabled(LLUICtrl* ctrl, void* data)
         self->childSetEnabled("xmlrpc_proxy_editor", check->get());
         self->childSetEnabled("xmlrpc_proxy_port", check->get());
         self->childSetEnabled("xmlrpc_proxy_text_label", check->get());
-}
\ No newline at end of file
+}
+
+// static
+void LLPanelNetwork::onCommitSocks5ProxyEnabled(LLUICtrl* ctrl, void* data)
+{
+        LLPanelNetwork* self  = (LLPanelNetwork*)data;
+        LLCheckBoxCtrl* check = (LLCheckBoxCtrl*)ctrl;
+
+        if (!self || !check) return;
+
+        sSocksSettingsChanged = true;
+        
+        updateProxyEnabled(self, check->get(), self->childGetValue("socks5_auth"));
+}
+
+// static
+void LLPanelNetwork::onSocksSettingsModified(LLUICtrl* ctrl, void* data)
+{
+        sSocksSettingsChanged = true;
+}
+
+// static
+void LLPanelNetwork::onSocksAuthChanged(LLUICtrl* ctrl, void* data)
+{
+        LLRadioGroup* radio  = static_cast<LLRadioGroup*>(ctrl);
+        LLPanelNetwork* self = static_cast<LLPanelNetwork*>(data);
+
+        sSocksSettingsChanged = true;
+
+        std::string selection = radio->getValue().asString();
+        updateProxyEnabled(self, true, selection);
+}
+
+// static
+void LLPanelNetwork::updateProxyEnabled(LLPanelNetwork * self, bool enabled, std::string authtype)
+{
+        // Manage all the enable/disable of the socks5 options from this single function
+        // to avoid code duplication
+
+        // Update all socks labels and controls except auth specific ones
+        self->childSetEnabled("socks5_proxy_port",  enabled);
+        self->childSetEnabled("socks5_proxy_host",  enabled);
+        self->childSetEnabled("socks5_host_label",  enabled);
+        self->childSetEnabled("socks5_proxy_label", enabled);
+        self->childSetEnabled("socks5_proxy_port",  enabled);
+        self->childSetEnabled("socks5_auth_label",  enabled);
+        self->childSetEnabled("socks5_auth",        enabled);
+
+        // disable the web option if the web proxy has not been configured
+        // this is still not ideal as apply or ok is needed for this to be saved to the preferences
+        self->childSetEnabled("Web", gSavedSettings.getBOOL("BrowserProxyEnabled"));
+
+        self->childSetEnabled("Socks", enabled);
+
+        // Hide the auth specific lables if authtype is none or
+        // we are not enabled.
+        if ((authtype.compare("None") == 0) || (enabled == false))
+        {
+                self->childSetEnabled("socks5_username_label", false);
+                self->childSetEnabled("socks5_password_label", false);
+                self->childSetEnabled("socks5_proxy_username", false);
+                self->childSetEnabled("socks5_proxy_password", false);
+        }
+
+        // Only show the username and password boxes if we are enabled
+        // and authtype is username pasword.
+        if ((authtype.compare("UserPass") == 0) && (enabled == true))
+        {
+                self->childSetEnabled("socks5_username_label", true);
+                self->childSetEnabled("socks5_password_label", true);
+                self->childSetEnabled("socks5_proxy_username", true);
+                self->childSetEnabled("socks5_proxy_password", true);
+        }
+}
diff --git a/linden/indra/newview/llpanelnetwork.h b/linden/indra/newview/llpanelnetwork.h
index 900158a..628f713 100644
--- a/linden/indra/newview/llpanelnetwork.h
+++ b/linden/indra/newview/llpanelnetwork.h
@@ -52,6 +52,14 @@ private:
         static void onClickResetCache(void*);
         static void onCommitPort(LLUICtrl* ctrl, void*);
         static void onCommitXMLRPCProxyEnabled(LLUICtrl* ctrl, void* data);
+        static void onCommitSocks5ProxyEnabled(LLUICtrl* ctrl, void* data);
+        static void onClickTestProxy(void* user_data);
+        static void onSocksSettingsModified(LLUICtrl* ctrl, void* data);
+        static void onSocksAuthChanged(LLUICtrl* ctrl, void* data);
+        static void updateProxyEnabled(LLPanelNetwork * self, bool enabled, std::string authtype);
+        
+        static bool sSocksSettingsChanged;
+
 };
 
 #endif
diff --git a/linden/indra/newview/llstartup.cpp b/linden/indra/newview/llstartup.cpp
index 8e11d8c..80ddfa4 100644
--- a/linden/indra/newview/llstartup.cpp
+++ b/linden/indra/newview/llstartup.cpp
@@ -189,6 +189,7 @@
 #include "llwlparammanager.h"
 #include "llwaterparammanager.h"
 #include "llagentlanguage.h"
+#include "llsocks5.h"
 #include "viewerversion.h"
 
 #include "lgghunspell_wrapper.h"
@@ -635,6 +636,15 @@ bool idle_startup()
                 LL_INFOS("AppInit") << "Message System Initialized." << LL_ENDL;
                 
                 //-------------------------------------------------
+                // Init the socks 5 proxy and open the control TCP 
+                // connection if the user is using SOCKS5
+                // We need to do this early incase the user is using
+                // socks for http so we get the login screen via socks
+                //-------------------------------------------------
+
+                LLStartUp::handleSocksProxy(false);
+
+                //-------------------------------------------------
                 // Init audio, which may be needed for prefs dialog
                 // or audio cues in connection UI.
                 //-------------------------------------------------
@@ -890,8 +900,31 @@ bool idle_startup()
 
         if (STATE_LOGIN_CLEANUP == LLStartUp::getStartupState())
         {
-
                 LL_DEBUGS("AppInitStartupState") << "STATE_LOGIN_CLEANUP" << LL_ENDL;
+        
+                // Post login screen, we should see if any settings have changed that may
+                // require us to either start/stop or change the socks proxy. As various communications
+                // past this point may require the proxy to be up.
+                bool socks_enable_required = gSavedSettings.getBOOL("Socks5ProxyEnabled");
+                if ((LLSocks::getInstance()->isEnabled() != socks_enable_required) || LLSocks::getInstance()->needsUpdate())
+                {
+                        if (socks_enable_required)
+                        {
+                                if (!LLStartUp::handleSocksProxy(false))
+                                {
+                                        // Proxy start up failed, we should now bail the state machine
+                                        // HandleSocksProxy() will have reported an error to the user 
+                                        // already, so we just go back to the login screen. The user
+                                        // could then change the perferences to fix the issue. 
+                                        LLStartUp::setStartupState(STATE_LOGIN_SHOW);
+                                        return FALSE;
+                                }
+                        }
+                        else
+                        {
+                                LLSocks::getInstance()->stopProxy();
+                        }
+                }
 
                 gDisconnected = TRUE;
 
@@ -4022,3 +4055,93 @@ void apply_udp_blacklist(const std::string& csv)
         
 }
 
+bool LLStartUp::handleSocksProxy(bool reportOK)
+{
+        std::string httpProxyType = gSavedSettings.getString("Socks5HttpProxyType");
+
+        // Determine the http proxy type (if any)
+        if ((httpProxyType.compare("Web") == 0) && gSavedSettings.getBOOL("BrowserProxyEnabled"))
+        {
+                LLHost httpHost;
+                httpHost.setHostByName(gSavedSettings.getString("BrowserProxyAddress"));
+                httpHost.setPort(gSavedSettings.getS32("BrowserProxyPort"));
+                LLSocks::getInstance()->EnableHttpProxy(httpHost,LLPROXY_HTTP);
+        }
+        else if ((httpProxyType.compare("Socks") == 0) && gSavedSettings.getBOOL("Socks5ProxyEnabled"))
+        {
+                LLHost httpHost;
+                httpHost.setHostByName(gSavedSettings.getString("Socks5ProxyHost"));
+                httpHost.setPort(gSavedSettings.getU32("Socks5ProxyPort"));
+                LLSocks::getInstance()->EnableHttpProxy(httpHost,LLPROXY_SOCKS);
+        }
+        else
+        {
+                LLSocks::getInstance()->DisableHttpProxy();
+        }
+        
+        bool use_socks_proxy = gSavedSettings.getBOOL("Socks5ProxyEnabled");
+        if (use_socks_proxy)
+        {       
+
+                // Determine and update LLSocks with the saved authentication system
+                std::string auth_type = gSavedSettings.getString("Socks5AuthType");
+                        
+                if (auth_type.compare("None") == 0)
+                {
+                        LLSocks::getInstance()->setAuthNone();
+                }
+
+                if (auth_type.compare("UserPass") == 0)
+                {
+                        LLSocks::getInstance()->setAuthPassword(gSavedSettings.getString("Socks5Username"),gSavedSettings.getString("Socks5Password"));
+                }
+
+                // Start the proxy and check for errors
+                int status = LLSocks::getInstance()->startProxy(gSavedSettings.getString("Socks5ProxyHost"), gSavedSettings.getU32("Socks5ProxyPort"));
+                LLSD subs;
+                subs["PROXY"] = gSavedSettings.getString("Socks5ProxyHost");
+
+                switch(status)
+                {
+                        case SOCKS_OK:
+                                if (reportOK == true)
+                                {
+                                        LLNotifications::instance().add("SOCKS_CONNECT_OK", subs);
+                                }
+                                return true;
+                                break;
+
+                        case SOCKS_CONNECT_ERROR: // TCP Fail
+                                LLNotifications::instance().add("SOCKS_CONNECT_ERROR", subs);
+                                break;
+
+                        case SOCKS_NOT_PERMITTED: // Socks5 server rule set refused connection
+                                LLNotifications::instance().add("SOCKS_NOT_PERMITTED", subs);
+                                break;
+                                        
+                        case SOCKS_NOT_ACCEPTABLE: // Selected authentication is not acceptable to server
+                                LLNotifications::instance().add("SOCKS_NOT_ACCEPTABLE", subs);
+                                break;
+
+                        case SOCKS_AUTH_FAIL: // Authentication failed
+                                LLNotifications::instance().add("SOCKS_AUTH_FAIL", subs);
+                                break;
+
+                        case SOCKS_UDP_FWD_NOT_GRANTED: // UDP forward request failed
+                                LLNotifications::instance().add("SOCKS_UDP_FWD_NOT_GRANTED", subs);
+                                break;
+
+                        case SOCKS_HOST_CONNECT_FAILED: // Failed to open a TCP channel to the socks server
+                                LLNotifications::instance().add("SOCKS_HOST_CONNECT_FAILED", subs);
+                                break;          
+                }
+
+                return false;
+        }
+        else
+        {
+                LLSocks::getInstance()->stopProxy(); //ensure no UDP proxy is running and its all cleaned up
+        }
+
+        return true;
+}
diff --git a/linden/indra/newview/llstartup.h b/linden/indra/newview/llstartup.h
index 3fe8daa..6dc3946 100644
--- a/linden/indra/newview/llstartup.h
+++ b/linden/indra/newview/llstartup.h
@@ -123,6 +123,9 @@ public:
         static std::string sSLURLCommand;
                 // *HACK: On startup, if we were passed a secondlife://app/do/foo
                 // command URL, store it for later processing.
+
+        static bool handleSocksProxy(bool reportOK = true);
+
         static bool shouldAutoLogin() { return mShouldAutoLogin; };
         static void setShouldAutoLogin(bool value) { mShouldAutoLogin = value; };
 
diff --git a/linden/indra/newview/llxmlrpctransaction.cpp b/linden/indra/newview/llxmlrpctransaction.cpp
index 675ba42..30b0249 100644
--- a/linden/indra/newview/llxmlrpctransaction.cpp
+++ b/linden/indra/newview/llxmlrpctransaction.cpp
@@ -236,6 +236,23 @@ void LLXMLRPCTransaction::Impl::init(XMLRPC_REQUEST request, bool useGzip)
                 mCurlRequest->setopt(CURLOPT_PROXYPORT, port);
                 mCurlRequest->setopt(CURLOPT_PROXYTYPE, CURLPROXY_HTTP);
         }
+        else if (LLSocks::getInstance()->isHttpProxyEnabled())
+        {
+                std::string address = LLSocks::getInstance()->getHTTPProxy().getIPString();
+                U16 port = LLSocks::getInstance()->getHTTPProxy().getPort();
+                mCurlRequest->setoptString(CURLOPT_PROXY, address.c_str());
+                mCurlRequest->setopt(CURLOPT_PROXYPORT, port);
+                if (LLSocks::getInstance()->getHttpProxyType() == LLPROXY_SOCKS)
+                {
+                        mCurlRequest->setopt(CURLOPT_PROXYTYPE, CURLPROXY_SOCKS5);
+                        if(LLSocks::getInstance()->getSelectedAuthMethod()==METHOD_PASSWORD)
+                                mCurlRequest->setoptString(CURLOPT_PROXYUSERPWD,LLSocks::getInstance()->getProxyUserPwd());
+                }
+                else
+                {
+                        mCurlRequest->setopt(CURLOPT_PROXYTYPE, CURLPROXY_HTTP);
+                }
+        }
 
 //      mCurlRequest->setopt(CURLOPT_VERBOSE, 1); // usefull for debugging
         mCurlRequest->setopt(CURLOPT_NOSIGNAL, 1);
diff --git a/linden/indra/newview/skins/default/xui/en-us/notifications.xml b/linden/indra/newview/skins/default/xui/en-us/notifications.xml
index 306e3b8..ecfc523 100644
--- a/linden/indra/newview/skins/default/xui/en-us/notifications.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/notifications.xml
@@ -7393,6 +7393,62 @@ Media/audio URL blocked for [DOMAIN]
 The media filters have been cleared
   </notification>
 
+  <notification
+   icon="alertmodal.tga"
+   name="ProxyNeedRestart"
+   type="alertmodal">
+Socks proxy settings will take effect after you restart [VIEWER_NAME].
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="SOCKS_CONNECT_OK"
+   type="alertmodal">
+Connection to Socks5 proxy [PROXY] was successful.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="SOCKS_NOT_PERMITTED"
+   type="alertmodal">
+The Socks5 proxy "[PROXY]" refused the connection, not allowed by rule set
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="SOCKS_CONNECT_ERROR"
+   type="alertmodal">
+The Socks5 proxy "[PROXY]" refused the connection, could not open TCP channel
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="SOCKS_NOT_ACCEPTABLE"
+   type="alertmodal">
+The Socks5 proxy "[PROXY]" refused the selected authentication system
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="SOCKS_AUTH_FAIL"
+   type="alertmodal">
+The Socks5 proxy "[PROXY]" reported your credentials are invalid
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="SOCKS_UDP_FWD_NOT_GRANTED"
+   type="alertmodal">
+The Socks5 proxy "[PROXY]" refused the UDP associate request
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="SOCKS_HOST_CONNECT_FAILED"
+   type="alertmodal">
+Could not connect to Socks5 proxy server "[PROXY]"
+  </notification>
+
 <!--End Imprudence notifications-->
  <!-- [KITTY VIEWER] -->
   <notification
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_network.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_network.xml
index 7d26ff5..c3f0c22 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_network.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_network.xml
@@ -63,32 +63,115 @@
              decimal_digits="0" enabled="true" follows="left|top" height="16"
              increment="1" initial_val="13000" label="Port number:" label_width="75"
              left_delta="20" max_val="13050" min_val="13000" mouse_opaque="true"
-             name="connection_port" width="150" />
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom_delta="-24" drop_shadow_visible="true" enabled="true"
-             follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
-             height="10" left="15" mouse_opaque="false" name="proxy_label" v_pad="0"
-             width="300">
-                XMLRPC Proxy (Login, Land- and Money purchase):
-        </text>
-        <check_box bottom_delta="-25" enabled="true"
+             name="connection_port" width="140" />
+  
+  <!-- XMLRPC PROXY -->
+
+  <check_box bottom_delta="-25" enabled="true"
              follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
-             label="Enable XMLRPC proxy" left_delta="199" mouse_opaque="true"
-             name="xmlrpc_proxy_enabled" radio_style="false" width="256" />
+             label="Enable XMLRPC proxy (Login, Land, and Money purchases)" left="15" mouse_opaque="true"
+             name="xmlrpc_proxy_enabled" radio_style="false" width="300" />
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom_delta="-25" drop_shadow_visible="true" enabled="true"
+             bottom_delta="-18" drop_shadow_visible="true" enabled="true"
              follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
-             height="10" left="140" mouse_opaque="false" name="xmlrpc_proxy_text_label"
+             height="10" left_delta="20" mouse_opaque="false" name="xmlrpc_proxy_text_label"
              v_pad="0" width="128">
                 Address:
         </text>
         <line_editor bottom_delta="-8" enabled="true" follows="left|top" font="SansSerif"
-             height="20" left="217" name="xmlrpc_proxy_editor"
+             height="20" left="112" name="xmlrpc_proxy_editor"
              tool_tip="The name or IP address of the proxy you would like to use"
              width="200" />
-        <spinner bottom_delta="-25" decimal_digits="0"
+        <spinner bottom_delta="-20" decimal_digits="0"
              enabled="true" follows="left|top" height="16" increment="1"
-             initial_val="80" label="Port number:" label_width="75" left="140"
+             initial_val="80" label="Port number:" label_width="75" left="35"
              max_val="12000" min_val="10" mouse_opaque="true" name="xmlrpc_proxy_port"
              width="140" />
+
+  <!-- SOCKS 5 PROXY -->
+
+  <check_box bottom_delta="-24" enabled="true"
+             follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
+             label="Enable SOCKS 5 proxy" left="15" mouse_opaque="true"
+             name="socks5_proxy_enabled" radio_style="false" width="256" />
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+             bottom_delta="-18" drop_shadow_visible="true" enabled="true"
+             follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
+             height="10" left="35" mouse_opaque="false" name="socks5_host_label"
+             v_pad="0" width="128">
+    Socks 5 host:
+  </text>
+  <line_editor bottom_delta="-6" enabled="true" follows="left|top" font="SansSerif"
+             height="20" left="113" name="socks5_proxy_host"
+             tool_tip="The name or IP address of the SOCKS5 proxy you would like to use"
+             width="200" />
+  <spinner bottom_delta="-20" decimal_digits="0"
+             enabled="true" follows="left|top" height="16" increment="1"
+             initial_val="80" label="Port number:" label_width="75" left="35"
+             max_val="12000" min_val="10" mouse_opaque="true" name="socks5_proxy_port"
+             width="140" />
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+             bottom_delta="-20" drop_shadow_visible="true" enabled="true"
+             follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
+             height="10" left="35" mouse_opaque="false" name="socks5_auth_label"
+             v_pad="0" width="128">
+    Socks5 authentication:
+  </text>
+  <radio_group bottom_delta="-6" draw_border="false" follows="left|top" height="20" left="35"
+             name="socks5_auth" width="420">
+    <radio_item bottom="0" height="20" left_delta="80" name="None" width="50"
+        tool_tip="No authentication">
+      None
+    </radio_item>
+    <radio_item bottom="0" height="20" left_delta="50" name="UserPass" width="50"
+        tool_tip="Username / Password authentication">
+      Username / Password
+    </radio_item>
+  </radio_group>
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+             bottom_delta="-16" drop_shadow_visible="true" enabled="true"
+             follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
+             height="10" left="122" mouse_opaque="false" name="socks5_username_label"
+             v_pad="0" width="128">
+    Username:
+  </text>
+  <line_editor bottom_delta="-8" enabled="true" follows="left|top" font="SansSerif"
+             height="20" left="200" name="socks5_proxy_username"
+             tool_tip="Username for the Socks5 proxy"
+             width="200" />
+
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+             bottom_delta="-14" drop_shadow_visible="true" enabled="true"
+             follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
+             height="10" left="122" mouse_opaque="false" name="socks5_password_label"
+             v_pad="0" width="128">
+    Password:
+  </text>
+  <line_editor bottom_delta="-8" enabled="true" follows="left|top" font="SansSerif"
+             height="20" left="200" name="socks5_proxy_password"
+             tool_tip="Password for the Socks5 proxy"
+             width="200" />
+
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+     bottom_delta="-20" drop_shadow_visible="true" enabled="true"
+     follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
+     height="10" left="35" mouse_opaque="false" name="socks5_auth_label"
+     v_pad="0" width="128">
+    HTTP proxy:
+  </text>
+  <radio_group bottom_delta="-8" draw_border="false" follows="left|top" height="20" left="35"
+             name="socks5_http_proxy_type" width="380" >
+    <radio_item height="20" bottom="0" left="100" name="None" width="50"
+        tool_tip="No HTTP proxy">
+      None
+    </radio_item>
+    <radio_item height="20" bottom="0" left="170" name="Socks" width="50"
+        tool_tip="Use Socks for HTTP proxy">
+      Socks
+    </radio_item>
+    <radio_item height="20" bottom="0" left="250" name="Web" width="50"
+        tool_tip="Use web proxy for HTTP proxy">
+      Web
+    </radio_item>
+  </radio_group>
 </panel>