libpurple/dnsquery.c

Fri, 18 Jan 2013 03:51:05 -0500

author
Elliott Sales de Andrade <qulogic@pidgin.im>
date
Fri, 18 Jan 2013 03:51:05 -0500
changeset 33643
6f7deddb8850
parent 33390
77d8af8354e7
child 33726
b6a91fd37461
permissions
-rw-r--r--

Move blist loading into purple_core_init.

The comments say we want to move this into purple_blist_init, but that
seems like it would be problematic. We need the UI ops to be set, which
moves blist init after UI init. But stuff needs blist signals to be
registered before UI init, etc., etc. It seemed like a pain to work that
all out. I made purple_blist_boot for purple_core_init to call after the
UI init happened. It could have been called _load, but I didn't want
people to accidentally continue calling it.

14243
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
1 /**
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
2 * @file dnsquery.c DNS query API
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
3 * @ingroup core
20147
66f05a854eee applied changes from 8a731bbd0197fbcc91a705c2d8f528154216defa
Richard Laager <rlaager@pidgin.im>
parents: 19859
diff changeset
4 */
66f05a854eee applied changes from 8a731bbd0197fbcc91a705c2d8f528154216defa
Richard Laager <rlaager@pidgin.im>
parents: 19859
diff changeset
5
66f05a854eee applied changes from 8a731bbd0197fbcc91a705c2d8f528154216defa
Richard Laager <rlaager@pidgin.im>
parents: 19859
diff changeset
6 /* purple
14243
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
7 *
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
8 * 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
9 * to list here. Please refer to the COPYRIGHT file distributed with this
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
10 * source distribution.
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 free software; you can redistribute it and/or modify
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
13 * 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
14 * the Free Software Foundation; either version 2 of the License, or
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
15 * (at your option) any later version.
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 * This program is distributed in the hope that it will be useful,
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
18 * but WITHOUT ANY WARRANTY; without even the implied warranty of
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
19 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
20 * GNU General Public License for more details.
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
21 *
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
22 * You should have received a copy of the GNU General Public License
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
23 * 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
24 * 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
25 *
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
26 */
31738
c0a7971ce0d2 purple: Fix some compiler warnings related to new API and missing prototypes.
Paul Aurich <darkrain42@pidgin.im>
parents: 31678
diff changeset
27 #define _PURPLE_DNSQUERY_C_
14243
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
28
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
29 #include "internal.h"
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
30 #include "debug.h"
14300
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
31 #include "dnsquery.h"
27898
4a6450d92e11 Move the IDN support into the DNS routines.
Paul Aurich <darkrain42@pidgin.im>
parents: 27738
diff changeset
32 #include "network.h"
14243
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
33 #include "notify.h"
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
34 #include "prefs.h"
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
35 #include "util.h"
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
36
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
37 #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
38 #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
39 #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
40
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
41 #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
42 #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
43 #endif
14243
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
44 /**************************************************************************
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
45 * DNS query API
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
46 **************************************************************************/
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
47
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
48 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
49
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
50 typedef struct _PurpleDnsQueryResolverProcess PurpleDnsQueryResolverProcess;
14300
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
51
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
52 struct _PurpleDnsQueryData {
14300
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
53 char *hostname;
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
54 int port;
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
55 PurpleDnsQueryConnectFunction callback;
14300
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
56 gpointer data;
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
57 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
58 PurpleAccount *account;
14300
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
59
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
60 #if defined(PURPLE_DNSQUERY_USE_FORK)
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
61 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
62 #elif defined _WIN32 /* end PURPLE_DNSQUERY_USE_FORK */
14300
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
63 GThread *resolver;
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
64 GSList *hosts;
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
65 gchar *error_message;
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
66 #endif
14245
8a215625c6cb [gaim-migrate @ 16835]
Mark Doliner <markdoliner@pidgin.im>
parents: 14244
diff changeset
67 };
8a215625c6cb [gaim-migrate @ 16835]
Mark Doliner <markdoliner@pidgin.im>
parents: 14244
diff changeset
68
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
69 #if defined(PURPLE_DNSQUERY_USE_FORK)
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
70
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
71 #define MAX_DNS_CHILDREN 4
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
72
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
73 /*
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
74 * This structure keeps a reference to a child resolver process.
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
75 */
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
76 struct _PurpleDnsQueryResolverProcess {
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
77 guint inpa;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
78 int fd_in, fd_out;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
79 pid_t dns_pid;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
80 };
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 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
83 static GQueue *queued_requests = NULL;
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
84
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
85 static int number_of_dns_children = 0;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
86
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
87 /*
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
88 * This is a convenience struct used to pass data to
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
89 * the child resolver process.
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
90 */
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
91 typedef struct {
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
92 char hostname[512];
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
93 int port;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
94 } dns_params_t;
24321
0d6d024049eb Improve a few comments
Mark Doliner <markdoliner@pidgin.im>
parents: 24318
diff changeset
95 #endif /* end PURPLE_DNSQUERY_USE_FORK */
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
96
14300
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
97 static void
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
98 purple_dnsquery_resolved(PurpleDnsQueryData *query_data, GSList *hosts)
14300
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
99 {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
100 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
101 if (query_data->callback != NULL)
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
102 query_data->callback(hosts, query_data->data, NULL);
14420
3c78e468b45a [gaim-migrate @ 17064]
Mark Doliner <markdoliner@pidgin.im>
parents: 14349
diff changeset
103 else
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 /*
3c78e468b45a [gaim-migrate @ 17064]
Mark Doliner <markdoliner@pidgin.im>
parents: 14349
diff changeset
106 * Callback is a required parameter, but it can get set to
3c78e468b45a [gaim-migrate @ 17064]
Mark Doliner <markdoliner@pidgin.im>
parents: 14349
diff changeset
107 * 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
108 * to free hosts.
3c78e468b45a [gaim-migrate @ 17064]
Mark Doliner <markdoliner@pidgin.im>
parents: 14349
diff changeset
109 */
3c78e468b45a [gaim-migrate @ 17064]
Mark Doliner <markdoliner@pidgin.im>
parents: 14349
diff changeset
110 while (hosts != NULL)
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 hosts = g_slist_remove(hosts, hosts->data);
3c78e468b45a [gaim-migrate @ 17064]
Mark Doliner <markdoliner@pidgin.im>
parents: 14349
diff changeset
113 g_free(hosts->data);
3c78e468b45a [gaim-migrate @ 17064]
Mark Doliner <markdoliner@pidgin.im>
parents: 14349
diff changeset
114 hosts = g_slist_remove(hosts, hosts->data);
3c78e468b45a [gaim-migrate @ 17064]
Mark Doliner <markdoliner@pidgin.im>
parents: 14349
diff changeset
115 }
3c78e468b45a [gaim-migrate @ 17064]
Mark Doliner <markdoliner@pidgin.im>
parents: 14349
diff changeset
116 }
3c78e468b45a [gaim-migrate @ 17064]
Mark Doliner <markdoliner@pidgin.im>
parents: 14349
diff changeset
117
24325
9b63613e82ab Fix DNS resolution. I think I broke this this morning in my revision
Mark Doliner <markdoliner@pidgin.im>
parents: 24324
diff changeset
118 #ifdef PURPLE_DNSQUERY_USE_FORK
24318
b2b1a42a7816 Revert my revision 3777b91f70ab86e67c1e039d08fb6d87e06f20d6, which
Mark Doliner <markdoliner@pidgin.im>
parents: 24287
diff changeset
119 /*
24325
9b63613e82ab Fix DNS resolution. I think I broke this this morning in my revision
Mark Doliner <markdoliner@pidgin.im>
parents: 24324
diff changeset
120 * 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
121 * 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
122 */
27738
91b067b7563d Don't assume a resolver generated the response.
Aman Gupta <aman@tmm1.net>
parents: 27737
diff changeset
123 if (query_data->resolver)
91b067b7563d Don't assume a resolver generated the response.
Aman Gupta <aman@tmm1.net>
parents: 27737
diff changeset
124 {
91b067b7563d Don't assume a resolver generated the response.
Aman Gupta <aman@tmm1.net>
parents: 27737
diff changeset
125 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
126 query_data->resolver = NULL;
91b067b7563d Don't assume a resolver generated the response.
Aman Gupta <aman@tmm1.net>
parents: 27737
diff changeset
127 }
24325
9b63613e82ab Fix DNS resolution. I think I broke this this morning in my revision
Mark Doliner <markdoliner@pidgin.im>
parents: 24324
diff changeset
128 #endif /* PURPLE_DNSQUERY_USE_FORK */
24318
b2b1a42a7816 Revert my revision 3777b91f70ab86e67c1e039d08fb6d87e06f20d6, which
Mark Doliner <markdoliner@pidgin.im>
parents: 24287
diff changeset
129
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
130 purple_dnsquery_destroy(query_data);
14300
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
131 }
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
132
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
133 static void
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
134 purple_dnsquery_failed(PurpleDnsQueryData *query_data, const gchar *error_message)
14300
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
135 {
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
136 purple_debug_error("dnsquery", "%s\n", error_message);
14300
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
137 if (query_data->callback != NULL)
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
138 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
139 purple_dnsquery_destroy(query_data);
14300
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
140 }
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
141
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
142 static gboolean
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
143 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
144 {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
145 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
146
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
147 if (ops && ops->resolve_host)
24323
fe88d45063e8 Simplify two bits of code a little
Mark Doliner <markdoliner@pidgin.im>
parents: 24322
diff changeset
148 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
149
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
150 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
151 }
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
152
27737
d2abba8c8e1f Don't fork a resolver process for IPs.
Aman Gupta <aman@tmm1.net>
parents: 27736
diff changeset
153 static gboolean
d2abba8c8e1f Don't fork a resolver process for IPs.
Aman Gupta <aman@tmm1.net>
parents: 27736
diff changeset
154 resolve_ip(PurpleDnsQueryData *query_data)
d2abba8c8e1f Don't fork a resolver process for IPs.
Aman Gupta <aman@tmm1.net>
parents: 27736
diff changeset
155 {
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
156 #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
157 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
158 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
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 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
161 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
162 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
163 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
164
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 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
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 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
168 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
169 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
170 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
171
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
172 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
173 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
174 }
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
175 #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
176 struct sockaddr_in sin;
d2abba8c8e1f Don't fork a resolver process for IPs.
Aman Gupta <aman@tmm1.net>
parents: 27736
diff changeset
177 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
178 {
d2abba8c8e1f Don't fork a resolver process for IPs.
Aman Gupta <aman@tmm1.net>
parents: 27736
diff changeset
179 /*
d2abba8c8e1f Don't fork a resolver process for IPs.
Aman Gupta <aman@tmm1.net>
parents: 27736
diff changeset
180 * 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
181 * don't need to do anything.
d2abba8c8e1f Don't fork a resolver process for IPs.
Aman Gupta <aman@tmm1.net>
parents: 27736
diff changeset
182 */
d2abba8c8e1f Don't fork a resolver process for IPs.
Aman Gupta <aman@tmm1.net>
parents: 27736
diff changeset
183 GSList *hosts = NULL;
d2abba8c8e1f Don't fork a resolver process for IPs.
Aman Gupta <aman@tmm1.net>
parents: 27736
diff changeset
184 sin.sin_family = AF_INET;
d2abba8c8e1f Don't fork a resolver process for IPs.
Aman Gupta <aman@tmm1.net>
parents: 27736
diff changeset
185 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
186 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
187 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
188 purple_dnsquery_resolved(query_data, hosts);
d2abba8c8e1f Don't fork a resolver process for IPs.
Aman Gupta <aman@tmm1.net>
parents: 27736
diff changeset
189
d2abba8c8e1f Don't fork a resolver process for IPs.
Aman Gupta <aman@tmm1.net>
parents: 27736
diff changeset
190 return TRUE;
d2abba8c8e1f Don't fork a resolver process for IPs.
Aman Gupta <aman@tmm1.net>
parents: 27736
diff changeset
191 }
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
192 #endif
27737
d2abba8c8e1f Don't fork a resolver process for IPs.
Aman Gupta <aman@tmm1.net>
parents: 27736
diff changeset
193
d2abba8c8e1f Don't fork a resolver process for IPs.
Aman Gupta <aman@tmm1.net>
parents: 27736
diff changeset
194 return FALSE;
d2abba8c8e1f Don't fork a resolver process for IPs.
Aman Gupta <aman@tmm1.net>
parents: 27736
diff changeset
195 }
d2abba8c8e1f Don't fork a resolver process for IPs.
Aman Gupta <aman@tmm1.net>
parents: 27736
diff changeset
196
28784
0344b94dba21 dns: Avoid two warnings when building with --disable-idn.
Paul Aurich <darkrain42@pidgin.im>
parents: 28592
diff changeset
197 #ifdef USE_IDN
27898
4a6450d92e11 Move the IDN support into the DNS routines.
Paul Aurich <darkrain42@pidgin.im>
parents: 27738
diff changeset
198 static gboolean
4a6450d92e11 Move the IDN support into the DNS routines.
Paul Aurich <darkrain42@pidgin.im>
parents: 27738
diff changeset
199 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
200 {
4a6450d92e11 Move the IDN support into the DNS routines.
Paul Aurich <darkrain42@pidgin.im>
parents: 27738
diff changeset
201 guchar *c;
4a6450d92e11 Move the IDN support into the DNS routines.
Paul Aurich <darkrain42@pidgin.im>
parents: 27738
diff changeset
202 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
203 if (*c > 0x7f)
4a6450d92e11 Move the IDN support into the DNS routines.
Paul Aurich <darkrain42@pidgin.im>
parents: 27738
diff changeset
204 return FALSE;
4a6450d92e11 Move the IDN support into the DNS routines.
Paul Aurich <darkrain42@pidgin.im>
parents: 27738
diff changeset
205 }
4a6450d92e11 Move the IDN support into the DNS routines.
Paul Aurich <darkrain42@pidgin.im>
parents: 27738
diff changeset
206
4a6450d92e11 Move the IDN support into the DNS routines.
Paul Aurich <darkrain42@pidgin.im>
parents: 27738
diff changeset
207 return TRUE;
4a6450d92e11 Move the IDN support into the DNS routines.
Paul Aurich <darkrain42@pidgin.im>
parents: 27738
diff changeset
208 }
28784
0344b94dba21 dns: Avoid two warnings when building with --disable-idn.
Paul Aurich <darkrain42@pidgin.im>
parents: 28592
diff changeset
209 #endif
27898
4a6450d92e11 Move the IDN support into the DNS routines.
Paul Aurich <darkrain42@pidgin.im>
parents: 27738
diff changeset
210
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
211 #if defined(PURPLE_DNSQUERY_USE_FORK)
14349
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 /*
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
214 * Unix!
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
215 */
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
216
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
217 /*
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
218 * Begin the DNS resolver child process functions.
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
219 */
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
220 #ifdef HAVE_SIGNAL_H
16701
0b41f23396cc Mark two functions as "noreturn"
Mark Doliner <markdoliner@pidgin.im>
parents: 15890
diff changeset
221 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
222 trap_gdb_bug(int sig)
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
223 {
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
224 const char *message =
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
225 "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
226 "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
227 "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
228 "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
229 "check cope_with_gdb_brokenness() in dnsquery.c.\n\n"
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
230 "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
231 fputs("\n* * *\n",stderr);
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
232 fputs(message,stderr);
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
233 fputs("* * *\n\n",stderr);
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
234 execlp("xmessage","xmessage","-center", message, NULL);
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
235 _exit(1);
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
236 }
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
237 #endif
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
238
22234
4d54e1c5c696 More compiler warning fixes from o_sukhodolsky (with additions by me).
Mark Doliner <markdoliner@pidgin.im>
parents: 22108
diff changeset
239 static void
4d54e1c5c696 More compiler warning fixes from o_sukhodolsky (with additions by me).
Mark Doliner <markdoliner@pidgin.im>
parents: 22108
diff changeset
240 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
241 {
4d54e1c5c696 More compiler warning fixes from o_sukhodolsky (with additions by me).
Mark Doliner <markdoliner@pidgin.im>
parents: 22108
diff changeset
242 ssize_t written;
4d54e1c5c696 More compiler warning fixes from o_sukhodolsky (with additions by me).
Mark Doliner <markdoliner@pidgin.im>
parents: 22108
diff changeset
243
4d54e1c5c696 More compiler warning fixes from o_sukhodolsky (with additions by me).
Mark Doliner <markdoliner@pidgin.im>
parents: 22108
diff changeset
244 written = write(fd, buf, count);
4d54e1c5c696 More compiler warning fixes from o_sukhodolsky (with additions by me).
Mark Doliner <markdoliner@pidgin.im>
parents: 22108
diff changeset
245 if (written != count) {
4d54e1c5c696 More compiler warning fixes from o_sukhodolsky (with additions by me).
Mark Doliner <markdoliner@pidgin.im>
parents: 22108
diff changeset
246 if (written < 0)
4d54e1c5c696 More compiler warning fixes from o_sukhodolsky (with additions by me).
Mark Doliner <markdoliner@pidgin.im>
parents: 22108
diff changeset
247 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
248 "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
249 else
4d54e1c5c696 More compiler warning fixes from o_sukhodolsky (with additions by me).
Mark Doliner <markdoliner@pidgin.im>
parents: 22108
diff changeset
250 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
251 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
252 "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
253 getpid(), count, written);
4d54e1c5c696 More compiler warning fixes from o_sukhodolsky (with additions by me).
Mark Doliner <markdoliner@pidgin.im>
parents: 22108
diff changeset
254 }
4d54e1c5c696 More compiler warning fixes from o_sukhodolsky (with additions by me).
Mark Doliner <markdoliner@pidgin.im>
parents: 22108
diff changeset
255 }
4d54e1c5c696 More compiler warning fixes from o_sukhodolsky (with additions by me).
Mark Doliner <markdoliner@pidgin.im>
parents: 22108
diff changeset
256
16701
0b41f23396cc Mark two functions as "noreturn"
Mark Doliner <markdoliner@pidgin.im>
parents: 15890
diff changeset
257 G_GNUC_NORETURN static void
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
258 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
259 {
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
260 dns_params_t dns_params;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
261 const size_t zero = 0;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
262 int rc;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
263 #ifdef HAVE_GETADDRINFO
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
264 struct addrinfo hints, *res, *tmp;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
265 char servname[20];
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
266 #else
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
267 struct sockaddr_in sin;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
268 const size_t addrlen = sizeof(sin);
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
269 #endif
27898
4a6450d92e11 Move the IDN support into the DNS routines.
Paul Aurich <darkrain42@pidgin.im>
parents: 27738
diff changeset
270 char *hostname;
14349
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 #ifdef HAVE_SIGNAL_H
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
273 purple_restore_default_signal_handlers();
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
274 signal(SIGTRAP, trap_gdb_bug);
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
275 #endif
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
276
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
277 /*
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
278 * We resolve 1 host name for each iteration of this
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
279 * while loop.
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 * The top half of this reads in the hostname and port
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
282 * number from the socket with our parent. The bottom
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
283 * half of this resolves the IP (blocking) and sends
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
284 * the result back to our parent, when finished.
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
285 */
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
286 while (1) {
24318
b2b1a42a7816 Revert my revision 3777b91f70ab86e67c1e039d08fb6d87e06f20d6, which
Mark Doliner <markdoliner@pidgin.im>
parents: 24287
diff changeset
287 fd_set fds;
b2b1a42a7816 Revert my revision 3777b91f70ab86e67c1e039d08fb6d87e06f20d6, which
Mark Doliner <markdoliner@pidgin.im>
parents: 24287
diff changeset
288 struct timeval tv = { .tv_sec = 20, .tv_usec = 0 };
b2b1a42a7816 Revert my revision 3777b91f70ab86e67c1e039d08fb6d87e06f20d6, which
Mark Doliner <markdoliner@pidgin.im>
parents: 24287
diff changeset
289 FD_ZERO(&fds);
b2b1a42a7816 Revert my revision 3777b91f70ab86e67c1e039d08fb6d87e06f20d6, which
Mark Doliner <markdoliner@pidgin.im>
parents: 24287
diff changeset
290 FD_SET(child_in, &fds);
b2b1a42a7816 Revert my revision 3777b91f70ab86e67c1e039d08fb6d87e06f20d6, which
Mark Doliner <markdoliner@pidgin.im>
parents: 24287
diff changeset
291 rc = select(child_in + 1, &fds, NULL, NULL, &tv);
b2b1a42a7816 Revert my revision 3777b91f70ab86e67c1e039d08fb6d87e06f20d6, which
Mark Doliner <markdoliner@pidgin.im>
parents: 24287
diff changeset
292 if (!rc) {
b2b1a42a7816 Revert my revision 3777b91f70ab86e67c1e039d08fb6d87e06f20d6, which
Mark Doliner <markdoliner@pidgin.im>
parents: 24287
diff changeset
293 if (show_debug)
b2b1a42a7816 Revert my revision 3777b91f70ab86e67c1e039d08fb6d87e06f20d6, which
Mark Doliner <markdoliner@pidgin.im>
parents: 24287
diff changeset
294 printf("dns[%d]: nobody needs me... =(\n", getpid());
b2b1a42a7816 Revert my revision 3777b91f70ab86e67c1e039d08fb6d87e06f20d6, which
Mark Doliner <markdoliner@pidgin.im>
parents: 24287
diff changeset
295 break;
b2b1a42a7816 Revert my revision 3777b91f70ab86e67c1e039d08fb6d87e06f20d6, which
Mark Doliner <markdoliner@pidgin.im>
parents: 24287
diff changeset
296 }
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
297 rc = read(child_in, &dns_params, sizeof(dns_params_t));
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
298 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
299 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
300 /* 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
301 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
302 }
22234
4d54e1c5c696 More compiler warning fixes from o_sukhodolsky (with additions by me).
Mark Doliner <markdoliner@pidgin.im>
parents: 22108
diff changeset
303 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
304 "%s\n", getpid(), strerror(errno));
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
305 break;
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 (rc == 0) {
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
308 if (show_debug)
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
309 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
310 _exit(0);
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
311 }
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
312 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
313 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
314 "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
315 dns_params.port);
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
316 _exit(1);
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
317 }
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
318
27898
4a6450d92e11 Move the IDN support into the DNS routines.
Paul Aurich <darkrain42@pidgin.im>
parents: 27738
diff changeset
319 #ifdef USE_IDN
4a6450d92e11 Move the IDN support into the DNS routines.
Paul Aurich <darkrain42@pidgin.im>
parents: 27738
diff changeset
320 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
321 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
322 if (rc != 0) {
4a6450d92e11 Move the IDN support into the DNS routines.
Paul Aurich <darkrain42@pidgin.im>
parents: 27738
diff changeset
323 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
324 if (show_debug)
4a6450d92e11 Move the IDN support into the DNS routines.
Paul Aurich <darkrain42@pidgin.im>
parents: 27738
diff changeset
325 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
326 "%d\n", getpid(), rc);
4a6450d92e11 Move the IDN support into the DNS routines.
Paul Aurich <darkrain42@pidgin.im>
parents: 27738
diff changeset
327 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
328 break;
27898
4a6450d92e11 Move the IDN support into the DNS routines.
Paul Aurich <darkrain42@pidgin.im>
parents: 27738
diff changeset
329 }
4a6450d92e11 Move the IDN support into the DNS routines.
Paul Aurich <darkrain42@pidgin.im>
parents: 27738
diff changeset
330 } 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
331 #endif
4a6450d92e11 Move the IDN support into the DNS routines.
Paul Aurich <darkrain42@pidgin.im>
parents: 27738
diff changeset
332 hostname = g_strdup(dns_params.hostname);
4a6450d92e11 Move the IDN support into the DNS routines.
Paul Aurich <darkrain42@pidgin.im>
parents: 27738
diff changeset
333
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
334 /* We have the hostname and port, now resolve the IP */
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
335
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
336 #ifdef HAVE_GETADDRINFO
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
337 g_snprintf(servname, sizeof(servname), "%d", dns_params.port);
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
338 memset(&hints, 0, sizeof(hints));
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
339
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
340 /* This is only used to convert a service
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
341 * name to a port number. As we know we are
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
342 * passing a number already, we know this
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
343 * value will not be really used by the C
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
344 * library.
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
345 */
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
346 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
347 #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
348 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
349 #endif /* AI_ADDRCONFIG */
27898
4a6450d92e11 Move the IDN support into the DNS routines.
Paul Aurich <darkrain42@pidgin.im>
parents: 27738
diff changeset
350 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
351 write_to_parent(child_out, &rc, sizeof(rc));
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
352 if (rc != 0) {
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
353 if (show_debug)
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
354 printf("dns[%d] Error: getaddrinfo returned %d\n",
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
355 getpid(), rc);
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
356 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
357 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
358 hostname = NULL;
28785
5515669c2a62 dns: I don't think this worked correctly before.
Paul Aurich <darkrain42@pidgin.im>
parents: 28784
diff changeset
359 break;
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
360 }
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
361 tmp = res;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
362 while (res) {
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
363 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
364 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
365 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
366 res = res->ai_next;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
367 }
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
368 freeaddrinfo(tmp);
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
369 #else
31674
e381758618dd Further consolidation of dnsquery code.
Daniel Atallah <datallah@pidgin.im>
parents: 31673
diff changeset
370 struct hostent *hp;
e381758618dd Further consolidation of dnsquery code.
Daniel Atallah <datallah@pidgin.im>
parents: 31673
diff changeset
371 if (!(hp = gethostbyname(hostname))) {
e381758618dd Further consolidation of dnsquery code.
Daniel Atallah <datallah@pidgin.im>
parents: 31673
diff changeset
372 write_to_parent(child_out, &h_errno, sizeof(int));
e381758618dd Further consolidation of dnsquery code.
Daniel Atallah <datallah@pidgin.im>
parents: 31673
diff changeset
373 close(child_out);
e381758618dd Further consolidation of dnsquery code.
Daniel Atallah <datallah@pidgin.im>
parents: 31673
diff changeset
374 if (show_debug)
e381758618dd Further consolidation of dnsquery code.
Daniel Atallah <datallah@pidgin.im>
parents: 31673
diff changeset
375 printf("DNS Error: %d\n", h_errno);
e381758618dd Further consolidation of dnsquery code.
Daniel Atallah <datallah@pidgin.im>
parents: 31673
diff changeset
376 _exit(0);
e381758618dd Further consolidation of dnsquery code.
Daniel Atallah <datallah@pidgin.im>
parents: 31673
diff changeset
377 }
e381758618dd Further consolidation of dnsquery code.
Daniel Atallah <datallah@pidgin.im>
parents: 31673
diff changeset
378 memset(&sin, 0, sizeof(struct sockaddr_in));
e381758618dd Further consolidation of dnsquery code.
Daniel Atallah <datallah@pidgin.im>
parents: 31673
diff changeset
379 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
380 sin.sin_family = hp->h_addrtype;
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
381
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
382 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
383 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
384 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
385 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
386 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
387 #endif
22234
4d54e1c5c696 More compiler warning fixes from o_sukhodolsky (with additions by me).
Mark Doliner <markdoliner@pidgin.im>
parents: 22108
diff changeset
388 write_to_parent(child_out, &zero, sizeof(zero));
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
389 dns_params.hostname[0] = '\0';
27898
4a6450d92e11 Move the IDN support into the DNS routines.
Paul Aurich <darkrain42@pidgin.im>
parents: 27738
diff changeset
390
4a6450d92e11 Move the IDN support into the DNS routines.
Paul Aurich <darkrain42@pidgin.im>
parents: 27738
diff changeset
391 g_free(hostname);
4a6450d92e11 Move the IDN support into the DNS routines.
Paul Aurich <darkrain42@pidgin.im>
parents: 27738
diff changeset
392 hostname = NULL;
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
393 }
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 close(child_out);
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
396 close(child_in);
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 _exit(0);
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 /*
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
401 * End the DNS resolver child process functions.
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
402 */
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
403
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 * Begin the functions for dealing with the DNS child processes.
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
406 */
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
407 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
408 cope_with_gdb_brokenness(void)
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
409 {
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
410 #ifdef __linux__
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
411 static gboolean already_done = FALSE;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
412 char s[256], e[512];
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
413 int n;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
414 pid_t ppid;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
415
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
416 if(already_done)
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
417 return;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
418 already_done = TRUE;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
419 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
420 g_snprintf(s, sizeof(s), "/proc/%d/exe", ppid);
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
421 n = readlink(s, e, sizeof(e));
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
422 if(n < 0)
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
423 return;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
424
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
425 e[MIN(n,sizeof(e)-1)] = '\0';
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 if(strstr(e,"gdb")) {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
428 purple_debug_info("dns",
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
429 "Debugger detected, performing useless query...\n");
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
430 gethostbyname("x.x.x.x.x");
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
431 }
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
432 #endif
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
433 }
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
434
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
435 static void
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
436 purple_dnsquery_resolver_destroy(PurpleDnsQueryResolverProcess *resolver)
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
437 {
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
438 g_return_if_fail(resolver != NULL);
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
439
24701
777f269be1b0 Fix a crash Jacky Lam noted on devel@pidgin.im:
Richard Laager <rlaager@pidgin.im>
parents: 24390
diff changeset
440 /* 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
441 if (resolver->inpa != 0) {
777f269be1b0 Fix a crash Jacky Lam noted on devel@pidgin.im:
Richard Laager <rlaager@pidgin.im>
parents: 24390
diff changeset
442 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
443 resolver->inpa = 0;
777f269be1b0 Fix a crash Jacky Lam noted on devel@pidgin.im:
Richard Laager <rlaager@pidgin.im>
parents: 24390
diff changeset
444 }
777f269be1b0 Fix a crash Jacky Lam noted on devel@pidgin.im:
Richard Laager <rlaager@pidgin.im>
parents: 24390
diff changeset
445
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
446 /*
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
447 * 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
448 * doesn't matter if this fails, because children will expire on
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
449 * their own after a few seconds.
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
450 */
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
451 if (resolver->dns_pid > 0)
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
452 kill(resolver->dns_pid, SIGKILL);
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 close(resolver->fd_in);
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
455 close(resolver->fd_out);
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
456
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
457 g_free(resolver);
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
458
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
459 number_of_dns_children--;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
460 }
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
461
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
462 static PurpleDnsQueryResolverProcess *
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
463 purple_dnsquery_resolver_new(gboolean show_debug)
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
464 {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
465 PurpleDnsQueryResolverProcess *resolver;
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
466 int child_out[2], child_in[2];
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
467
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
468 /* Create pipes for communicating with the child process */
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
469 if (pipe(child_out) || pipe(child_in)) {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
470 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
471 "Could not create pipes: %s\n", g_strerror(errno));
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
472 return NULL;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
473 }
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
474
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
475 resolver = g_new(PurpleDnsQueryResolverProcess, 1);
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
476 resolver->inpa = 0;
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 cope_with_gdb_brokenness();
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
479
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
480 /* "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
481 resolver->dns_pid = fork();
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
482
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
483 /* If we are the child process... */
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
484 if (resolver->dns_pid == 0) {
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
485 /* 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
486 close(child_out[0]);
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
487 close(child_in[1]);
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
488
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
489 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
490 /* 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
491 }
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
492
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
493 /* 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
494 close(child_out[1]);
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
495 close(child_in[0]);
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
496 if (resolver->dns_pid == -1) {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
497 purple_debug_error("dns",
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
498 "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
499 g_strerror(errno));
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
500 purple_dnsquery_resolver_destroy(resolver);
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
501 return NULL;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
502 }
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
503
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
504 resolver->fd_out = child_out[0];
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
505 resolver->fd_in = child_in[1];
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
506 number_of_dns_children++;
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
507 purple_debug_info("dns",
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
508 "Created new DNS child %d, there are now %d children.\n",
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
509 resolver->dns_pid, number_of_dns_children);
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
510
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
511 return resolver;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
512 }
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
513
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
514 /**
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
515 * @return TRUE if the request was sent succesfully. FALSE
24321
0d6d024049eb Improve a few comments
Mark Doliner <markdoliner@pidgin.im>
parents: 24318
diff changeset
516 * if the request could not be sent. This isn't
0d6d024049eb Improve a few comments
Mark Doliner <markdoliner@pidgin.im>
parents: 24318
diff changeset
517 * necessarily an error. If the child has expired,
0d6d024049eb Improve a few comments
Mark Doliner <markdoliner@pidgin.im>
parents: 24318
diff changeset
518 * 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
519 */
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
520 static gboolean
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
521 send_dns_request_to_child(PurpleDnsQueryData *query_data,
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
522 PurpleDnsQueryResolverProcess *resolver)
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
523 {
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
524 pid_t pid;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
525 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
526 ssize_t rc;
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
527
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
528 /* 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
529 * exited, or it might return an error if it exited "long
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
530 * enough" ago that it has already been reaped; in either
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
531 * instance, we can't use it. */
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
532 pid = waitpid(resolver->dns_pid, NULL, WNOHANG);
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
533 if (pid > 0) {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
534 purple_debug_warning("dns", "DNS child %d no longer exists\n",
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
535 resolver->dns_pid);
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
536 purple_dnsquery_resolver_destroy(resolver);
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
537 return FALSE;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
538 } else if (pid < 0) {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
539 purple_debug_warning("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
540 resolver->dns_pid, g_strerror(errno));
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
541 purple_dnsquery_resolver_destroy(resolver);
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
542 return FALSE;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
543 }
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
544
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
545 /* Copy the hostname and port into a single data structure */
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
546 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
547 dns_params.hostname[sizeof(dns_params.hostname) - 1] = '\0';
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
548 dns_params.port = query_data->port;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
549
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
550 /* Send the data structure to the child */
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
551 rc = write(resolver->fd_in, &dns_params, sizeof(dns_params));
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
552 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
553 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
554 resolver->dns_pid, g_strerror(errno));
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
555 purple_dnsquery_resolver_destroy(resolver);
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
556 return FALSE;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
557 }
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 if (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
559 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
560 " 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
561 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
562 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
563 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
564 }
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
565
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
566 purple_debug_info("dns",
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
567 "Successfully sent DNS request to child %d\n",
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
568 resolver->dns_pid);
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
569
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
570 query_data->resolver = resolver;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
571
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
572 return TRUE;
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
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
575 static void host_resolved(gpointer data, gint source, PurpleInputCondition cond);
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
576
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
577 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
578 handle_next_queued_request(void)
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
579 {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
580 PurpleDnsQueryData *query_data;
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
581 PurpleDnsQueryResolverProcess *resolver;
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
582
33374
2375ffdbb565 Use a GQueue for DNS requests.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 32297
diff changeset
583 if (g_queue_is_empty(queued_requests))
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
584 /* No more DNS queries, yay! */
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
585 return;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
586
33374
2375ffdbb565 Use a GQueue for DNS requests.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 32297
diff changeset
587 query_data = g_queue_pop_head(queued_requests);
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
588
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
589 /*
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
590 * 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
591 * 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
592 * set to the PurpleDnsQueryResolverProcess. Otherwise, resolver
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
593 * 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
594 */
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
595 while (free_dns_children != NULL)
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 resolver = free_dns_children->data;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
598 free_dns_children = g_slist_remove(free_dns_children, resolver);
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
599
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
600 if (send_dns_request_to_child(query_data, resolver))
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
601 /* We found an acceptable child, yay */
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
602 break;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
603 }
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 /* We need to create a new DNS request child */
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
606 if (query_data->resolver == NULL)
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
607 {
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
608 if (number_of_dns_children >= MAX_DNS_CHILDREN)
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
609 {
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
610 /* 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
611 g_queue_push_head(queued_requests, query_data);
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
612 return;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
613 }
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 resolver = purple_dnsquery_resolver_new(purple_debug_is_enabled());
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
616 if (resolver == NULL)
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
617 {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
618 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
619 return;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
620 }
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
621 if (!send_dns_request_to_child(query_data, resolver))
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
622 {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
623 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
624 return;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
625 }
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
626 }
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
627
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
628 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
629 PURPLE_INPUT_READ, host_resolved, query_data);
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
630 }
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 * End the functions for dealing with the DNS child processes.
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
634 */
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
635
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
636 static void
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
637 host_resolved(gpointer data, gint source, PurpleInputCondition cond)
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
638 {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
639 PurpleDnsQueryData *query_data;
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
640 int rc, err;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
641 GSList *hosts = NULL;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
642 struct sockaddr *addr = NULL;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
643 size_t addrlen;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
644 char message[1024];
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
645
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
646 query_data = data;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
647
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
648 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
649 purple_input_remove(query_data->resolver->inpa);
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
650 query_data->resolver->inpa = 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 rc = read(query_data->resolver->fd_out, &err, sizeof(err));
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
653 if ((rc == 4) && (err != 0))
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
654 {
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
655 #ifdef HAVE_GETADDRINFO
14454
df290cda81a3 [gaim-migrate @ 17099]
Mark Doliner <markdoliner@pidgin.im>
parents: 14420
diff changeset
656 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
657 query_data->hostname, purple_gai_strerror(err));
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
658 #else
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
659 g_snprintf(message, sizeof(message), _("Error resolving %s: %d"),
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
660 query_data->hostname, err);
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
661 #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
662 /* 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
663 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
664
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
665 purple_dnsquery_failed(query_data, message);
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
666 } else if (rc > 0) {
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
667 /* Success! */
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
668 while (rc > 0) {
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
669 rc = read(query_data->resolver->fd_out, &addrlen, sizeof(addrlen));
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
670 if (rc > 0 && addrlen > 0) {
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
671 addr = g_malloc(addrlen);
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
672 rc = read(query_data->resolver->fd_out, addr, addrlen);
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
673 hosts = g_slist_append(hosts, GINT_TO_POINTER(addrlen));
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
674 hosts = g_slist_append(hosts, addr);
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
675 } else {
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
676 break;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
677 }
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 /* wait4(resolver->dns_pid, NULL, WNOHANG, NULL); */
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
680 purple_dnsquery_resolved(query_data, hosts);
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
681
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
682 } 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
683 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
684 purple_dnsquery_failed(query_data, message);
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
685
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
686 } 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
687 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
688 purple_dnsquery_failed(query_data, message);
14349
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
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
691 handle_next_queued_request();
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
692 }
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
693
31674
e381758618dd Further consolidation of dnsquery code.
Daniel Atallah <datallah@pidgin.im>
parents: 31673
diff changeset
694 static void
e381758618dd Further consolidation of dnsquery code.
Daniel Atallah <datallah@pidgin.im>
parents: 31673
diff changeset
695 resolve_host(PurpleDnsQueryData *query_data)
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
696 {
33374
2375ffdbb565 Use a GQueue for DNS requests.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 32297
diff changeset
697 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
698
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
699 handle_next_queued_request();
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
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
702 #elif defined _WIN32 /* end PURPLE_DNSQUERY_USE_FORK */
14349
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 /*
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
705 * Windows!
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
706 */
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
707
14300
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
708 static gboolean
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
709 dns_main_thread_cb(gpointer data)
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
710 {
20212
9bf576eeaac0 applied changes from 77376fe079e753b612b3b8c901060e689f3dee11
Luke Schierer <lschiere@pidgin.im>
parents: 20147
diff changeset
711 PurpleDnsQueryData *query_data = data;
14300
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
712
20212
9bf576eeaac0 applied changes from 77376fe079e753b612b3b8c901060e689f3dee11
Luke Schierer <lschiere@pidgin.im>
parents: 20147
diff changeset
713 /* 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
714 query_data->resolver = NULL;
14243
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
715
14300
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
716 if (query_data->error_message != NULL)
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
717 purple_dnsquery_failed(query_data, query_data->error_message);
14300
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
718 else
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
719 {
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
720 GSList *hosts;
14306
7c3f2162a897 [gaim-migrate @ 16926]
Mark Doliner <markdoliner@pidgin.im>
parents: 14300
diff changeset
721
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
722 /* 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
723 hosts = query_data->hosts;
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
724 query_data->hosts = NULL;
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
725 purple_dnsquery_resolved(query_data, hosts);
14243
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
726 }
14300
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
727
14243
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
728 return FALSE;
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
729 }
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
730
14300
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
731 static gpointer
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
732 dns_thread(gpointer data)
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
733 {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
734 PurpleDnsQueryData *query_data;
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
735 #ifdef HAVE_GETADDRINFO
14243
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
736 int rc;
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
737 struct addrinfo hints, *res, *tmp;
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
738 char servname[20];
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
739 #else
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
740 struct sockaddr_in sin;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
741 struct hostent *hp;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
742 #endif
27898
4a6450d92e11 Move the IDN support into the DNS routines.
Paul Aurich <darkrain42@pidgin.im>
parents: 27738
diff changeset
743 char *hostname;
14300
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
744
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
745 query_data = data;
14243
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
746
27898
4a6450d92e11 Move the IDN support into the DNS routines.
Paul Aurich <darkrain42@pidgin.im>
parents: 27738
diff changeset
747 #ifdef USE_IDN
27901
940e5967eabd Build fix on Windows. Thanks to SuperMMX.
Paul Aurich <darkrain42@pidgin.im>
parents: 27898
diff changeset
748 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
749 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
750 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
751 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
752 "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
753 /* back to main thread */
4a6450d92e11 Move the IDN support into the DNS routines.
Paul Aurich <darkrain42@pidgin.im>
parents: 27738
diff changeset
754 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
755 return 0;
4a6450d92e11 Move the IDN support into the DNS routines.
Paul Aurich <darkrain42@pidgin.im>
parents: 27738
diff changeset
756 }
4a6450d92e11 Move the IDN support into the DNS routines.
Paul Aurich <darkrain42@pidgin.im>
parents: 27738
diff changeset
757 } else /* intentional fallthru */
4a6450d92e11 Move the IDN support into the DNS routines.
Paul Aurich <darkrain42@pidgin.im>
parents: 27738
diff changeset
758 #endif
27901
940e5967eabd Build fix on Windows. Thanks to SuperMMX.
Paul Aurich <darkrain42@pidgin.im>
parents: 27898
diff changeset
759 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
760
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
761 #ifdef HAVE_GETADDRINFO
14300
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
762 g_snprintf(servname, sizeof(servname), "%d", query_data->port);
14243
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
763 memset(&hints,0,sizeof(hints));
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
764
14300
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
765 /*
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
766 * This is only used to convert a service
14243
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
767 * name to a port number. As we know we are
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
768 * passing a number already, we know this
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
769 * value will not be really used by the C
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
770 * library.
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
771 */
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
772 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
773 #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
774 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
775 #endif /* AI_ADDRCONFIG */
27898
4a6450d92e11 Move the IDN support into the DNS routines.
Paul Aurich <darkrain42@pidgin.im>
parents: 27738
diff changeset
776 if ((rc = getaddrinfo(hostname, servname, &hints, &res)) == 0) {
14243
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
777 tmp = res;
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
778 while(res) {
14300
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
779 query_data->hosts = g_slist_append(query_data->hosts,
14243
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
780 GSIZE_TO_POINTER(res->ai_addrlen));
14300
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
781 query_data->hosts = g_slist_append(query_data->hosts,
14243
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
782 g_memdup(res->ai_addr, res->ai_addrlen));
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
783 res = res->ai_next;
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
784 }
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
785 freeaddrinfo(tmp);
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
786 } else {
21977
c87889698afb Create a purple_gai_strerror() function similar to g_str_error() which
Mark Doliner <markdoliner@pidgin.im>
parents: 21389
diff changeset
787 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
788 }
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
789 #else
27898
4a6450d92e11 Move the IDN support into the DNS routines.
Paul Aurich <darkrain42@pidgin.im>
parents: 27738
diff changeset
790 if ((hp = gethostbyname(hostname))) {
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
791 memset(&sin, 0, sizeof(struct sockaddr_in));
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
792 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
793 sin.sin_family = hp->h_addrtype;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
794 sin.sin_port = htons(query_data->port);
14243
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
795
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
796 query_data->hosts = g_slist_append(query_data->hosts,
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
797 GSIZE_TO_POINTER(sizeof(sin)));
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
798 query_data->hosts = g_slist_append(query_data->hosts,
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
799 g_memdup(&sin, sizeof(sin)));
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
800 } else {
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
801 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
802 }
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
803 #endif
27898
4a6450d92e11 Move the IDN support into the DNS routines.
Paul Aurich <darkrain42@pidgin.im>
parents: 27738
diff changeset
804 g_free(hostname);
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
805
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
806 /* back to main thread */
20212
9bf576eeaac0 applied changes from 77376fe079e753b612b3b8c901060e689f3dee11
Luke Schierer <lschiere@pidgin.im>
parents: 20147
diff changeset
807 purple_timeout_add(0, dns_main_thread_cb, query_data);
14300
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
808
14243
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
809 return 0;
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
810 }
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
811
31674
e381758618dd Further consolidation of dnsquery code.
Daniel Atallah <datallah@pidgin.im>
parents: 31673
diff changeset
812 static void
e381758618dd Further consolidation of dnsquery code.
Daniel Atallah <datallah@pidgin.im>
parents: 31673
diff changeset
813 resolve_host(PurpleDnsQueryData *query_data)
14243
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
814 {
14300
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
815 GError *err = NULL;
14243
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
816
31674
e381758618dd Further consolidation of dnsquery code.
Daniel Atallah <datallah@pidgin.im>
parents: 31673
diff changeset
817 /*
e381758618dd Further consolidation of dnsquery code.
Daniel Atallah <datallah@pidgin.im>
parents: 31673
diff changeset
818 * 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
819 * that we don't block the UI.
e381758618dd Further consolidation of dnsquery code.
Daniel Atallah <datallah@pidgin.im>
parents: 31673
diff changeset
820 */
e381758618dd Further consolidation of dnsquery code.
Daniel Atallah <datallah@pidgin.im>
parents: 31673
diff changeset
821 query_data->resolver = g_thread_create(dns_thread,
e381758618dd Further consolidation of dnsquery code.
Daniel Atallah <datallah@pidgin.im>
parents: 31673
diff changeset
822 query_data, FALSE, &err);
e381758618dd Further consolidation of dnsquery code.
Daniel Atallah <datallah@pidgin.im>
parents: 31673
diff changeset
823 if (query_data->resolver == NULL)
14300
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
824 {
31674
e381758618dd Further consolidation of dnsquery code.
Daniel Atallah <datallah@pidgin.im>
parents: 31673
diff changeset
825 char message[1024];
e381758618dd Further consolidation of dnsquery code.
Daniel Atallah <datallah@pidgin.im>
parents: 31673
diff changeset
826 g_snprintf(message, sizeof(message), _("Thread creation failure: %s"),
e381758618dd Further consolidation of dnsquery code.
Daniel Atallah <datallah@pidgin.im>
parents: 31673
diff changeset
827 (err && err->message) ? err->message : _("Unknown reason"));
e381758618dd Further consolidation of dnsquery code.
Daniel Atallah <datallah@pidgin.im>
parents: 31673
diff changeset
828 g_error_free(err);
e381758618dd Further consolidation of dnsquery code.
Daniel Atallah <datallah@pidgin.im>
parents: 31673
diff changeset
829 purple_dnsquery_failed(query_data, message);
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 }
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
832
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
833 #else /* not PURPLE_DNSQUERY_USE_FORK or _WIN32 */
14349
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 /*
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
836 * 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
837 * fail-safe name resolution code, which is blocking.
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
838 */
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
839
31674
e381758618dd Further consolidation of dnsquery code.
Daniel Atallah <datallah@pidgin.im>
parents: 31673
diff changeset
840 static void
e381758618dd Further consolidation of dnsquery code.
Daniel Atallah <datallah@pidgin.im>
parents: 31673
diff changeset
841 resolve_host(PurpleDnsQueryData *query_data)
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
842 {
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
843 struct sockaddr_in sin;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
844 GSList *hosts = NULL;
31674
e381758618dd Further consolidation of dnsquery code.
Daniel Atallah <datallah@pidgin.im>
parents: 31673
diff changeset
845 struct hostent *hp;
e381758618dd Further consolidation of dnsquery code.
Daniel Atallah <datallah@pidgin.im>
parents: 31673
diff changeset
846 gchar *hostname;
27898
4a6450d92e11 Move the IDN support into the DNS routines.
Paul Aurich <darkrain42@pidgin.im>
parents: 27738
diff changeset
847 #ifdef USE_IDN
31674
e381758618dd Further consolidation of dnsquery code.
Daniel Atallah <datallah@pidgin.im>
parents: 31673
diff changeset
848 if (!dns_str_is_ascii(query_data->hostname)) {
e381758618dd Further consolidation of dnsquery code.
Daniel Atallah <datallah@pidgin.im>
parents: 31673
diff changeset
849 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
850 &hostname);
e381758618dd Further consolidation of dnsquery code.
Daniel Atallah <datallah@pidgin.im>
parents: 31673
diff changeset
851 if (ret != 0) {
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
852 char message[1024];
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
853 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
854 query_data->hostname, ret);
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
855 purple_dnsquery_failed(query_data, message);
31674
e381758618dd Further consolidation of dnsquery code.
Daniel Atallah <datallah@pidgin.im>
parents: 31673
diff changeset
856 return;
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
857 }
31674
e381758618dd Further consolidation of dnsquery code.
Daniel Atallah <datallah@pidgin.im>
parents: 31673
diff changeset
858 } else /* fallthrough is intentional to the g_strdup */
e381758618dd Further consolidation of dnsquery code.
Daniel Atallah <datallah@pidgin.im>
parents: 31673
diff changeset
859 #endif
e381758618dd Further consolidation of dnsquery code.
Daniel Atallah <datallah@pidgin.im>
parents: 31673
diff changeset
860 hostname = g_strdup(query_data->hostname);
e381758618dd Further consolidation of dnsquery code.
Daniel Atallah <datallah@pidgin.im>
parents: 31673
diff changeset
861
e381758618dd Further consolidation of dnsquery code.
Daniel Atallah <datallah@pidgin.im>
parents: 31673
diff changeset
862 if(!(hp = gethostbyname(hostname))) {
e381758618dd Further consolidation of dnsquery code.
Daniel Atallah <datallah@pidgin.im>
parents: 31673
diff changeset
863 char message[1024];
e381758618dd Further consolidation of dnsquery code.
Daniel Atallah <datallah@pidgin.im>
parents: 31673
diff changeset
864 g_snprintf(message, sizeof(message), _("Error resolving %s: %d"),
e381758618dd Further consolidation of dnsquery code.
Daniel Atallah <datallah@pidgin.im>
parents: 31673
diff changeset
865 query_data->hostname, h_errno);
e381758618dd Further consolidation of dnsquery code.
Daniel Atallah <datallah@pidgin.im>
parents: 31673
diff changeset
866 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
867 g_free(hostname);
31674
e381758618dd Further consolidation of dnsquery code.
Daniel Atallah <datallah@pidgin.im>
parents: 31673
diff changeset
868 return;
e381758618dd Further consolidation of dnsquery code.
Daniel Atallah <datallah@pidgin.im>
parents: 31673
diff changeset
869 }
e381758618dd Further consolidation of dnsquery code.
Daniel Atallah <datallah@pidgin.im>
parents: 31673
diff changeset
870 memset(&sin, 0, sizeof(struct sockaddr_in));
e381758618dd Further consolidation of dnsquery code.
Daniel Atallah <datallah@pidgin.im>
parents: 31673
diff changeset
871 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
872 sin.sin_family = hp->h_addrtype;
e381758618dd Further consolidation of dnsquery code.
Daniel Atallah <datallah@pidgin.im>
parents: 31673
diff changeset
873 g_free(hostname);
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
874 sin.sin_port = htons(query_data->port);
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
875
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
876 hosts = g_slist_append(hosts, GINT_TO_POINTER(sizeof(sin)));
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
877 hosts = g_slist_append(hosts, g_memdup(&sin, sizeof(sin)));
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
878
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
879 purple_dnsquery_resolved(query_data, hosts);
31674
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
e381758618dd Further consolidation of dnsquery code.
Daniel Atallah <datallah@pidgin.im>
parents: 31673
diff changeset
882 #endif /* not PURPLE_DNSQUERY_USE_FORK or _WIN32 */
e381758618dd Further consolidation of dnsquery code.
Daniel Atallah <datallah@pidgin.im>
parents: 31673
diff changeset
883
e381758618dd Further consolidation of dnsquery code.
Daniel Atallah <datallah@pidgin.im>
parents: 31673
diff changeset
884 static gboolean
e381758618dd Further consolidation of dnsquery code.
Daniel Atallah <datallah@pidgin.im>
parents: 31673
diff changeset
885 initiate_resolving(gpointer data)
e381758618dd Further consolidation of dnsquery code.
Daniel Atallah <datallah@pidgin.im>
parents: 31673
diff changeset
886 {
e381758618dd Further consolidation of dnsquery code.
Daniel Atallah <datallah@pidgin.im>
parents: 31673
diff changeset
887 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
888 PurpleProxyType proxy_type;
31674
e381758618dd Further consolidation of dnsquery code.
Daniel Atallah <datallah@pidgin.im>
parents: 31673
diff changeset
889
e381758618dd Further consolidation of dnsquery code.
Daniel Atallah <datallah@pidgin.im>
parents: 31673
diff changeset
890 query_data = data;
e381758618dd Further consolidation of dnsquery code.
Daniel Atallah <datallah@pidgin.im>
parents: 31673
diff changeset
891 query_data->timeout = 0;
e381758618dd Further consolidation of dnsquery code.
Daniel Atallah <datallah@pidgin.im>
parents: 31673
diff changeset
892
e381758618dd Further consolidation of dnsquery code.
Daniel Atallah <datallah@pidgin.im>
parents: 31673
diff changeset
893 if (resolve_ip(query_data))
e381758618dd Further consolidation of dnsquery code.
Daniel Atallah <datallah@pidgin.im>
parents: 31673
diff changeset
894 /* resolve_ip calls purple_dnsquery_resolved */
e381758618dd Further consolidation of dnsquery code.
Daniel Atallah <datallah@pidgin.im>
parents: 31673
diff changeset
895 return FALSE;
e381758618dd Further consolidation of dnsquery code.
Daniel Atallah <datallah@pidgin.im>
parents: 31673
diff changeset
896
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 proxy_type = purple_proxy_info_get_type(
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 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
899 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
900 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
901 _("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
902 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
903 }
ad8a9a266b05 Add new DNS-related API to perform lookups in the context of an account.
Daniel Atallah <datallah@pidgin.im>
parents: 31674
diff changeset
904
31674
e381758618dd Further consolidation of dnsquery code.
Daniel Atallah <datallah@pidgin.im>
parents: 31673
diff changeset
905 if (purple_dnsquery_ui_resolve(query_data))
e381758618dd Further consolidation of dnsquery code.
Daniel Atallah <datallah@pidgin.im>
parents: 31673
diff changeset
906 /* The UI is handling the resolve; we're done */
e381758618dd Further consolidation of dnsquery code.
Daniel Atallah <datallah@pidgin.im>
parents: 31673
diff changeset
907 return FALSE;
e381758618dd Further consolidation of dnsquery code.
Daniel Atallah <datallah@pidgin.im>
parents: 31673
diff changeset
908
e381758618dd Further consolidation of dnsquery code.
Daniel Atallah <datallah@pidgin.im>
parents: 31673
diff changeset
909 resolve_host(query_data);
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
910
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
911 return FALSE;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
912 }
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
913
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
914 PurpleDnsQueryData *
32297
100ef65e9664 Replace purple_dnsquery_a_account with purple_dnsquery_a.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 32230
diff changeset
915 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
916 PurpleDnsQueryConnectFunction callback, gpointer data)
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
917 {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
918 PurpleDnsQueryData *query_data;
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
919
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
920 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
921 g_return_val_if_fail(port != 0, NULL);
14528
b8e4715b2953 [gaim-migrate @ 17180]
Mark Doliner <markdoliner@pidgin.im>
parents: 14454
diff changeset
922 g_return_val_if_fail(callback != NULL, NULL);
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
923
31673
acb4b08defe2 Consolidate duplicated implementations of purple_dnsquery_a
Daniel Atallah <datallah@pidgin.im>
parents: 28785
diff changeset
924 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
925
acb4b08defe2 Consolidate duplicated implementations of purple_dnsquery_a
Daniel Atallah <datallah@pidgin.im>
parents: 28785
diff changeset
926 query_data = g_new0(PurpleDnsQueryData, 1);
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
927 query_data->hostname = g_strdup(hostname);
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
928 g_strstrip(query_data->hostname);
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
929 query_data->port = port;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
930 query_data->callback = callback;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
931 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
932 query_data->account = account;
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
933
31673
acb4b08defe2 Consolidate duplicated implementations of purple_dnsquery_a
Daniel Atallah <datallah@pidgin.im>
parents: 28785
diff changeset
934 if (*query_data->hostname == '\0')
14528
b8e4715b2953 [gaim-migrate @ 17180]
Mark Doliner <markdoliner@pidgin.im>
parents: 14454
diff changeset
935 {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
936 purple_dnsquery_destroy(query_data);
14528
b8e4715b2953 [gaim-migrate @ 17180]
Mark Doliner <markdoliner@pidgin.im>
parents: 14454
diff changeset
937 g_return_val_if_reached(NULL);
b8e4715b2953 [gaim-migrate @ 17180]
Mark Doliner <markdoliner@pidgin.im>
parents: 14454
diff changeset
938 }
b8e4715b2953 [gaim-migrate @ 17180]
Mark Doliner <markdoliner@pidgin.im>
parents: 14454
diff changeset
939
31674
e381758618dd Further consolidation of dnsquery code.
Daniel Atallah <datallah@pidgin.im>
parents: 31673
diff changeset
940 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
941
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
942 return query_data;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
943 }
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
944
14300
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
945 void
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
946 purple_dnsquery_destroy(PurpleDnsQueryData *query_data)
14300
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
947 {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
948 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
949
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
950 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
951 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
952
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
953 #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
954 g_queue_remove(queued_requests, query_data);
14572
80e79a4926b4 [gaim-migrate @ 17230]
Mark Doliner <markdoliner@pidgin.im>
parents: 14528
diff changeset
955
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
956 if (query_data->resolver != NULL)
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
957 /*
24321
0d6d024049eb Improve a few comments
Mark Doliner <markdoliner@pidgin.im>
parents: 24318
diff changeset
958 * 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
959 * query. Ideally we would tell our resolver child to stop
0d6d024049eb Improve a few comments
Mark Doliner <markdoliner@pidgin.im>
parents: 24318
diff changeset
960 * 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
961 * 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
962 * 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
963 * 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
964 * have more stuff to resolve.
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
965 */
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
966 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
967 #elif defined _WIN32 /* end PURPLE_DNSQUERY_USE_FORK */
14300
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
968 if (query_data->resolver != NULL)
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 /*
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
971 * 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
972 * just set the callback to NULL and let the DNS lookup
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
973 * finish.
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
974 */
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
975 query_data->callback = NULL;
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
976 return;
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
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
979 while (query_data->hosts != NULL)
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
980 {
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
981 /* Discard the length... */
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
982 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
983 /* Free the address... */
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
984 g_free(query_data->hosts->data);
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
985 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
986 }
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
987 g_free(query_data->error_message);
24321
0d6d024049eb Improve a few comments
Mark Doliner <markdoliner@pidgin.im>
parents: 24318
diff changeset
988 #endif /* end _WIN32 */
14300
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
989
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
990 if (query_data->timeout > 0)
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
991 purple_timeout_remove(query_data->timeout);
14300
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
992
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
993 g_free(query_data->hostname);
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
994 g_free(query_data);
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
995 }
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
996
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
997 char *
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
998 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
999 {
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 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
1001
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 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
1003 }
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
1004
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
1005 unsigned short
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
1006 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
1007 {
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
1008 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
1009
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
1010 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
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
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
1013 void
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
1014 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
1015 {
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 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
1017 }
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
1018
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
1019 PurpleDnsQueryUiOps *
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
1020 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
1021 {
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
1022 /* 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
1023 * 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
1024 */
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
1025 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
1026 }
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
1027
14300
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
1028 void
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
1029 purple_dnsquery_init(void)
14300
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
1030 {
33374
2375ffdbb565 Use a GQueue for DNS requests.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 32297
diff changeset
1031 #if defined(PURPLE_DNSQUERY_USE_FORK)
2375ffdbb565 Use a GQueue for DNS requests.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 32297
diff changeset
1032 queued_requests = g_queue_new();
2375ffdbb565 Use a GQueue for DNS requests.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 32297
diff changeset
1033 #endif
14300
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
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
1036 void
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
1037 purple_dnsquery_uninit(void)
14300
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
1038 {
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
1039 #if defined(PURPLE_DNSQUERY_USE_FORK)
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
1040 while (free_dns_children != NULL)
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
1041 {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
1042 purple_dnsquery_resolver_destroy(free_dns_children->data);
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
1043 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
1044 }
33374
2375ffdbb565 Use a GQueue for DNS requests.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 32297
diff changeset
1045
2375ffdbb565 Use a GQueue for DNS requests.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 32297
diff changeset
1046 g_queue_free(queued_requests);
2375ffdbb565 Use a GQueue for DNS requests.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 32297
diff changeset
1047 queued_requests = NULL;
24321
0d6d024049eb Improve a few comments
Mark Doliner <markdoliner@pidgin.im>
parents: 24318
diff changeset
1048 #endif /* end PURPLE_DNSQUERY_USE_FORK */
14300
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
1049 }
33374
2375ffdbb565 Use a GQueue for DNS requests.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 32297
diff changeset
1050

mercurial