pidgin.yaz: libpurple/dnsquery.c comparison

comparison libpurple/dnsquery.c @ 27711:7fbf964c6c6c

Move the IDN support into the DNS routines. This turned out to be cleaner than I first thought, so here we go. All libpurple DNS routines support IDN when built against GNU libidn.

author	Paul Aurich <paul@darkrain42.org>
date	Sun, 19 Jul 2009 23:45:13 +0000
parents	5345dfe48272
children	8b669aaa3ed7

comparison

equal deleted inserted replaced

-:91333c6c16ef
+:7fbf964c6c6c
 */
 #include "internal.h"
 #include "debug.h"
 #include "dnsquery.h"
+#include "network.h"
 #include "notify.h"
 #include "prefs.h"
 #include "util.h"
 #ifndef _WIN32
 		return TRUE;
 	}
 	return FALSE;
+}
+static gboolean
+dns_str_is_ascii(const char *name)
+{
+	guchar *c;
+	for (c = (guchar *)name; c && *c; ++c) {
+		if (*c > 0x7f)
+			return FALSE;
+	}
+	return TRUE;
 }
 #if defined(PURPLE_DNSQUERY_USE_FORK)
 /*
 	char servname[20];
 #else
 	struct sockaddr_in sin;
 	const size_t addrlen = sizeof(sin);
 #endif
+	char *hostname;
 #ifdef HAVE_SIGNAL_H
 	purple_restore_default_signal_handlers();
 	signal(SIGTRAP, trap_gdb_bug);
 #endif
 					"of an empty hostname (port = %d)!!!\n", getpid(),
 					dns_params.port);
 			_exit(1);
 		}
+#ifdef USE_IDN
+		if (!dns_str_is_ascii(dns_params.hostname)) {
+			rc = purple_network_convert_idn_to_ascii(dns_params.hostname, &hostname);
+			if (rc != 0) {
+				write_to_parent(child_out, &rc, sizeof(rc));
+				close(child_out);
+				if (show_debug)
+					fprintf(stderr, "dns[%d] Error: IDN conversion returned "
+							"%d\n", getpid(), rc);
+				dns_params.hostname[0] = '\0';
+				continue;
+			}
+		} else /* intentional to execute the g_strdup */
+#endif
+		hostname = g_strdup(dns_params.hostname);
 		/* We have the hostname and port, now resolve the IP */
 #ifdef HAVE_GETADDRINFO
 		g_snprintf(servname, sizeof(servname), "%d", dns_params.port);
 		memset(&hints, 0, sizeof(hints));
 		 */
 		hints.ai_socktype = SOCK_STREAM;
 #ifdef AI_ADDRCONFIG
 		hints.ai_flags |= AI_ADDRCONFIG;
 #endif /* AI_ADDRCONFIG */
-		rc = getaddrinfo(dns_params.hostname, servname, &hints, &res);
+		rc = getaddrinfo(hostname, servname, &hints, &res);
 		write_to_parent(child_out, &rc, sizeof(rc));
 		if (rc != 0) {
 			close(child_out);
 			if (show_debug)
 				printf("dns[%d] Error: getaddrinfo returned %d\n",
 			write_to_parent(child_out, res->ai_addr, res->ai_addrlen);
 			res = res->ai_next;
 		}
 		freeaddrinfo(tmp);
 #else
-		if (!inet_aton(dns_params.hostname, &sin.sin_addr)) {
+		if (!inet_aton(hostname, &sin.sin_addr)) {
 			struct hostent *hp;
-			if (!(hp = gethostbyname(dns_params.hostname))) {
+			if (!(hp = gethostbyname(hostname))) {
 				write_to_parent(child_out, &h_errno, sizeof(int));
 				close(child_out);
 				if (show_debug)
 					printf("DNS Error: %d\n", h_errno);
 				_exit(0);
 		write_to_parent(child_out, &addrlen, sizeof(addrlen));
 		write_to_parent(child_out, &sin, addrlen);
 #endif
 		write_to_parent(child_out, &zero, sizeof(zero));
 		dns_params.hostname[0] = '\0';
+		g_free(hostname);
+		hostname = NULL;
 	}
 	close(child_out);
 	close(child_in);
 	char servname[20];
 #else
 	struct sockaddr_in sin;
 	struct hostent *hp;
 #endif
+	char *hostname;
 	query_data = data;
+#ifdef USE_IDN
+	if (!dns_str_is_ascii(dns_params.hostname)) {
+		rc = purple_network_convert_idn_to_ascii(dns_params.hostname, &hostname);
+		if (rc != 0) {
+			/* FIXME: Dirty 2.6.0 string freeze hack */
+			char tmp[8];
+			g_snprintf(tmp, sizeof(tmp), "%d", rc);
+			query_data->error_message = g_strdup_printf(_("Error resolving %s:\n%s"),
+					query_data->hostname, tmp);
+			/* back to main thread */
+			purple_timeout_add(0, dns_main_thread_cb, query_data);
+			return 0;
+		}
+	} else /* intentional fallthru */
+#endif
+	hostname = g_strdup(dns_params.hostname);
 #ifdef HAVE_GETADDRINFO
 	g_snprintf(servname, sizeof(servname), "%d", query_data->port);
 	memset(&hints,0,sizeof(hints));
 	 */
 	hints.ai_socktype = SOCK_STREAM;
 #ifdef AI_ADDRCONFIG
 	hints.ai_flags |= AI_ADDRCONFIG;
 #endif /* AI_ADDRCONFIG */
-	if ((rc = getaddrinfo(query_data->hostname, servname, &hints, &res)) == 0) {
+	if ((rc = getaddrinfo(hostname, servname, &hints, &res)) == 0) {
 		tmp = res;
 		while(res) {
 			query_data->hosts = g_slist_append(query_data->hosts,
 				GSIZE_TO_POINTER(res->ai_addrlen));
 			query_data->hosts = g_slist_append(query_data->hosts,
 		freeaddrinfo(tmp);
 	} else {
 		query_data->error_message = g_strdup_printf(_("Error resolving %s:\n%s"), query_data->hostname, purple_gai_strerror(rc));
 	}
 #else
-	if ((hp = gethostbyname(query_data->hostname))) {
+	if ((hp = gethostbyname(hostname))) {
 		memset(&sin, 0, sizeof(struct sockaddr_in));
 		memcpy(&sin.sin_addr.s_addr, hp->h_addr, hp->h_length);
 		sin.sin_family = hp->h_addrtype;
 		sin.sin_port = htons(query_data->port);
 				g_memdup(&sin, sizeof(sin)));
 	} else {
 		query_data->error_message = g_strdup_printf(_("Error resolving %s: %d"), query_data->hostname, h_errno);
 	}
 #endif
+	g_free(hostname);
 	/* back to main thread */
 	purple_timeout_add(0, dns_main_thread_cb, query_data);
 	return 0;
 resolve_host(gpointer data)
 {
 	PurpleDnsQueryData *query_data;
 	struct sockaddr_in sin;
 	GSList *hosts = NULL;
+	char *hostname;
 	query_data = data;
 	query_data->timeout = 0;
 	if (purple_dnsquery_ui_resolve(query_data))
 		return FALSE;
 	}
 	if (!inet_aton(query_data->hostname, &sin.sin_addr)) {
 		struct hostent *hp;
-		if(!(hp = gethostbyname(query_data->hostname))) {
+#ifdef USE_IDN
+		if (!dns_str_is_ascii(query_data->hostname)) {
+			int ret = purple_network_convert_idn_to_ascii(query_data->hostname,
+					&hostname);
+			if (ret != 0) {
+				char message[1024];
+				g_snprintf(message, sizeof(message), _("Error resolving %s: %d"),
+						query_data->hostname, ret);
+				purple_dnsquery_failed(query_data, message);
+				return FALSE;
+			}
+		} else /* fallthrough is intentional to the g_strdup */
+#endif
+		hostname = g_strdup(query_data->hostname);
+		if(!(hp = gethostbyname(hostname))) {
 			char message[1024];
 			g_snprintf(message, sizeof(message), _("Error resolving %s: %d"),
 					query_data->hostname, h_errno);
 			purple_dnsquery_failed(query_data, message);
 			return FALSE;
 		sin.sin_family = hp->h_addrtype;
 	} else
 		sin.sin_family = AF_INET;
 	sin.sin_port = htons(query_data->port);
+	g_free(hostname);
 	hosts = g_slist_append(hosts, GINT_TO_POINTER(sizeof(sin)));
 	hosts = g_slist_append(hosts, g_memdup(&sin, sizeof(sin)));
 	purple_dnsquery_resolved(query_data, hosts);

Mercurial > pidgin.yaz

comparison libpurple/dnsquery.c @ 27711:7fbf964c6c6c