diff options
| author | Dan Winship <danw@gnome.org> | 2011-11-30 19:16:36 +0100 |
|---|---|---|
| committer | Dan Winship <danw@gnome.org> | 2012-04-28 13:18:11 -0400 |
| commit | a4910d0ca8f5034d75e35dd69059332f01a64ac0 (patch) | |
| tree | badd5aa3b486c1b6c74e77105e051623ea7a4fa4 /libsoup/soup-connection.h | |
| parent | bac8c22fd28479a3be149c0d742b8c7417381091 (diff) | |
| download | libsoup-a4910d0ca8f5034d75e35dd69059332f01a64ac0.tar.gz | |
Reorganize proxy resolution, and support SOCKS and other proxy types
Push the proxy resolution code from SoupSession down into
SoupConnection and SoupSocket. If using a SoupProxyResolverDefault,
just enable proxy support on the GSocketClient instead (after adding
"http" as an application protocol). This way we get support for SOCKS
proxies (and any other proxies supported by GProxy types).
https://bugzilla.gnome.org/show_bug.cgi?id=553269
Diffstat (limited to 'libsoup/soup-connection.h')
| -rw-r--r-- | libsoup/soup-connection.h | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/libsoup/soup-connection.h b/libsoup/soup-connection.h index 72e61062..52e638f5 100644 --- a/libsoup/soup-connection.h +++ b/libsoup/soup-connection.h @@ -39,9 +39,8 @@ typedef void (*SoupConnectionCallback) (SoupConnection *conn, guint status, gpointer data); -#define SOUP_CONNECTION_REMOTE_ADDRESS "remote-address" -#define SOUP_CONNECTION_TUNNEL_ADDRESS "tunnel-address" -#define SOUP_CONNECTION_PROXY_URI "proxy-uri" +#define SOUP_CONNECTION_REMOTE_URI "remote-uri" +#define SOUP_CONNECTION_PROXY_RESOLVER "proxy-resolver" #define SOUP_CONNECTION_SSL "ssl" #define SOUP_CONNECTION_SSL_CREDENTIALS "ssl-creds" #define SOUP_CONNECTION_SSL_STRICT "ssl-strict" @@ -53,16 +52,12 @@ typedef void (*SoupConnectionCallback) (SoupConnection *conn, #define SOUP_CONNECTION_STATE "state" #define SOUP_CONNECTION_MESSAGE "message" -SoupConnection *soup_connection_new (const char *propname1, - ...) G_GNUC_NULL_TERMINATED; - void soup_connection_connect_async (SoupConnection *conn, GCancellable *cancellable, SoupConnectionCallback callback, gpointer user_data); guint soup_connection_connect_sync (SoupConnection *conn, GCancellable *cancellable); -SoupAddress *soup_connection_get_tunnel_addr(SoupConnection *conn); guint soup_connection_start_ssl_sync (SoupConnection *conn, GCancellable *cancellable); void soup_connection_start_ssl_async (SoupConnection *conn, @@ -73,8 +68,10 @@ void soup_connection_start_ssl_async (SoupConnection *conn, void soup_connection_disconnect (SoupConnection *conn); SoupSocket *soup_connection_get_socket (SoupConnection *conn); +SoupURI *soup_connection_get_remote_uri (SoupConnection *conn); SoupURI *soup_connection_get_proxy_uri (SoupConnection *conn); gboolean soup_connection_is_via_proxy (SoupConnection *conn); +gboolean soup_connection_is_tunnelled (SoupConnection *conn); SoupConnectionState soup_connection_get_state (SoupConnection *conn); void soup_connection_set_state (SoupConnection *conn, |