From: Mark D. <the...@us...> - 2005-03-21 00:43:35
|
Update of /cvsroot/gaim/gaim/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2371/src Modified Files: proxy.c Log Message: That same DNS fix (for real)^2 from oldstatus. Index: proxy.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/proxy.c,v retrieving revision 1.128 retrieving revision 1.129 diff -u -d -p -r1.128 -r1.129 --- proxy.c 20 Mar 2005 17:23:30 -0000 1.128 +++ proxy.c 21 Mar 2005 00:43:26 -0000 1.129 @@ -425,7 +425,7 @@ static void cope_with_gdb_brokenness() static void gaim_dns_childthread(int child_out, int child_in, dns_params_t *dns_params, gboolean show_debug) { - const int zero = 0; + const size_t zero = 0; int rc; #if HAVE_GETADDRINFO struct addrinfo hints, *res, *tmp; @@ -486,8 +486,8 @@ gaim_dns_childthread(int child_out, int */ hints.ai_socktype = SOCK_STREAM; rc = getaddrinfo(dns_params->hostname, servname, &hints, &res); + write(child_out, &rc, sizeof(rc)); if (rc != 0) { - write(child_out, &rc, sizeof(rc)); close(child_out); if (show_debug) fprintf(stderr,"dns[%d] Error: getaddrinfo returned %d\n", @@ -495,7 +495,6 @@ gaim_dns_childthread(int child_out, int dns_params->hostname[0] = '\0'; continue; } - write(child_out, &zero, sizeof(zero)); tmp = res; while (res) { size_t ai_addrlen = res->ai_addrlen; @@ -522,7 +521,6 @@ gaim_dns_childthread(int child_out, int 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)); |