Mercurial > pidgin
diff libpurple/proxy.h @ 31532:b9f58c31afc7
proxy: Use account proxy when making standalone SOCKS5 connections.
This ends up being potentially weird in that you may end up tunnelling a
SOCKS5 proxy connection though another SOCKS5 proxy.
It may mean that non-IBB file xmpp transfers work more consistently on
restricted networks, but may make the situation worse some situations e.g.
when a proxy is required to connect to the xmpp server, but you want to send
a file to someone on your local network.
What it does do though is to allow you to prevent the streamhost from knowing
where you're connecting from.
Fixes #13928
author | Daniel Atallah <daniel.atallah@gmail.com> |
---|---|
date | Tue, 03 May 2011 04:57:17 +0000 |
parents | 0eceb1304f53 |
children | 3e11fa72c5d8 |
line wrap: on
line diff
--- a/libpurple/proxy.h Tue May 03 02:26:35 2011 +0000 +++ b/libpurple/proxy.h Tue May 03 04:57:17 2011 +0000 @@ -289,11 +289,15 @@ /** * Makes a connection through a SOCKS5 proxy. * + * Note that if the account that is making the connection uses a proxy, this + * connection to a SOCKS5 proxy will be made through the account proxy. + * * @param handle A handle that should be associated with this * connection attempt. The handle can be used * to cancel the connection attempt using the * purple_proxy_connect_cancel_with_handle() * function. + * @param account The account making the connection. * @param gpi The PurpleProxyInfo specifying the proxy settings * @param host The destination host. * @param port The destination port.