pidgin: src/proxy.c comparison

comparison src/proxy.c @ 14089:10e8eb6a4910

[gaim-migrate @ 16712] Pretty large commit here. Basically I got sick of having to verify that gc is still valid on all the callback functions for gaim_proxy_connect(). The fix for this for gaim_proxy_connect() to return something that allows the connection attempt to be canceled. It's not quite there yet, but this is a good first step. I changed gaim_proxy_connect() to return a reference to a new GaimProxyConnectInfo (this used to be called PHB). Eventually this can be passed to a function that'll cancel the connection attempt. I also decided to add an error_cb instead of using connect_cb and passing a file descriptor of -1. And proxy.c will also pass an error message to callers which should explain the reason that the connection attempt failed. Oh, and proxy.c now never calls gaim_connection_error() committer: Tailor Script <tailor@pidgin.im>

author	Mark Doliner <mark@kingant.net>
date	Sat, 12 Aug 2006 10:12:43 +0000
parents	8bda65b88e49
children	983fbec46eb0

comparison

equal deleted inserted replaced

-:223570831b0b
+:10e8eb6a4910
 #include "ntlm.h"
 #include "prefs.h"
 #include "proxy.h"
 #include "util.h"
-static GaimProxyInfo *global_proxy_info = NULL;
+/* Does anyone know what PHB stands for? */
 struct PHB {
-	GaimInputFunction func;
+	GaimProxyConnectFunction connect_cb;
+	GaimProxyErrorFunction error_cb;
 	gpointer data;
 	char *host;
 	int port;
-	gint inpa;
+	guint inpa;
 	GaimProxyInfo *gpi;
-	GaimAccount *account;
 	GSList *hosts;
 	guchar *write_buffer;
 	gsize write_buf_len;
 	gsize written_len;
 	GaimInputFunction read_cb;
 	guchar *read_buffer;
 	gsize read_buf_len;
 	gsize read_len;
 };
-static void try_connect(struct PHB *);
 static const char *socks5errors[] = {
 	"succeeded\n",
 	"general SOCKS server failure\n",
 	"connection not allowed by ruleset\n",
 	"TTL expired\n",
 	"Command not supported\n",
 	"Address type not supported\n"
 };
+static GaimProxyInfo *global_proxy_info = NULL;
+static GSList *phbs = NULL;
+static void try_connect(struct PHB *);
 /**************************************************************************
 * Proxy structure API
 **************************************************************************/
 GaimProxyInfo *
 gaim_proxy_info_new(void)
 }
 /**************************************************************************
 * Proxy API
 **************************************************************************/
+static void
+gaim_proxy_phb_destroy(struct PHB *phb)
+{
+	phbs = g_slist_remove(phbs, phb);
+	if (phb->inpa > 0)
+		gaim_input_remove(phb->inpa);
+	while (phb->hosts != NULL)
+	{
+		/* Discard the length... */
+		phb->hosts = g_slist_remove(phb->hosts, phb->hosts->data);
+		/* Free the address... */
+		g_free(phb->hosts->data);
+		phb->hosts = g_slist_remove(phb->hosts, phb->hosts->data);
+	}
+	g_free(phb->host);
+	g_free(phb->write_buffer);
+	g_free(phb->read_buffer);
+	g_free(phb);
+}
+static void
+gaim_proxy_phb_connected(struct PHB *phb, int fd)
+{
+	phb->connect_cb(phb->data, fd);
+	gaim_proxy_phb_destroy(phb);
+}
+/**
+* @param error An error message explaining why the connection
+*        failed.  This will be passed to the callback function
+*        specified in the call to gaim_proxy_connect().
+*/
+static void
+gaim_proxy_phb_error(struct PHB *phb, const gchar *error_message)
+{
+	if (phb->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.
+		 */
+		phb->connect_cb(phb->data, -1);
+		gaim_proxy_phb_destroy(phb);
+		return;
+	}
+	phb->error_cb(phb->data, error_message);
+	gaim_proxy_phb_destroy(phb);
+}
 #if defined(__unix__) || defined(__APPLE__)
 /*
 * This structure represents both a pending DNS request and
 * a free child process.
 */
 typedef struct {
 	char *host;
 	int port;
-	dns_callback_t callback;
+	GaimProxyDnsConnectFunction callback;
 	gpointer data;
-	gint inpa;
+	guint inpa;
 	int fd_in, fd_out;
 	pid_t dns_pid;
 } pending_dns_request_t;
 static GSList *free_dns_children = NULL;
 	int port;
 } dns_params_t;
 typedef struct {
 	dns_params_t params;
-	dns_callback_t callback;
+	GaimProxyDnsConnectFunction callback;
 	gpointer data;
 } queued_dns_request_t;
 /*
 * Begin the DNS resolver child process functions.
 /*
 * End the functions for dealing with the DNS child processes.
 */
 int
-gaim_gethostbyname_async(const char *hostname, int port, dns_callback_t callback, gpointer data)
+gaim_gethostbyname_async(const char *hostname, int port, GaimProxyDnsConnectFunction callback, gpointer data)
 {
 	pending_dns_request_t *req = NULL;
 	dns_params_t dns_params;
 	gchar *host_temp;
 	gboolean show_debug;
 #elif defined _WIN32 /* end __unix__ || __APPLE__ */
 typedef struct _dns_tdata {
 	char *hostname;
 	int port;
-	dns_callback_t callback;
+	GaimProxyDnsConnectFunction callback;
 	gpointer data;
 	GSList *hosts;
 	char *errmsg;
 } dns_tdata;
 	return 0;
 }
 int
 gaim_gethostbyname_async(const char *hostname, int port,
-							  dns_callback_t callback, gpointer data)
+							  GaimProxyDnsConnectFunction callback, gpointer data)
 {
 	dns_tdata *td;
 	struct sockaddr_in sin;
 	GError* err = NULL;
 typedef struct {
 	gpointer data;
 	size_t addrlen;
 	struct sockaddr *addr;
-	dns_callback_t callback;
+	GaimProxyDnsConnectFunction callback;
 } pending_dns_request_t;
 static gboolean host_resolved(gpointer data)
 {
 	pending_dns_request_t *req = (pending_dns_request_t*)data;
 	return FALSE;
 }
 int
 gaim_gethostbyname_async(const char *hostname, int port,
-						 dns_callback_t callback, gpointer data)
+						 GaimProxyDnsConnectFunction callback, gpointer data)
 {
 	struct sockaddr_in sin;
 	pending_dns_request_t *req;
 	if (!inet_aton(hostname, &sin.sin_addr)) {
 	 */
 	ret = getsockopt(source, SOL_SOCKET, SO_ERROR, &error, &len);
 	if (ret == 0 && error == EINPROGRESS)
 		return; /* we'll be called again later */
 	if (ret < 0 || error != 0) {
-		if(ret!=0) error = errno;
+		if (ret!=0)
+			error = errno;
 		close(source);
 		gaim_input_remove(phb->inpa);
+		phb->inpa = 0;
 		gaim_debug_error("proxy",
 			   "getsockopt SO_ERROR check: %s\n", strerror(error));
 		try_connect(phb);
 		return;
 	}
 	gaim_input_remove(phb->inpa);
+	phb->inpa = 0;
-	if (phb->account == NULL ||
-		gaim_account_get_connection(phb->account) != NULL) {
+	gaim_proxy_phb_connected(phb, source);
-		phb->func(phb->data, source, GAIM_INPUT_READ);
-	}
-	g_free(phb->host);
-	g_free(phb);
 }
 static gboolean clean_connect(gpointer data)
 {
 	struct PHB *phb = data;
-	if (phb->account == NULL ||
+	gaim_proxy_phb_connected(phb, phb->port);
-		gaim_account_get_connection(phb->account) != NULL) {
-		phb->func(phb->data, phb->port, GAIM_INPUT_READ);
-	}
-	g_free(phb->host);
-	g_free(phb);
 	return FALSE;
 }
 		if (getsockopt(fd, SOL_SOCKET, SO_ERROR, &error, &len) < 0) {
 			gaim_debug_error("proxy", "getsockopt failed.\n");
 			close(fd);
 			return -1;
 		}
+		/* TODO: Why is the following line so strange? */
 		phb->port = fd;	/* bleh */
-		gaim_timeout_add(50, clean_connect, phb);	/* we do this because we never
+		gaim_timeout_add(10, clean_connect, phb);	/* we do this because we never
 							   want to call our callback
 							   before we return. */
 	}
 	return fd;
 	if(ret < 0 && errno == EAGAIN)
 		return;
 	else if(ret < 0) {
 		gaim_input_remove(phb->inpa);
+		phb->inpa = 0;
 		close(source);
 		g_free(phb->write_buffer);
 		phb->write_buffer = NULL;
 		try_connect(phb);
 		return;
 	phb->inpa = gaim_input_add(source, GAIM_INPUT_READ, phb->read_cb, phb);
 }
 #define HTTP_GOODSTRING "HTTP/1.0 200"
 #define HTTP_GOODSTRING2 "HTTP/1.1 200"
-static void
-http_complete(struct PHB *phb, gint source)
-{
-	gaim_debug_info("http proxy", "proxy connection established\n");
-	if(!phb->account || phb->account->gc) {
-		phb->func(phb->data, source, GAIM_INPUT_READ);
-	}
-	g_free(phb->host);
-	g_free(phb);
-}
 /* read the response to the CONNECT request, if we are requesting a non-port-80 tunnel */
 static void
 http_canread(gpointer data, gint source, GaimInputCondition cond)
 {
 	int len, headers_len, status = 0;
 	gboolean error;
 	struct PHB *phb = data;
 	guchar *p;
 	gsize max_read;
+	gchar *msg;
 	if(phb->read_buffer == NULL) {
 		phb->read_buf_len = 8192;
 		phb->read_buffer = g_malloc(phb->read_buf_len);
 		phb->read_len = 0;
 	len = read(source, p, max_read);
 	if(len < 0 && errno == EAGAIN)
 		return;
 	else if(len <= 0) {
 		close(source);
-		source = -1;
+		gaim_proxy_phb_error(phb, _("Lost connection with server for an unknown reason."));
-		g_free(phb->read_buffer);
-		phb->read_buffer = NULL;
-		gaim_input_remove(phb->inpa);
-		phb->inpa = 0;
-		http_complete(phb, source);
 		return;
 	} else {
 		phb->read_len += len;
 	}
 	p[len] = '\0';
 		headers_len = len;
 	else
 		return;
 	error = strncmp((const char *)phb->read_buffer, "HTTP/", 5) != 0;
-	if(!error) {
+	if (!error)
+	{
 		int major;
 		p = phb->read_buffer + 5;
 		major = strtol((const char *)p, (char **)&p, 10);
 		error = (major == 0) || (*p != '.');
 		if(!error) {
 		}
 	}
 	/* Read the contents */
 	p = (guchar *)g_strrstr((const gchar *)phb->read_buffer, "Content-Length: ");
-	if(p != NULL) {
+	if (p != NULL)
+	{
 		gchar *tmp;
 		int len = 0;
 		char tmpc;
 		p += strlen("Content-Length: ");
 		tmp = strchr((const char *)p, '\r');
 			if (read(source, &tmpc, 1) < 0 && errno != EAGAIN)
 				break;
 		}
 	}
-	if(error) {
+	if (error)
-		gaim_debug_error("proxy",
+	{
-				"Unable to parse proxy's response: %s\n",
+		close(source);
+		msg = g_strdup_printf("Unable to parse response from HTTP proxy: %s\n",
 				phb->read_buffer);
-		close(source);
+		gaim_proxy_phb_error(phb, msg);
-		source = -1;
+		g_free(msg);
-		g_free(phb->read_buffer);
+		return;
-		phb->read_buffer = NULL;
+	}
-		gaim_input_remove(phb->inpa);
+	else if (status != 200)
-		phb->inpa = 0;
+	{
-		http_complete(phb, source);
-		return;
-	} else if(status != 200) {
 		gaim_debug_error("proxy",
 				"Proxy server replied with:\n%s\n",
 				phb->read_buffer);
-		/* XXX: why in the hell are we calling gaim_connection_error() here? */
 		if(status == 407 /* Proxy Auth */) {
 			gchar *ntlm;
 			if((ntlm = g_strrstr((const gchar *)phb->read_buffer, "Proxy-Authenticate: NTLM "))) { /* Check for Type-2 */
 				gchar *tmp = ntlm;
 				guint8 *nonce;
 				gchar *domain = (gchar*)gaim_proxy_info_get_username(phb->gpi);
 				gchar *username;
 				gchar *request;
 				gchar *response;
-				if(!(username = strchr(domain, '\\'))) {
+				username = strchr(domain, '\\');
-					char *msg = g_strdup_printf(_("Proxy connection error %d"), status);
+				if (username == NULL)
+				{
 					close(source);
-					source = -1;
+					msg = g_strdup_printf(_("HTTP proxy connection error %d"), status);
-					if(phb->account)
+					gaim_proxy_phb_error(phb, msg);
-						gaim_connection_error(phb->account->gc, msg);
-					else
-						gaim_debug_error("http proxy", "%s\n", msg);
 					g_free(msg);
-					gaim_input_remove(phb->inpa);
-					g_free(phb->read_buffer);
-					g_free(phb->host);
-					g_free(phb);
 					return;
 				}
 				*username = '\0';
 				username++;
 				ntlm += strlen("Proxy-Authenticate: NTLM ");
 			} else if((ntlm = g_strrstr((const char *)phb->read_buffer, "Proxy-Authenticate: NTLM"))) { /* Empty message */
 				gchar request[2048];
 				gchar *domain = (gchar*) gaim_proxy_info_get_username(phb->gpi);
 				gchar *username;
 				int request_len;
-				if(!(username = strchr(domain, '\\'))) {
+				username = strchr(domain, '\\');
-					char *msg = g_strdup_printf(_("Proxy connection error %d"), status);
+				if (username == NULL)
+				{
 					close(source);
-					source = -1;
+					msg = g_strdup_printf(_("HTTP proxy connection error %d"), status);
-					if(phb->account)
+					gaim_proxy_phb_error(phb, msg);
-						gaim_connection_error(phb->account->gc, msg);
-					else
-						gaim_debug_error("http proxy", "%s\n", msg);
 					g_free(msg);
-					gaim_input_remove(phb->inpa);
-					g_free(phb->read_buffer);
-					g_free(phb->host);
-					g_free(phb);
 					return;
 				}
 				*username = '\0';
 				request_len = g_snprintf(request, sizeof(request),
 					GAIM_INPUT_WRITE, proxy_do_write, phb);
 				proxy_do_write(phb, source, cond);
 				return;
 			} else {
-				char *msg = g_strdup_printf(_("Proxy connection error %d"), status);
 				close(source);
-				source = -1;
+				msg = g_strdup_printf(_("HTTP proxy connection error %d"), status);
-				if(phb->account)
+				gaim_proxy_phb_error(phb, msg);
-					gaim_connection_error(phb->account->gc, msg);
-				else
-					gaim_debug_error("http proxy", "%s\n", msg);
 				g_free(msg);
-				gaim_input_remove(phb->inpa);
-				g_free(phb->read_buffer);
-				g_free(phb->host);
-				g_free(phb);
 				return;
 			}
 		}
 		if(status == 403 /* Forbidden */ ) {
-			gchar *msg = g_strdup_printf(_("Access denied: proxy server forbids port %d tunnelling."), phb->port);
+			msg = g_strdup_printf(_("Access denied: HTTP proxy server forbids port %d tunnelling."), phb->port);
-			if(phb->account)
+			gaim_proxy_phb_error(phb, msg);
-				gaim_connection_error(phb->account->gc, msg);
-			else
-				gaim_debug_error("http proxy", "%s\n", msg);
 			g_free(msg);
-			gaim_input_remove(phb->inpa);
-			g_free(phb->read_buffer);
-			g_free(phb->host);
-			g_free(phb);
 		} else {
-			char *msg = g_strdup_printf(_("Proxy connection error %d"), status);
+			msg = g_strdup_printf(_("HTTP proxy connection error %d"), status);
-			if(phb->account)
+			gaim_proxy_phb_error(phb, msg);
-				gaim_connection_error(phb->account->gc, msg);
-			else
-				gaim_debug_error("http proxy", "%s\n", msg);
 			g_free(msg);
-			gaim_input_remove(phb->inpa);
-			g_free(phb->read_buffer);
-			g_free(phb->host);
-			g_free(phb);
 		}
 	} else {
 		gaim_input_remove(phb->inpa);
+		phb->inpa = 0;
 		g_free(phb->read_buffer);
 		phb->read_buffer = NULL;
-		http_complete(phb, source);
+		gaim_debug_info("proxy", "HTTP proxy connection established\n");
+		gaim_proxy_phb_connected(phb, source);
 		return;
 	}
 }
 	int error = ETIMEDOUT;
 	gaim_debug_info("http proxy", "Connected.\n");
 	if (phb->inpa > 0)
+	{
 		gaim_input_remove(phb->inpa);
+		phb->inpa = 0;
+	}
 	len = sizeof(error);
 	if (getsockopt(source, SOL_SOCKET, SO_ERROR, &error, &len) < 0) {
 		close(source);
 			if (phb->port != 80) {
 				/* we need to do CONNECT first */
 				phb->inpa = gaim_input_add(fd, GAIM_INPUT_WRITE,
 							   http_canwrite, phb);
 			} else {
-				http_complete(phb, fd);
+				gaim_debug_info("proxy", "HTTP proxy connection established\n");
+				gaim_proxy_phb_connected(phb, fd);
 			}
 		} else {
 			close(fd);
 			return -1;
 		}
 	if ((len < 0 && errno == EAGAIN) || (len > 0 && len + phb->read_len < 4))
 		return;
 	else if (len + phb->read_len >= 4) {
 		if (phb->read_buffer[1] == 90) {
-			if (phb->account == NULL ||
+			gaim_proxy_phb_connected(phb, source);
-				gaim_account_get_connection(phb->account) != NULL) {
-				phb->func(phb->data, source, GAIM_INPUT_READ);
-			}
-			gaim_input_remove(phb->inpa);
-			g_free(phb->read_buffer);
-			g_free(phb->host);
-			g_free(phb);
 			return;
 		}
 	}
 	gaim_input_remove(phb->inpa);
+	phb->inpa = 0;
 	g_free(phb->read_buffer);
 	phb->read_buffer = NULL;
 	close(source);
 	int error = ETIMEDOUT;
 	gaim_debug_info("socks4 proxy", "Connected.\n");
 	if (phb->inpa > 0)
+	{
 		gaim_input_remove(phb->inpa);
+		phb->inpa = 0;
+	}
 	len = sizeof(error);
 	if (getsockopt(source, SOL_SOCKET, SO_ERROR, &error, &len) < 0) {
 		close(source);
 		return;
 	else if(len <= 0) {
 		gaim_debug_warning("socks5 proxy", "or not...\n");
 		close(source);
 		gaim_input_remove(phb->inpa);
+		phb->inpa = 0;
 		g_free(phb->read_buffer);
 		phb->read_buffer = NULL;
 		try_connect(phb);
 		return;
 	}
 			gaim_debug_error("socks5 proxy", socks5errors[buf[1]]);
 		else
 			gaim_debug_error("socks5 proxy", "Bad data.\n");
 		close(source);
 		gaim_input_remove(phb->inpa);
+		phb->inpa = 0;
 		g_free(phb->read_buffer);
 		phb->read_buffer = NULL;
 		try_connect(phb);
 		return;
 	}
 		return;
 	/* Skip past BND.PORT */
 	buf += 2;
-	if (phb->account == NULL ||
+	gaim_proxy_phb_connected(phb, source);
-		gaim_account_get_connection(phb->account) != NULL) {
-		phb->func(phb->data, source, GAIM_INPUT_READ);
-	}
-	gaim_input_remove(phb->inpa);
-	g_free(phb->read_buffer);
-	g_free(phb->host);
-	g_free(phb);
 }
 static void
-s5_sendconnect(gpointer data, gint source)
+s5_sendconnect(gpointer data, int source)
 {
 	struct PHB *phb = data;
 	int hlen = strlen(phb->host);
 	phb->write_buf_len = 5 + hlen + 2;
 	phb->write_buffer = g_malloc(phb->write_buf_len);
 	phb->read_cb = s5_canread_again;
 	phb->inpa = gaim_input_add(source, GAIM_INPUT_WRITE, proxy_do_write, phb);
 	proxy_do_write(phb, source, GAIM_INPUT_WRITE);
 }
 static void
 s5_readauth(gpointer data, gint source, GaimInputCondition cond)
 {
 	if(len < 0 && errno == EAGAIN)
 		return;
 	else if(len <= 0) {
 		close(source);
 		gaim_input_remove(phb->inpa);
+		phb->inpa = 0;
 		g_free(phb->read_buffer);
 		phb->read_buffer = NULL;
 		try_connect(phb);
 		return;
 	}
 	if (phb->read_len < 2)
 		return;
 	gaim_input_remove(phb->inpa);
+	phb->inpa = 0;
 	if ((phb->read_buffer[0] != 0x01) || (phb->read_buffer[1] != 0x00)) {
 		close(source);
 		g_free(phb->read_buffer);
 		phb->read_buffer = NULL;
 	if(len < 0 && errno == EAGAIN)
 		return;
 	else if(len <= 0) {
 		close(source);
 		gaim_input_remove(phb->inpa);
+		phb->inpa = 0;
 		g_free(phb->read_buffer);
 		phb->read_buffer = NULL;
 		try_connect(phb);
 		return;
 	}
 	cmdbuf = phb->read_buffer;
 	if (*cmdbuf != 0x01) {
 		close(source);
 		gaim_input_remove(phb->inpa);
+		phb->inpa = 0;
 		g_free(phb->read_buffer);
 		phb->read_buffer = NULL;
 		try_connect(phb);
 		return;
 	}
 		switch (cmdbuf[0]) {
 			case 0x00:
 				/* Did auth work? */
 				if (buf[0] == 0x00) {
 					gaim_input_remove(phb->inpa);
+					phb->inpa = 0;
 					g_free(phb->read_buffer);
 					phb->read_buffer = NULL;
 					/* Success */
 					s5_sendconnect(phb, source);
 					return;
 					gaim_debug_warning("proxy",
 						"socks5 CHAP authentication "
 						"failed.  Disconnecting...");
 					close(source);
 					gaim_input_remove(phb->inpa);
+					phb->inpa = 0;
 					g_free(phb->read_buffer);
 					phb->read_buffer = NULL;
 					try_connect(phb);
 					return;
 				}
 						"as supporting.  This is a violation "
 						"of the socks5 CHAP specification.  "
 						"Disconnecting...");
 					close(source);
 					gaim_input_remove(phb->inpa);
+					phb->inpa = 0;
 					g_free(phb->read_buffer);
 					phb->read_buffer = NULL;
 					try_connect(phb);
 					return;
 				}
 	if(len < 0 && errno == EAGAIN)
 		return;
 	else if(len <= 0) {
 		close(source);
 		gaim_input_remove(phb->inpa);
+		phb->inpa = 0;
 		g_free(phb->read_buffer);
 		phb->read_buffer = NULL;
 		try_connect(phb);
 		return;
 	}
 	if (phb->read_len < 2)
 		return;
 	gaim_input_remove(phb->inpa);
+	phb->inpa = 0;
 	if ((phb->read_buffer[0] != 0x05) || (phb->read_buffer[1] == 0xff)) {
 		close(source);
 		g_free(phb->read_buffer);
 		phb->read_buffer = NULL;
 	int error = ETIMEDOUT;
 	gaim_debug_info("socks5 proxy", "Connected.\n");
 	if (phb->inpa > 0)
+	{
 		gaim_input_remove(phb->inpa);
+		phb->inpa = 0;
+	}
 	len = sizeof(error);
 	if (getsockopt(source, SOL_SOCKET, SO_ERROR, &error, &len) < 0) {
 		close(source);
 		if (ret > 0)
 			break;
 	}
 	if (ret < 0) {
-		if (phb->account == NULL ||
+		gaim_proxy_phb_error(phb, _("TODO"));
-			gaim_account_get_connection(phb->account) != NULL) {
-			phb->func(phb->data, -1, GAIM_INPUT_READ);
-		}
-		g_free(phb->host);
-		g_free(phb);
 	}
 }
 static void
 connection_host_resolved(GSList *hosts, gpointer data,
 	}
 	return gpi;
 }
-/*
+GaimProxyConnectInfo *
-* TODO: It would be really good if this returned some sort of handle
-*       that we could use to cancel the connection.  As it is now,
-*       each callback has to check to make sure gc is still valid.
-*       And that is ugly.
-*/
-int
 gaim_proxy_connect(GaimAccount *account, const char *host, int port,
-				   GaimInputFunction func, gpointer data)
+				   GaimProxyConnectFunction connect_cb,
+				   GaimProxyErrorFunction error_cb, gpointer data)
 {
 	const char *connecthost = host;
 	int connectport = port;
 	struct PHB *phb;
-	g_return_val_if_fail(host != NULL, -1);
+	g_return_val_if_fail(host       != NULL, NULL);
-	g_return_val_if_fail(port != 0 && port != -1, -1);
+	g_return_val_if_fail(port       >  0,    NULL);
-	g_return_val_if_fail(func != NULL, -1);
+	g_return_val_if_fail(connect_cb != NULL, NULL);
+	/* g_return_val_if_fail(error_cb   != NULL, NULL); *//* TODO: Soon! */
 	phb = g_new0(struct PHB, 1);
+	phb->connect_cb = connect_cb;
-	phb->func = func;
+	phb->error_cb = error_cb;
 	phb->data = data;
 	phb->host = g_strdup(host);
 	phb->port = port;
-	phb->account = account;
 	phb->gpi = gaim_proxy_get_setup(account);
 	if ((gaim_proxy_info_get_type(phb->gpi) != GAIM_PROXY_NONE) &&
 		(gaim_proxy_info_get_host(phb->gpi) == NULL ||
 		 gaim_proxy_info_get_port(phb->gpi) <= 0)) {
 		gaim_notify_error(NULL, NULL, _("Invalid proxy settings"), _("Either the host name or port number specified for your given proxy type is invalid."));
-		g_free(phb->host);
+		gaim_proxy_phb_destroy(phb);
-		g_free(phb);
+		return NULL;
-		return -1;
 	}
 	switch (gaim_proxy_info_get_type(phb->gpi))
 	{
 		case GAIM_PROXY_NONE:
 			connecthost = gaim_proxy_info_get_host(phb->gpi);
 			connectport = gaim_proxy_info_get_port(phb->gpi);
 			break;
 		default:
-			g_free(phb->host);
+			gaim_proxy_phb_destroy(phb);
-			g_free(phb);
+			return NULL;
-			return -1;
+	}
-	}
+	if (gaim_gethostbyname_async(connecthost,
-	return gaim_gethostbyname_async(connecthost, connectport,
+			connectport, connection_host_resolved, phb) != 0)
-		connection_host_resolved, phb);
+	{
-}
+		gaim_proxy_phb_destroy(phb);
+		return NULL;
-int
+	}
+	phbs = g_slist_prepend(phbs, phb);
+	return phb;
+}
+/*
+* Combine some of this code with gaim_proxy_connect()
+*/
+GaimProxyConnectInfo *
 gaim_proxy_connect_socks5(GaimProxyInfo *gpi, const char *host, int port,
-		GaimInputFunction func, gpointer data)
+				   GaimProxyConnectFunction connect_cb,
+				   GaimProxyErrorFunction error_cb, gpointer data)
 {
 	struct PHB *phb;
+	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! */
 	phb = g_new0(struct PHB, 1);
-	phb->gpi = gpi;
+	phb->connect_cb = connect_cb;
-	phb->func = func;
+	phb->error_cb = error_cb;
 	phb->data = data;
 	phb->host = g_strdup(host);
 	phb->port = port;
+	phb->gpi = gpi;
-	return gaim_gethostbyname_async(gaim_proxy_info_get_host(gpi),
-		gaim_proxy_info_get_port(gpi), connection_host_resolved, phb);
+	if (gaim_gethostbyname_async(gaim_proxy_info_get_host(gpi),
+			gaim_proxy_info_get_port(gpi), connection_host_resolved, phb) != 0)
+	{
+		gaim_proxy_phb_destroy(phb);
+		return NULL;
+	}
+	phbs = g_slist_prepend(phbs, phb);
+	return phb;
 }
 static void
 proxy_pref_cb(const char *name, GaimPrefType type,
 		gaim_proxy_info_set_port(info, GPOINTER_TO_INT(value));
 	else if (!strcmp(name, "/core/proxy/username"))
 		gaim_proxy_info_set_username(info, value);
 	else if (!strcmp(name, "/core/proxy/password"))
 		gaim_proxy_info_set_password(info, value);
+}
+void *
+gaim_proxy_get_handle()
+{
+	static int handle;
+	return &handle;
 }
 void
 gaim_proxy_init(void)
 {
 	if(!g_thread_supported())
 		g_thread_init(NULL);
 #endif
 }
-void *
+void
-gaim_proxy_get_handle()
+gaim_proxy_uninit(void)
 {
-	static int handle;
+	while (phbs != NULL)
+		gaim_proxy_phb_destroy(phbs->data);
-	return &handle;
+}
-}

Mercurial > pidgin

comparison src/proxy.c @ 14089:10e8eb6a4910