Skip to content
Snippets Groups Projects
Commit 7d381c65 authored by Logan Dethrow's avatar Logan Dethrow
Browse files

LLProxy: Moved the enabling of the UDP proxy back into startSOCKSProxy()

parent b8fddce3
No related branches found
No related tags found
No related merge requests found
...@@ -180,7 +180,6 @@ S32 LLProxy::proxyHandshake(LLHost proxy) ...@@ -180,7 +180,6 @@ S32 LLProxy::proxyHandshake(LLHost proxy)
mUDPProxy.setAddress(proxy.getAddress()); mUDPProxy.setAddress(proxy.getAddress());
// The connection was successful. We now have the UDP port to send requests that need forwarding to. // 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; LL_INFOS("Proxy") << "SOCKS 5 UDP proxy connected on " << mUDPProxy << LL_ENDL;
sUDPProxyEnabled = true;
return SOCKS_OK; return SOCKS_OK;
} }
...@@ -223,6 +222,11 @@ S32 LLProxy::startSOCKSProxy(LLHost host) ...@@ -223,6 +222,11 @@ S32 LLProxy::startSOCKSProxy(LLHost host)
// Shut down the proxy if any of the above steps failed. // Shut down the proxy if any of the above steps failed.
stopSOCKSProxy(); stopSOCKSProxy();
} }
else
{
// Connection was successful.
sUDPProxyEnabled = true;
}
return status; return status;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment