From 7d381c65969678281dba056e77ff8423ccfe186a Mon Sep 17 00:00:00 2001
From: Logan Dethrow <log@lindenlab.com>
Date: Thu, 8 Sep 2011 10:43:07 -0400
Subject: [PATCH] LLProxy: Moved the enabling of the UDP proxy back into
startSOCKSProxy()
---
indra/llmessage/llproxy.cpp | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/indra/llmessage/llproxy.cpp b/indra/llmessage/llproxy.cpp
index 3ffe6d2d3be..4a7d326c0e6 100644
--- a/indra/llmessage/llproxy.cpp
+++ b/indra/llmessage/llproxy.cpp
@@ -180,7 +180,6 @@ S32 LLProxy::proxyHandshake(LLHost proxy)
mUDPProxy.setAddress(proxy.getAddress());
// The connection was successful. We now have the UDP port to send requests that need forwarding to.
LL_INFOS("Proxy") << "SOCKS 5 UDP proxy connected on " << mUDPProxy << LL_ENDL;
- sUDPProxyEnabled = true;
return SOCKS_OK;
}
@@ -223,6 +222,11 @@ S32 LLProxy::startSOCKSProxy(LLHost host)
// Shut down the proxy if any of the above steps failed.
stopSOCKSProxy();
}
+ else
+ {
+ // Connection was successful.
+ sUDPProxyEnabled = true;
+ }
return status;
}
--
GitLab