comparison src/proxy.h @ 14108:7a205b430d19

[gaim-migrate @ 16742] Removing the "error_cb" parameter for gaim_proxy_connect(), changing it back to how it was. As I started making changes to oscar to support canceling connection attempts, I realized that having a separate callback for errors would result in more code duplication than was needed. Originally I thought the separate callback would make things cleaner. Anyway, sorry for the noise. committer: Tailor Script <[e-mail]>

14107:c0ee28af3ca2

} GaimProxyInfo;

typedef struct _GaimProxyConnectInfo GaimProxyConnectInfo;

typedef void (*GaimProxyConnectFunction)(gpointer data, gint source);
typedef void (*GaimProxyErrorFunction)(gpointer dat, const gchar *error_message);

/**
 * The "hosts" parameter is a linked list containing pairs of
 * one size_t addrlen and one struct sockaddr *addr.
 */

 *
 * @param account    The account making the connection.
 * @param host       The destination host.
 * @param port       The destination port.
 * @param connect_cb The function to call when the connection is
 *                   established.
 * @param error_cb   The function to call if there is an error while
 *                   establishing the connection.
 * @param data       User-defined data.
 *
 * @return NULL if there was an error, or a reference to a data
 *         structure that can be used to cancel the pending
 *         connection, if needed.
 */
GaimProxyConnectInfo *gaim_proxy_connect(GaimAccount *account,
			const char *host, int port,
			GaimProxyConnectFunction connect_cb,
			GaimProxyErrorFunction error_cb, gpointer data);

/**
 * Makes a connection through a SOCKS5 proxy.
 *
 * @param gpi        The GaimProxyInfo specifying the proxy settings
 * @param host       The destination host.
 * @param port       The destination port.
 * @param connect_cb The function to call when the connection is
 *                   established.
 * @param error_cb   The function to call if there is an error while
 *                   establishing the connection.
 * @param data       User-defined data.
 *
 * @return NULL if there was an error, or a reference to a data
 *         structure that can be used to cancel the pending
 *         connection, if needed.
 */
GaimProxyConnectInfo *gaim_proxy_connect_socks5(GaimProxyInfo *gpi,
			const char *host, int port,
			GaimProxyConnectFunction connect_cb,
			GaimProxyErrorFunction error_cb, gpointer data);

/**
 * Cancel an in-progress connection attempt.  This should be called
 * by the PRPL if the user disables an account while it is still
 * performing the initial sign on.  Or when establishing a file

14108:7a205b430d19

} GaimProxyInfo;

typedef struct _GaimProxyConnectInfo GaimProxyConnectInfo;

typedef void (*GaimProxyConnectFunction)(gpointer data, gint source, const gchar *error_message);

/**
 * The "hosts" parameter is a linked list containing pairs of
 * one size_t addrlen and one struct sockaddr *addr.
 */

 *
 * @param account    The account making the connection.
 * @param host       The destination host.
 * @param port       The destination port.
 * @param connect_cb The function to call when the connection is
 *                   established.  If the connection failed then
 *                   fd will be -1 and error message will be set
 *                   to something descriptive (hopefully).
 * @param data       User-defined data.
 *
 * @return NULL if there was an error, or a reference to a data
 *         structure that can be used to cancel the pending
 *         connection, if needed.
 */
GaimProxyConnectInfo *gaim_proxy_connect(GaimAccount *account,
			const char *host, int port,
			GaimProxyConnectFunction connect_cb, gpointer data);

/**
 * Makes a connection through a SOCKS5 proxy.
 *
 * @param gpi        The GaimProxyInfo specifying the proxy settings
 * @param host       The destination host.
 * @param port       The destination port.
 * @param connect_cb The function to call when the connection is
 *                   established.  If the connection failed then
 *                   fd will be -1 and error message will be set
 *                   to something descriptive (hopefully).
 * @param data       User-defined data.
 *
 * @return NULL if there was an error, or a reference to a data
 *         structure that can be used to cancel the pending
 *         connection, if needed.
 */
GaimProxyConnectInfo *gaim_proxy_connect_socks5(GaimProxyInfo *gpi,
			const char *host, int port,
			GaimProxyConnectFunction connect_cb, gpointer data);

/**
 * Cancel an in-progress connection attempt.  This should be called
 * by the PRPL if the user disables an account while it is still
 * performing the initial sign on.  Or when establishing a file