From: <the...@us...> - 2006-08-21 01:00:39
|
Revision: 16926 Author: thekingant Date: 2006-08-20 18:00:31 -0700 (Sun, 20 Aug 2006) ViewCVS: http://svn.sourceforge.net/gaim/?rev=16926&view=rev Log Message: ----------- Get rid of the child-process DNS lookup method and use threads everywhere 1 file changed, 13 insertions(+), 611 deletions(-) Modified Paths: -------------- trunk/libgaim/dnsquery.c Modified: trunk/libgaim/dnsquery.c =================================================================== --- trunk/libgaim/dnsquery.c 2006-08-21 00:23:12 UTC (rev 16925) +++ trunk/libgaim/dnsquery.c 2006-08-21 01:00:31 UTC (rev 16926) @@ -44,46 +44,15 @@ gpointer data; guint timeout; -#if defined(__unix__) || defined(__APPLE__) - GaimDnsQueryResolverProcess *resolver; -#elif defined _WIN32 /* end __unix__ || __APPLE__ */ GThread *resolver; GSList *hosts; gchar *error_message; -#endif }; -#if defined(__unix__) || defined(__APPLE__) - -#define MAX_DNS_CHILDREN 4 - -/* - * This structure keeps a reference to a child resolver process. - */ -struct _GaimDnsQueryResolverProcess { - guint inpa; - int fd_in, fd_out; - pid_t dns_pid; -}; - -static GSList *free_dns_children = NULL; -static GQueue *queued_requests = NULL; - -static int number_of_dns_children = 0; - -/* - * This is a convenience struct used to pass data to - * the child resolver process. - */ -typedef struct { - char hostname[512]; - int port; -} dns_params_t; -#endif - static void gaim_dnsquery_resolved(GaimDnsQueryData *query_data, GSList *hosts) { + gaim_debug_info("dnsquery", "IP resolved for %s\n", query_data->hostname); if (query_data->callback != NULL) query_data->callback(hosts, query_data->data, NULL); gaim_dnsquery_destroy(query_data); @@ -98,500 +67,7 @@ gaim_dnsquery_destroy(query_data); } -#if defined(__unix__) || defined(__APPLE__) - -/* - * Unix! - */ - -/* - * Begin the DNS resolver child process functions. - */ -#ifdef HAVE_SIGNAL_H -static void -trap_gdb_bug() -{ - const char *message = - "Gaim's DNS child got a SIGTRAP signal.\n" - "This can be caused by trying to run gaim inside gdb.\n" - "There is a known gdb bug which prevents this. Supposedly gaim\n" - "should have detected you were using gdb and used an ugly hack,\n" - "check cope_with_gdb_brokenness() in dnsquery.c.\n\n" - "For more info about this bug, see http://sources.redhat.com/ml/gdb/2001-07/msg00349.html\n"; - fputs("\n* * *\n",stderr); - fputs(message,stderr); - fputs("* * *\n\n",stderr); - execlp("xmessage","xmessage","-center", message, NULL); - _exit(1); -} -#endif - -static void -gaim_dnsquery_resolver_run(int child_out, int child_in, gboolean show_debug) -{ - dns_params_t dns_params; - const size_t zero = 0; - int rc; -#ifdef HAVE_GETADDRINFO - struct addrinfo hints, *res, *tmp; - char servname[20]; -#else - struct sockaddr_in sin; - const size_t addrlen = sizeof(sin); -#endif - -#ifdef HAVE_SIGNAL_H - signal(SIGHUP, SIG_DFL); - signal(SIGINT, SIG_DFL); - signal(SIGQUIT, SIG_DFL); - signal(SIGCHLD, SIG_DFL); - signal(SIGTERM, SIG_DFL); - signal(SIGTRAP, trap_gdb_bug); -#endif - - /* - * We resolve 1 host name for each iteration of this - * while loop. - * - * The top half of this reads in the hostname and port - * number from the socket with our parent. The bottom - * half of this resolves the IP (blocking) and sends - * the result back to our parent, when finished. - */ - while (1) { - const char ch = 'Y'; - fd_set fds; - struct timeval tv = { .tv_sec = 40 , .tv_usec = 0 }; - FD_ZERO(&fds); - FD_SET(child_in, &fds); - rc = select(child_in + 1, &fds, NULL, NULL, &tv); - if (!rc) { - if (show_debug) - printf("dns[%d]: nobody needs me... =(\n", getpid()); - break; - } - rc = read(child_in, &dns_params, sizeof(dns_params_t)); - if (rc < 0) { - perror("read()"); - break; - } - if (rc == 0) { - if (show_debug) - printf("dns[%d]: Oops, father has gone, wait for me, wait...!\n", getpid()); - _exit(0); - } - if (dns_params.hostname[0] == '\0') { - printf("dns[%d]: hostname = \"\" (port = %d)!!!\n", getpid(), dns_params.port); - _exit(1); - } - /* Tell our parent that we read the data successfully */ - write(child_out, &ch, sizeof(ch)); - - /* 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)); - - /* This is only used to convert a service - * name to a port number. As we know we are - * passing a number already, we know this - * value will not be really used by the C - * library. - */ - hints.ai_socktype = SOCK_STREAM; - rc = getaddrinfo(dns_params.hostname, servname, &hints, &res); - write(child_out, &rc, sizeof(rc)); - if (rc != 0) { - close(child_out); - if (show_debug) - printf("dns[%d] Error: getaddrinfo returned %d\n", - getpid(), rc); - dns_params.hostname[0] = '\0'; - continue; - } - tmp = res; - while (res) { - size_t ai_addrlen = res->ai_addrlen; - write(child_out, &ai_addrlen, sizeof(ai_addrlen)); - write(child_out, res->ai_addr, res->ai_addrlen); - res = res->ai_next; - } - freeaddrinfo(tmp); - write(child_out, &zero, sizeof(zero)); -#else - if (!inet_aton(dns_params.hostname, &sin.sin_addr)) { - struct hostent *hp; - if (!(hp = gethostbyname(dns_params.hostname))) { - write(child_out, &h_errno, sizeof(int)); - close(child_out); - if (show_debug) - printf("DNS Error: %d\n", h_errno); - _exit(0); - } - 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; - } else - sin.sin_family = AF_INET; - - sin.sin_port = htons(dns_params.port); - write(child_out, &addrlen, sizeof(addrlen)); - write(child_out, &sin, addrlen); - write(child_out, &zero, sizeof(zero)); -#endif - dns_params.hostname[0] = '\0'; - } - - close(child_out); - close(child_in); - - _exit(0); -} -/* - * End the DNS resolver child process functions. - */ - -/* - * Begin the functions for dealing with the DNS child processes. - */ -static void -cope_with_gdb_brokenness() -{ -#ifdef __linux__ - static gboolean already_done = FALSE; - char s[256], e[512]; - int n; - pid_t ppid; - - if(already_done) - return; - already_done = TRUE; - ppid = getppid(); - snprintf(s, sizeof(s), "/proc/%d/exe", ppid); - n = readlink(s, e, sizeof(e)); - if(n < 0) - return; - - e[MIN(n,sizeof(e)-1)] = '\0'; - - if(strstr(e,"gdb")) { - gaim_debug_info("dns", - "Debugger detected, performing useless query...\n"); - gethostbyname("x.x.x.x.x"); - } -#endif -} - -static void -gaim_dnsquery_resolver_destroy(GaimDnsQueryResolverProcess *resolver) -{ - g_return_if_fail(resolver != NULL); - - /* - * We might as well attempt to kill our child process. It really - * doesn't matter if this fails, because children will expire on - * their own after a few seconds. - */ - if (resolver->dns_pid > 0) - kill(resolver->dns_pid, SIGKILL); - - if (resolver->inpa != 0) - gaim_input_remove(resolver->inpa); - - close(resolver->fd_in); - close(resolver->fd_out); - - g_free(resolver); - - number_of_dns_children--; -} - -static GaimDnsQueryResolverProcess * -gaim_dnsquery_resolver_new(gboolean show_debug) -{ - GaimDnsQueryResolverProcess *resolver; - int child_out[2], child_in[2]; - - /* Create pipes for communicating with the child process */ - if (pipe(child_out) || pipe(child_in)) { - gaim_debug_error("dns", - "Could not create pipes: %s\n", strerror(errno)); - return NULL; - } - - resolver = g_new(GaimDnsQueryResolverProcess, 1); - resolver->inpa = 0; - - cope_with_gdb_brokenness(); - - /* "Go fork and multiply." --Tommy Caldwell (Emily's dad, not the climber) */ - resolver->dns_pid = fork(); - - /* If we are the child process... */ - if (resolver->dns_pid == 0) { - /* We should not access the parent's side of the pipes, so close them */ - close(child_out[0]); - close(child_in[1]); - - gaim_dnsquery_resolver_run(child_out[1], child_in[0], show_debug); - /* The thread calls _exit() rather than returning, so we never get here */ - } - - /* We should not access the child's side of the pipes, so close them */ - close(child_out[1]); - close(child_in[0]); - if (resolver->dns_pid == -1) { - gaim_debug_error("dns", - "Could not create child process for DNS: %s\n", - strerror(errno)); - gaim_dnsquery_resolver_destroy(resolver); - return NULL; - } - - resolver->fd_out = child_out[0]; - resolver->fd_in = child_in[1]; - number_of_dns_children++; - gaim_debug_info("dns", - "Created new DNS child %d, there are now %d children.\n", - resolver->dns_pid, number_of_dns_children); - - return resolver; -} - -/** - * @return TRUE if the request was sent succesfully. FALSE - * if the request could not be sent. This isn't - * necessarily an error. If the child has expired, - * for example, we won't be able to send the message. - */ static gboolean -send_dns_request_to_child(GaimDnsQueryData *query_data, - GaimDnsQueryResolverProcess *resolver) -{ - pid_t pid; - dns_params_t dns_params; - int rc; - char ch; - - /* This waitpid might return the child's PID if it has recently - * exited, or it might return an error if it exited "long - * enough" ago that it has already been reaped; in either - * instance, we can't use it. */ - pid = waitpid(resolver->dns_pid, NULL, WNOHANG); - if (pid > 0) { - gaim_debug_warning("dns", "DNS child %d no longer exists\n", - resolver->dns_pid); - gaim_dnsquery_resolver_destroy(resolver); - return FALSE; - } else if (pid < 0) { - gaim_debug_warning("dns", "Wait for DNS child %d failed: %s\n", - resolver->dns_pid, strerror(errno)); - gaim_dnsquery_resolver_destroy(resolver); - return FALSE; - } - - /* Copy the hostname and port into a single data structure */ - strncpy(dns_params.hostname, query_data->hostname, sizeof(dns_params.hostname) - 1); - dns_params.hostname[sizeof(dns_params.hostname) - 1] = '\0'; - dns_params.port = query_data->port; - - /* Send the data structure to the child */ - rc = write(resolver->fd_in, &dns_params, sizeof(dns_params)); - if (rc < 0) { - gaim_debug_error("dns", "Unable to write to DNS child %d: %d\n", - resolver->dns_pid, strerror(errno)); - gaim_dnsquery_resolver_destroy(resolver); - return FALSE; - } - - g_return_val_if_fail(rc == sizeof(dns_params), -1); - - /* Did you hear me? (This avoids some race conditions) */ - rc = read(resolver->fd_out, &ch, sizeof(ch)); - if (rc != 1 || ch != 'Y') - { - gaim_debug_warning("dns", - "DNS child %d not responding. Killing it!\n", - resolver->dns_pid); - gaim_dnsquery_resolver_destroy(resolver); - return FALSE; - } - - gaim_debug_info("dns", - "Successfully sent DNS request to child %d\n", - resolver->dns_pid); - - query_data->resolver = resolver; - - return TRUE; -} - -static void host_resolved(gpointer data, gint source, GaimInputCondition cond); - -static void -handle_next_queued_request() -{ - GaimDnsQueryData *query_data; - GaimDnsQueryResolverProcess *resolver; - - if ((queued_requests == NULL) || (g_queue_is_empty(queued_requests))) - /* No more DNS queries, yay! */ - return; - - query_data = g_queue_pop_head(queued_requests); - - /* - * If we have any children, attempt to have them perform the DNS - * query. If we're able to send the query then resolver will be - * set to the GaimDnsQueryResolverProcess. Otherwise, resolver - * will be NULL and we'll need to create a new DNS request child. - */ - while (free_dns_children != NULL) - { - resolver = free_dns_children->data; - free_dns_children = g_slist_remove(free_dns_children, resolver); - - if (send_dns_request_to_child(query_data, resolver)) - /* We found an acceptable child, yay */ - break; - } - - /* We need to create a new DNS request child */ - if (query_data->resolver == NULL) - { - if (number_of_dns_children >= MAX_DNS_CHILDREN) - { - /* Apparently all our children are busy */ - g_queue_push_head(queued_requests, query_data); - return; - } - - resolver = gaim_dnsquery_resolver_new(gaim_debug_is_enabled()); - if (resolver == NULL) - { - gaim_dnsquery_failed(query_data, _("Unable to create new resolver process\n")); - return; - } - if (!send_dns_request_to_child(query_data, resolver)) - { - gaim_dnsquery_failed(query_data, _("Unable to send request to resolver process\n")); - return; - } - } - - query_data->resolver->inpa = gaim_input_add(query_data->resolver->fd_out, - GAIM_INPUT_READ, host_resolved, query_data); -} - -/* - * End the functions for dealing with the DNS child processes. - */ - -static void -host_resolved(gpointer data, gint source, GaimInputCondition cond) -{ - GaimDnsQueryData *query_data; - int rc, err; - GSList *hosts = NULL; - struct sockaddr *addr = NULL; - size_t addrlen; - char message[1024]; - - query_data = data; - - gaim_debug_info("dns", "Got response for '%s'\n", query_data->hostname); - gaim_input_remove(query_data->resolver->inpa); - query_data->resolver->inpa = 0; - - rc = read(query_data->resolver->fd_out, &err, sizeof(err)); - if ((rc == 4) && (err != 0)) - { -#ifdef HAVE_GETADDRINFO - g_snprintf(message, sizeof(message), _("Error resolving %s: %s"), - query_data->hostname, gai_strerror(err)); -#else - g_snprintf(message, sizeof(message), _("Error resolving %s: %d"), - query_data->hostname, err); -#endif - gaim_dnsquery_failed(query_data, message); - - } else if (rc > 0) { - /* Success! */ - while (rc > 0) { - rc = read(query_data->resolver->fd_out, &addrlen, sizeof(addrlen)); - if (rc > 0 && addrlen > 0) { - addr = g_malloc(addrlen); - rc = read(query_data->resolver->fd_out, addr, addrlen); - hosts = g_slist_append(hosts, GINT_TO_POINTER(addrlen)); - hosts = g_slist_append(hosts, addr); - } else { - break; - } - } - /* wait4(resolver->dns_pid, NULL, WNOHANG, NULL); */ - gaim_dnsquery_resolved(query_data, hosts); - - } else if (rc == -1) { - g_snprintf(message, sizeof(message), _("Error reading from resolver process: %s"), strerror(errno)); - gaim_dnsquery_failed(query_data, message); - - } else if (rc == 0) { - g_snprintf(message, sizeof(message), _("EOF while reading from resolver process")); - gaim_dnsquery_failed(query_data, message); - } - - handle_next_queued_request(); -} - -static gboolean -resolve_host(gpointer data) -{ - GaimDnsQueryData *query_data; - - query_data = data; - query_data->timeout = 0; - - handle_next_queued_request(); - - return FALSE; -} - -GaimDnsQueryData * -gaim_dnsquery_a(const char *hostname, int port, - GaimDnsQueryConnectFunction callback, gpointer data) -{ - GaimDnsQueryData *query_data; - - g_return_val_if_fail(hostname != NULL, NULL); - g_return_val_if_fail(port != 0, NULL); - - query_data = g_new(GaimDnsQueryData, 1); - query_data->hostname = g_strdup(hostname); - g_strstrip(query_data->hostname); - query_data->port = port; - query_data->callback = callback; - query_data->data = data; - query_data->resolver = NULL; - - if (!queued_requests) - queued_requests = g_queue_new(); - g_queue_push_tail(queued_requests, query_data); - - gaim_debug_info("dns", "DNS query for '%s' queued\n", query_data->hostname); - - query_data->timeout = gaim_timeout_add(0, resolve_host, query_data); - - return query_data; -} - -#elif defined _WIN32 /* end __unix__ || __APPLE__ */ - -/* - * Windows! - */ - -static gboolean dns_main_thread_cb(gpointer data) { GaimDnsQueryData *query_data; @@ -603,7 +79,8 @@ else { GSList *hosts; - /* We don't want gaim_dns_query_resolved() to free(hosts) */ + + /* We don't want gaim_dns_query_resolved() to free hosts */ hosts = query_data->hosts; query_data->hosts = NULL; gaim_dnsquery_resolved(query_data, hosts); @@ -686,6 +163,10 @@ if (inet_aton(query_data->hostname, &sin.sin_addr)) { + /* + * The given "hostname" is actually an IP address, so we + * don't need to do anything. + */ GSList *hosts = NULL; sin.sin_family = AF_INET; sin.sin_port = htons(query_data->port); @@ -695,6 +176,10 @@ } else { + /* + * Spin off a separate thread to perform the DNS lookup so + * that we don't block the UI. + */ query_data->resolver = g_thread_create(dns_thread, query_data, FALSE, &err); if (query_data->resolver == NULL) @@ -719,6 +204,8 @@ g_return_val_if_fail(hostname != NULL, NULL); g_return_val_if_fail(port != 0, NULL); + gaim_debug_info("dnsquery", "Performing DNS lookup for %s\n", hostname); + query_data = g_new(GaimDnsQueryData, 1); query_data->hostname = g_strdup(hostname); g_strstrip(query_data->hostname); @@ -734,85 +221,10 @@ return query_data; } -#else /* not __unix__ or __APPLE__ or _WIN32 */ - -/* - * We weren't able to do anything fancier above, so use the - * fail-safe name resolution code, which is blocking. - */ - -static gboolean -resolve_host(gpointer data) -{ - GaimDnsQueryData *query_data; - struct sockaddr_in sin; - GSList *hosts = NULL; - - query_data = data; - query_data->timeout = 0; - - if (!inet_aton(query_data->hostname, &sin.sin_addr)) { - struct hostent *hp; - if(!(hp = gethostbyname(query_data->hostname))) { - char message[1024]; - g_snprintf(message, sizeof(message), _("Error resolving %s: %d"), - query_data->hostname, h_errno); - gaim_dnsquery_failed(query_data, message); - return FALSE; - } - 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; - } else - sin.sin_family = AF_INET; - sin.sin_port = htons(query_data->port); - - hosts = g_slist_append(hosts, GINT_TO_POINTER(sizeof(sin))); - hosts = g_slist_append(hosts, g_memdup(&sin, sizeof(sin))); - - gaim_dnsquery_resolved(query_data, hosts); - - return FALSE; -} - -GaimDnsQueryData * -gaim_dnsquery_a(const char *hostname, int port, - GaimDnsQueryConnectFunction callback, gpointer data) -{ - GaimDnsQueryData *query_data; - - g_return_val_if_fail(hostname != NULL, NULL); - g_return_val_if_fail(port != 0, NULL); - - query_data = g_new(GaimDnsQueryData, 1); - query_data->hostname = g_strdup(hostname); - g_strstrip(query_data->hostname); - query_data->port = port; - query_data->callback = callback; - query_data->data = data; - - /* Don't call the callback before returning */ - query_data->timeout = gaim_timeout_add(0, resolve_host, query_data); - - return query_data; -} - -#endif /* not __unix__ or __APPLE__ or _WIN32 */ - void gaim_dnsquery_destroy(GaimDnsQueryData *query_data) { -#if defined(__unix__) || defined(__APPLE__) if (query_data->resolver != NULL) - /* - * Ideally we would tell our resolver child to stop resolving - * shit and then we would add it back to the free_dns_children - * linked list. However, it's hard to tell children stuff, - * they just don't listen. - */ - gaim_dnsquery_resolver_destroy(query_data->resolver); -#elif defined _WIN32 /* end __unix__ || __APPLE__ */ - if (query_data->resolver != NULL) { /* * It's not really possible to kill a thread. So instead we @@ -832,7 +244,6 @@ query_data->hosts = g_slist_remove(query_data->hosts, query_data->hosts->data); } g_free(query_data->error_message); -#endif if (query_data->timeout > 0) gaim_timeout_remove(query_data->timeout); @@ -844,20 +255,11 @@ void gaim_dnsquery_init(void) { -#ifdef _WIN32 if (!g_thread_supported()) g_thread_init(NULL); -#endif } void gaim_dnsquery_uninit(void) { -#if defined(__unix__) || defined(__APPLE__) - while (free_dns_children != NULL) - { - gaim_dnsquery_resolver_destroy(free_dns_children->data); - free_dns_children = g_slist_remove(free_dns_children, free_dns_children->data); - } -#endif } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <the...@us...> - 2006-08-21 05:49:24
|
Revision: 16945 Author: thekingant Date: 2006-08-20 22:49:20 -0700 (Sun, 20 Aug 2006) ViewCVS: http://svn.sourceforge.net/gaim/?rev=16945&view=rev Log Message: ----------- Don't call gethostbyname in a thread because it's not thread-safe. Modified Paths: -------------- trunk/libgaim/dnsquery.c Modified: trunk/libgaim/dnsquery.c =================================================================== --- trunk/libgaim/dnsquery.c 2006-08-21 05:25:44 UTC (rev 16944) +++ trunk/libgaim/dnsquery.c 2006-08-21 05:49:20 UTC (rev 16945) @@ -89,22 +89,17 @@ return FALSE; } +#ifdef HAVE_GETADDRINFO static gpointer dns_thread(gpointer data) { GaimDnsQueryData *query_data; -#ifdef HAVE_GETADDRINFO int rc; struct addrinfo hints, *res, *tmp; char servname[20]; -#else - struct sockaddr_in sin; - struct hostent *hp; -#endif query_data = data; -#ifdef HAVE_GETADDRINFO g_snprintf(servname, sizeof(servname), "%d", query_data->port); memset(&hints,0,sizeof(hints)); @@ -129,27 +124,13 @@ } else { query_data->error_message = g_strdup_printf(_("Error resolving %s: %s"), query_data->hostname, gai_strerror(rc)); } -#else - if ((hp = gethostbyname(query_data->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); - query_data->hosts = g_slist_append(query_data->hosts, - GSIZE_TO_POINTER(sizeof(sin))); - query_data->hosts = g_slist_append(query_data->hosts, - g_memdup(&sin, sizeof(sin))); - } else { - query_data->error_message = g_strdup_printf(_("Error resolving %s: %d"), query_data->hostname, h_errno); - } -#endif - - /* back to main thread */ + /* We're done, tell the main thread to look at our results */ g_idle_add(dns_main_thread_cb, query_data); return 0; } +#endif static gboolean resolve_host(gpointer data) @@ -176,6 +157,7 @@ } else { +#ifdef HAVE_GETADDRINFO /* * Spin off a separate thread to perform the DNS lookup so * that we don't block the UI. @@ -190,6 +172,34 @@ g_error_free(err); gaim_dnsquery_failed(query_data, message); } +#else + struct sockaddr_in sin; + struct hostent *hp; + + /* + * gethostbyname() is not threadsafe, but gethostbyname_r() is a GNU + * extension. Unfortunately this means that we'll have to do a + * blocking DNS query for systems without GETADDRINFO. Fortunately + * this should be a very small number of systems. + */ + + if ((hp = gethostbyname(query_data->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); + + query_data->hosts = g_slist_append(query_data->hosts, + GSIZE_TO_POINTER(sizeof(sin))); + query_data->hosts = g_slist_append(query_data->hosts, + g_memdup(&sin, sizeof(sin))); + } else { + query_data->error_message = g_strdup_printf(_("Error resolving %s: %d"), query_data->hostname, h_errno); + } + + /* We're done! */ + dns_main_thread(query_data); +#endif } return FALSE; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <the...@us...> - 2006-08-22 06:17:47
|
Revision: 16974 Author: thekingant Date: 2006-08-21 23:17:43 -0700 (Mon, 21 Aug 2006) ViewCVS: http://svn.sourceforge.net/gaim/?rev=16974&view=rev Log Message: ----------- Revert SVN revisions 16945 and 16926. Go back to having 3 DNS lookup methods. It seems like people tend to prefer this. Sigh. Modified Paths: -------------- trunk/libgaim/dnsquery.c Modified: trunk/libgaim/dnsquery.c =================================================================== --- trunk/libgaim/dnsquery.c 2006-08-22 06:10:01 UTC (rev 16973) +++ trunk/libgaim/dnsquery.c 2006-08-22 06:17:43 UTC (rev 16974) @@ -44,11 +44,43 @@ gpointer data; guint timeout; +#if defined(__unix__) || defined(__APPLE__) + GaimDnsQueryResolverProcess *resolver; +#elif defined _WIN32 /* end __unix__ || __APPLE__ */ GThread *resolver; GSList *hosts; gchar *error_message; +#endif }; +#if defined(__unix__) || defined(__APPLE__) + +#define MAX_DNS_CHILDREN 4 + +/* + * This structure keeps a reference to a child resolver process. + */ +struct _GaimDnsQueryResolverProcess { + guint inpa; + int fd_in, fd_out; + pid_t dns_pid; +}; + +static GSList *free_dns_children = NULL; +static GQueue *queued_requests = NULL; + +static int number_of_dns_children = 0; + +/* + * This is a convenience struct used to pass data to + * the child resolver process. + */ +typedef struct { + char hostname[512]; + int port; +} dns_params_t; +#endif + static void gaim_dnsquery_resolved(GaimDnsQueryData *query_data, GSList *hosts) { @@ -67,7 +99,500 @@ gaim_dnsquery_destroy(query_data); } +#if defined(__unix__) || defined(__APPLE__) + +/* + * Unix! + */ + +/* + * Begin the DNS resolver child process functions. + */ +#ifdef HAVE_SIGNAL_H +static void +trap_gdb_bug() +{ + const char *message = + "Gaim's DNS child got a SIGTRAP signal.\n" + "This can be caused by trying to run gaim inside gdb.\n" + "There is a known gdb bug which prevents this. Supposedly gaim\n" + "should have detected you were using gdb and used an ugly hack,\n" + "check cope_with_gdb_brokenness() in dnsquery.c.\n\n" + "For more info about this bug, see http://sources.redhat.com/ml/gdb/2001-07/msg00349.html\n"; + fputs("\n* * *\n",stderr); + fputs(message,stderr); + fputs("* * *\n\n",stderr); + execlp("xmessage","xmessage","-center", message, NULL); + _exit(1); +} +#endif + +static void +gaim_dnsquery_resolver_run(int child_out, int child_in, gboolean show_debug) +{ + dns_params_t dns_params; + const size_t zero = 0; + int rc; +#ifdef HAVE_GETADDRINFO + struct addrinfo hints, *res, *tmp; + char servname[20]; +#else + struct sockaddr_in sin; + const size_t addrlen = sizeof(sin); +#endif + +#ifdef HAVE_SIGNAL_H + signal(SIGHUP, SIG_DFL); + signal(SIGINT, SIG_DFL); + signal(SIGQUIT, SIG_DFL); + signal(SIGCHLD, SIG_DFL); + signal(SIGTERM, SIG_DFL); + signal(SIGTRAP, trap_gdb_bug); +#endif + + /* + * We resolve 1 host name for each iteration of this + * while loop. + * + * The top half of this reads in the hostname and port + * number from the socket with our parent. The bottom + * half of this resolves the IP (blocking) and sends + * the result back to our parent, when finished. + */ + while (1) { + const char ch = 'Y'; + fd_set fds; + struct timeval tv = { .tv_sec = 40 , .tv_usec = 0 }; + FD_ZERO(&fds); + FD_SET(child_in, &fds); + rc = select(child_in + 1, &fds, NULL, NULL, &tv); + if (!rc) { + if (show_debug) + printf("dns[%d]: nobody needs me... =(\n", getpid()); + break; + } + rc = read(child_in, &dns_params, sizeof(dns_params_t)); + if (rc < 0) { + perror("read()"); + break; + } + if (rc == 0) { + if (show_debug) + printf("dns[%d]: Oops, father has gone, wait for me, wait...!\n", getpid()); + _exit(0); + } + if (dns_params.hostname[0] == '\0') { + printf("dns[%d]: hostname = \"\" (port = %d)!!!\n", getpid(), dns_params.port); + _exit(1); + } + /* Tell our parent that we read the data successfully */ + write(child_out, &ch, sizeof(ch)); + + /* 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)); + + /* This is only used to convert a service + * name to a port number. As we know we are + * passing a number already, we know this + * value will not be really used by the C + * library. + */ + hints.ai_socktype = SOCK_STREAM; + rc = getaddrinfo(dns_params.hostname, servname, &hints, &res); + write(child_out, &rc, sizeof(rc)); + if (rc != 0) { + close(child_out); + if (show_debug) + printf("dns[%d] Error: getaddrinfo returned %d\n", + getpid(), rc); + dns_params.hostname[0] = '\0'; + continue; + } + tmp = res; + while (res) { + size_t ai_addrlen = res->ai_addrlen; + write(child_out, &ai_addrlen, sizeof(ai_addrlen)); + write(child_out, res->ai_addr, res->ai_addrlen); + res = res->ai_next; + } + freeaddrinfo(tmp); + write(child_out, &zero, sizeof(zero)); +#else + if (!inet_aton(dns_params.hostname, &sin.sin_addr)) { + struct hostent *hp; + if (!(hp = gethostbyname(dns_params.hostname))) { + write(child_out, &h_errno, sizeof(int)); + close(child_out); + if (show_debug) + printf("DNS Error: %d\n", h_errno); + _exit(0); + } + 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; + } else + sin.sin_family = AF_INET; + + sin.sin_port = htons(dns_params.port); + write(child_out, &addrlen, sizeof(addrlen)); + write(child_out, &sin, addrlen); + write(child_out, &zero, sizeof(zero)); +#endif + dns_params.hostname[0] = '\0'; + } + + close(child_out); + close(child_in); + + _exit(0); +} +/* + * End the DNS resolver child process functions. + */ + +/* + * Begin the functions for dealing with the DNS child processes. + */ +static void +cope_with_gdb_brokenness() +{ +#ifdef __linux__ + static gboolean already_done = FALSE; + char s[256], e[512]; + int n; + pid_t ppid; + + if(already_done) + return; + already_done = TRUE; + ppid = getppid(); + snprintf(s, sizeof(s), "/proc/%d/exe", ppid); + n = readlink(s, e, sizeof(e)); + if(n < 0) + return; + + e[MIN(n,sizeof(e)-1)] = '\0'; + + if(strstr(e,"gdb")) { + gaim_debug_info("dns", + "Debugger detected, performing useless query...\n"); + gethostbyname("x.x.x.x.x"); + } +#endif +} + +static void +gaim_dnsquery_resolver_destroy(GaimDnsQueryResolverProcess *resolver) +{ + g_return_if_fail(resolver != NULL); + + /* + * We might as well attempt to kill our child process. It really + * doesn't matter if this fails, because children will expire on + * their own after a few seconds. + */ + if (resolver->dns_pid > 0) + kill(resolver->dns_pid, SIGKILL); + + if (resolver->inpa != 0) + gaim_input_remove(resolver->inpa); + + close(resolver->fd_in); + close(resolver->fd_out); + + g_free(resolver); + + number_of_dns_children--; +} + +static GaimDnsQueryResolverProcess * +gaim_dnsquery_resolver_new(gboolean show_debug) +{ + GaimDnsQueryResolverProcess *resolver; + int child_out[2], child_in[2]; + + /* Create pipes for communicating with the child process */ + if (pipe(child_out) || pipe(child_in)) { + gaim_debug_error("dns", + "Could not create pipes: %s\n", strerror(errno)); + return NULL; + } + + resolver = g_new(GaimDnsQueryResolverProcess, 1); + resolver->inpa = 0; + + cope_with_gdb_brokenness(); + + /* "Go fork and multiply." --Tommy Caldwell (Emily's dad, not the climber) */ + resolver->dns_pid = fork(); + + /* If we are the child process... */ + if (resolver->dns_pid == 0) { + /* We should not access the parent's side of the pipes, so close them */ + close(child_out[0]); + close(child_in[1]); + + gaim_dnsquery_resolver_run(child_out[1], child_in[0], show_debug); + /* The thread calls _exit() rather than returning, so we never get here */ + } + + /* We should not access the child's side of the pipes, so close them */ + close(child_out[1]); + close(child_in[0]); + if (resolver->dns_pid == -1) { + gaim_debug_error("dns", + "Could not create child process for DNS: %s\n", + strerror(errno)); + gaim_dnsquery_resolver_destroy(resolver); + return NULL; + } + + resolver->fd_out = child_out[0]; + resolver->fd_in = child_in[1]; + number_of_dns_children++; + gaim_debug_info("dns", + "Created new DNS child %d, there are now %d children.\n", + resolver->dns_pid, number_of_dns_children); + + return resolver; +} + +/** + * @return TRUE if the request was sent succesfully. FALSE + * if the request could not be sent. This isn't + * necessarily an error. If the child has expired, + * for example, we won't be able to send the message. + */ static gboolean +send_dns_request_to_child(GaimDnsQueryData *query_data, + GaimDnsQueryResolverProcess *resolver) +{ + pid_t pid; + dns_params_t dns_params; + int rc; + char ch; + + /* This waitpid might return the child's PID if it has recently + * exited, or it might return an error if it exited "long + * enough" ago that it has already been reaped; in either + * instance, we can't use it. */ + pid = waitpid(resolver->dns_pid, NULL, WNOHANG); + if (pid > 0) { + gaim_debug_warning("dns", "DNS child %d no longer exists\n", + resolver->dns_pid); + gaim_dnsquery_resolver_destroy(resolver); + return FALSE; + } else if (pid < 0) { + gaim_debug_warning("dns", "Wait for DNS child %d failed: %s\n", + resolver->dns_pid, strerror(errno)); + gaim_dnsquery_resolver_destroy(resolver); + return FALSE; + } + + /* Copy the hostname and port into a single data structure */ + strncpy(dns_params.hostname, query_data->hostname, sizeof(dns_params.hostname) - 1); + dns_params.hostname[sizeof(dns_params.hostname) - 1] = '\0'; + dns_params.port = query_data->port; + + /* Send the data structure to the child */ + rc = write(resolver->fd_in, &dns_params, sizeof(dns_params)); + if (rc < 0) { + gaim_debug_error("dns", "Unable to write to DNS child %d: %d\n", + resolver->dns_pid, strerror(errno)); + gaim_dnsquery_resolver_destroy(resolver); + return FALSE; + } + + g_return_val_if_fail(rc == sizeof(dns_params), -1); + + /* Did you hear me? (This avoids some race conditions) */ + rc = read(resolver->fd_out, &ch, sizeof(ch)); + if (rc != 1 || ch != 'Y') + { + gaim_debug_warning("dns", + "DNS child %d not responding. Killing it!\n", + resolver->dns_pid); + gaim_dnsquery_resolver_destroy(resolver); + return FALSE; + } + + gaim_debug_info("dns", + "Successfully sent DNS request to child %d\n", + resolver->dns_pid); + + query_data->resolver = resolver; + + return TRUE; +} + +static void host_resolved(gpointer data, gint source, GaimInputCondition cond); + +static void +handle_next_queued_request() +{ + GaimDnsQueryData *query_data; + GaimDnsQueryResolverProcess *resolver; + + if ((queued_requests == NULL) || (g_queue_is_empty(queued_requests))) + /* No more DNS queries, yay! */ + return; + + query_data = g_queue_pop_head(queued_requests); + + /* + * If we have any children, attempt to have them perform the DNS + * query. If we're able to send the query then resolver will be + * set to the GaimDnsQueryResolverProcess. Otherwise, resolver + * will be NULL and we'll need to create a new DNS request child. + */ + while (free_dns_children != NULL) + { + resolver = free_dns_children->data; + free_dns_children = g_slist_remove(free_dns_children, resolver); + + if (send_dns_request_to_child(query_data, resolver)) + /* We found an acceptable child, yay */ + break; + } + + /* We need to create a new DNS request child */ + if (query_data->resolver == NULL) + { + if (number_of_dns_children >= MAX_DNS_CHILDREN) + { + /* Apparently all our children are busy */ + g_queue_push_head(queued_requests, query_data); + return; + } + + resolver = gaim_dnsquery_resolver_new(gaim_debug_is_enabled()); + if (resolver == NULL) + { + gaim_dnsquery_failed(query_data, _("Unable to create new resolver process\n")); + return; + } + if (!send_dns_request_to_child(query_data, resolver)) + { + gaim_dnsquery_failed(query_data, _("Unable to send request to resolver process\n")); + return; + } + } + + query_data->resolver->inpa = gaim_input_add(query_data->resolver->fd_out, + GAIM_INPUT_READ, host_resolved, query_data); +} + +/* + * End the functions for dealing with the DNS child processes. + */ + +static void +host_resolved(gpointer data, gint source, GaimInputCondition cond) +{ + GaimDnsQueryData *query_data; + int rc, err; + GSList *hosts = NULL; + struct sockaddr *addr = NULL; + size_t addrlen; + char message[1024]; + + query_data = data; + + gaim_debug_info("dns", "Got response for '%s'\n", query_data->hostname); + gaim_input_remove(query_data->resolver->inpa); + query_data->resolver->inpa = 0; + + rc = read(query_data->resolver->fd_out, &err, sizeof(err)); + if ((rc == 4) && (err != 0)) + { +#ifdef HAVE_GETADDRINFO + g_snprintf(message, sizeof(message), _("Error resolving %s: %s"), + query_data->hostname, gai_strerror(err)); +#else + g_snprintf(message, sizeof(message), _("Error resolving %s: %d"), + query_data->hostname, err); +#endif + gaim_dnsquery_failed(query_data, message); + + } else if (rc > 0) { + /* Success! */ + while (rc > 0) { + rc = read(query_data->resolver->fd_out, &addrlen, sizeof(addrlen)); + if (rc > 0 && addrlen > 0) { + addr = g_malloc(addrlen); + rc = read(query_data->resolver->fd_out, addr, addrlen); + hosts = g_slist_append(hosts, GINT_TO_POINTER(addrlen)); + hosts = g_slist_append(hosts, addr); + } else { + break; + } + } + /* wait4(resolver->dns_pid, NULL, WNOHANG, NULL); */ + gaim_dnsquery_resolved(query_data, hosts); + + } else if (rc == -1) { + g_snprintf(message, sizeof(message), _("Error reading from resolver process: %s"), strerror(errno)); + gaim_dnsquery_failed(query_data, message); + + } else if (rc == 0) { + g_snprintf(message, sizeof(message), _("EOF while reading from resolver process")); + gaim_dnsquery_failed(query_data, message); + } + + handle_next_queued_request(); +} + +static gboolean +resolve_host(gpointer data) +{ + GaimDnsQueryData *query_data; + + query_data = data; + query_data->timeout = 0; + + handle_next_queued_request(); + + return FALSE; +} + +GaimDnsQueryData * +gaim_dnsquery_a(const char *hostname, int port, + GaimDnsQueryConnectFunction callback, gpointer data) +{ + GaimDnsQueryData *query_data; + + g_return_val_if_fail(hostname != NULL, NULL); + g_return_val_if_fail(port != 0, NULL); + + query_data = g_new(GaimDnsQueryData, 1); + query_data->hostname = g_strdup(hostname); + g_strstrip(query_data->hostname); + query_data->port = port; + query_data->callback = callback; + query_data->data = data; + query_data->resolver = NULL; + + if (!queued_requests) + queued_requests = g_queue_new(); + g_queue_push_tail(queued_requests, query_data); + + gaim_debug_info("dns", "DNS query for '%s' queued\n", query_data->hostname); + + query_data->timeout = gaim_timeout_add(0, resolve_host, query_data); + + return query_data; +} + +#elif defined _WIN32 /* end __unix__ || __APPLE__ */ + +/* + * Windows! + */ + +static gboolean dns_main_thread_cb(gpointer data) { GaimDnsQueryData *query_data; @@ -80,7 +605,7 @@ { GSList *hosts; - /* We don't want gaim_dns_query_resolved() to free hosts */ + /* We don't want gaim_dns_query_resolved() to free(hosts) */ hosts = query_data->hosts; query_data->hosts = NULL; gaim_dnsquery_resolved(query_data, hosts); @@ -89,17 +614,22 @@ return FALSE; } -#ifdef HAVE_GETADDRINFO static gpointer dns_thread(gpointer data) { GaimDnsQueryData *query_data; +#ifdef HAVE_GETADDRINFO int rc; struct addrinfo hints, *res, *tmp; char servname[20]; +#else + struct sockaddr_in sin; + struct hostent *hp; +#endif query_data = data; +#ifdef HAVE_GETADDRINFO g_snprintf(servname, sizeof(servname), "%d", query_data->port); memset(&hints,0,sizeof(hints)); @@ -124,13 +654,27 @@ } else { query_data->error_message = g_strdup_printf(_("Error resolving %s: %s"), query_data->hostname, gai_strerror(rc)); } +#else + if ((hp = gethostbyname(query_data->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); - /* We're done, tell the main thread to look at our results */ + query_data->hosts = g_slist_append(query_data->hosts, + GSIZE_TO_POINTER(sizeof(sin))); + query_data->hosts = g_slist_append(query_data->hosts, + g_memdup(&sin, sizeof(sin))); + } else { + query_data->error_message = g_strdup_printf(_("Error resolving %s: %d"), query_data->hostname, h_errno); + } +#endif + + /* back to main thread */ g_idle_add(dns_main_thread_cb, query_data); return 0; } -#endif static gboolean resolve_host(gpointer data) @@ -157,7 +701,6 @@ } else { -#ifdef HAVE_GETADDRINFO /* * Spin off a separate thread to perform the DNS lookup so * that we don't block the UI. @@ -172,34 +715,6 @@ g_error_free(err); gaim_dnsquery_failed(query_data, message); } -#else - struct sockaddr_in sin; - struct hostent *hp; - - /* - * gethostbyname() is not threadsafe, but gethostbyname_r() is a GNU - * extension. Unfortunately this means that we'll have to do a - * blocking DNS query for systems without GETADDRINFO. Fortunately - * this should be a very small number of systems. - */ - - if ((hp = gethostbyname(query_data->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); - - query_data->hosts = g_slist_append(query_data->hosts, - GSIZE_TO_POINTER(sizeof(sin))); - query_data->hosts = g_slist_append(query_data->hosts, - g_memdup(&sin, sizeof(sin))); - } else { - query_data->error_message = g_strdup_printf(_("Error resolving %s: %d"), query_data->hostname, h_errno); - } - - /* We're done! */ - dns_main_thread(query_data); -#endif } return FALSE; @@ -231,10 +746,85 @@ return query_data; } +#else /* not __unix__ or __APPLE__ or _WIN32 */ + +/* + * We weren't able to do anything fancier above, so use the + * fail-safe name resolution code, which is blocking. + */ + +static gboolean +resolve_host(gpointer data) +{ + GaimDnsQueryData *query_data; + struct sockaddr_in sin; + GSList *hosts = NULL; + + query_data = data; + query_data->timeout = 0; + + if (!inet_aton(query_data->hostname, &sin.sin_addr)) { + struct hostent *hp; + if(!(hp = gethostbyname(query_data->hostname))) { + char message[1024]; + g_snprintf(message, sizeof(message), _("Error resolving %s: %d"), + query_data->hostname, h_errno); + gaim_dnsquery_failed(query_data, message); + return FALSE; + } + 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; + } else + sin.sin_family = AF_INET; + sin.sin_port = htons(query_data->port); + + hosts = g_slist_append(hosts, GINT_TO_POINTER(sizeof(sin))); + hosts = g_slist_append(hosts, g_memdup(&sin, sizeof(sin))); + + gaim_dnsquery_resolved(query_data, hosts); + + return FALSE; +} + +GaimDnsQueryData * +gaim_dnsquery_a(const char *hostname, int port, + GaimDnsQueryConnectFunction callback, gpointer data) +{ + GaimDnsQueryData *query_data; + + g_return_val_if_fail(hostname != NULL, NULL); + g_return_val_if_fail(port != 0, NULL); + + query_data = g_new(GaimDnsQueryData, 1); + query_data->hostname = g_strdup(hostname); + g_strstrip(query_data->hostname); + query_data->port = port; + query_data->callback = callback; + query_data->data = data; + + /* Don't call the callback before returning */ + query_data->timeout = gaim_timeout_add(0, resolve_host, query_data); + + return query_data; +} + +#endif /* not __unix__ or __APPLE__ or _WIN32 */ + void gaim_dnsquery_destroy(GaimDnsQueryData *query_data) { +#if defined(__unix__) || defined(__APPLE__) if (query_data->resolver != NULL) + /* + * Ideally we would tell our resolver child to stop resolving + * shit and then we would add it back to the free_dns_children + * linked list. However, it's hard to tell children stuff, + * they just don't listen. + */ + gaim_dnsquery_resolver_destroy(query_data->resolver); +#elif defined _WIN32 /* end __unix__ || __APPLE__ */ + if (query_data->resolver != NULL) { /* * It's not really possible to kill a thread. So instead we @@ -254,6 +844,7 @@ query_data->hosts = g_slist_remove(query_data->hosts, query_data->hosts->data); } g_free(query_data->error_message); +#endif if (query_data->timeout > 0) gaim_timeout_remove(query_data->timeout); @@ -265,11 +856,20 @@ void gaim_dnsquery_init(void) { +#ifdef _WIN32 if (!g_thread_supported()) g_thread_init(NULL); +#endif } void gaim_dnsquery_uninit(void) { +#if defined(__unix__) || defined(__APPLE__) + while (free_dns_children != NULL) + { + gaim_dnsquery_resolver_destroy(free_dns_children->data); + free_dns_children = g_slist_remove(free_dns_children, free_dns_children->data); + } +#endif } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <the...@us...> - 2006-08-27 22:04:12
|
Revision: 17064 Author: thekingant Date: 2006-08-27 15:04:09 -0700 (Sun, 27 Aug 2006) ViewCVS: http://svn.sourceforge.net/gaim/?rev=17064&view=rev Log Message: ----------- Fix a small memleak Modified Paths: -------------- trunk/libgaim/dnsquery.c Modified: trunk/libgaim/dnsquery.c =================================================================== --- trunk/libgaim/dnsquery.c 2006-08-27 21:36:52 UTC (rev 17063) +++ trunk/libgaim/dnsquery.c 2006-08-27 22:04:09 UTC (rev 17064) @@ -87,6 +87,21 @@ gaim_debug_info("dnsquery", "IP resolved for %s\n", query_data->hostname); if (query_data->callback != NULL) query_data->callback(hosts, query_data->data, NULL); + else + { + /* + * Callback is a required parameter, but it can get set to + * NULL if we cancel a thread-based DNS lookup. So we need + * to free hosts. + */ + while (hosts != NULL) + { + hosts = g_slist_remove(hosts, hosts->data); + g_free(hosts->data); + hosts = g_slist_remove(hosts, hosts->data); + } + } + gaim_dnsquery_destroy(query_data); } @@ -566,6 +581,7 @@ g_return_val_if_fail(hostname != NULL, NULL); g_return_val_if_fail(port != 0, NULL); + g_return_val_if_fail(callback != NULL, NULL); query_data = g_new(GaimDnsQueryData, 1); query_data->hostname = g_strdup(hostname); @@ -728,6 +744,7 @@ g_return_val_if_fail(hostname != NULL, NULL); g_return_val_if_fail(port != 0, NULL); + g_return_val_if_fail(callback != NULL, NULL); gaim_debug_info("dnsquery", "Performing DNS lookup for %s\n", hostname); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <the...@us...> - 2006-09-06 10:06:59
|
Revision: 17180 http://svn.sourceforge.net/gaim/?rev=17180&view=rev Author: thekingant Date: 2006-09-06 03:06:58 -0700 (Wed, 06 Sep 2006) Log Message: ----------- Don't allow dns lookups of empty strings Modified Paths: -------------- trunk/libgaim/dnsquery.c Modified: trunk/libgaim/dnsquery.c =================================================================== --- trunk/libgaim/dnsquery.c 2006-09-06 10:04:34 UTC (rev 17179) +++ trunk/libgaim/dnsquery.c 2006-09-06 10:06:58 UTC (rev 17180) @@ -591,6 +591,12 @@ query_data->data = data; query_data->resolver = NULL; + if (strlen(query_data->hostname) == 0) + { + gaim_dnsquery_destroy(query_data); + g_return_val_if_reached(NULL); + } + if (!queued_requests) queued_requests = g_queue_new(); g_queue_push_tail(queued_requests, query_data); @@ -757,6 +763,12 @@ query_data->error_message = NULL; query_data->hosts = NULL; + if (strlen(query_data->hostname) == 0) + { + gaim_dnsquery_destroy(query_data); + g_return_val_if_reached(NULL); + } + /* Don't call the callback before returning */ query_data->timeout = gaim_timeout_add(0, resolve_host, query_data); @@ -812,6 +824,7 @@ g_return_val_if_fail(hostname != NULL, NULL); g_return_val_if_fail(port != 0, NULL); + g_return_val_if_fail(callback != NULL, NULL); query_data = g_new(GaimDnsQueryData, 1); query_data->hostname = g_strdup(hostname); @@ -820,6 +833,12 @@ query_data->callback = callback; query_data->data = data; + if (strlen(query_data->hostname) == 0) + { + gaim_dnsquery_destroy(query_data); + g_return_val_if_reached(NULL); + } + /* Don't call the callback before returning */ query_data->timeout = gaim_timeout_add(0, resolve_host, query_data); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <the...@us...> - 2006-09-10 22:33:31
|
Revision: 17230 http://svn.sourceforge.net/gaim/?rev=17230&view=rev Author: thekingant Date: 2006-09-10 15:33:28 -0700 (Sun, 10 Sep 2006) Log Message: ----------- Evan, see if this fixes the MSN get info crashes for you. Basically canceled DNS requests weren't being removed from the queue, then Gaim would pop them off the queue, but since the request had been canceled the memory was free'd and is now invalid. Modified Paths: -------------- trunk/libgaim/dnsquery.c Modified: trunk/libgaim/dnsquery.c =================================================================== --- trunk/libgaim/dnsquery.c 2006-09-10 21:21:21 UTC (rev 17229) +++ trunk/libgaim/dnsquery.c 2006-09-10 22:33:28 UTC (rev 17230) @@ -851,6 +851,8 @@ gaim_dnsquery_destroy(GaimDnsQueryData *query_data) { #if defined(__unix__) || defined(__APPLE__) + g_queue_remove(queued_requests, query_data); + if (query_data->resolver != NULL) /* * Ideally we would tell our resolver child to stop resolving This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <the...@us...> - 2006-09-29 06:15:57
|
Revision: 17395 http://svn.sourceforge.net/gaim/?rev=17395&view=rev Author: thekingant Date: 2006-09-28 23:15:53 -0700 (Thu, 28 Sep 2006) Log Message: ----------- Use a GSList instead of a GQueue because g_queue_remove() wasn't added until glib 2.4 Are we releasing beta 4 this weekend? Modified Paths: -------------- trunk/libgaim/dnsquery.c Modified: trunk/libgaim/dnsquery.c =================================================================== --- trunk/libgaim/dnsquery.c 2006-09-29 06:04:13 UTC (rev 17394) +++ trunk/libgaim/dnsquery.c 2006-09-29 06:15:53 UTC (rev 17395) @@ -67,7 +67,7 @@ }; static GSList *free_dns_children = NULL; -static GQueue *queued_requests = NULL; +static GSList *queued_requests = NULL; static int number_of_dns_children = 0; @@ -451,11 +451,12 @@ GaimDnsQueryData *query_data; GaimDnsQueryResolverProcess *resolver; - if ((queued_requests == NULL) || (g_queue_is_empty(queued_requests))) + if (queued_requests == NULL) /* No more DNS queries, yay! */ return; - query_data = g_queue_pop_head(queued_requests); + query_data = queued_requests->data; + queued_requests = g_slist_delete_link(queued_requests, queued_requests); /* * If we have any children, attempt to have them perform the DNS @@ -479,7 +480,7 @@ if (number_of_dns_children >= MAX_DNS_CHILDREN) { /* Apparently all our children are busy */ - g_queue_push_head(queued_requests, query_data); + queued_requests = g_slist_prepend(queued_requests, query_data); return; } @@ -597,9 +598,7 @@ g_return_val_if_reached(NULL); } - if (!queued_requests) - queued_requests = g_queue_new(); - g_queue_push_tail(queued_requests, query_data); + queued_requests = g_slist_append(queued_requests, query_data); gaim_debug_info("dns", "DNS query for '%s' queued\n", query_data->hostname); @@ -851,7 +850,7 @@ gaim_dnsquery_destroy(GaimDnsQueryData *query_data) { #if defined(__unix__) || defined(__APPLE__) - g_queue_remove(queued_requests, query_data); + queued_requests = g_slist_remove(queued_requests, query_data); if (query_data->resolver != NULL) /* This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dat...@us...> - 2006-12-12 16:20:52
|
Revision: 17974 http://svn.sourceforge.net/gaim/?rev=17974&view=rev Author: datallah Date: 2006-12-12 08:20:43 -0800 (Tue, 12 Dec 2006) Log Message: ----------- trime noticed that dns lookups don't work if you don't HAVE_GETADDRINFO; he? also submitted a patch to fix the bug. Modified Paths: -------------- trunk/libgaim/dnsquery.c Modified: trunk/libgaim/dnsquery.c =================================================================== --- trunk/libgaim/dnsquery.c 2006-12-12 08:53:35 UTC (rev 17973) +++ trunk/libgaim/dnsquery.c 2006-12-12 16:20:43 UTC (rev 17974) @@ -252,6 +252,7 @@ sin.sin_family = AF_INET; sin.sin_port = htons(dns_params.port); + write(child_out, &zero, sizeof(zero)); write(child_out, &addrlen, sizeof(addrlen)); write(child_out, &sin, addrlen); write(child_out, &zero, sizeof(zero)); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |