comparison src/proxy.c @ 14183:c3c792958635

[gaim-migrate @ 16835] Change the DNS query function to return a struct that will eventually allow the query to be canceled. Also rename two of the DNS query things committer: Tailor Script <[e-mail]>

14182:ccb670ba3b4f

	char *host;
	int port;
	int fd;
	guint inpa;
	GaimProxyInfo *gpi;

	/**
	 * This contains alternating length/char* values.  The char*
	 * values need to be freed when removed from the linked list.
	 */

		default:
			gaim_proxy_connect_info_destroy(connect_info);
			return NULL;
	}

	if (gaim_gethostbyname_async(connecthost,
			connectport, connection_host_resolved, connect_info) != 0)
	{
		gaim_proxy_connect_info_destroy(connect_info);
		return NULL;
	}

	connect_info->data = data;
	connect_info->host = g_strdup(host);
	connect_info->port = port;
	connect_info->gpi = gpi;

	if (gaim_gethostbyname_async(gaim_proxy_info_get_host(gpi),
			gaim_proxy_info_get_port(gpi), connection_host_resolved, connect_info) != 0)
	{
		gaim_proxy_connect_info_destroy(connect_info);
		return NULL;
	}

14183:c3c792958635

	char *host;
	int port;
	int fd;
	guint inpa;
	GaimProxyInfo *gpi;
	GaimDnsQueryData *query_data;

	/**
	 * This contains alternating length/char* values.  The char*
	 * values need to be freed when removed from the linked list.
	 */

		default:
			gaim_proxy_connect_info_destroy(connect_info);
			return NULL;
	}

	connect_info->query_data = gaim_dnsquery_a(connecthost,
			connectport, connection_host_resolved, connect_info);
	if (connect_info->query_data == NULL)
	{
		gaim_proxy_connect_info_destroy(connect_info);
		return NULL;
	}

	connect_info->data = data;
	connect_info->host = g_strdup(host);
	connect_info->port = port;
	connect_info->gpi = gpi;

	connect_info->query_data =
			gaim_dnsquery_a(gaim_proxy_info_get_host(gpi),
					gaim_proxy_info_get_port(gpi),
					connection_host_resolved, connect_info);
	if (connect_info->query_data == NULL)
	{
		gaim_proxy_connect_info_destroy(connect_info);
		return NULL;
	}