comparison src/proxy.c @ 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

#include "proxy.h"
#include "util.h"

struct _GaimProxyConnectInfo {
	GaimProxyConnectFunction connect_cb;
	GaimProxyErrorFunction error_cb;
	gpointer data;
	char *host;
	int port;
	int fd;
	guint inpa;

}

static void
gaim_proxy_connect_info_connected(GaimProxyConnectInfo *connect_info)
{
	connect_info->connect_cb(connect_info->data, connect_info->fd);

	/*
	 * We've passed the file descriptor to the protocol, so it's no longer
	 * our responsibility, and we should be careful not to free it when
	 * we destroy the connect_info.

 *       good error_message.
 */
static void
gaim_proxy_connect_info_error(GaimProxyConnectInfo *connect_info, const gchar *error_message)
{
	if (connect_info->error_cb == NULL)
	{
		/*
		 * TODO
		 * While we're transitioning to the new gaim_proxy_connect()
		 * code, not all callers supply an error_cb.  If this is the
		 * case then they're expecting connect_cb to be called with
		 * an fd of -1 in the case of an error.  Once all callers have
		 * been changed this whole if statement should be removed.
		 */
		connect_info->connect_cb(connect_info->data, -1);
		gaim_proxy_connect_info_destroy(connect_info);
		return;
	}

	connect_info->error_cb(connect_info->data, error_message);
	gaim_proxy_connect_info_destroy(connect_info);
}

#if defined(__unix__) || defined(__APPLE__)

	return gpi;
}

GaimProxyConnectInfo *
gaim_proxy_connect(GaimAccount *account, const char *host, int port,
				   GaimProxyConnectFunction connect_cb,
				   GaimProxyErrorFunction error_cb, gpointer data)
{
	const char *connecthost = host;
	int connectport = port;
	GaimProxyConnectInfo *connect_info;

	g_return_val_if_fail(host       != NULL, NULL);
	g_return_val_if_fail(port       >  0,    NULL);
	g_return_val_if_fail(connect_cb != NULL, NULL);
	/* g_return_val_if_fail(error_cb   != NULL, NULL); *//* TODO: Soon! */

	connect_info = g_new0(GaimProxyConnectInfo, 1);
	connect_info->fd = -1;
	connect_info->connect_cb = connect_cb;
	connect_info->error_cb = error_cb;
	connect_info->data = data;
	connect_info->host = g_strdup(host);
	connect_info->port = port;
	connect_info->gpi = gaim_proxy_get_setup(account);

/*
 * Combine some of this code with gaim_proxy_connect()
 */
GaimProxyConnectInfo *
gaim_proxy_connect_socks5(GaimProxyInfo *gpi, const char *host, int port,
				   GaimProxyConnectFunction connect_cb,
				   GaimProxyErrorFunction error_cb, gpointer data)
{
	GaimProxyConnectInfo *connect_info;

	g_return_val_if_fail(host       != NULL, NULL);
	g_return_val_if_fail(port       >  0,    NULL);
	g_return_val_if_fail(connect_cb != NULL, NULL);
	/* g_return_val_if_fail(error_cb   != NULL, NULL); *//* TODO: Soon! */

	connect_info = g_new0(GaimProxyConnectInfo, 1);
	connect_info->fd = -1;
	connect_info->connect_cb = connect_cb;
	connect_info->error_cb = error_cb;
	connect_info->data = data;
	connect_info->host = g_strdup(host);
	connect_info->port = port;
	connect_info->gpi = gpi;

14108:7a205b430d19

#include "proxy.h"
#include "util.h"

struct _GaimProxyConnectInfo {
	GaimProxyConnectFunction connect_cb;
	gpointer data;
	char *host;
	int port;
	int fd;
	guint inpa;

}

static void
gaim_proxy_connect_info_connected(GaimProxyConnectInfo *connect_info)
{
	connect_info->connect_cb(connect_info->data, connect_info->fd, NULL);

	/*
	 * We've passed the file descriptor to the protocol, so it's no longer
	 * our responsibility, and we should be careful not to free it when
	 * we destroy the connect_info.

 *       good error_message.
 */
static void
gaim_proxy_connect_info_error(GaimProxyConnectInfo *connect_info, const gchar *error_message)
{
	connect_info->connect_cb(connect_info->data, -1, error_message);
	gaim_proxy_connect_info_destroy(connect_info);
}

#if defined(__unix__) || defined(__APPLE__)

	return gpi;
}

GaimProxyConnectInfo *
gaim_proxy_connect(GaimAccount *account, const char *host, int port,
				   GaimProxyConnectFunction connect_cb, gpointer data)
{
	const char *connecthost = host;
	int connectport = port;
	GaimProxyConnectInfo *connect_info;

	g_return_val_if_fail(host       != NULL, NULL);
	g_return_val_if_fail(port       >  0,    NULL);
	g_return_val_if_fail(connect_cb != NULL, NULL);

	connect_info = g_new0(GaimProxyConnectInfo, 1);
	connect_info->fd = -1;
	connect_info->connect_cb = connect_cb;
	connect_info->data = data;
	connect_info->host = g_strdup(host);
	connect_info->port = port;
	connect_info->gpi = gaim_proxy_get_setup(account);

/*
 * Combine some of this code with gaim_proxy_connect()
 */
GaimProxyConnectInfo *
gaim_proxy_connect_socks5(GaimProxyInfo *gpi, const char *host, int port,
				   GaimProxyConnectFunction connect_cb, gpointer data)
{
	GaimProxyConnectInfo *connect_info;

	g_return_val_if_fail(host       != NULL, NULL);
	g_return_val_if_fail(port       >  0,    NULL);
	g_return_val_if_fail(connect_cb != NULL, NULL);

	connect_info = g_new0(GaimProxyConnectInfo, 1);
	connect_info->fd = -1;
	connect_info->connect_cb = connect_cb;
	connect_info->data = data;
	connect_info->host = g_strdup(host);
	connect_info->port = port;
	connect_info->gpi = gpi;