libpurple/dnsquery.c

Thu, 13 Feb 2014 20:11:13 +0100

author
Tomasz Wasilczyk <twasilczyk@pidgin.im>
date
Thu, 13 Feb 2014 20:11:13 +0100
changeset 35559
061c2ae3679c
parent 35475
ec0d44434ba8
child 35572
5c4846317f2f
permissions
-rw-r--r--

Fix the build again

20147
66f05a854eee applied changes from 8a731bbd0197fbcc91a705c2d8f528154216defa
Richard Laager <rlaager@pidgin.im>
parents: 19859
diff changeset
1 /* purple
14243
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
2 *
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
3 * Purple is the legal property of its developers, whose names are too numerous
14243
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
4 * to list here. Please refer to the COPYRIGHT file distributed with this
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
5 * source distribution.
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
6 *
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
7 * This program is free software; you can redistribute it and/or modify
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
8 * it under the terms of the GNU General Public License as published by
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
9 * the Free Software Foundation; either version 2 of the License, or
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
10 * (at your option) any later version.
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
11 *
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
12 * This program is distributed in the hope that it will be useful,
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
15 * GNU General Public License for more details.
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
16 *
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
17 * You should have received a copy of the GNU General Public License
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
18 * along with this program; if not, write to the Free Software
19859
71d37b57eff2 The FSF changed its address a while ago; our files were out of date.
John Bailey <rekkanoryo@rekkanoryo.org>
parents: 16701
diff changeset
19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
14243
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
20 *
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
21 */
31738
c0a7971ce0d2 purple: Fix some compiler warnings related to new API and missing prototypes.
Paul Aurich <darkrain42@pidgin.im>
parents: 31678
diff changeset
22 #define _PURPLE_DNSQUERY_C_
14243
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
23
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
24 #include "internal.h"
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
25 #include "debug.h"
14300
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
26 #include "dnsquery.h"
27898
4a6450d92e11 Move the IDN support into the DNS routines.
Paul Aurich <darkrain42@pidgin.im>
parents: 27738
diff changeset
27 #include "network.h"
14243
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
28 #include "notify.h"
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
29 #include "prefs.h"
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
30 #include "util.h"
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
31
27157
609f187d0ac7 Call res_init() when DNS queries fail in case the failure indicates a timeout
Paul Aurich <darkrain42@pidgin.im>
parents: 27147
diff changeset
32 #ifndef _WIN32
609f187d0ac7 Call res_init() when DNS queries fail in case the failure indicates a timeout
Paul Aurich <darkrain42@pidgin.im>
parents: 27147
diff changeset
33 #include <resolv.h>
609f187d0ac7 Call res_init() when DNS queries fail in case the failure indicates a timeout
Paul Aurich <darkrain42@pidgin.im>
parents: 27147
diff changeset
34 #endif
609f187d0ac7 Call res_init() when DNS queries fail in case the failure indicates a timeout
Paul Aurich <darkrain42@pidgin.im>
parents: 27147
diff changeset
35
23352
9714223ca7a7 A patch from Peter O'Gorman at The Written Word, Inc. to fix various
Peter O'Gorman <pogma@thewrittenword.com>
parents: 22622
diff changeset
36 #if (defined(__APPLE__) || defined (__unix__)) && !defined(__osf__)
9714223ca7a7 A patch from Peter O'Gorman at The Written Word, Inc. to fix various
Peter O'Gorman <pogma@thewrittenword.com>
parents: 22622
diff changeset
37 #define PURPLE_DNSQUERY_USE_FORK
9714223ca7a7 A patch from Peter O'Gorman at The Written Word, Inc. to fix various
Peter O'Gorman <pogma@thewrittenword.com>
parents: 22622
diff changeset
38 #endif
14243
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
39 /**************************************************************************
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
40 * DNS query API
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
41 **************************************************************************/
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
42
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
43 static PurpleDnsQueryUiOps *dns_query_ui_ops = NULL;
15763
2b529e4350bc The UI can now use the GaimDnsQueryUiOps to handle DNS resolving itself; if this is done, the platform-specific DNS query code won't be used. This will be used in Adium to use an efficient threads-based DNS resolve (since Adium is already multithreaded, this is significantly cheaper than fork()).
Evan Schoenberg <evands@pidgin.im>
parents: 15707
diff changeset
44
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
45 typedef struct _PurpleDnsQueryResolverProcess PurpleDnsQueryResolverProcess;
14300
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
46
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
47 struct _PurpleDnsQueryData {
14300
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
48 char *hostname;
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
49 int port;
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
50 PurpleDnsQueryConnectFunction callback;
14300
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
51 gpointer data;
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
52 guint timeout;
31678
ad8a9a266b05 Add new DNS-related API to perform lookups in the context of an account.
Daniel Atallah <datallah@pidgin.im>
parents: 31674
diff changeset
53 PurpleAccount *account;
14300
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
54
23352
9714223ca7a7 A patch from Peter O'Gorman at The Written Word, Inc. to fix various
Peter O'Gorman <pogma@thewrittenword.com>
parents: 22622
diff changeset
55 #if defined(PURPLE_DNSQUERY_USE_FORK)
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
56 PurpleDnsQueryResolverProcess *resolver;
23352
9714223ca7a7 A patch from Peter O'Gorman at The Written Word, Inc. to fix various
Peter O'Gorman <pogma@thewrittenword.com>
parents: 22622
diff changeset
57 #elif defined _WIN32 /* end PURPLE_DNSQUERY_USE_FORK */
14300
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
58 GThread *resolver;
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
59 GSList *hosts;
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
60 gchar *error_message;
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
61 #endif
14245
8a215625c6cb [gaim-migrate @ 16835]
Mark Doliner <markdoliner@pidgin.im>
parents: 14244
diff changeset
62 };
8a215625c6cb [gaim-migrate @ 16835]
Mark Doliner <markdoliner@pidgin.im>
parents: 14244
diff changeset
63
23352
9714223ca7a7 A patch from Peter O'Gorman at The Written Word, Inc. to fix various
Peter O'Gorman <pogma@thewrittenword.com>
parents: 22622
diff changeset
64 #if defined(PURPLE_DNSQUERY_USE_FORK)
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
65
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
66 #define MAX_DNS_CHILDREN 4
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
67
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
68 /*
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
69 * This structure keeps a reference to a child resolver process.
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
70 */
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
71 struct _PurpleDnsQueryResolverProcess {
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
72 guint inpa;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
73 int fd_in, fd_out;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
74 pid_t dns_pid;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
75 };
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
76
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
77 static GSList *free_dns_children = NULL;
33374
2375ffdbb565 Use a GQueue for DNS requests.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 32297
diff changeset
78 static GQueue *queued_requests = NULL;
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
79
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
80 static int number_of_dns_children = 0;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
81
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
82 /*
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
83 * This is a convenience struct used to pass data to
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
84 * the child resolver process.
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
85 */
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
86 typedef struct {
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
87 char hostname[512];
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
88 int port;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
89 } dns_params_t;
24321
0d6d024049eb Improve a few comments
Mark Doliner <markdoliner@pidgin.im>
parents: 24318
diff changeset
90 #endif /* end PURPLE_DNSQUERY_USE_FORK */
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
91
14300
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
92 static void
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
93 purple_dnsquery_resolved(PurpleDnsQueryData *query_data, GSList *hosts)
14300
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
94 {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
95 purple_debug_info("dnsquery", "IP resolved for %s\n", query_data->hostname);
14300
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
96 if (query_data->callback != NULL)
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
97 query_data->callback(hosts, query_data->data, NULL);
14420
3c78e468b45a [gaim-migrate @ 17064]
Mark Doliner <markdoliner@pidgin.im>
parents: 14349
diff changeset
98 else
3c78e468b45a [gaim-migrate @ 17064]
Mark Doliner <markdoliner@pidgin.im>
parents: 14349
diff changeset
99 {
3c78e468b45a [gaim-migrate @ 17064]
Mark Doliner <markdoliner@pidgin.im>
parents: 14349
diff changeset
100 /*
3c78e468b45a [gaim-migrate @ 17064]
Mark Doliner <markdoliner@pidgin.im>
parents: 14349
diff changeset
101 * Callback is a required parameter, but it can get set to
3c78e468b45a [gaim-migrate @ 17064]
Mark Doliner <markdoliner@pidgin.im>
parents: 14349
diff changeset
102 * NULL if we cancel a thread-based DNS lookup. So we need
3c78e468b45a [gaim-migrate @ 17064]
Mark Doliner <markdoliner@pidgin.im>
parents: 14349
diff changeset
103 * to free hosts.
3c78e468b45a [gaim-migrate @ 17064]
Mark Doliner <markdoliner@pidgin.im>
parents: 14349
diff changeset
104 */
3c78e468b45a [gaim-migrate @ 17064]
Mark Doliner <markdoliner@pidgin.im>
parents: 14349
diff changeset
105 while (hosts != NULL)
3c78e468b45a [gaim-migrate @ 17064]
Mark Doliner <markdoliner@pidgin.im>
parents: 14349
diff changeset
106 {
3c78e468b45a [gaim-migrate @ 17064]
Mark Doliner <markdoliner@pidgin.im>
parents: 14349
diff changeset
107 hosts = g_slist_remove(hosts, hosts->data);
3c78e468b45a [gaim-migrate @ 17064]
Mark Doliner <markdoliner@pidgin.im>
parents: 14349
diff changeset
108 g_free(hosts->data);
3c78e468b45a [gaim-migrate @ 17064]
Mark Doliner <markdoliner@pidgin.im>
parents: 14349
diff changeset
109 hosts = g_slist_remove(hosts, hosts->data);
3c78e468b45a [gaim-migrate @ 17064]
Mark Doliner <markdoliner@pidgin.im>
parents: 14349
diff changeset
110 }
3c78e468b45a [gaim-migrate @ 17064]
Mark Doliner <markdoliner@pidgin.im>
parents: 14349
diff changeset
111 }
3c78e468b45a [gaim-migrate @ 17064]
Mark Doliner <markdoliner@pidgin.im>
parents: 14349
diff changeset
112
24325
9b63613e82ab Fix DNS resolution. I think I broke this this morning in my revision
Mark Doliner <markdoliner@pidgin.im>
parents: 24324
diff changeset
113 #ifdef PURPLE_DNSQUERY_USE_FORK
24318
b2b1a42a7816 Revert my revision 3777b91f70ab86e67c1e039d08fb6d87e06f20d6, which
Mark Doliner <markdoliner@pidgin.im>
parents: 24287
diff changeset
114 /*
24325
9b63613e82ab Fix DNS resolution. I think I broke this this morning in my revision
Mark Doliner <markdoliner@pidgin.im>
parents: 24324
diff changeset
115 * Add the resolver to the list of available resolvers, and set it
9b63613e82ab Fix DNS resolution. I think I broke this this morning in my revision
Mark Doliner <markdoliner@pidgin.im>
parents: 24324
diff changeset
116 * to NULL so that it doesn't get destroyed along with the query_data
24318
b2b1a42a7816 Revert my revision 3777b91f70ab86e67c1e039d08fb6d87e06f20d6, which
Mark Doliner <markdoliner@pidgin.im>
parents: 24287
diff changeset
117 */
27738
91b067b7563d Don't assume a resolver generated the response.
Aman Gupta <aman@tmm1.net>
parents: 27737
diff changeset
118 if (query_data->resolver)
91b067b7563d Don't assume a resolver generated the response.
Aman Gupta <aman@tmm1.net>
parents: 27737
diff changeset
119 {
91b067b7563d Don't assume a resolver generated the response.
Aman Gupta <aman@tmm1.net>
parents: 27737
diff changeset
120 free_dns_children = g_slist_prepend(free_dns_children, query_data->resolver);
91b067b7563d Don't assume a resolver generated the response.
Aman Gupta <aman@tmm1.net>
parents: 27737
diff changeset
121 query_data->resolver = NULL;
91b067b7563d Don't assume a resolver generated the response.
Aman Gupta <aman@tmm1.net>
parents: 27737
diff changeset
122 }
24325
9b63613e82ab Fix DNS resolution. I think I broke this this morning in my revision
Mark Doliner <markdoliner@pidgin.im>
parents: 24324
diff changeset
123 #endif /* PURPLE_DNSQUERY_USE_FORK */
24318
b2b1a42a7816 Revert my revision 3777b91f70ab86e67c1e039d08fb6d87e06f20d6, which
Mark Doliner <markdoliner@pidgin.im>
parents: 24287
diff changeset
124
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
125 purple_dnsquery_destroy(query_data);
14300
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
126 }
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
127
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
128 static void
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
129 purple_dnsquery_failed(PurpleDnsQueryData *query_data, const gchar *error_message)
14300
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
130 {
27497
2dc5a0e0c4c2 Increase the logging level of some debugging messages that seemed to be a
Mauro Brasil <mauro.brasil@tqi.com.br>
parents: 27157
diff changeset
131 purple_debug_error("dnsquery", "%s\n", error_message);
14300
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
132 if (query_data->callback != NULL)
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
133 query_data->callback(NULL, query_data->data, error_message);
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
134 purple_dnsquery_destroy(query_data);
14300
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
135 }
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
136
15763
2b529e4350bc The UI can now use the GaimDnsQueryUiOps to handle DNS resolving itself; if this is done, the platform-specific DNS query code won't be used. This will be used in Adium to use an efficient threads-based DNS resolve (since Adium is already multithreaded, this is significantly cheaper than fork()).
Evan Schoenberg <evands@pidgin.im>
parents: 15707
diff changeset
137 static gboolean
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
138 purple_dnsquery_ui_resolve(PurpleDnsQueryData *query_data)
15763
2b529e4350bc The UI can now use the GaimDnsQueryUiOps to handle DNS resolving itself; if this is done, the platform-specific DNS query code won't be used. This will be used in Adium to use an efficient threads-based DNS resolve (since Adium is already multithreaded, this is significantly cheaper than fork()).
Evan Schoenberg <evands@pidgin.im>
parents: 15707
diff changeset
139 {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
140 PurpleDnsQueryUiOps *ops = purple_dnsquery_get_ui_ops();
15763
2b529e4350bc The UI can now use the GaimDnsQueryUiOps to handle DNS resolving itself; if this is done, the platform-specific DNS query code won't be used. This will be used in Adium to use an efficient threads-based DNS resolve (since Adium is already multithreaded, this is significantly cheaper than fork()).
Evan Schoenberg <evands@pidgin.im>
parents: 15707
diff changeset
141
15775
a1aed6d0c33b No changes; fixed a bunch of whitespace problems made by a text editor with 'use tabs' disabled. Sorry for the noise.
Evan Schoenberg <evands@pidgin.im>
parents: 15771
diff changeset
142 if (ops && ops->resolve_host)
24323
fe88d45063e8 Simplify two bits of code a little
Mark Doliner <markdoliner@pidgin.im>
parents: 24322
diff changeset
143 return ops->resolve_host(query_data, purple_dnsquery_resolved, purple_dnsquery_failed);
15763
2b529e4350bc The UI can now use the GaimDnsQueryUiOps to handle DNS resolving itself; if this is done, the platform-specific DNS query code won't be used. This will be used in Adium to use an efficient threads-based DNS resolve (since Adium is already multithreaded, this is significantly cheaper than fork()).
Evan Schoenberg <evands@pidgin.im>
parents: 15707
diff changeset
144
2b529e4350bc The UI can now use the GaimDnsQueryUiOps to handle DNS resolving itself; if this is done, the platform-specific DNS query code won't be used. This will be used in Adium to use an efficient threads-based DNS resolve (since Adium is already multithreaded, this is significantly cheaper than fork()).
Evan Schoenberg <evands@pidgin.im>
parents: 15707
diff changeset
145 return FALSE;
2b529e4350bc The UI can now use the GaimDnsQueryUiOps to handle DNS resolving itself; if this is done, the platform-specific DNS query code won't be used. This will be used in Adium to use an efficient threads-based DNS resolve (since Adium is already multithreaded, this is significantly cheaper than fork()).
Evan Schoenberg <evands@pidgin.im>
parents: 15707
diff changeset
146 }
2b529e4350bc The UI can now use the GaimDnsQueryUiOps to handle DNS resolving itself; if this is done, the platform-specific DNS query code won't be used. This will be used in Adium to use an efficient threads-based DNS resolve (since Adium is already multithreaded, this is significantly cheaper than fork()).
Evan Schoenberg <evands@pidgin.im>
parents: 15707
diff changeset
147
27737
d2abba8c8e1f Don't fork a resolver process for IPs.
Aman Gupta <aman@tmm1.net>
parents: 27736
diff changeset
148 static gboolean
d2abba8c8e1f Don't fork a resolver process for IPs.
Aman Gupta <aman@tmm1.net>
parents: 27736
diff changeset
149 resolve_ip(PurpleDnsQueryData *query_data)
d2abba8c8e1f Don't fork a resolver process for IPs.
Aman Gupta <aman@tmm1.net>
parents: 27736
diff changeset
150 {
31973
15b977ffc25d dnsquery: Behold, automagic conversion of a string IP address into a sockaddr struct, IPv#-independent.
Paul Aurich <darkrain42@pidgin.im>
parents: 31738
diff changeset
151 #if defined(HAVE_GETADDRINFO) && defined(AI_NUMERICHOST)
15b977ffc25d dnsquery: Behold, automagic conversion of a string IP address into a sockaddr struct, IPv#-independent.
Paul Aurich <darkrain42@pidgin.im>
parents: 31738
diff changeset
152 struct addrinfo hints, *res;
15b977ffc25d dnsquery: Behold, automagic conversion of a string IP address into a sockaddr struct, IPv#-independent.
Paul Aurich <darkrain42@pidgin.im>
parents: 31738
diff changeset
153 char servname[20];
15b977ffc25d dnsquery: Behold, automagic conversion of a string IP address into a sockaddr struct, IPv#-independent.
Paul Aurich <darkrain42@pidgin.im>
parents: 31738
diff changeset
154
15b977ffc25d dnsquery: Behold, automagic conversion of a string IP address into a sockaddr struct, IPv#-independent.
Paul Aurich <darkrain42@pidgin.im>
parents: 31738
diff changeset
155 g_snprintf(servname, sizeof(servname), "%d", query_data->port);
15b977ffc25d dnsquery: Behold, automagic conversion of a string IP address into a sockaddr struct, IPv#-independent.
Paul Aurich <darkrain42@pidgin.im>
parents: 31738
diff changeset
156 memset(&hints, 0, sizeof(hints));
15b977ffc25d dnsquery: Behold, automagic conversion of a string IP address into a sockaddr struct, IPv#-independent.
Paul Aurich <darkrain42@pidgin.im>
parents: 31738
diff changeset
157 hints.ai_family = AF_UNSPEC;
15b977ffc25d dnsquery: Behold, automagic conversion of a string IP address into a sockaddr struct, IPv#-independent.
Paul Aurich <darkrain42@pidgin.im>
parents: 31738
diff changeset
158 hints.ai_flags |= AI_NUMERICHOST;
15b977ffc25d dnsquery: Behold, automagic conversion of a string IP address into a sockaddr struct, IPv#-independent.
Paul Aurich <darkrain42@pidgin.im>
parents: 31738
diff changeset
159
15b977ffc25d dnsquery: Behold, automagic conversion of a string IP address into a sockaddr struct, IPv#-independent.
Paul Aurich <darkrain42@pidgin.im>
parents: 31738
diff changeset
160 if (0 == getaddrinfo(query_data->hostname, servname, &hints, &res))
15b977ffc25d dnsquery: Behold, automagic conversion of a string IP address into a sockaddr struct, IPv#-independent.
Paul Aurich <darkrain42@pidgin.im>
parents: 31738
diff changeset
161 {
15b977ffc25d dnsquery: Behold, automagic conversion of a string IP address into a sockaddr struct, IPv#-independent.
Paul Aurich <darkrain42@pidgin.im>
parents: 31738
diff changeset
162 GSList *hosts = NULL;
15b977ffc25d dnsquery: Behold, automagic conversion of a string IP address into a sockaddr struct, IPv#-independent.
Paul Aurich <darkrain42@pidgin.im>
parents: 31738
diff changeset
163 hosts = g_slist_append(hosts, GINT_TO_POINTER(res->ai_addrlen));
15b977ffc25d dnsquery: Behold, automagic conversion of a string IP address into a sockaddr struct, IPv#-independent.
Paul Aurich <darkrain42@pidgin.im>
parents: 31738
diff changeset
164 hosts = g_slist_append(hosts, g_memdup(res->ai_addr, res->ai_addrlen));
15b977ffc25d dnsquery: Behold, automagic conversion of a string IP address into a sockaddr struct, IPv#-independent.
Paul Aurich <darkrain42@pidgin.im>
parents: 31738
diff changeset
165 purple_dnsquery_resolved(query_data, hosts);
15b977ffc25d dnsquery: Behold, automagic conversion of a string IP address into a sockaddr struct, IPv#-independent.
Paul Aurich <darkrain42@pidgin.im>
parents: 31738
diff changeset
166
15b977ffc25d dnsquery: Behold, automagic conversion of a string IP address into a sockaddr struct, IPv#-independent.
Paul Aurich <darkrain42@pidgin.im>
parents: 31738
diff changeset
167 freeaddrinfo(res);
15b977ffc25d dnsquery: Behold, automagic conversion of a string IP address into a sockaddr struct, IPv#-independent.
Paul Aurich <darkrain42@pidgin.im>
parents: 31738
diff changeset
168 return TRUE;
15b977ffc25d dnsquery: Behold, automagic conversion of a string IP address into a sockaddr struct, IPv#-independent.
Paul Aurich <darkrain42@pidgin.im>
parents: 31738
diff changeset
169 }
15b977ffc25d dnsquery: Behold, automagic conversion of a string IP address into a sockaddr struct, IPv#-independent.
Paul Aurich <darkrain42@pidgin.im>
parents: 31738
diff changeset
170 #else /* defined(HAVE_GETADDRINFO) && defined(AI_NUMERICHOST) */
27737
d2abba8c8e1f Don't fork a resolver process for IPs.
Aman Gupta <aman@tmm1.net>
parents: 27736
diff changeset
171 struct sockaddr_in sin;
d2abba8c8e1f Don't fork a resolver process for IPs.
Aman Gupta <aman@tmm1.net>
parents: 27736
diff changeset
172 if (inet_aton(query_data->hostname, &sin.sin_addr))
d2abba8c8e1f Don't fork a resolver process for IPs.
Aman Gupta <aman@tmm1.net>
parents: 27736
diff changeset
173 {
d2abba8c8e1f Don't fork a resolver process for IPs.
Aman Gupta <aman@tmm1.net>
parents: 27736
diff changeset
174 /*
d2abba8c8e1f Don't fork a resolver process for IPs.
Aman Gupta <aman@tmm1.net>
parents: 27736
diff changeset
175 * The given "hostname" is actually an IP address, so we
d2abba8c8e1f Don't fork a resolver process for IPs.
Aman Gupta <aman@tmm1.net>
parents: 27736
diff changeset
176 * don't need to do anything.
d2abba8c8e1f Don't fork a resolver process for IPs.
Aman Gupta <aman@tmm1.net>
parents: 27736
diff changeset
177 */
d2abba8c8e1f Don't fork a resolver process for IPs.
Aman Gupta <aman@tmm1.net>
parents: 27736
diff changeset
178 GSList *hosts = NULL;
d2abba8c8e1f Don't fork a resolver process for IPs.
Aman Gupta <aman@tmm1.net>
parents: 27736
diff changeset
179 sin.sin_family = AF_INET;
d2abba8c8e1f Don't fork a resolver process for IPs.
Aman Gupta <aman@tmm1.net>
parents: 27736
diff changeset
180 sin.sin_port = htons(query_data->port);
d2abba8c8e1f Don't fork a resolver process for IPs.
Aman Gupta <aman@tmm1.net>
parents: 27736
diff changeset
181 hosts = g_slist_append(hosts, GINT_TO_POINTER(sizeof(sin)));
d2abba8c8e1f Don't fork a resolver process for IPs.
Aman Gupta <aman@tmm1.net>
parents: 27736
diff changeset
182 hosts = g_slist_append(hosts, g_memdup(&sin, sizeof(sin)));
d2abba8c8e1f Don't fork a resolver process for IPs.
Aman Gupta <aman@tmm1.net>
parents: 27736
diff changeset
183 purple_dnsquery_resolved(query_data, hosts);
d2abba8c8e1f Don't fork a resolver process for IPs.
Aman Gupta <aman@tmm1.net>
parents: 27736
diff changeset
184
d2abba8c8e1f Don't fork a resolver process for IPs.
Aman Gupta <aman@tmm1.net>
parents: 27736
diff changeset
185 return TRUE;
d2abba8c8e1f Don't fork a resolver process for IPs.
Aman Gupta <aman@tmm1.net>
parents: 27736
diff changeset
186 }
31973
15b977ffc25d dnsquery: Behold, automagic conversion of a string IP address into a sockaddr struct, IPv#-independent.
Paul Aurich <darkrain42@pidgin.im>
parents: 31738
diff changeset
187 #endif
27737
d2abba8c8e1f Don't fork a resolver process for IPs.
Aman Gupta <aman@tmm1.net>
parents: 27736
diff changeset
188
d2abba8c8e1f Don't fork a resolver process for IPs.
Aman Gupta <aman@tmm1.net>
parents: 27736
diff changeset
189 return FALSE;
d2abba8c8e1f Don't fork a resolver process for IPs.
Aman Gupta <aman@tmm1.net>
parents: 27736
diff changeset
190 }
d2abba8c8e1f Don't fork a resolver process for IPs.
Aman Gupta <aman@tmm1.net>
parents: 27736
diff changeset
191
28784
0344b94dba21 dns: Avoid two warnings when building with --disable-idn.
Paul Aurich <darkrain42@pidgin.im>
parents: 28592
diff changeset
192 #ifdef USE_IDN
27898
4a6450d92e11 Move the IDN support into the DNS routines.
Paul Aurich <darkrain42@pidgin.im>
parents: 27738
diff changeset
193 static gboolean
4a6450d92e11 Move the IDN support into the DNS routines.
Paul Aurich <darkrain42@pidgin.im>
parents: 27738
diff changeset
194 dns_str_is_ascii(const char *name)
4a6450d92e11 Move the IDN support into the DNS routines.
Paul Aurich <darkrain42@pidgin.im>
parents: 27738
diff changeset
195 {
4a6450d92e11 Move the IDN support into the DNS routines.
Paul Aurich <darkrain42@pidgin.im>
parents: 27738
diff changeset
196 guchar *c;
4a6450d92e11 Move the IDN support into the DNS routines.
Paul Aurich <darkrain42@pidgin.im>
parents: 27738
diff changeset
197 for (c = (guchar *)name; c && *c; ++c) {
4a6450d92e11 Move the IDN support into the DNS routines.
Paul Aurich <darkrain42@pidgin.im>
parents: 27738
diff changeset
198 if (*c > 0x7f)
4a6450d92e11 Move the IDN support into the DNS routines.
Paul Aurich <darkrain42@pidgin.im>
parents: 27738
diff changeset
199 return FALSE;
4a6450d92e11 Move the IDN support into the DNS routines.
Paul Aurich <darkrain42@pidgin.im>
parents: 27738
diff changeset
200 }
4a6450d92e11 Move the IDN support into the DNS routines.
Paul Aurich <darkrain42@pidgin.im>
parents: 27738
diff changeset
201
4a6450d92e11 Move the IDN support into the DNS routines.
Paul Aurich <darkrain42@pidgin.im>
parents: 27738
diff changeset
202 return TRUE;
4a6450d92e11 Move the IDN support into the DNS routines.
Paul Aurich <darkrain42@pidgin.im>
parents: 27738
diff changeset
203 }
28784
0344b94dba21 dns: Avoid two warnings when building with --disable-idn.
Paul Aurich <darkrain42@pidgin.im>
parents: 28592
diff changeset
204 #endif
27898
4a6450d92e11 Move the IDN support into the DNS routines.
Paul Aurich <darkrain42@pidgin.im>
parents: 27738
diff changeset
205
23352
9714223ca7a7 A patch from Peter O'Gorman at The Written Word, Inc. to fix various
Peter O'Gorman <pogma@thewrittenword.com>
parents: 22622
diff changeset
206 #if defined(PURPLE_DNSQUERY_USE_FORK)
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
207
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
208 /*
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
209 * Unix!
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
210 */
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
211
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
212 /*
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
213 * Begin the DNS resolver child process functions.
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
214 */
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
215 #ifdef HAVE_SIGNAL_H
16701
0b41f23396cc Mark two functions as "noreturn"
Mark Doliner <markdoliner@pidgin.im>
parents: 15890
diff changeset
216 G_GNUC_NORETURN static void
22108
cb9819851163 Squash some compiler warnings, some from my -Wstrict-prototypes fixing.
Richard Laager <rlaager@pidgin.im>
parents: 22104
diff changeset
217 trap_gdb_bug(int sig)
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
218 {
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
219 const char *message =
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
220 "Purple's DNS child got a SIGTRAP signal.\n"
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
221 "This can be caused by trying to run purple inside gdb.\n"
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
222 "There is a known gdb bug which prevents this. Supposedly purple\n"
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
223 "should have detected you were using gdb and used an ugly hack,\n"
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
224 "check cope_with_gdb_brokenness() in dnsquery.c.\n\n"
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
225 "For more info about this bug, see http://sources.redhat.com/ml/gdb/2001-07/msg00349.html\n";
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
226 fputs("\n* * *\n",stderr);
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
227 fputs(message,stderr);
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
228 fputs("* * *\n\n",stderr);
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
229 execlp("xmessage","xmessage","-center", message, NULL);
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
230 _exit(1);
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
231 }
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
232 #endif
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
233
22234
4d54e1c5c696 More compiler warning fixes from o_sukhodolsky (with additions by me).
Mark Doliner <markdoliner@pidgin.im>
parents: 22108
diff changeset
234 static void
4d54e1c5c696 More compiler warning fixes from o_sukhodolsky (with additions by me).
Mark Doliner <markdoliner@pidgin.im>
parents: 22108
diff changeset
235 write_to_parent(int fd, const void *buf, size_t count)
4d54e1c5c696 More compiler warning fixes from o_sukhodolsky (with additions by me).
Mark Doliner <markdoliner@pidgin.im>
parents: 22108
diff changeset
236 {
4d54e1c5c696 More compiler warning fixes from o_sukhodolsky (with additions by me).
Mark Doliner <markdoliner@pidgin.im>
parents: 22108
diff changeset
237 ssize_t written;
4d54e1c5c696 More compiler warning fixes from o_sukhodolsky (with additions by me).
Mark Doliner <markdoliner@pidgin.im>
parents: 22108
diff changeset
238
4d54e1c5c696 More compiler warning fixes from o_sukhodolsky (with additions by me).
Mark Doliner <markdoliner@pidgin.im>
parents: 22108
diff changeset
239 written = write(fd, buf, count);
34305
5804117fb298 Fix the rest of libpurple warnings about -Wsign-compare
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents: 33883
diff changeset
240 if (written < 0 || (gsize)written != count) {
22234
4d54e1c5c696 More compiler warning fixes from o_sukhodolsky (with additions by me).
Mark Doliner <markdoliner@pidgin.im>
parents: 22108
diff changeset
241 if (written < 0)
4d54e1c5c696 More compiler warning fixes from o_sukhodolsky (with additions by me).
Mark Doliner <markdoliner@pidgin.im>
parents: 22108
diff changeset
242 fprintf(stderr, "dns[%d]: Error writing data to "
4d54e1c5c696 More compiler warning fixes from o_sukhodolsky (with additions by me).
Mark Doliner <markdoliner@pidgin.im>
parents: 22108
diff changeset
243 "parent: %s\n", getpid(), strerror(errno));
4d54e1c5c696 More compiler warning fixes from o_sukhodolsky (with additions by me).
Mark Doliner <markdoliner@pidgin.im>
parents: 22108
diff changeset
244 else
4d54e1c5c696 More compiler warning fixes from o_sukhodolsky (with additions by me).
Mark Doliner <markdoliner@pidgin.im>
parents: 22108
diff changeset
245 fprintf(stderr, "dns[%d]: Error: Tried to write %"
4d54e1c5c696 More compiler warning fixes from o_sukhodolsky (with additions by me).
Mark Doliner <markdoliner@pidgin.im>
parents: 22108
diff changeset
246 G_GSIZE_FORMAT " bytes to parent but instead "
4d54e1c5c696 More compiler warning fixes from o_sukhodolsky (with additions by me).
Mark Doliner <markdoliner@pidgin.im>
parents: 22108
diff changeset
247 "wrote %" G_GSIZE_FORMAT " bytes\n",
4d54e1c5c696 More compiler warning fixes from o_sukhodolsky (with additions by me).
Mark Doliner <markdoliner@pidgin.im>
parents: 22108
diff changeset
248 getpid(), count, written);
4d54e1c5c696 More compiler warning fixes from o_sukhodolsky (with additions by me).
Mark Doliner <markdoliner@pidgin.im>
parents: 22108
diff changeset
249 }
4d54e1c5c696 More compiler warning fixes from o_sukhodolsky (with additions by me).
Mark Doliner <markdoliner@pidgin.im>
parents: 22108
diff changeset
250 }
4d54e1c5c696 More compiler warning fixes from o_sukhodolsky (with additions by me).
Mark Doliner <markdoliner@pidgin.im>
parents: 22108
diff changeset
251
16701
0b41f23396cc Mark two functions as "noreturn"
Mark Doliner <markdoliner@pidgin.im>
parents: 15890
diff changeset
252 G_GNUC_NORETURN static void
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
253 purple_dnsquery_resolver_run(int child_out, int child_in, gboolean show_debug)
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
254 {
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
255 dns_params_t dns_params;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
256 const size_t zero = 0;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
257 int rc;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
258 #ifdef HAVE_GETADDRINFO
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
259 struct addrinfo hints, *res, *tmp;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
260 char servname[20];
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
261 #else
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
262 struct sockaddr_in sin;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
263 const size_t addrlen = sizeof(sin);
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
264 #endif
27898
4a6450d92e11 Move the IDN support into the DNS routines.
Paul Aurich <darkrain42@pidgin.im>
parents: 27738
diff changeset
265 char *hostname;
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
266
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
267 #ifdef HAVE_SIGNAL_H
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
268 purple_restore_default_signal_handlers();
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
269 signal(SIGTRAP, trap_gdb_bug);
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
270 #endif
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
271
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
272 /*
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
273 * We resolve 1 host name for each iteration of this
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
274 * while loop.
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
275 *
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
276 * The top half of this reads in the hostname and port
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
277 * number from the socket with our parent. The bottom
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
278 * half of this resolves the IP (blocking) and sends
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
279 * the result back to our parent, when finished.
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
280 */
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
281 while (1) {
24318
b2b1a42a7816 Revert my revision 3777b91f70ab86e67c1e039d08fb6d87e06f20d6, which
Mark Doliner <markdoliner@pidgin.im>
parents: 24287
diff changeset
282 fd_set fds;
b2b1a42a7816 Revert my revision 3777b91f70ab86e67c1e039d08fb6d87e06f20d6, which
Mark Doliner <markdoliner@pidgin.im>
parents: 24287
diff changeset
283 struct timeval tv = { .tv_sec = 20, .tv_usec = 0 };
b2b1a42a7816 Revert my revision 3777b91f70ab86e67c1e039d08fb6d87e06f20d6, which
Mark Doliner <markdoliner@pidgin.im>
parents: 24287
diff changeset
284 FD_ZERO(&fds);
b2b1a42a7816 Revert my revision 3777b91f70ab86e67c1e039d08fb6d87e06f20d6, which
Mark Doliner <markdoliner@pidgin.im>
parents: 24287
diff changeset
285 FD_SET(child_in, &fds);
b2b1a42a7816 Revert my revision 3777b91f70ab86e67c1e039d08fb6d87e06f20d6, which
Mark Doliner <markdoliner@pidgin.im>
parents: 24287
diff changeset
286 rc = select(child_in + 1, &fds, NULL, NULL, &tv);
b2b1a42a7816 Revert my revision 3777b91f70ab86e67c1e039d08fb6d87e06f20d6, which
Mark Doliner <markdoliner@pidgin.im>
parents: 24287
diff changeset
287 if (!rc) {
b2b1a42a7816 Revert my revision 3777b91f70ab86e67c1e039d08fb6d87e06f20d6, which
Mark Doliner <markdoliner@pidgin.im>
parents: 24287
diff changeset
288 if (show_debug)
b2b1a42a7816 Revert my revision 3777b91f70ab86e67c1e039d08fb6d87e06f20d6, which
Mark Doliner <markdoliner@pidgin.im>
parents: 24287
diff changeset
289 printf("dns[%d]: nobody needs me... =(\n", getpid());
b2b1a42a7816 Revert my revision 3777b91f70ab86e67c1e039d08fb6d87e06f20d6, which
Mark Doliner <markdoliner@pidgin.im>
parents: 24287
diff changeset
290 break;
b2b1a42a7816 Revert my revision 3777b91f70ab86e67c1e039d08fb6d87e06f20d6, which
Mark Doliner <markdoliner@pidgin.im>
parents: 24287
diff changeset
291 }
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
292 rc = read(child_in, &dns_params, sizeof(dns_params_t));
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
293 if (rc < 0) {
32230
ca33449df8fb In our forked DNS resolver processes, don't bail out if we get a retryable
Mark Doliner <markdoliner@pidgin.im>
parents: 31973
diff changeset
294 if (errno == EINTR || errno == EAGAIN || errno == EWOULDBLOCK) {
ca33449df8fb In our forked DNS resolver processes, don't bail out if we get a retryable
Mark Doliner <markdoliner@pidgin.im>
parents: 31973
diff changeset
295 /* Try again */
ca33449df8fb In our forked DNS resolver processes, don't bail out if we get a retryable
Mark Doliner <markdoliner@pidgin.im>
parents: 31973
diff changeset
296 continue;
ca33449df8fb In our forked DNS resolver processes, don't bail out if we get a retryable
Mark Doliner <markdoliner@pidgin.im>
parents: 31973
diff changeset
297 }
22234
4d54e1c5c696 More compiler warning fixes from o_sukhodolsky (with additions by me).
Mark Doliner <markdoliner@pidgin.im>
parents: 22108
diff changeset
298 fprintf(stderr, "dns[%d]: Error: Could not read dns_params: "
4d54e1c5c696 More compiler warning fixes from o_sukhodolsky (with additions by me).
Mark Doliner <markdoliner@pidgin.im>
parents: 22108
diff changeset
299 "%s\n", getpid(), strerror(errno));
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
300 break;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
301 }
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
302 if (rc == 0) {
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
303 if (show_debug)
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
304 printf("dns[%d]: Oops, father has gone, wait for me, wait...!\n", getpid());
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
305 _exit(0);
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
306 }
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
307 if (dns_params.hostname[0] == '\0') {
22234
4d54e1c5c696 More compiler warning fixes from o_sukhodolsky (with additions by me).
Mark Doliner <markdoliner@pidgin.im>
parents: 22108
diff changeset
308 fprintf(stderr, "dns[%d]: Error: Parent requested resolution "
4d54e1c5c696 More compiler warning fixes from o_sukhodolsky (with additions by me).
Mark Doliner <markdoliner@pidgin.im>
parents: 22108
diff changeset
309 "of an empty hostname (port = %d)!!!\n", getpid(),
4d54e1c5c696 More compiler warning fixes from o_sukhodolsky (with additions by me).
Mark Doliner <markdoliner@pidgin.im>
parents: 22108
diff changeset
310 dns_params.port);
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
311 _exit(1);
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
312 }
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
313
27898
4a6450d92e11 Move the IDN support into the DNS routines.
Paul Aurich <darkrain42@pidgin.im>
parents: 27738
diff changeset
314 #ifdef USE_IDN
4a6450d92e11 Move the IDN support into the DNS routines.
Paul Aurich <darkrain42@pidgin.im>
parents: 27738
diff changeset
315 if (!dns_str_is_ascii(dns_params.hostname)) {
4a6450d92e11 Move the IDN support into the DNS routines.
Paul Aurich <darkrain42@pidgin.im>
parents: 27738
diff changeset
316 rc = purple_network_convert_idn_to_ascii(dns_params.hostname, &hostname);
4a6450d92e11 Move the IDN support into the DNS routines.
Paul Aurich <darkrain42@pidgin.im>
parents: 27738
diff changeset
317 if (rc != 0) {
4a6450d92e11 Move the IDN support into the DNS routines.
Paul Aurich <darkrain42@pidgin.im>
parents: 27738
diff changeset
318 write_to_parent(child_out, &rc, sizeof(rc));
4a6450d92e11 Move the IDN support into the DNS routines.
Paul Aurich <darkrain42@pidgin.im>
parents: 27738
diff changeset
319 if (show_debug)
4a6450d92e11 Move the IDN support into the DNS routines.
Paul Aurich <darkrain42@pidgin.im>
parents: 27738
diff changeset
320 fprintf(stderr, "dns[%d] Error: IDN conversion returned "
4a6450d92e11 Move the IDN support into the DNS routines.
Paul Aurich <darkrain42@pidgin.im>
parents: 27738
diff changeset
321 "%d\n", getpid(), rc);
4a6450d92e11 Move the IDN support into the DNS routines.
Paul Aurich <darkrain42@pidgin.im>
parents: 27738
diff changeset
322 dns_params.hostname[0] = '\0';
28785
5515669c2a62 dns: I don't think this worked correctly before.
Paul Aurich <darkrain42@pidgin.im>
parents: 28784
diff changeset
323 break;
27898
4a6450d92e11 Move the IDN support into the DNS routines.
Paul Aurich <darkrain42@pidgin.im>
parents: 27738
diff changeset
324 }
4a6450d92e11 Move the IDN support into the DNS routines.
Paul Aurich <darkrain42@pidgin.im>
parents: 27738
diff changeset
325 } else /* intentional to execute the g_strdup */
4a6450d92e11 Move the IDN support into the DNS routines.
Paul Aurich <darkrain42@pidgin.im>
parents: 27738
diff changeset
326 #endif
4a6450d92e11 Move the IDN support into the DNS routines.
Paul Aurich <darkrain42@pidgin.im>
parents: 27738
diff changeset
327 hostname = g_strdup(dns_params.hostname);
4a6450d92e11 Move the IDN support into the DNS routines.
Paul Aurich <darkrain42@pidgin.im>
parents: 27738
diff changeset
328
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
329 /* We have the hostname and port, now resolve the IP */
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
330
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
331 #ifdef HAVE_GETADDRINFO
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
332 g_snprintf(servname, sizeof(servname), "%d", dns_params.port);
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
333 memset(&hints, 0, sizeof(hints));
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
334
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
335 /* This is only used to convert a service
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
336 * name to a port number. As we know we are
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
337 * passing a number already, we know this
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
338 * value will not be really used by the C
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
339 * library.
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
340 */
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
341 hints.ai_socktype = SOCK_STREAM;
27147
7f09d9398273 Don't do IPv6 AAAA lookups if there is no IPv6 address configured on
Mark Doliner <markdoliner@pidgin.im>
parents: 27116
diff changeset
342 #ifdef AI_ADDRCONFIG
7f09d9398273 Don't do IPv6 AAAA lookups if there is no IPv6 address configured on
Mark Doliner <markdoliner@pidgin.im>
parents: 27116
diff changeset
343 hints.ai_flags |= AI_ADDRCONFIG;
7f09d9398273 Don't do IPv6 AAAA lookups if there is no IPv6 address configured on
Mark Doliner <markdoliner@pidgin.im>
parents: 27116
diff changeset
344 #endif /* AI_ADDRCONFIG */
27898
4a6450d92e11 Move the IDN support into the DNS routines.
Paul Aurich <darkrain42@pidgin.im>
parents: 27738
diff changeset
345 rc = getaddrinfo(hostname, servname, &hints, &res);
22234
4d54e1c5c696 More compiler warning fixes from o_sukhodolsky (with additions by me).
Mark Doliner <markdoliner@pidgin.im>
parents: 22108
diff changeset
346 write_to_parent(child_out, &rc, sizeof(rc));
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
347 if (rc != 0) {
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
348 if (show_debug)
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
349 printf("dns[%d] Error: getaddrinfo returned %d\n",
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
350 getpid(), rc);
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
351 dns_params.hostname[0] = '\0';
28591
f943daaf368e Minor leak fixes. Probably not too important since they're in DNS resolver
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 28585
diff changeset
352 g_free(hostname);
f943daaf368e Minor leak fixes. Probably not too important since they're in DNS resolver
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 28585
diff changeset
353 hostname = NULL;
28785
5515669c2a62 dns: I don't think this worked correctly before.
Paul Aurich <darkrain42@pidgin.im>
parents: 28784
diff changeset
354 break;
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
355 }
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
356 tmp = res;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
357 while (res) {
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
358 size_t ai_addrlen = res->ai_addrlen;
22234
4d54e1c5c696 More compiler warning fixes from o_sukhodolsky (with additions by me).
Mark Doliner <markdoliner@pidgin.im>
parents: 22108
diff changeset
359 write_to_parent(child_out, &ai_addrlen, sizeof(ai_addrlen));
4d54e1c5c696 More compiler warning fixes from o_sukhodolsky (with additions by me).
Mark Doliner <markdoliner@pidgin.im>
parents: 22108
diff changeset
360 write_to_parent(child_out, res->ai_addr, res->ai_addrlen);
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
361 res = res->ai_next;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
362 }
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
363 freeaddrinfo(tmp);
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
364 #else
31674
e381758618dd Further consolidation of dnsquery code.
Daniel Atallah <datallah@pidgin.im>
parents: 31673
diff changeset
365 struct hostent *hp;
e381758618dd Further consolidation of dnsquery code.
Daniel Atallah <datallah@pidgin.im>
parents: 31673
diff changeset
366 if (!(hp = gethostbyname(hostname))) {
e381758618dd Further consolidation of dnsquery code.
Daniel Atallah <datallah@pidgin.im>
parents: 31673
diff changeset
367 write_to_parent(child_out, &h_errno, sizeof(int));
e381758618dd Further consolidation of dnsquery code.
Daniel Atallah <datallah@pidgin.im>
parents: 31673
diff changeset
368 close(child_out);
e381758618dd Further consolidation of dnsquery code.
Daniel Atallah <datallah@pidgin.im>
parents: 31673
diff changeset
369 if (show_debug)
e381758618dd Further consolidation of dnsquery code.
Daniel Atallah <datallah@pidgin.im>
parents: 31673
diff changeset
370 printf("DNS Error: %d\n", h_errno);
e381758618dd Further consolidation of dnsquery code.
Daniel Atallah <datallah@pidgin.im>
parents: 31673
diff changeset
371 _exit(0);
e381758618dd Further consolidation of dnsquery code.
Daniel Atallah <datallah@pidgin.im>
parents: 31673
diff changeset
372 }
e381758618dd Further consolidation of dnsquery code.
Daniel Atallah <datallah@pidgin.im>
parents: 31673
diff changeset
373 memset(&sin, 0, sizeof(struct sockaddr_in));
e381758618dd Further consolidation of dnsquery code.
Daniel Atallah <datallah@pidgin.im>
parents: 31673
diff changeset
374 memcpy(&sin.sin_addr.s_addr, hp->h_addr, hp->h_length);
e381758618dd Further consolidation of dnsquery code.
Daniel Atallah <datallah@pidgin.im>
parents: 31673
diff changeset
375 sin.sin_family = hp->h_addrtype;
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
376
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
377 sin.sin_port = htons(dns_params.port);
25360
4315bf325ab4 Ludovico Cavedon noticed that on 64-bit platforms, when HAVE_GETADDRINFO isn't
Daniel Atallah <datallah@pidgin.im>
parents: 24701
diff changeset
378 rc = 0;
4315bf325ab4 Ludovico Cavedon noticed that on 64-bit platforms, when HAVE_GETADDRINFO isn't
Daniel Atallah <datallah@pidgin.im>
parents: 24701
diff changeset
379 write_to_parent(child_out, &rc, sizeof(rc));
22234
4d54e1c5c696 More compiler warning fixes from o_sukhodolsky (with additions by me).
Mark Doliner <markdoliner@pidgin.im>
parents: 22108
diff changeset
380 write_to_parent(child_out, &addrlen, sizeof(addrlen));
4d54e1c5c696 More compiler warning fixes from o_sukhodolsky (with additions by me).
Mark Doliner <markdoliner@pidgin.im>
parents: 22108
diff changeset
381 write_to_parent(child_out, &sin, addrlen);
25360
4315bf325ab4 Ludovico Cavedon noticed that on 64-bit platforms, when HAVE_GETADDRINFO isn't
Daniel Atallah <datallah@pidgin.im>
parents: 24701
diff changeset
382 #endif
22234
4d54e1c5c696 More compiler warning fixes from o_sukhodolsky (with additions by me).
Mark Doliner <markdoliner@pidgin.im>
parents: 22108
diff changeset
383 write_to_parent(child_out, &zero, sizeof(zero));
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
384 dns_params.hostname[0] = '\0';
27898
4a6450d92e11 Move the IDN support into the DNS routines.
Paul Aurich <darkrain42@pidgin.im>
parents: 27738
diff changeset
385
4a6450d92e11 Move the IDN support into the DNS routines.
Paul Aurich <darkrain42@pidgin.im>
parents: 27738
diff changeset
386 g_free(hostname);
4a6450d92e11 Move the IDN support into the DNS routines.
Paul Aurich <darkrain42@pidgin.im>
parents: 27738
diff changeset
387 hostname = NULL;
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
388 }
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
389
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
390 close(child_out);
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
391 close(child_in);
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
392
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
393 _exit(0);
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
394 }
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
395 /*
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
396 * End the DNS resolver child process functions.
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
397 */
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
398
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
399 /*
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
400 * Begin the functions for dealing with the DNS child processes.
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
401 */
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
402 static void
22104
56970903b8e9 Probe for -Wstrict-prototypes to get some more warnings. I then cleaned up
Richard Laager <rlaager@pidgin.im>
parents: 21977
diff changeset
403 cope_with_gdb_brokenness(void)
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
404 {
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
405 #ifdef __linux__
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
406 static gboolean already_done = FALSE;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
407 char s[256], e[512];
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
408 int n;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
409 pid_t ppid;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
410
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
411 if(already_done)
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
412 return;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
413 already_done = TRUE;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
414 ppid = getppid();
27116
19dff7b3ed0f A patch from Scott Wolchok to replace snprintf() with g_snprintf() and
Richard Laager <rlaager@pidgin.im>
parents: 25360
diff changeset
415 g_snprintf(s, sizeof(s), "/proc/%d/exe", ppid);
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
416 n = readlink(s, e, sizeof(e));
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
417 if(n < 0)
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
418 return;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
419
34305
5804117fb298 Fix the rest of libpurple warnings about -Wsign-compare
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents: 33883
diff changeset
420 e[MIN((gsize)n,sizeof(e)-1)] = '\0';
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
421
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
422 if(strstr(e,"gdb")) {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
423 purple_debug_info("dns",
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
424 "Debugger detected, performing useless query...\n");
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
425 gethostbyname("x.x.x.x.x");
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
426 }
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
427 #endif
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
428 }
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
429
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
430 static void
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
431 purple_dnsquery_resolver_destroy(PurpleDnsQueryResolverProcess *resolver)
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
432 {
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
433 g_return_if_fail(resolver != NULL);
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
434
24701
777f269be1b0 Fix a crash Jacky Lam noted on devel@pidgin.im:
Richard Laager <rlaager@pidgin.im>
parents: 24390
diff changeset
435 /* Keep this before the kill() call below. */
777f269be1b0 Fix a crash Jacky Lam noted on devel@pidgin.im:
Richard Laager <rlaager@pidgin.im>
parents: 24390
diff changeset
436 if (resolver->inpa != 0) {
777f269be1b0 Fix a crash Jacky Lam noted on devel@pidgin.im:
Richard Laager <rlaager@pidgin.im>
parents: 24390
diff changeset
437 purple_input_remove(resolver->inpa);
777f269be1b0 Fix a crash Jacky Lam noted on devel@pidgin.im:
Richard Laager <rlaager@pidgin.im>
parents: 24390
diff changeset
438 resolver->inpa = 0;
777f269be1b0 Fix a crash Jacky Lam noted on devel@pidgin.im:
Richard Laager <rlaager@pidgin.im>
parents: 24390
diff changeset
439 }
777f269be1b0 Fix a crash Jacky Lam noted on devel@pidgin.im:
Richard Laager <rlaager@pidgin.im>
parents: 24390
diff changeset
440
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
441 /*
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
442 * We might as well attempt to kill our child process. It really
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
443 * doesn't matter if this fails, because children will expire on
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
444 * their own after a few seconds.
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
445 */
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
446 if (resolver->dns_pid > 0)
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
447 kill(resolver->dns_pid, SIGKILL);
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
448
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
449 close(resolver->fd_in);
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
450 close(resolver->fd_out);
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
451
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
452 g_free(resolver);
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
453
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
454 number_of_dns_children--;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
455 }
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
456
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
457 static PurpleDnsQueryResolverProcess *
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
458 purple_dnsquery_resolver_new(gboolean show_debug)
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
459 {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
460 PurpleDnsQueryResolverProcess *resolver;
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
461 int child_out[2], child_in[2];
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
462
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
463 /* Create pipes for communicating with the child process */
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
464 if (pipe(child_out) || pipe(child_in)) {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
465 purple_debug_error("dns",
21389
e1dd8142bb87 replace most calls to strerror with calls to g_strerror. strerror will return
Nathan Walp <nwalp@pidgin.im>
parents: 20212
diff changeset
466 "Could not create pipes: %s\n", g_strerror(errno));
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
467 return NULL;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
468 }
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
469
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
470 resolver = g_new(PurpleDnsQueryResolverProcess, 1);
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
471 resolver->inpa = 0;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
472
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
473 cope_with_gdb_brokenness();
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
474
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
475 /* "Go fork and multiply." --Tommy Caldwell (Emily's dad, not the climber) */
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
476 resolver->dns_pid = fork();
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
477
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
478 /* If we are the child process... */
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
479 if (resolver->dns_pid == 0) {
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
480 /* We should not access the parent's side of the pipes, so close them */
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
481 close(child_out[0]);
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
482 close(child_in[1]);
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
483
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
484 purple_dnsquery_resolver_run(child_out[1], child_in[0], show_debug);
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
485 /* The thread calls _exit() rather than returning, so we never get here */
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
486 }
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
487
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
488 /* We should not access the child's side of the pipes, so close them */
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
489 close(child_out[1]);
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
490 close(child_in[0]);
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
491 if (resolver->dns_pid == -1) {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
492 purple_debug_error("dns",
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
493 "Could not create child process for DNS: %s\n",
21389
e1dd8142bb87 replace most calls to strerror with calls to g_strerror. strerror will return
Nathan Walp <nwalp@pidgin.im>
parents: 20212
diff changeset
494 g_strerror(errno));
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
495 purple_dnsquery_resolver_destroy(resolver);
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
496 return NULL;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
497 }
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
498
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
499 resolver->fd_out = child_out[0];
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
500 resolver->fd_in = child_in[1];
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
501 number_of_dns_children++;
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
502 purple_debug_info("dns",
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
503 "Created new DNS child %d, there are now %d children.\n",
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
504 resolver->dns_pid, number_of_dns_children);
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
505
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
506 return resolver;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
507 }
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
508
35460
96946e21fce5 Fix some more gtk-doc warnings till dnssrv
Ankit Vani <a@nevitus.org>
parents: 35454
diff changeset
509 /*
96946e21fce5 Fix some more gtk-doc warnings till dnssrv
Ankit Vani <a@nevitus.org>
parents: 35454
diff changeset
510 * send_dns_request_to_child:
96946e21fce5 Fix some more gtk-doc warnings till dnssrv
Ankit Vani <a@nevitus.org>
parents: 35454
diff changeset
511 *
96946e21fce5 Fix some more gtk-doc warnings till dnssrv
Ankit Vani <a@nevitus.org>
parents: 35454
diff changeset
512 * Returns: TRUE if the request was sent succesfully. FALSE
96946e21fce5 Fix some more gtk-doc warnings till dnssrv
Ankit Vani <a@nevitus.org>
parents: 35454
diff changeset
513 * if the request could not be sent. This isn't
96946e21fce5 Fix some more gtk-doc warnings till dnssrv
Ankit Vani <a@nevitus.org>
parents: 35454
diff changeset
514 * necessarily an error. If the child has expired,
96946e21fce5 Fix some more gtk-doc warnings till dnssrv
Ankit Vani <a@nevitus.org>
parents: 35454
diff changeset
515 * for example, we won't be able to send the message.
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
516 */
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
517 static gboolean
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
518 send_dns_request_to_child(PurpleDnsQueryData *query_data,
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
519 PurpleDnsQueryResolverProcess *resolver)
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
520 {
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
521 pid_t pid;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
522 dns_params_t dns_params;
24287
a2e8d72efd34 Fix this g_return_val_if_fail. It should have been returning TRUE or
Mark Doliner <markdoliner@pidgin.im>
parents: 24286
diff changeset
523 ssize_t rc;
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
524
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
525 /* This waitpid might return the child's PID if it has recently
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
526 * exited, or it might return an error if it exited "long
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
527 * enough" ago that it has already been reaped; in either
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
528 * instance, we can't use it. */
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
529 pid = waitpid(resolver->dns_pid, NULL, WNOHANG);
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
530 if (pid > 0) {
33726
b6a91fd37461 DNS child that finished its job is nothing to worry about
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents: 33390
diff changeset
531 purple_debug_info("dns", "DNS child %d no longer exists\n",
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
532 resolver->dns_pid);
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
533 purple_dnsquery_resolver_destroy(resolver);
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
534 return FALSE;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
535 } else if (pid < 0) {
33726
b6a91fd37461 DNS child that finished its job is nothing to worry about
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents: 33390
diff changeset
536 purple_debug_info("dns", "Wait for DNS child %d failed: %s\n",
21389
e1dd8142bb87 replace most calls to strerror with calls to g_strerror. strerror will return
Nathan Walp <nwalp@pidgin.im>
parents: 20212
diff changeset
537 resolver->dns_pid, g_strerror(errno));
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
538 purple_dnsquery_resolver_destroy(resolver);
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
539 return FALSE;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
540 }
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
541
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
542 /* Copy the hostname and port into a single data structure */
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
543 strncpy(dns_params.hostname, query_data->hostname, sizeof(dns_params.hostname) - 1);
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
544 dns_params.hostname[sizeof(dns_params.hostname) - 1] = '\0';
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
545 dns_params.port = query_data->port;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
546
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
547 /* Send the data structure to the child */
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
548 rc = write(resolver->fd_in, &dns_params, sizeof(dns_params));
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
549 if (rc < 0) {
22622
1ecb840b5101 Fix a bunch of compiler warnings caused by my addition of G_GNUC_PRINTF()
Mark Doliner <markdoliner@pidgin.im>
parents: 22234
diff changeset
550 purple_debug_error("dns", "Unable to write to DNS child %d: %s\n",
21389
e1dd8142bb87 replace most calls to strerror with calls to g_strerror. strerror will return
Nathan Walp <nwalp@pidgin.im>
parents: 20212
diff changeset
551 resolver->dns_pid, g_strerror(errno));
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
552 purple_dnsquery_resolver_destroy(resolver);
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
553 return FALSE;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
554 }
34305
5804117fb298 Fix the rest of libpurple warnings about -Wsign-compare
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents: 33883
diff changeset
555 if ((gsize)rc < sizeof(dns_params)) {
24390
24755e1e9f11 Fix this debug message. Thanks to fledermaus who pointed it out.
Mark Doliner <markdoliner@pidgin.im>
parents: 24325
diff changeset
556 purple_debug_error("dns", "Tried to write %" G_GSSIZE_FORMAT
24755e1e9f11 Fix this debug message. Thanks to fledermaus who pointed it out.
Mark Doliner <markdoliner@pidgin.im>
parents: 24325
diff changeset
557 " bytes to child but only wrote %" G_GSSIZE_FORMAT "\n",
24287
a2e8d72efd34 Fix this g_return_val_if_fail. It should have been returning TRUE or
Mark Doliner <markdoliner@pidgin.im>
parents: 24286
diff changeset
558 sizeof(dns_params), rc);
a2e8d72efd34 Fix this g_return_val_if_fail. It should have been returning TRUE or
Mark Doliner <markdoliner@pidgin.im>
parents: 24286
diff changeset
559 purple_dnsquery_resolver_destroy(resolver);
a2e8d72efd34 Fix this g_return_val_if_fail. It should have been returning TRUE or
Mark Doliner <markdoliner@pidgin.im>
parents: 24286
diff changeset
560 return FALSE;
a2e8d72efd34 Fix this g_return_val_if_fail. It should have been returning TRUE or
Mark Doliner <markdoliner@pidgin.im>
parents: 24286
diff changeset
561 }
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
562
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
563 purple_debug_info("dns",
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
564 "Successfully sent DNS request to child %d\n",
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
565 resolver->dns_pid);
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
566
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
567 query_data->resolver = resolver;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
568
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
569 return TRUE;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
570 }
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
571
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
572 static void host_resolved(gpointer data, gint source, PurpleInputCondition cond);
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
573
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
574 static void
22104
56970903b8e9 Probe for -Wstrict-prototypes to get some more warnings. I then cleaned up
Richard Laager <rlaager@pidgin.im>
parents: 21977
diff changeset
575 handle_next_queued_request(void)
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
576 {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
577 PurpleDnsQueryData *query_data;
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
578 PurpleDnsQueryResolverProcess *resolver;
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
579
33374
2375ffdbb565 Use a GQueue for DNS requests.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 32297
diff changeset
580 if (g_queue_is_empty(queued_requests))
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
581 /* No more DNS queries, yay! */
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
582 return;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
583
33374
2375ffdbb565 Use a GQueue for DNS requests.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 32297
diff changeset
584 query_data = g_queue_pop_head(queued_requests);
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
585
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
586 /*
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
587 * If we have any children, attempt to have them perform the DNS
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
588 * query. If we're able to send the query then resolver will be
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
589 * set to the PurpleDnsQueryResolverProcess. Otherwise, resolver
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
590 * will be NULL and we'll need to create a new DNS request child.
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
591 */
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
592 while (free_dns_children != NULL)
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
593 {
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
594 resolver = free_dns_children->data;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
595 free_dns_children = g_slist_remove(free_dns_children, resolver);
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
596
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
597 if (send_dns_request_to_child(query_data, resolver))
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
598 /* We found an acceptable child, yay */
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
599 break;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
600 }
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
601
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
602 /* We need to create a new DNS request child */
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
603 if (query_data->resolver == NULL)
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
604 {
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
605 if (number_of_dns_children >= MAX_DNS_CHILDREN)
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
606 {
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
607 /* Apparently all our children are busy */
33390
77d8af8354e7 I think it's more appropriate to push to the head of the queue rather than
Mark Doliner <mark@kingant.net>
parents: 33374
diff changeset
608 g_queue_push_head(queued_requests, query_data);
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
609 return;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
610 }
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
611
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
612 resolver = purple_dnsquery_resolver_new(purple_debug_is_enabled());
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
613 if (resolver == NULL)
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
614 {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
615 purple_dnsquery_failed(query_data, _("Unable to create new resolver process\n"));
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
616 return;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
617 }
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
618 if (!send_dns_request_to_child(query_data, resolver))
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
619 {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
620 purple_dnsquery_failed(query_data, _("Unable to send request to resolver process\n"));
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
621 return;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
622 }
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
623 }
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
624
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
625 query_data->resolver->inpa = purple_input_add(query_data->resolver->fd_out,
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
626 PURPLE_INPUT_READ, host_resolved, query_data);
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
627 }
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
628
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
629 /*
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
630 * End the functions for dealing with the DNS child processes.
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
631 */
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
632
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
633 static void
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
634 host_resolved(gpointer data, gint source, PurpleInputCondition cond)
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
635 {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
636 PurpleDnsQueryData *query_data;
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
637 int rc, err;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
638 GSList *hosts = NULL;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
639 struct sockaddr *addr = NULL;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
640 size_t addrlen;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
641 char message[1024];
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
642
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
643 query_data = data;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
644
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
645 purple_debug_info("dns", "Got response for '%s'\n", query_data->hostname);
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
646 purple_input_remove(query_data->resolver->inpa);
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
647 query_data->resolver->inpa = 0;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
648
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
649 rc = read(query_data->resolver->fd_out, &err, sizeof(err));
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
650 if ((rc == 4) && (err != 0))
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
651 {
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
652 #ifdef HAVE_GETADDRINFO
14454
df290cda81a3 [gaim-migrate @ 17099]
Mark Doliner <markdoliner@pidgin.im>
parents: 14420
diff changeset
653 g_snprintf(message, sizeof(message), _("Error resolving %s:\n%s"),
21977
c87889698afb Create a purple_gai_strerror() function similar to g_str_error() which
Mark Doliner <markdoliner@pidgin.im>
parents: 21389
diff changeset
654 query_data->hostname, purple_gai_strerror(err));
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
655 #else
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
656 g_snprintf(message, sizeof(message), _("Error resolving %s: %d"),
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
657 query_data->hostname, err);
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
658 #endif
27157
609f187d0ac7 Call res_init() when DNS queries fail in case the failure indicates a timeout
Paul Aurich <darkrain42@pidgin.im>
parents: 27147
diff changeset
659 /* Re-read resolv.conf and friends in case DNS servers have changed */
609f187d0ac7 Call res_init() when DNS queries fail in case the failure indicates a timeout
Paul Aurich <darkrain42@pidgin.im>
parents: 27147
diff changeset
660 res_init();
609f187d0ac7 Call res_init() when DNS queries fail in case the failure indicates a timeout
Paul Aurich <darkrain42@pidgin.im>
parents: 27147
diff changeset
661
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
662 purple_dnsquery_failed(query_data, message);
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
663 } else if (rc > 0) {
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
664 /* Success! */
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
665 while (rc > 0) {
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
666 rc = read(query_data->resolver->fd_out, &addrlen, sizeof(addrlen));
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
667 if (rc > 0 && addrlen > 0) {
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
668 addr = g_malloc(addrlen);
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
669 rc = read(query_data->resolver->fd_out, addr, addrlen);
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
670 hosts = g_slist_append(hosts, GINT_TO_POINTER(addrlen));
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
671 hosts = g_slist_append(hosts, addr);
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
672 } else {
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
673 break;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
674 }
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
675 }
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
676 /* wait4(resolver->dns_pid, NULL, WNOHANG, NULL); */
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
677 purple_dnsquery_resolved(query_data, hosts);
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
678
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
679 } else if (rc == -1) {
21389
e1dd8142bb87 replace most calls to strerror with calls to g_strerror. strerror will return
Nathan Walp <nwalp@pidgin.im>
parents: 20212
diff changeset
680 g_snprintf(message, sizeof(message), _("Error reading from resolver process:\n%s"), g_strerror(errno));
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
681 purple_dnsquery_failed(query_data, message);
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
682
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
683 } else if (rc == 0) {
24322
05dd0a880a44 Change a string to be more user friendly (people shouldn't have any idea
Mark Doliner <markdoliner@pidgin.im>
parents: 24321
diff changeset
684 g_snprintf(message, sizeof(message), _("Resolver process exited without answering our request"));
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
685 purple_dnsquery_failed(query_data, message);
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
686 }
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
687
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
688 handle_next_queued_request();
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
689 }
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
690
31674
e381758618dd Further consolidation of dnsquery code.
Daniel Atallah <datallah@pidgin.im>
parents: 31673
diff changeset
691 static void
e381758618dd Further consolidation of dnsquery code.
Daniel Atallah <datallah@pidgin.im>
parents: 31673
diff changeset
692 resolve_host(PurpleDnsQueryData *query_data)
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
693 {
33374
2375ffdbb565 Use a GQueue for DNS requests.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 32297
diff changeset
694 g_queue_push_tail(queued_requests, query_data);
27736
37496418416a Fix a leak of the queued_requests from purple_dnsquery_a.
Aman Gupta <aman@tmm1.net>
parents: 27497
diff changeset
695
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
696 handle_next_queued_request();
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
697 }
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
698
23352
9714223ca7a7 A patch from Peter O'Gorman at The Written Word, Inc. to fix various
Peter O'Gorman <pogma@thewrittenword.com>
parents: 22622
diff changeset
699 #elif defined _WIN32 /* end PURPLE_DNSQUERY_USE_FORK */
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
700
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
701 /*
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
702 * Windows!
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
703 */
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
704
14300
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
705 static gboolean
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
706 dns_main_thread_cb(gpointer data)
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
707 {
20212
9bf576eeaac0 applied changes from 77376fe079e753b612b3b8c901060e689f3dee11
Luke Schierer <lschiere@pidgin.im>
parents: 20147
diff changeset
708 PurpleDnsQueryData *query_data = data;
14300
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
709
20212
9bf576eeaac0 applied changes from 77376fe079e753b612b3b8c901060e689f3dee11
Luke Schierer <lschiere@pidgin.im>
parents: 20147
diff changeset
710 /* We're done, so purple_dnsquery_destroy() shouldn't think it is canceling an in-progress lookup */
9bf576eeaac0 applied changes from 77376fe079e753b612b3b8c901060e689f3dee11
Luke Schierer <lschiere@pidgin.im>
parents: 20147
diff changeset
711 query_data->resolver = NULL;
14243
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
712
14300
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
713 if (query_data->error_message != NULL)
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
714 purple_dnsquery_failed(query_data, query_data->error_message);
14300
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
715 else
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
716 {
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
717 GSList *hosts;
14306
7c3f2162a897 [gaim-migrate @ 16926]
Mark Doliner <markdoliner@pidgin.im>
parents: 14300
diff changeset
718
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
719 /* We don't want purple_dns_query_resolved() to free(hosts) */
14300
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
720 hosts = query_data->hosts;
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
721 query_data->hosts = NULL;
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
722 purple_dnsquery_resolved(query_data, hosts);
14243
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
723 }
14300
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
724
14243
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
725 return FALSE;
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
726 }
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
727
14300
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
728 static gpointer
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
729 dns_thread(gpointer data)
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
730 {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
731 PurpleDnsQueryData *query_data;
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
732 #ifdef HAVE_GETADDRINFO
14243
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
733 int rc;
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
734 struct addrinfo hints, *res, *tmp;
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
735 char servname[20];
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
736 #else
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
737 struct sockaddr_in sin;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
738 struct hostent *hp;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
739 #endif
27898
4a6450d92e11 Move the IDN support into the DNS routines.
Paul Aurich <darkrain42@pidgin.im>
parents: 27738
diff changeset
740 char *hostname;
14300
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
741
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
742 query_data = data;
14243
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
743
27898
4a6450d92e11 Move the IDN support into the DNS routines.
Paul Aurich <darkrain42@pidgin.im>
parents: 27738
diff changeset
744 #ifdef USE_IDN
27901
940e5967eabd Build fix on Windows. Thanks to SuperMMX.
Paul Aurich <darkrain42@pidgin.im>
parents: 27898
diff changeset
745 if (!dns_str_is_ascii(query_data->hostname)) {
940e5967eabd Build fix on Windows. Thanks to SuperMMX.
Paul Aurich <darkrain42@pidgin.im>
parents: 27898
diff changeset
746 rc = purple_network_convert_idn_to_ascii(query_data->hostname, &hostname);
27898
4a6450d92e11 Move the IDN support into the DNS routines.
Paul Aurich <darkrain42@pidgin.im>
parents: 27738
diff changeset
747 if (rc != 0) {
28590
b0bc7df691c5 Fix a string now that we're not in string freeze. Thanks, QuLogic!
Paul Aurich <darkrain42@pidgin.im>
parents: 28585
diff changeset
748 query_data->error_message = g_strdup_printf(_("Error converting %s "
b0bc7df691c5 Fix a string now that we're not in string freeze. Thanks, QuLogic!
Paul Aurich <darkrain42@pidgin.im>
parents: 28585
diff changeset
749 "to punycode: %d"), query_data->hostname, rc);
27898
4a6450d92e11 Move the IDN support into the DNS routines.
Paul Aurich <darkrain42@pidgin.im>
parents: 27738
diff changeset
750 /* back to main thread */
4a6450d92e11 Move the IDN support into the DNS routines.
Paul Aurich <darkrain42@pidgin.im>
parents: 27738
diff changeset
751 purple_timeout_add(0, dns_main_thread_cb, query_data);
4a6450d92e11 Move the IDN support into the DNS routines.
Paul Aurich <darkrain42@pidgin.im>
parents: 27738
diff changeset
752 return 0;
4a6450d92e11 Move the IDN support into the DNS routines.
Paul Aurich <darkrain42@pidgin.im>
parents: 27738
diff changeset
753 }
4a6450d92e11 Move the IDN support into the DNS routines.
Paul Aurich <darkrain42@pidgin.im>
parents: 27738
diff changeset
754 } else /* intentional fallthru */
4a6450d92e11 Move the IDN support into the DNS routines.
Paul Aurich <darkrain42@pidgin.im>
parents: 27738
diff changeset
755 #endif
27901
940e5967eabd Build fix on Windows. Thanks to SuperMMX.
Paul Aurich <darkrain42@pidgin.im>
parents: 27898
diff changeset
756 hostname = g_strdup(query_data->hostname);
27898
4a6450d92e11 Move the IDN support into the DNS routines.
Paul Aurich <darkrain42@pidgin.im>
parents: 27738
diff changeset
757
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
758 #ifdef HAVE_GETADDRINFO
14300
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
759 g_snprintf(servname, sizeof(servname), "%d", query_data->port);
14243
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
760 memset(&hints,0,sizeof(hints));
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
761
14300
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
762 /*
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
763 * This is only used to convert a service
14243
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
764 * name to a port number. As we know we are
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
765 * passing a number already, we know this
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
766 * value will not be really used by the C
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
767 * library.
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
768 */
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
769 hints.ai_socktype = SOCK_STREAM;
27147
7f09d9398273 Don't do IPv6 AAAA lookups if there is no IPv6 address configured on
Mark Doliner <markdoliner@pidgin.im>
parents: 27116
diff changeset
770 #ifdef AI_ADDRCONFIG
7f09d9398273 Don't do IPv6 AAAA lookups if there is no IPv6 address configured on
Mark Doliner <markdoliner@pidgin.im>
parents: 27116
diff changeset
771 hints.ai_flags |= AI_ADDRCONFIG;
7f09d9398273 Don't do IPv6 AAAA lookups if there is no IPv6 address configured on
Mark Doliner <markdoliner@pidgin.im>
parents: 27116
diff changeset
772 #endif /* AI_ADDRCONFIG */
27898
4a6450d92e11 Move the IDN support into the DNS routines.
Paul Aurich <darkrain42@pidgin.im>
parents: 27738
diff changeset
773 if ((rc = getaddrinfo(hostname, servname, &hints, &res)) == 0) {
14243
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
774 tmp = res;
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
775 while(res) {
14300
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
776 query_data->hosts = g_slist_append(query_data->hosts,
14243
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
777 GSIZE_TO_POINTER(res->ai_addrlen));
14300
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
778 query_data->hosts = g_slist_append(query_data->hosts,
14243
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
779 g_memdup(res->ai_addr, res->ai_addrlen));
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
780 res = res->ai_next;
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
781 }
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
782 freeaddrinfo(tmp);
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
783 } else {
21977
c87889698afb Create a purple_gai_strerror() function similar to g_str_error() which
Mark Doliner <markdoliner@pidgin.im>
parents: 21389
diff changeset
784 query_data->error_message = g_strdup_printf(_("Error resolving %s:\n%s"), query_data->hostname, purple_gai_strerror(rc));
14243
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
785 }
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
786 #else
27898
4a6450d92e11 Move the IDN support into the DNS routines.
Paul Aurich <darkrain42@pidgin.im>
parents: 27738
diff changeset
787 if ((hp = gethostbyname(hostname))) {
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
788 memset(&sin, 0, sizeof(struct sockaddr_in));
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
789 memcpy(&sin.sin_addr.s_addr, hp->h_addr, hp->h_length);
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
790 sin.sin_family = hp->h_addrtype;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
791 sin.sin_port = htons(query_data->port);
14243
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
792
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
793 query_data->hosts = g_slist_append(query_data->hosts,
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
794 GSIZE_TO_POINTER(sizeof(sin)));
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
795 query_data->hosts = g_slist_append(query_data->hosts,
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
796 g_memdup(&sin, sizeof(sin)));
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
797 } else {
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
798 query_data->error_message = g_strdup_printf(_("Error resolving %s: %d"), query_data->hostname, h_errno);
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
799 }
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
800 #endif
27898
4a6450d92e11 Move the IDN support into the DNS routines.
Paul Aurich <darkrain42@pidgin.im>
parents: 27738
diff changeset
801 g_free(hostname);
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
802
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
803 /* back to main thread */
20212
9bf576eeaac0 applied changes from 77376fe079e753b612b3b8c901060e689f3dee11
Luke Schierer <lschiere@pidgin.im>
parents: 20147
diff changeset
804 purple_timeout_add(0, dns_main_thread_cb, query_data);
14300
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
805
14243
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
806 return 0;
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
807 }
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
808
31674
e381758618dd Further consolidation of dnsquery code.
Daniel Atallah <datallah@pidgin.im>
parents: 31673
diff changeset
809 static void
e381758618dd Further consolidation of dnsquery code.
Daniel Atallah <datallah@pidgin.im>
parents: 31673
diff changeset
810 resolve_host(PurpleDnsQueryData *query_data)
14243
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
811 {
14300
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
812 GError *err = NULL;
14243
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
813
31674
e381758618dd Further consolidation of dnsquery code.
Daniel Atallah <datallah@pidgin.im>
parents: 31673
diff changeset
814 /*
e381758618dd Further consolidation of dnsquery code.
Daniel Atallah <datallah@pidgin.im>
parents: 31673
diff changeset
815 * Spin off a separate thread to perform the DNS lookup so
e381758618dd Further consolidation of dnsquery code.
Daniel Atallah <datallah@pidgin.im>
parents: 31673
diff changeset
816 * that we don't block the UI.
e381758618dd Further consolidation of dnsquery code.
Daniel Atallah <datallah@pidgin.im>
parents: 31673
diff changeset
817 */
33883
8a0d96bd9cf4 Replace deprecated g_thread_create with g_thread_try_new
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents: 33726
diff changeset
818 query_data->resolver = g_thread_try_new("dnsquery resolver", dns_thread,
8a0d96bd9cf4 Replace deprecated g_thread_create with g_thread_try_new
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents: 33726
diff changeset
819 query_data, &err);
31674
e381758618dd Further consolidation of dnsquery code.
Daniel Atallah <datallah@pidgin.im>
parents: 31673
diff changeset
820 if (query_data->resolver == NULL)
14300
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
821 {
31674
e381758618dd Further consolidation of dnsquery code.
Daniel Atallah <datallah@pidgin.im>
parents: 31673
diff changeset
822 char message[1024];
e381758618dd Further consolidation of dnsquery code.
Daniel Atallah <datallah@pidgin.im>
parents: 31673
diff changeset
823 g_snprintf(message, sizeof(message), _("Thread creation failure: %s"),
e381758618dd Further consolidation of dnsquery code.
Daniel Atallah <datallah@pidgin.im>
parents: 31673
diff changeset
824 (err && err->message) ? err->message : _("Unknown reason"));
e381758618dd Further consolidation of dnsquery code.
Daniel Atallah <datallah@pidgin.im>
parents: 31673
diff changeset
825 g_error_free(err);
e381758618dd Further consolidation of dnsquery code.
Daniel Atallah <datallah@pidgin.im>
parents: 31673
diff changeset
826 purple_dnsquery_failed(query_data, message);
14243
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
827 }
33883
8a0d96bd9cf4 Replace deprecated g_thread_create with g_thread_try_new
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents: 33726
diff changeset
828 else
8a0d96bd9cf4 Replace deprecated g_thread_create with g_thread_try_new
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents: 33726
diff changeset
829 g_thread_unref(query_data->resolver);
14243
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
830 }
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
831
23352
9714223ca7a7 A patch from Peter O'Gorman at The Written Word, Inc. to fix various
Peter O'Gorman <pogma@thewrittenword.com>
parents: 22622
diff changeset
832 #else /* not PURPLE_DNSQUERY_USE_FORK or _WIN32 */
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
833
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
834 /*
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
835 * We weren't able to do anything fancier above, so use the
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
836 * fail-safe name resolution code, which is blocking.
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
837 */
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
838
31674
e381758618dd Further consolidation of dnsquery code.
Daniel Atallah <datallah@pidgin.im>
parents: 31673
diff changeset
839 static void
e381758618dd Further consolidation of dnsquery code.
Daniel Atallah <datallah@pidgin.im>
parents: 31673
diff changeset
840 resolve_host(PurpleDnsQueryData *query_data)
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
841 {
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
842 struct sockaddr_in sin;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
843 GSList *hosts = NULL;
31674
e381758618dd Further consolidation of dnsquery code.
Daniel Atallah <datallah@pidgin.im>
parents: 31673
diff changeset
844 struct hostent *hp;
e381758618dd Further consolidation of dnsquery code.
Daniel Atallah <datallah@pidgin.im>
parents: 31673
diff changeset
845 gchar *hostname;
27898
4a6450d92e11 Move the IDN support into the DNS routines.
Paul Aurich <darkrain42@pidgin.im>
parents: 27738
diff changeset
846 #ifdef USE_IDN
31674
e381758618dd Further consolidation of dnsquery code.
Daniel Atallah <datallah@pidgin.im>
parents: 31673
diff changeset
847 if (!dns_str_is_ascii(query_data->hostname)) {
e381758618dd Further consolidation of dnsquery code.
Daniel Atallah <datallah@pidgin.im>
parents: 31673
diff changeset
848 int ret = purple_network_convert_idn_to_ascii(query_data->hostname,
e381758618dd Further consolidation of dnsquery code.
Daniel Atallah <datallah@pidgin.im>
parents: 31673
diff changeset
849 &hostname);
e381758618dd Further consolidation of dnsquery code.
Daniel Atallah <datallah@pidgin.im>
parents: 31673
diff changeset
850 if (ret != 0) {
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
851 char message[1024];
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
852 g_snprintf(message, sizeof(message), _("Error resolving %s: %d"),
31674
e381758618dd Further consolidation of dnsquery code.
Daniel Atallah <datallah@pidgin.im>
parents: 31673
diff changeset
853 query_data->hostname, ret);
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
854 purple_dnsquery_failed(query_data, message);
31674
e381758618dd Further consolidation of dnsquery code.
Daniel Atallah <datallah@pidgin.im>
parents: 31673
diff changeset
855 return;
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
856 }
31674
e381758618dd Further consolidation of dnsquery code.
Daniel Atallah <datallah@pidgin.im>
parents: 31673
diff changeset
857 } else /* fallthrough is intentional to the g_strdup */
e381758618dd Further consolidation of dnsquery code.
Daniel Atallah <datallah@pidgin.im>
parents: 31673
diff changeset
858 #endif
e381758618dd Further consolidation of dnsquery code.
Daniel Atallah <datallah@pidgin.im>
parents: 31673
diff changeset
859 hostname = g_strdup(query_data->hostname);
e381758618dd Further consolidation of dnsquery code.
Daniel Atallah <datallah@pidgin.im>
parents: 31673
diff changeset
860
e381758618dd Further consolidation of dnsquery code.
Daniel Atallah <datallah@pidgin.im>
parents: 31673
diff changeset
861 if(!(hp = gethostbyname(hostname))) {
e381758618dd Further consolidation of dnsquery code.
Daniel Atallah <datallah@pidgin.im>
parents: 31673
diff changeset
862 char message[1024];
e381758618dd Further consolidation of dnsquery code.
Daniel Atallah <datallah@pidgin.im>
parents: 31673
diff changeset
863 g_snprintf(message, sizeof(message), _("Error resolving %s: %d"),
e381758618dd Further consolidation of dnsquery code.
Daniel Atallah <datallah@pidgin.im>
parents: 31673
diff changeset
864 query_data->hostname, h_errno);
e381758618dd Further consolidation of dnsquery code.
Daniel Atallah <datallah@pidgin.im>
parents: 31673
diff changeset
865 purple_dnsquery_failed(query_data, message);
28585
e5cbd8a675ac More tightly scope a variable and avoid trying to free an unset variable.
Brian Lu <brian.lu@sun.com>
parents: 27901
diff changeset
866 g_free(hostname);
31674
e381758618dd Further consolidation of dnsquery code.
Daniel Atallah <datallah@pidgin.im>
parents: 31673
diff changeset
867 return;
e381758618dd Further consolidation of dnsquery code.
Daniel Atallah <datallah@pidgin.im>
parents: 31673
diff changeset
868 }
e381758618dd Further consolidation of dnsquery code.
Daniel Atallah <datallah@pidgin.im>
parents: 31673
diff changeset
869 memset(&sin, 0, sizeof(struct sockaddr_in));
e381758618dd Further consolidation of dnsquery code.
Daniel Atallah <datallah@pidgin.im>
parents: 31673
diff changeset
870 memcpy(&sin.sin_addr.s_addr, hp->h_addr, hp->h_length);
e381758618dd Further consolidation of dnsquery code.
Daniel Atallah <datallah@pidgin.im>
parents: 31673
diff changeset
871 sin.sin_family = hp->h_addrtype;
e381758618dd Further consolidation of dnsquery code.
Daniel Atallah <datallah@pidgin.im>
parents: 31673
diff changeset
872 g_free(hostname);
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
873 sin.sin_port = htons(query_data->port);
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
874
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
875 hosts = g_slist_append(hosts, GINT_TO_POINTER(sizeof(sin)));
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
876 hosts = g_slist_append(hosts, g_memdup(&sin, sizeof(sin)));
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
877
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
878 purple_dnsquery_resolved(query_data, hosts);
31674
e381758618dd Further consolidation of dnsquery code.
Daniel Atallah <datallah@pidgin.im>
parents: 31673
diff changeset
879 }
e381758618dd Further consolidation of dnsquery code.
Daniel Atallah <datallah@pidgin.im>
parents: 31673
diff changeset
880
e381758618dd Further consolidation of dnsquery code.
Daniel Atallah <datallah@pidgin.im>
parents: 31673
diff changeset
881 #endif /* not PURPLE_DNSQUERY_USE_FORK or _WIN32 */
e381758618dd Further consolidation of dnsquery code.
Daniel Atallah <datallah@pidgin.im>
parents: 31673
diff changeset
882
e381758618dd Further consolidation of dnsquery code.
Daniel Atallah <datallah@pidgin.im>
parents: 31673
diff changeset
883 static gboolean
e381758618dd Further consolidation of dnsquery code.
Daniel Atallah <datallah@pidgin.im>
parents: 31673
diff changeset
884 initiate_resolving(gpointer data)
e381758618dd Further consolidation of dnsquery code.
Daniel Atallah <datallah@pidgin.im>
parents: 31673
diff changeset
885 {
e381758618dd Further consolidation of dnsquery code.
Daniel Atallah <datallah@pidgin.im>
parents: 31673
diff changeset
886 PurpleDnsQueryData *query_data;
31678
ad8a9a266b05 Add new DNS-related API to perform lookups in the context of an account.
Daniel Atallah <datallah@pidgin.im>
parents: 31674
diff changeset
887 PurpleProxyType proxy_type;
31674
e381758618dd Further consolidation of dnsquery code.
Daniel Atallah <datallah@pidgin.im>
parents: 31673
diff changeset
888
e381758618dd Further consolidation of dnsquery code.
Daniel Atallah <datallah@pidgin.im>
parents: 31673
diff changeset
889 query_data = data;
e381758618dd Further consolidation of dnsquery code.
Daniel Atallah <datallah@pidgin.im>
parents: 31673
diff changeset
890 query_data->timeout = 0;
e381758618dd Further consolidation of dnsquery code.
Daniel Atallah <datallah@pidgin.im>
parents: 31673
diff changeset
891
e381758618dd Further consolidation of dnsquery code.
Daniel Atallah <datallah@pidgin.im>
parents: 31673
diff changeset
892 if (resolve_ip(query_data))
e381758618dd Further consolidation of dnsquery code.
Daniel Atallah <datallah@pidgin.im>
parents: 31673
diff changeset
893 /* resolve_ip calls purple_dnsquery_resolved */
e381758618dd Further consolidation of dnsquery code.
Daniel Atallah <datallah@pidgin.im>
parents: 31673
diff changeset
894 return FALSE;
e381758618dd Further consolidation of dnsquery code.
Daniel Atallah <datallah@pidgin.im>
parents: 31673
diff changeset
895
35378
5d9e2581005b gtk-doc prep: *_get_type() functions are hidden as standard GType-returning funcs, so rename them.
Ankit Vani <a@nevitus.org>
parents: 34305
diff changeset
896 proxy_type = purple_proxy_info_get_proxy_type(
31678
ad8a9a266b05 Add new DNS-related API to perform lookups in the context of an account.
Daniel Atallah <datallah@pidgin.im>
parents: 31674
diff changeset
897 purple_proxy_get_setup(query_data->account));
ad8a9a266b05 Add new DNS-related API to perform lookups in the context of an account.
Daniel Atallah <datallah@pidgin.im>
parents: 31674
diff changeset
898 if (proxy_type == PURPLE_PROXY_TOR) {
ad8a9a266b05 Add new DNS-related API to perform lookups in the context of an account.
Daniel Atallah <datallah@pidgin.im>
parents: 31674
diff changeset
899 purple_dnsquery_failed(query_data,
ad8a9a266b05 Add new DNS-related API to perform lookups in the context of an account.
Daniel Atallah <datallah@pidgin.im>
parents: 31674
diff changeset
900 _("Aborting DNS lookup in Tor Proxy mode."));
ad8a9a266b05 Add new DNS-related API to perform lookups in the context of an account.
Daniel Atallah <datallah@pidgin.im>
parents: 31674
diff changeset
901 return FALSE;
ad8a9a266b05 Add new DNS-related API to perform lookups in the context of an account.
Daniel Atallah <datallah@pidgin.im>
parents: 31674
diff changeset
902 }
ad8a9a266b05 Add new DNS-related API to perform lookups in the context of an account.
Daniel Atallah <datallah@pidgin.im>
parents: 31674
diff changeset
903
31674
e381758618dd Further consolidation of dnsquery code.
Daniel Atallah <datallah@pidgin.im>
parents: 31673
diff changeset
904 if (purple_dnsquery_ui_resolve(query_data))
e381758618dd Further consolidation of dnsquery code.
Daniel Atallah <datallah@pidgin.im>
parents: 31673
diff changeset
905 /* The UI is handling the resolve; we're done */
e381758618dd Further consolidation of dnsquery code.
Daniel Atallah <datallah@pidgin.im>
parents: 31673
diff changeset
906 return FALSE;
e381758618dd Further consolidation of dnsquery code.
Daniel Atallah <datallah@pidgin.im>
parents: 31673
diff changeset
907
e381758618dd Further consolidation of dnsquery code.
Daniel Atallah <datallah@pidgin.im>
parents: 31673
diff changeset
908 resolve_host(query_data);
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
909
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
910 return FALSE;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
911 }
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
912
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
913 PurpleDnsQueryData *
32297
100ef65e9664 Replace purple_dnsquery_a_account with purple_dnsquery_a.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 32230
diff changeset
914 purple_dnsquery_a(PurpleAccount *account, const char *hostname, int port,
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
915 PurpleDnsQueryConnectFunction callback, gpointer data)
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
916 {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
917 PurpleDnsQueryData *query_data;
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
918
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
919 g_return_val_if_fail(hostname != NULL, NULL);
31673
acb4b08defe2 Consolidate duplicated implementations of purple_dnsquery_a
Daniel Atallah <datallah@pidgin.im>
parents: 28785
diff changeset
920 g_return_val_if_fail(port != 0, NULL);
14528
b8e4715b2953 [gaim-migrate @ 17180]
Mark Doliner <markdoliner@pidgin.im>
parents: 14454
diff changeset
921 g_return_val_if_fail(callback != NULL, NULL);
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
922
31673
acb4b08defe2 Consolidate duplicated implementations of purple_dnsquery_a
Daniel Atallah <datallah@pidgin.im>
parents: 28785
diff changeset
923 purple_debug_info("dnsquery", "Performing DNS lookup for %s\n", hostname);
acb4b08defe2 Consolidate duplicated implementations of purple_dnsquery_a
Daniel Atallah <datallah@pidgin.im>
parents: 28785
diff changeset
924
acb4b08defe2 Consolidate duplicated implementations of purple_dnsquery_a
Daniel Atallah <datallah@pidgin.im>
parents: 28785
diff changeset
925 query_data = g_new0(PurpleDnsQueryData, 1);
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
926 query_data->hostname = g_strdup(hostname);
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
927 g_strstrip(query_data->hostname);
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
928 query_data->port = port;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
929 query_data->callback = callback;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
930 query_data->data = data;
31678
ad8a9a266b05 Add new DNS-related API to perform lookups in the context of an account.
Daniel Atallah <datallah@pidgin.im>
parents: 31674
diff changeset
931 query_data->account = account;
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
932
31673
acb4b08defe2 Consolidate duplicated implementations of purple_dnsquery_a
Daniel Atallah <datallah@pidgin.im>
parents: 28785
diff changeset
933 if (*query_data->hostname == '\0')
14528
b8e4715b2953 [gaim-migrate @ 17180]
Mark Doliner <markdoliner@pidgin.im>
parents: 14454
diff changeset
934 {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
935 purple_dnsquery_destroy(query_data);
14528
b8e4715b2953 [gaim-migrate @ 17180]
Mark Doliner <markdoliner@pidgin.im>
parents: 14454
diff changeset
936 g_return_val_if_reached(NULL);
b8e4715b2953 [gaim-migrate @ 17180]
Mark Doliner <markdoliner@pidgin.im>
parents: 14454
diff changeset
937 }
b8e4715b2953 [gaim-migrate @ 17180]
Mark Doliner <markdoliner@pidgin.im>
parents: 14454
diff changeset
938
31674
e381758618dd Further consolidation of dnsquery code.
Daniel Atallah <datallah@pidgin.im>
parents: 31673
diff changeset
939 query_data->timeout = purple_timeout_add(0, initiate_resolving, query_data);
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
940
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
941 return query_data;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
942 }
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
943
14300
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
944 void
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
945 purple_dnsquery_destroy(PurpleDnsQueryData *query_data)
14300
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
946 {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
947 PurpleDnsQueryUiOps *ops = purple_dnsquery_get_ui_ops();
15763
2b529e4350bc The UI can now use the GaimDnsQueryUiOps to handle DNS resolving itself; if this is done, the platform-specific DNS query code won't be used. This will be used in Adium to use an efficient threads-based DNS resolve (since Adium is already multithreaded, this is significantly cheaper than fork()).
Evan Schoenberg <evands@pidgin.im>
parents: 15707
diff changeset
948
15775
a1aed6d0c33b No changes; fixed a bunch of whitespace problems made by a text editor with 'use tabs' disabled. Sorry for the noise.
Evan Schoenberg <evands@pidgin.im>
parents: 15771
diff changeset
949 if (ops && ops->destroy)
a1aed6d0c33b No changes; fixed a bunch of whitespace problems made by a text editor with 'use tabs' disabled. Sorry for the noise.
Evan Schoenberg <evands@pidgin.im>
parents: 15771
diff changeset
950 ops->destroy(query_data);
15763
2b529e4350bc The UI can now use the GaimDnsQueryUiOps to handle DNS resolving itself; if this is done, the platform-specific DNS query code won't be used. This will be used in Adium to use an efficient threads-based DNS resolve (since Adium is already multithreaded, this is significantly cheaper than fork()).
Evan Schoenberg <evands@pidgin.im>
parents: 15707
diff changeset
951
23352
9714223ca7a7 A patch from Peter O'Gorman at The Written Word, Inc. to fix various
Peter O'Gorman <pogma@thewrittenword.com>
parents: 22622
diff changeset
952 #if defined(PURPLE_DNSQUERY_USE_FORK)
33374
2375ffdbb565 Use a GQueue for DNS requests.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 32297
diff changeset
953 g_queue_remove(queued_requests, query_data);
14572
80e79a4926b4 [gaim-migrate @ 17230]
Mark Doliner <markdoliner@pidgin.im>
parents: 14528
diff changeset
954
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
955 if (query_data->resolver != NULL)
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
956 /*
24321
0d6d024049eb Improve a few comments
Mark Doliner <markdoliner@pidgin.im>
parents: 24318
diff changeset
957 * This is only non-NULL when we're cancelling an in-progress
0d6d024049eb Improve a few comments
Mark Doliner <markdoliner@pidgin.im>
parents: 24318
diff changeset
958 * query. Ideally we would tell our resolver child to stop
0d6d024049eb Improve a few comments
Mark Doliner <markdoliner@pidgin.im>
parents: 24318
diff changeset
959 * resolving shit and then we would add it back to the
0d6d024049eb Improve a few comments
Mark Doliner <markdoliner@pidgin.im>
parents: 24318
diff changeset
960 * free_dns_children linked list. However, it's hard to tell
0d6d024049eb Improve a few comments
Mark Doliner <markdoliner@pidgin.im>
parents: 24318
diff changeset
961 * children stuff, they just don't listen. So we'll just
0d6d024049eb Improve a few comments
Mark Doliner <markdoliner@pidgin.im>
parents: 24318
diff changeset
962 * kill the process and allow a new child to be started if we
0d6d024049eb Improve a few comments
Mark Doliner <markdoliner@pidgin.im>
parents: 24318
diff changeset
963 * have more stuff to resolve.
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
964 */
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
965 purple_dnsquery_resolver_destroy(query_data->resolver);
23352
9714223ca7a7 A patch from Peter O'Gorman at The Written Word, Inc. to fix various
Peter O'Gorman <pogma@thewrittenword.com>
parents: 22622
diff changeset
966 #elif defined _WIN32 /* end PURPLE_DNSQUERY_USE_FORK */
14300
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
967 if (query_data->resolver != NULL)
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
968 {
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
969 /*
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
970 * It's not really possible to kill a thread. So instead we
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
971 * just set the callback to NULL and let the DNS lookup
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
972 * finish.
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
973 */
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
974 query_data->callback = NULL;
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
975 return;
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
976 }
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
977
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
978 while (query_data->hosts != NULL)
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
979 {
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
980 /* Discard the length... */
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
981 query_data->hosts = g_slist_remove(query_data->hosts, query_data->hosts->data);
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
982 /* Free the address... */
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
983 g_free(query_data->hosts->data);
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
984 query_data->hosts = g_slist_remove(query_data->hosts, query_data->hosts->data);
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
985 }
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
986 g_free(query_data->error_message);
24321
0d6d024049eb Improve a few comments
Mark Doliner <markdoliner@pidgin.im>
parents: 24318
diff changeset
987 #endif /* end _WIN32 */
14300
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
988
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
989 if (query_data->timeout > 0)
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
990 purple_timeout_remove(query_data->timeout);
14300
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
991
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
992 g_free(query_data->hostname);
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
993 g_free(query_data);
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
994 }
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
995
15763
2b529e4350bc The UI can now use the GaimDnsQueryUiOps to handle DNS resolving itself; if this is done, the platform-specific DNS query code won't be used. This will be used in Adium to use an efficient threads-based DNS resolve (since Adium is already multithreaded, this is significantly cheaper than fork()).
Evan Schoenberg <evands@pidgin.im>
parents: 15707
diff changeset
996 char *
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
997 purple_dnsquery_get_host(PurpleDnsQueryData *query_data)
15763
2b529e4350bc The UI can now use the GaimDnsQueryUiOps to handle DNS resolving itself; if this is done, the platform-specific DNS query code won't be used. This will be used in Adium to use an efficient threads-based DNS resolve (since Adium is already multithreaded, this is significantly cheaper than fork()).
Evan Schoenberg <evands@pidgin.im>
parents: 15707
diff changeset
998 {
2b529e4350bc The UI can now use the GaimDnsQueryUiOps to handle DNS resolving itself; if this is done, the platform-specific DNS query code won't be used. This will be used in Adium to use an efficient threads-based DNS resolve (since Adium is already multithreaded, this is significantly cheaper than fork()).
Evan Schoenberg <evands@pidgin.im>
parents: 15707
diff changeset
999 g_return_val_if_fail(query_data != NULL, NULL);
2b529e4350bc The UI can now use the GaimDnsQueryUiOps to handle DNS resolving itself; if this is done, the platform-specific DNS query code won't be used. This will be used in Adium to use an efficient threads-based DNS resolve (since Adium is already multithreaded, this is significantly cheaper than fork()).
Evan Schoenberg <evands@pidgin.im>
parents: 15707
diff changeset
1000
2b529e4350bc The UI can now use the GaimDnsQueryUiOps to handle DNS resolving itself; if this is done, the platform-specific DNS query code won't be used. This will be used in Adium to use an efficient threads-based DNS resolve (since Adium is already multithreaded, this is significantly cheaper than fork()).
Evan Schoenberg <evands@pidgin.im>
parents: 15707
diff changeset
1001 return query_data->hostname;
2b529e4350bc The UI can now use the GaimDnsQueryUiOps to handle DNS resolving itself; if this is done, the platform-specific DNS query code won't be used. This will be used in Adium to use an efficient threads-based DNS resolve (since Adium is already multithreaded, this is significantly cheaper than fork()).
Evan Schoenberg <evands@pidgin.im>
parents: 15707
diff changeset
1002 }
2b529e4350bc The UI can now use the GaimDnsQueryUiOps to handle DNS resolving itself; if this is done, the platform-specific DNS query code won't be used. This will be used in Adium to use an efficient threads-based DNS resolve (since Adium is already multithreaded, this is significantly cheaper than fork()).
Evan Schoenberg <evands@pidgin.im>
parents: 15707
diff changeset
1003
15771
848371e40d86 Remove a g_return_val_if_fail() which isn't needed, made gaim_dnsquery_get_port() return an unsigned short and return 0 if query_data is NULL, and fixed a whitespace mistake
Evan Schoenberg <evands@pidgin.im>
parents: 15764
diff changeset
1004 unsigned short
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
1005 purple_dnsquery_get_port(PurpleDnsQueryData *query_data)
15763
2b529e4350bc The UI can now use the GaimDnsQueryUiOps to handle DNS resolving itself; if this is done, the platform-specific DNS query code won't be used. This will be used in Adium to use an efficient threads-based DNS resolve (since Adium is already multithreaded, this is significantly cheaper than fork()).
Evan Schoenberg <evands@pidgin.im>
parents: 15707
diff changeset
1006 {
15771
848371e40d86 Remove a g_return_val_if_fail() which isn't needed, made gaim_dnsquery_get_port() return an unsigned short and return 0 if query_data is NULL, and fixed a whitespace mistake
Evan Schoenberg <evands@pidgin.im>
parents: 15764
diff changeset
1007 g_return_val_if_fail(query_data != NULL, 0);
15763
2b529e4350bc The UI can now use the GaimDnsQueryUiOps to handle DNS resolving itself; if this is done, the platform-specific DNS query code won't be used. This will be used in Adium to use an efficient threads-based DNS resolve (since Adium is already multithreaded, this is significantly cheaper than fork()).
Evan Schoenberg <evands@pidgin.im>
parents: 15707
diff changeset
1008
15775
a1aed6d0c33b No changes; fixed a bunch of whitespace problems made by a text editor with 'use tabs' disabled. Sorry for the noise.
Evan Schoenberg <evands@pidgin.im>
parents: 15771
diff changeset
1009 return query_data->port;
15763
2b529e4350bc The UI can now use the GaimDnsQueryUiOps to handle DNS resolving itself; if this is done, the platform-specific DNS query code won't be used. This will be used in Adium to use an efficient threads-based DNS resolve (since Adium is already multithreaded, this is significantly cheaper than fork()).
Evan Schoenberg <evands@pidgin.im>
parents: 15707
diff changeset
1010 }
2b529e4350bc The UI can now use the GaimDnsQueryUiOps to handle DNS resolving itself; if this is done, the platform-specific DNS query code won't be used. This will be used in Adium to use an efficient threads-based DNS resolve (since Adium is already multithreaded, this is significantly cheaper than fork()).
Evan Schoenberg <evands@pidgin.im>
parents: 15707
diff changeset
1011
2b529e4350bc The UI can now use the GaimDnsQueryUiOps to handle DNS resolving itself; if this is done, the platform-specific DNS query code won't be used. This will be used in Adium to use an efficient threads-based DNS resolve (since Adium is already multithreaded, this is significantly cheaper than fork()).
Evan Schoenberg <evands@pidgin.im>
parents: 15707
diff changeset
1012 void
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
1013 purple_dnsquery_set_ui_ops(PurpleDnsQueryUiOps *ops)
15763
2b529e4350bc The UI can now use the GaimDnsQueryUiOps to handle DNS resolving itself; if this is done, the platform-specific DNS query code won't be used. This will be used in Adium to use an efficient threads-based DNS resolve (since Adium is already multithreaded, this is significantly cheaper than fork()).
Evan Schoenberg <evands@pidgin.im>
parents: 15707
diff changeset
1014 {
2b529e4350bc The UI can now use the GaimDnsQueryUiOps to handle DNS resolving itself; if this is done, the platform-specific DNS query code won't be used. This will be used in Adium to use an efficient threads-based DNS resolve (since Adium is already multithreaded, this is significantly cheaper than fork()).
Evan Schoenberg <evands@pidgin.im>
parents: 15707
diff changeset
1015 dns_query_ui_ops = ops;
2b529e4350bc The UI can now use the GaimDnsQueryUiOps to handle DNS resolving itself; if this is done, the platform-specific DNS query code won't be used. This will be used in Adium to use an efficient threads-based DNS resolve (since Adium is already multithreaded, this is significantly cheaper than fork()).
Evan Schoenberg <evands@pidgin.im>
parents: 15707
diff changeset
1016 }
2b529e4350bc The UI can now use the GaimDnsQueryUiOps to handle DNS resolving itself; if this is done, the platform-specific DNS query code won't be used. This will be used in Adium to use an efficient threads-based DNS resolve (since Adium is already multithreaded, this is significantly cheaper than fork()).
Evan Schoenberg <evands@pidgin.im>
parents: 15707
diff changeset
1017
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
1018 PurpleDnsQueryUiOps *
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
1019 purple_dnsquery_get_ui_ops(void)
15763
2b529e4350bc The UI can now use the GaimDnsQueryUiOps to handle DNS resolving itself; if this is done, the platform-specific DNS query code won't be used. This will be used in Adium to use an efficient threads-based DNS resolve (since Adium is already multithreaded, this is significantly cheaper than fork()).
Evan Schoenberg <evands@pidgin.im>
parents: 15707
diff changeset
1020 {
15771
848371e40d86 Remove a g_return_val_if_fail() which isn't needed, made gaim_dnsquery_get_port() return an unsigned short and return 0 if query_data is NULL, and fixed a whitespace mistake
Evan Schoenberg <evands@pidgin.im>
parents: 15764
diff changeset
1021 /* It is perfectly acceptable for dns_query_ui_ops to be NULL; this just
848371e40d86 Remove a g_return_val_if_fail() which isn't needed, made gaim_dnsquery_get_port() return an unsigned short and return 0 if query_data is NULL, and fixed a whitespace mistake
Evan Schoenberg <evands@pidgin.im>
parents: 15764
diff changeset
1022 * means that the default platform-specific implementation will be used.
848371e40d86 Remove a g_return_val_if_fail() which isn't needed, made gaim_dnsquery_get_port() return an unsigned short and return 0 if query_data is NULL, and fixed a whitespace mistake
Evan Schoenberg <evands@pidgin.im>
parents: 15764
diff changeset
1023 */
15763
2b529e4350bc The UI can now use the GaimDnsQueryUiOps to handle DNS resolving itself; if this is done, the platform-specific DNS query code won't be used. This will be used in Adium to use an efficient threads-based DNS resolve (since Adium is already multithreaded, this is significantly cheaper than fork()).
Evan Schoenberg <evands@pidgin.im>
parents: 15707
diff changeset
1024 return dns_query_ui_ops;
2b529e4350bc The UI can now use the GaimDnsQueryUiOps to handle DNS resolving itself; if this is done, the platform-specific DNS query code won't be used. This will be used in Adium to use an efficient threads-based DNS resolve (since Adium is already multithreaded, this is significantly cheaper than fork()).
Evan Schoenberg <evands@pidgin.im>
parents: 15707
diff changeset
1025 }
2b529e4350bc The UI can now use the GaimDnsQueryUiOps to handle DNS resolving itself; if this is done, the platform-specific DNS query code won't be used. This will be used in Adium to use an efficient threads-based DNS resolve (since Adium is already multithreaded, this is significantly cheaper than fork()).
Evan Schoenberg <evands@pidgin.im>
parents: 15707
diff changeset
1026
14300
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
1027 void
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
1028 purple_dnsquery_init(void)
14300
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
1029 {
33374
2375ffdbb565 Use a GQueue for DNS requests.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 32297
diff changeset
1030 #if defined(PURPLE_DNSQUERY_USE_FORK)
2375ffdbb565 Use a GQueue for DNS requests.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 32297
diff changeset
1031 queued_requests = g_queue_new();
2375ffdbb565 Use a GQueue for DNS requests.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 32297
diff changeset
1032 #endif
14300
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
1033 }
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
1034
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
1035 void
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
1036 purple_dnsquery_uninit(void)
14300
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
1037 {
23352
9714223ca7a7 A patch from Peter O'Gorman at The Written Word, Inc. to fix various
Peter O'Gorman <pogma@thewrittenword.com>
parents: 22622
diff changeset
1038 #if defined(PURPLE_DNSQUERY_USE_FORK)
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
1039 while (free_dns_children != NULL)
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
1040 {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
1041 purple_dnsquery_resolver_destroy(free_dns_children->data);
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
1042 free_dns_children = g_slist_remove(free_dns_children, free_dns_children->data);
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
1043 }
33374
2375ffdbb565 Use a GQueue for DNS requests.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 32297
diff changeset
1044
2375ffdbb565 Use a GQueue for DNS requests.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 32297
diff changeset
1045 g_queue_free(queued_requests);
2375ffdbb565 Use a GQueue for DNS requests.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 32297
diff changeset
1046 queued_requests = NULL;
24321
0d6d024049eb Improve a few comments
Mark Doliner <markdoliner@pidgin.im>
parents: 24318
diff changeset
1047 #endif /* end PURPLE_DNSQUERY_USE_FORK */
14300
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
1048 }
33374
2375ffdbb565 Use a GQueue for DNS requests.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 32297
diff changeset
1049

mercurial