libpurple/dnsquery.c

Tue, 16 Sep 2008 23:37:36 +0000

author
Mark Doliner <markdoliner@pidgin.im>
date
Tue, 16 Sep 2008 23:37:36 +0000
changeset 24325
9b63613e82ab
parent 24324
a36c5d08a43c
child 24390
24755e1e9f11
permissions
-rw-r--r--

Fix DNS resolution. I think I broke this this morning in my revision
b2b1a42a78168eb8f19ba3398c0058b6a9cac4c5. I changed us to not
free the child DNS resolvers, but also to not re-use them. So it would
do 4 dns requests then just sit around waiting forever. Now resolvers
are added to the list of idle resolvers after they're done resolving.

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 */
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
27
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
28 #include "internal.h"
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
29 #include "debug.h"
14300
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
30 #include "dnsquery.h"
14243
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
31 #include "notify.h"
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
32 #include "prefs.h"
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
33 #include "util.h"
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
34
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
35 #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
36 #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
37 #endif
14243
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
38 /**************************************************************************
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
39 * DNS query API
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
40 **************************************************************************/
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
41
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
42 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
43
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
44 typedef struct _PurpleDnsQueryResolverProcess PurpleDnsQueryResolverProcess;
14300
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
45
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
46 struct _PurpleDnsQueryData {
14300
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
47 char *hostname;
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
48 int port;
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
49 PurpleDnsQueryConnectFunction callback;
14300
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
50 gpointer data;
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
51 guint timeout;
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
52
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
53 #if defined(PURPLE_DNSQUERY_USE_FORK)
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
54 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
55 #elif defined _WIN32 /* end PURPLE_DNSQUERY_USE_FORK */
14300
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
56 GThread *resolver;
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
57 GSList *hosts;
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
58 gchar *error_message;
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
59 #endif
14245
8a215625c6cb [gaim-migrate @ 16835]
Mark Doliner <markdoliner@pidgin.im>
parents: 14244
diff changeset
60 };
8a215625c6cb [gaim-migrate @ 16835]
Mark Doliner <markdoliner@pidgin.im>
parents: 14244
diff changeset
61
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 #if defined(PURPLE_DNSQUERY_USE_FORK)
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
63
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
64 #define MAX_DNS_CHILDREN 4
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
65
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
66 /*
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
67 * This structure keeps a reference to a child resolver process.
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
68 */
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
69 struct _PurpleDnsQueryResolverProcess {
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
70 guint inpa;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
71 int fd_in, fd_out;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
72 pid_t dns_pid;
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
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
75 static GSList *free_dns_children = NULL;
14711
404c5a931bb2 [gaim-migrate @ 17395]
Mark Doliner <markdoliner@pidgin.im>
parents: 14572
diff changeset
76 static GSList *queued_requests = NULL;
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
77
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
78 static int number_of_dns_children = 0;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
79
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
80 /*
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
81 * This is a convenience struct used to pass data to
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
82 * the child resolver process.
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
83 */
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
84 typedef struct {
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
85 char hostname[512];
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
86 int port;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
87 } dns_params_t;
24321
0d6d024049eb Improve a few comments
Mark Doliner <markdoliner@pidgin.im>
parents: 24318
diff changeset
88 #endif /* end PURPLE_DNSQUERY_USE_FORK */
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
89
14300
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
90 static void
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
91 purple_dnsquery_resolved(PurpleDnsQueryData *query_data, GSList *hosts)
14300
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
92 {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
93 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
94 if (query_data->callback != NULL)
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
95 query_data->callback(hosts, query_data->data, NULL);
14420
3c78e468b45a [gaim-migrate @ 17064]
Mark Doliner <markdoliner@pidgin.im>
parents: 14349
diff changeset
96 else
3c78e468b45a [gaim-migrate @ 17064]
Mark Doliner <markdoliner@pidgin.im>
parents: 14349
diff changeset
97 {
3c78e468b45a [gaim-migrate @ 17064]
Mark Doliner <markdoliner@pidgin.im>
parents: 14349
diff changeset
98 /*
3c78e468b45a [gaim-migrate @ 17064]
Mark Doliner <markdoliner@pidgin.im>
parents: 14349
diff changeset
99 * Callback is a required parameter, but it can get set to
3c78e468b45a [gaim-migrate @ 17064]
Mark Doliner <markdoliner@pidgin.im>
parents: 14349
diff changeset
100 * 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
101 * to free hosts.
3c78e468b45a [gaim-migrate @ 17064]
Mark Doliner <markdoliner@pidgin.im>
parents: 14349
diff changeset
102 */
3c78e468b45a [gaim-migrate @ 17064]
Mark Doliner <markdoliner@pidgin.im>
parents: 14349
diff changeset
103 while (hosts != NULL)
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 hosts = g_slist_remove(hosts, hosts->data);
3c78e468b45a [gaim-migrate @ 17064]
Mark Doliner <markdoliner@pidgin.im>
parents: 14349
diff changeset
106 g_free(hosts->data);
3c78e468b45a [gaim-migrate @ 17064]
Mark Doliner <markdoliner@pidgin.im>
parents: 14349
diff changeset
107 hosts = g_slist_remove(hosts, hosts->data);
3c78e468b45a [gaim-migrate @ 17064]
Mark Doliner <markdoliner@pidgin.im>
parents: 14349
diff changeset
108 }
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
24325
9b63613e82ab Fix DNS resolution. I think I broke this this morning in my revision
Mark Doliner <markdoliner@pidgin.im>
parents: 24324
diff changeset
111 #ifdef PURPLE_DNSQUERY_USE_FORK
24318
b2b1a42a7816 Revert my revision 3777b91f70ab86e67c1e039d08fb6d87e06f20d6, which
Mark Doliner <markdoliner@pidgin.im>
parents: 24287
diff changeset
112 /*
24325
9b63613e82ab Fix DNS resolution. I think I broke this this morning in my revision
Mark Doliner <markdoliner@pidgin.im>
parents: 24324
diff changeset
113 * 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
114 * 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
115 */
24325
9b63613e82ab Fix DNS resolution. I think I broke this this morning in my revision
Mark Doliner <markdoliner@pidgin.im>
parents: 24324
diff changeset
116 free_dns_children = g_slist_prepend(free_dns_children, query_data->resolver);
24318
b2b1a42a7816 Revert my revision 3777b91f70ab86e67c1e039d08fb6d87e06f20d6, which
Mark Doliner <markdoliner@pidgin.im>
parents: 24287
diff changeset
117 query_data->resolver = NULL;
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 #endif /* PURPLE_DNSQUERY_USE_FORK */
24318
b2b1a42a7816 Revert my revision 3777b91f70ab86e67c1e039d08fb6d87e06f20d6, which
Mark Doliner <markdoliner@pidgin.im>
parents: 24287
diff changeset
119
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
120 purple_dnsquery_destroy(query_data);
14300
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
121 }
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
122
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
123 static void
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
124 purple_dnsquery_failed(PurpleDnsQueryData *query_data, const gchar *error_message)
14300
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
125 {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
126 purple_debug_info("dnsquery", "%s\n", error_message);
14300
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
127 if (query_data->callback != NULL)
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
128 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
129 purple_dnsquery_destroy(query_data);
14300
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
130 }
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
131
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
132 static gboolean
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
133 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
134 {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
135 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
136
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
137 if (ops && ops->resolve_host)
24323
fe88d45063e8 Simplify two bits of code a little
Mark Doliner <markdoliner@pidgin.im>
parents: 24322
diff changeset
138 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
139
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
140 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
141 }
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
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
143 #if defined(PURPLE_DNSQUERY_USE_FORK)
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
144
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
145 /*
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
146 * Unix!
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
147 */
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
148
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
149 /*
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
150 * Begin the DNS resolver child process functions.
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
151 */
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
152 #ifdef HAVE_SIGNAL_H
16701
0b41f23396cc Mark two functions as "noreturn"
Mark Doliner <markdoliner@pidgin.im>
parents: 15890
diff changeset
153 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
154 trap_gdb_bug(int sig)
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
155 {
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
156 const char *message =
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
157 "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
158 "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
159 "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
160 "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
161 "check cope_with_gdb_brokenness() in dnsquery.c.\n\n"
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
162 "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
163 fputs("\n* * *\n",stderr);
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
164 fputs(message,stderr);
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
165 fputs("* * *\n\n",stderr);
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
166 execlp("xmessage","xmessage","-center", message, NULL);
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
167 _exit(1);
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
168 }
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
169 #endif
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
170
22234
4d54e1c5c696 More compiler warning fixes from o_sukhodolsky (with additions by me).
Mark Doliner <markdoliner@pidgin.im>
parents: 22108
diff changeset
171 static void
4d54e1c5c696 More compiler warning fixes from o_sukhodolsky (with additions by me).
Mark Doliner <markdoliner@pidgin.im>
parents: 22108
diff changeset
172 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
173 {
4d54e1c5c696 More compiler warning fixes from o_sukhodolsky (with additions by me).
Mark Doliner <markdoliner@pidgin.im>
parents: 22108
diff changeset
174 ssize_t written;
4d54e1c5c696 More compiler warning fixes from o_sukhodolsky (with additions by me).
Mark Doliner <markdoliner@pidgin.im>
parents: 22108
diff changeset
175
4d54e1c5c696 More compiler warning fixes from o_sukhodolsky (with additions by me).
Mark Doliner <markdoliner@pidgin.im>
parents: 22108
diff changeset
176 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
177 if (written != count) {
4d54e1c5c696 More compiler warning fixes from o_sukhodolsky (with additions by me).
Mark Doliner <markdoliner@pidgin.im>
parents: 22108
diff changeset
178 if (written < 0)
4d54e1c5c696 More compiler warning fixes from o_sukhodolsky (with additions by me).
Mark Doliner <markdoliner@pidgin.im>
parents: 22108
diff changeset
179 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
180 "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
181 else
4d54e1c5c696 More compiler warning fixes from o_sukhodolsky (with additions by me).
Mark Doliner <markdoliner@pidgin.im>
parents: 22108
diff changeset
182 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
183 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
184 "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
185 getpid(), count, written);
4d54e1c5c696 More compiler warning fixes from o_sukhodolsky (with additions by me).
Mark Doliner <markdoliner@pidgin.im>
parents: 22108
diff changeset
186 }
4d54e1c5c696 More compiler warning fixes from o_sukhodolsky (with additions by me).
Mark Doliner <markdoliner@pidgin.im>
parents: 22108
diff changeset
187 }
4d54e1c5c696 More compiler warning fixes from o_sukhodolsky (with additions by me).
Mark Doliner <markdoliner@pidgin.im>
parents: 22108
diff changeset
188
16701
0b41f23396cc Mark two functions as "noreturn"
Mark Doliner <markdoliner@pidgin.im>
parents: 15890
diff changeset
189 G_GNUC_NORETURN static void
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
190 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
191 {
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
192 dns_params_t dns_params;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
193 const size_t zero = 0;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
194 int rc;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
195 #ifdef HAVE_GETADDRINFO
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
196 struct addrinfo hints, *res, *tmp;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
197 char servname[20];
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
198 #else
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
199 struct sockaddr_in sin;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
200 const size_t addrlen = sizeof(sin);
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
201 #endif
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
202
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
203 #ifdef HAVE_SIGNAL_H
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
204 purple_restore_default_signal_handlers();
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
205 signal(SIGTRAP, trap_gdb_bug);
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
206 #endif
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
207
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
208 /*
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
209 * We resolve 1 host name for each iteration of this
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
210 * while loop.
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
211 *
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
212 * The top half of this reads in the hostname and port
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
213 * number from the socket with our parent. The bottom
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
214 * half of this resolves the IP (blocking) and sends
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
215 * the result back to our parent, when finished.
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 while (1) {
24318
b2b1a42a7816 Revert my revision 3777b91f70ab86e67c1e039d08fb6d87e06f20d6, which
Mark Doliner <markdoliner@pidgin.im>
parents: 24287
diff changeset
218 fd_set fds;
b2b1a42a7816 Revert my revision 3777b91f70ab86e67c1e039d08fb6d87e06f20d6, which
Mark Doliner <markdoliner@pidgin.im>
parents: 24287
diff changeset
219 struct timeval tv = { .tv_sec = 20, .tv_usec = 0 };
b2b1a42a7816 Revert my revision 3777b91f70ab86e67c1e039d08fb6d87e06f20d6, which
Mark Doliner <markdoliner@pidgin.im>
parents: 24287
diff changeset
220 FD_ZERO(&fds);
b2b1a42a7816 Revert my revision 3777b91f70ab86e67c1e039d08fb6d87e06f20d6, which
Mark Doliner <markdoliner@pidgin.im>
parents: 24287
diff changeset
221 FD_SET(child_in, &fds);
b2b1a42a7816 Revert my revision 3777b91f70ab86e67c1e039d08fb6d87e06f20d6, which
Mark Doliner <markdoliner@pidgin.im>
parents: 24287
diff changeset
222 rc = select(child_in + 1, &fds, NULL, NULL, &tv);
b2b1a42a7816 Revert my revision 3777b91f70ab86e67c1e039d08fb6d87e06f20d6, which
Mark Doliner <markdoliner@pidgin.im>
parents: 24287
diff changeset
223 if (!rc) {
b2b1a42a7816 Revert my revision 3777b91f70ab86e67c1e039d08fb6d87e06f20d6, which
Mark Doliner <markdoliner@pidgin.im>
parents: 24287
diff changeset
224 if (show_debug)
b2b1a42a7816 Revert my revision 3777b91f70ab86e67c1e039d08fb6d87e06f20d6, which
Mark Doliner <markdoliner@pidgin.im>
parents: 24287
diff changeset
225 printf("dns[%d]: nobody needs me... =(\n", getpid());
b2b1a42a7816 Revert my revision 3777b91f70ab86e67c1e039d08fb6d87e06f20d6, which
Mark Doliner <markdoliner@pidgin.im>
parents: 24287
diff changeset
226 break;
b2b1a42a7816 Revert my revision 3777b91f70ab86e67c1e039d08fb6d87e06f20d6, which
Mark Doliner <markdoliner@pidgin.im>
parents: 24287
diff changeset
227 }
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
228 rc = read(child_in, &dns_params, sizeof(dns_params_t));
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
229 if (rc < 0) {
22234
4d54e1c5c696 More compiler warning fixes from o_sukhodolsky (with additions by me).
Mark Doliner <markdoliner@pidgin.im>
parents: 22108
diff changeset
230 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
231 "%s\n", getpid(), strerror(errno));
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
232 break;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
233 }
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
234 if (rc == 0) {
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
235 if (show_debug)
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
236 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
237 _exit(0);
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
238 }
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
239 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
240 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
241 "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
242 dns_params.port);
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
243 _exit(1);
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
244 }
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
245
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
246 /* We have the hostname and port, now resolve the IP */
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
247
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
248 #ifdef HAVE_GETADDRINFO
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
249 g_snprintf(servname, sizeof(servname), "%d", dns_params.port);
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
250 memset(&hints, 0, sizeof(hints));
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
251
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
252 /* This is only used to convert a service
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
253 * name to a port number. As we know we are
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
254 * passing a number already, we know this
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
255 * value will not be really used by the C
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
256 * library.
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
257 */
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
258 hints.ai_socktype = SOCK_STREAM;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
259 rc = getaddrinfo(dns_params.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
260 write_to_parent(child_out, &rc, sizeof(rc));
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
261 if (rc != 0) {
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
262 close(child_out);
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
263 if (show_debug)
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
264 printf("dns[%d] Error: getaddrinfo returned %d\n",
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
265 getpid(), rc);
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
266 dns_params.hostname[0] = '\0';
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
267 continue;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
268 }
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
269 tmp = res;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
270 while (res) {
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
271 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
272 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
273 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
274 res = res->ai_next;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
275 }
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
276 freeaddrinfo(tmp);
22234
4d54e1c5c696 More compiler warning fixes from o_sukhodolsky (with additions by me).
Mark Doliner <markdoliner@pidgin.im>
parents: 22108
diff changeset
277 write_to_parent(child_out, &zero, sizeof(zero));
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
278 #else
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
279 if (!inet_aton(dns_params.hostname, &sin.sin_addr)) {
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
280 struct hostent *hp;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
281 if (!(hp = gethostbyname(dns_params.hostname))) {
22234
4d54e1c5c696 More compiler warning fixes from o_sukhodolsky (with additions by me).
Mark Doliner <markdoliner@pidgin.im>
parents: 22108
diff changeset
282 write_to_parent(child_out, &h_errno, sizeof(int));
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
283 close(child_out);
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
284 if (show_debug)
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
285 printf("DNS Error: %d\n", h_errno);
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
286 _exit(0);
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
287 }
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
288 memset(&sin, 0, sizeof(struct sockaddr_in));
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
289 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
290 sin.sin_family = hp->h_addrtype;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
291 } else
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
292 sin.sin_family = AF_INET;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
293
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
294 sin.sin_port = htons(dns_params.port);
22234
4d54e1c5c696 More compiler warning fixes from o_sukhodolsky (with additions by me).
Mark Doliner <markdoliner@pidgin.im>
parents: 22108
diff changeset
295 write_to_parent(child_out, &zero, sizeof(zero));
4d54e1c5c696 More compiler warning fixes from o_sukhodolsky (with additions by me).
Mark Doliner <markdoliner@pidgin.im>
parents: 22108
diff changeset
296 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
297 write_to_parent(child_out, &sin, addrlen);
4d54e1c5c696 More compiler warning fixes from o_sukhodolsky (with additions by me).
Mark Doliner <markdoliner@pidgin.im>
parents: 22108
diff changeset
298 write_to_parent(child_out, &zero, sizeof(zero));
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
299 #endif
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
300 dns_params.hostname[0] = '\0';
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
301 }
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
302
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
303 close(child_out);
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
304 close(child_in);
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
305
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
306 _exit(0);
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
307 }
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
308 /*
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
309 * End the DNS resolver child process functions.
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
310 */
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 /*
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
313 * Begin the functions for dealing with the DNS child processes.
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
314 */
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
315 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
316 cope_with_gdb_brokenness(void)
14349
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 #ifdef __linux__
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
319 static gboolean already_done = FALSE;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
320 char s[256], e[512];
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
321 int n;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
322 pid_t ppid;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
323
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
324 if(already_done)
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
325 return;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
326 already_done = TRUE;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
327 ppid = getppid();
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
328 snprintf(s, sizeof(s), "/proc/%d/exe", ppid);
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
329 n = readlink(s, e, sizeof(e));
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
330 if(n < 0)
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
331 return;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
332
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
333 e[MIN(n,sizeof(e)-1)] = '\0';
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
334
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
335 if(strstr(e,"gdb")) {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
336 purple_debug_info("dns",
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
337 "Debugger detected, performing useless query...\n");
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
338 gethostbyname("x.x.x.x.x");
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 #endif
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
341 }
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
342
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
343 static void
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
344 purple_dnsquery_resolver_destroy(PurpleDnsQueryResolverProcess *resolver)
14349
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 g_return_if_fail(resolver != NULL);
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
347
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
348 /*
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
349 * 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
350 * doesn't matter if this fails, because children will expire on
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
351 * their own after a few seconds.
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
352 */
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
353 if (resolver->dns_pid > 0)
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
354 kill(resolver->dns_pid, SIGKILL);
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
355
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
356 if (resolver->inpa != 0)
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
357 purple_input_remove(resolver->inpa);
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
358
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
359 close(resolver->fd_in);
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
360 close(resolver->fd_out);
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
361
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
362 g_free(resolver);
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
363
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
364 number_of_dns_children--;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
365 }
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
366
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
367 static PurpleDnsQueryResolverProcess *
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
368 purple_dnsquery_resolver_new(gboolean show_debug)
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
369 {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
370 PurpleDnsQueryResolverProcess *resolver;
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
371 int child_out[2], child_in[2];
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
372
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
373 /* Create pipes for communicating with the child process */
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
374 if (pipe(child_out) || pipe(child_in)) {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
375 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
376 "Could not create pipes: %s\n", g_strerror(errno));
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
377 return NULL;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
378 }
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
379
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
380 resolver = g_new(PurpleDnsQueryResolverProcess, 1);
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
381 resolver->inpa = 0;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
382
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
383 cope_with_gdb_brokenness();
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
384
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
385 /* "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
386 resolver->dns_pid = fork();
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
387
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
388 /* If we are the child process... */
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
389 if (resolver->dns_pid == 0) {
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
390 /* 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
391 close(child_out[0]);
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
392 close(child_in[1]);
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
393
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
394 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
395 /* 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
396 }
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 /* 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
399 close(child_out[1]);
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
400 close(child_in[0]);
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
401 if (resolver->dns_pid == -1) {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
402 purple_debug_error("dns",
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
403 "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
404 g_strerror(errno));
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
405 purple_dnsquery_resolver_destroy(resolver);
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
406 return NULL;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
407 }
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
408
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
409 resolver->fd_out = child_out[0];
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
410 resolver->fd_in = child_in[1];
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
411 number_of_dns_children++;
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
412 purple_debug_info("dns",
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
413 "Created new DNS child %d, there are now %d children.\n",
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
414 resolver->dns_pid, number_of_dns_children);
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 return resolver;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
417 }
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
418
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
419 /**
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
420 * @return TRUE if the request was sent succesfully. FALSE
24321
0d6d024049eb Improve a few comments
Mark Doliner <markdoliner@pidgin.im>
parents: 24318
diff changeset
421 * if the request could not be sent. This isn't
0d6d024049eb Improve a few comments
Mark Doliner <markdoliner@pidgin.im>
parents: 24318
diff changeset
422 * necessarily an error. If the child has expired,
0d6d024049eb Improve a few comments
Mark Doliner <markdoliner@pidgin.im>
parents: 24318
diff changeset
423 * 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
424 */
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
425 static gboolean
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
426 send_dns_request_to_child(PurpleDnsQueryData *query_data,
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
427 PurpleDnsQueryResolverProcess *resolver)
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
428 {
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
429 pid_t pid;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
430 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
431 ssize_t rc;
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
432
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
433 /* 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
434 * exited, or it might return an error if it exited "long
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
435 * enough" ago that it has already been reaped; in either
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
436 * instance, we can't use it. */
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
437 pid = waitpid(resolver->dns_pid, NULL, WNOHANG);
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
438 if (pid > 0) {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
439 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
440 resolver->dns_pid);
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
441 purple_dnsquery_resolver_destroy(resolver);
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
442 return FALSE;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
443 } else if (pid < 0) {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
444 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
445 resolver->dns_pid, g_strerror(errno));
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
446 purple_dnsquery_resolver_destroy(resolver);
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
447 return FALSE;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
448 }
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
449
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
450 /* Copy the hostname and port into a single data structure */
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
451 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
452 dns_params.hostname[sizeof(dns_params.hostname) - 1] = '\0';
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
453 dns_params.port = query_data->port;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
454
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
455 /* Send the data structure to the child */
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
456 rc = write(resolver->fd_in, &dns_params, sizeof(dns_params));
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
457 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
458 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
459 resolver->dns_pid, g_strerror(errno));
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
460 purple_dnsquery_resolver_destroy(resolver);
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
461 return FALSE;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
462 }
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
463 if (rc < sizeof(dns_params)) {
a2e8d72efd34 Fix this g_return_val_if_fail. It should have been returning TRUE or
Mark Doliner <markdoliner@pidgin.im>
parents: 24286
diff changeset
464 purple_debug_error("dns", "Tried to read %" G_GSSIZE_FORMAT
a2e8d72efd34 Fix this g_return_val_if_fail. It should have been returning TRUE or
Mark Doliner <markdoliner@pidgin.im>
parents: 24286
diff changeset
465 " bytes from child but only read %" G_GSSIZE_FORMAT "\n",
a2e8d72efd34 Fix this g_return_val_if_fail. It should have been returning TRUE or
Mark Doliner <markdoliner@pidgin.im>
parents: 24286
diff changeset
466 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
467 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
468 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
469 }
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
470
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
471 purple_debug_info("dns",
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
472 "Successfully sent DNS request to child %d\n",
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
473 resolver->dns_pid);
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
474
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
475 query_data->resolver = resolver;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
476
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
477 return TRUE;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
478 }
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
479
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
480 static void host_resolved(gpointer data, gint source, PurpleInputCondition cond);
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
481
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
482 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
483 handle_next_queued_request(void)
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
484 {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
485 PurpleDnsQueryData *query_data;
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
486 PurpleDnsQueryResolverProcess *resolver;
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
487
14711
404c5a931bb2 [gaim-migrate @ 17395]
Mark Doliner <markdoliner@pidgin.im>
parents: 14572
diff changeset
488 if (queued_requests == NULL)
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
489 /* No more DNS queries, yay! */
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
490 return;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
491
14711
404c5a931bb2 [gaim-migrate @ 17395]
Mark Doliner <markdoliner@pidgin.im>
parents: 14572
diff changeset
492 query_data = queued_requests->data;
404c5a931bb2 [gaim-migrate @ 17395]
Mark Doliner <markdoliner@pidgin.im>
parents: 14572
diff changeset
493 queued_requests = g_slist_delete_link(queued_requests, queued_requests);
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
494
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
495 /*
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
496 * 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
497 * 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
498 * set to the PurpleDnsQueryResolverProcess. Otherwise, resolver
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
499 * 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
500 */
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
501 while (free_dns_children != 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 resolver = free_dns_children->data;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
504 free_dns_children = g_slist_remove(free_dns_children, resolver);
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
505
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
506 if (send_dns_request_to_child(query_data, resolver))
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
507 /* We found an acceptable child, yay */
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
508 break;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
509 }
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 /* We need to create a new DNS request child */
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
512 if (query_data->resolver == NULL)
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 if (number_of_dns_children >= MAX_DNS_CHILDREN)
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
515 {
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
516 /* Apparently all our children are busy */
14711
404c5a931bb2 [gaim-migrate @ 17395]
Mark Doliner <markdoliner@pidgin.im>
parents: 14572
diff changeset
517 queued_requests = g_slist_prepend(queued_requests, query_data);
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
518 return;
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
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
521 resolver = purple_dnsquery_resolver_new(purple_debug_is_enabled());
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
522 if (resolver == NULL)
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
523 {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
524 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
525 return;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
526 }
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
527 if (!send_dns_request_to_child(query_data, resolver))
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
528 {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
529 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
530 return;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
531 }
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
532 }
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
533
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
534 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
535 PURPLE_INPUT_READ, host_resolved, query_data);
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
536 }
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
537
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
538 /*
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
539 * End the functions for dealing with the DNS child processes.
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
540 */
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
541
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
542 static void
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
543 host_resolved(gpointer data, gint source, PurpleInputCondition cond)
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
544 {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
545 PurpleDnsQueryData *query_data;
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
546 int rc, err;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
547 GSList *hosts = NULL;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
548 struct sockaddr *addr = NULL;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
549 size_t addrlen;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
550 char message[1024];
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
551
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
552 query_data = data;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
553
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
554 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
555 purple_input_remove(query_data->resolver->inpa);
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
556 query_data->resolver->inpa = 0;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
557
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
558 rc = read(query_data->resolver->fd_out, &err, sizeof(err));
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
559 if ((rc == 4) && (err != 0))
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
560 {
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
561 #ifdef HAVE_GETADDRINFO
14454
df290cda81a3 [gaim-migrate @ 17099]
Mark Doliner <markdoliner@pidgin.im>
parents: 14420
diff changeset
562 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
563 query_data->hostname, purple_gai_strerror(err));
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
564 #else
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
565 g_snprintf(message, sizeof(message), _("Error resolving %s: %d"),
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
566 query_data->hostname, err);
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
567 #endif
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
568 purple_dnsquery_failed(query_data, message);
14349
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 } else if (rc > 0) {
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
571 /* Success! */
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
572 while (rc > 0) {
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
573 rc = read(query_data->resolver->fd_out, &addrlen, sizeof(addrlen));
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
574 if (rc > 0 && addrlen > 0) {
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
575 addr = g_malloc(addrlen);
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
576 rc = read(query_data->resolver->fd_out, addr, addrlen);
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
577 hosts = g_slist_append(hosts, GINT_TO_POINTER(addrlen));
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
578 hosts = g_slist_append(hosts, addr);
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
579 } else {
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
580 break;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
581 }
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
582 }
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
583 /* wait4(resolver->dns_pid, NULL, WNOHANG, NULL); */
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
584 purple_dnsquery_resolved(query_data, hosts);
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
585
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
586 } 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
587 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
588 purple_dnsquery_failed(query_data, message);
14349
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 } 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
591 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
592 purple_dnsquery_failed(query_data, message);
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
593 }
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
594
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
595 handle_next_queued_request();
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
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
598 static gboolean
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
599 resolve_host(gpointer data)
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
600 {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
601 PurpleDnsQueryData *query_data;
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
602
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
603 query_data = data;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
604 query_data->timeout = 0;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
605
24324
a36c5d08a43c There was a little weirdness with the code that called the UI function
Mark Doliner <markdoliner@pidgin.im>
parents: 24323
diff changeset
606 if (purple_dnsquery_ui_resolve(query_data))
a36c5d08a43c There was a little weirdness with the code that called the UI function
Mark Doliner <markdoliner@pidgin.im>
parents: 24323
diff changeset
607 {
a36c5d08a43c There was a little weirdness with the code that called the UI function
Mark Doliner <markdoliner@pidgin.im>
parents: 24323
diff changeset
608 /* The UI is handling the resolve; we're done */
a36c5d08a43c There was a little weirdness with the code that called the UI function
Mark Doliner <markdoliner@pidgin.im>
parents: 24323
diff changeset
609 return FALSE;
a36c5d08a43c There was a little weirdness with the code that called the UI function
Mark Doliner <markdoliner@pidgin.im>
parents: 24323
diff changeset
610 }
a36c5d08a43c There was a little weirdness with the code that called the UI function
Mark Doliner <markdoliner@pidgin.im>
parents: 24323
diff changeset
611
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
612 handle_next_queued_request();
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 return FALSE;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
615 }
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
616
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
617 PurpleDnsQueryData *
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
618 purple_dnsquery_a(const char *hostname, int port,
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
619 PurpleDnsQueryConnectFunction callback, gpointer data)
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
620 {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
621 PurpleDnsQueryData *query_data;
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
622
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
623 g_return_val_if_fail(hostname != NULL, NULL);
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
624 g_return_val_if_fail(port != 0, NULL);
14420
3c78e468b45a [gaim-migrate @ 17064]
Mark Doliner <markdoliner@pidgin.im>
parents: 14349
diff changeset
625 g_return_val_if_fail(callback != NULL, NULL);
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
626
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
627 query_data = g_new(PurpleDnsQueryData, 1);
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
628 query_data->hostname = g_strdup(hostname);
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
629 g_strstrip(query_data->hostname);
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
630 query_data->port = port;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
631 query_data->callback = callback;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
632 query_data->data = data;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
633 query_data->resolver = NULL;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
634
24323
fe88d45063e8 Simplify two bits of code a little
Mark Doliner <markdoliner@pidgin.im>
parents: 24322
diff changeset
635 if (*query_data->hostname == '\0')
14528
b8e4715b2953 [gaim-migrate @ 17180]
Mark Doliner <markdoliner@pidgin.im>
parents: 14454
diff changeset
636 {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
637 purple_dnsquery_destroy(query_data);
14528
b8e4715b2953 [gaim-migrate @ 17180]
Mark Doliner <markdoliner@pidgin.im>
parents: 14454
diff changeset
638 g_return_val_if_reached(NULL);
b8e4715b2953 [gaim-migrate @ 17180]
Mark Doliner <markdoliner@pidgin.im>
parents: 14454
diff changeset
639 }
b8e4715b2953 [gaim-migrate @ 17180]
Mark Doliner <markdoliner@pidgin.im>
parents: 14454
diff changeset
640
14711
404c5a931bb2 [gaim-migrate @ 17395]
Mark Doliner <markdoliner@pidgin.im>
parents: 14572
diff changeset
641 queued_requests = g_slist_append(queued_requests, query_data);
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
642
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
643 purple_debug_info("dns", "DNS query for '%s' queued\n", query_data->hostname);
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
644
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
645 query_data->timeout = purple_timeout_add(0, resolve_host, query_data);
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
646
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
647 return query_data;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
648 }
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
649
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
650 #elif defined _WIN32 /* end PURPLE_DNSQUERY_USE_FORK */
14349
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 /*
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
653 * Windows!
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
14300
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
656 static gboolean
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
657 dns_main_thread_cb(gpointer data)
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
658 {
20212
9bf576eeaac0 applied changes from 77376fe079e753b612b3b8c901060e689f3dee11
Luke Schierer <lschiere@pidgin.im>
parents: 20147
diff changeset
659 PurpleDnsQueryData *query_data = data;
14300
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
660
20212
9bf576eeaac0 applied changes from 77376fe079e753b612b3b8c901060e689f3dee11
Luke Schierer <lschiere@pidgin.im>
parents: 20147
diff changeset
661 /* 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
662 query_data->resolver = NULL;
14243
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
663
14300
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
664 if (query_data->error_message != NULL)
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
665 purple_dnsquery_failed(query_data, query_data->error_message);
14300
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
666 else
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
667 {
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
668 GSList *hosts;
14306
7c3f2162a897 [gaim-migrate @ 16926]
Mark Doliner <markdoliner@pidgin.im>
parents: 14300
diff changeset
669
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
670 /* 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
671 hosts = query_data->hosts;
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
672 query_data->hosts = NULL;
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
673 purple_dnsquery_resolved(query_data, hosts);
14243
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
674 }
14300
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
675
14243
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
676 return FALSE;
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
677 }
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
678
14300
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
679 static gpointer
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
680 dns_thread(gpointer data)
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
681 {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
682 PurpleDnsQueryData *query_data;
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
683 #ifdef HAVE_GETADDRINFO
14243
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
684 int rc;
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
685 struct addrinfo hints, *res, *tmp;
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
686 char servname[20];
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
687 #else
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
688 struct sockaddr_in sin;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
689 struct hostent *hp;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
690 #endif
14300
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
691
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
692 query_data = data;
14243
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
693
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
694 #ifdef HAVE_GETADDRINFO
14300
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
695 g_snprintf(servname, sizeof(servname), "%d", query_data->port);
14243
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
696 memset(&hints,0,sizeof(hints));
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
697
14300
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
698 /*
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
699 * This is only used to convert a service
14243
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
700 * name to a port number. As we know we are
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
701 * passing a number already, we know this
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
702 * value will not be really used by the C
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
703 * library.
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
704 */
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
705 hints.ai_socktype = SOCK_STREAM;
14300
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
706 if ((rc = getaddrinfo(query_data->hostname, servname, &hints, &res)) == 0) {
14243
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
707 tmp = res;
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
708 while(res) {
14300
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
709 query_data->hosts = g_slist_append(query_data->hosts,
14243
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
710 GSIZE_TO_POINTER(res->ai_addrlen));
14300
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
711 query_data->hosts = g_slist_append(query_data->hosts,
14243
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
712 g_memdup(res->ai_addr, res->ai_addrlen));
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
713 res = res->ai_next;
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
714 }
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
715 freeaddrinfo(tmp);
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
716 } else {
21977
c87889698afb Create a purple_gai_strerror() function similar to g_str_error() which
Mark Doliner <markdoliner@pidgin.im>
parents: 21389
diff changeset
717 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
718 }
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
719 #else
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
720 if ((hp = gethostbyname(query_data->hostname))) {
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
721 memset(&sin, 0, sizeof(struct sockaddr_in));
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
722 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
723 sin.sin_family = hp->h_addrtype;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
724 sin.sin_port = htons(query_data->port);
14243
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
725
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
726 query_data->hosts = g_slist_append(query_data->hosts,
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
727 GSIZE_TO_POINTER(sizeof(sin)));
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
728 query_data->hosts = g_slist_append(query_data->hosts,
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
729 g_memdup(&sin, sizeof(sin)));
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
730 } else {
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
731 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
732 }
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
733 #endif
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
734
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
735 /* back to main thread */
20212
9bf576eeaac0 applied changes from 77376fe079e753b612b3b8c901060e689f3dee11
Luke Schierer <lschiere@pidgin.im>
parents: 20147
diff changeset
736 purple_timeout_add(0, dns_main_thread_cb, query_data);
14300
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
737
14243
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
738 return 0;
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
739 }
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
740
14300
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
741 static gboolean
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
742 resolve_host(gpointer data)
14243
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
743 {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
744 PurpleDnsQueryData *query_data;
14243
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
745 struct sockaddr_in sin;
14300
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
746 GError *err = NULL;
14243
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
747
14300
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
748 query_data = data;
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
749 query_data->timeout = 0;
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
750
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
751 if (purple_dnsquery_ui_resolve(query_data))
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
752 {
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
753 /* The UI is handling the resolve; we're done */
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
754 return FALSE;
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
755 }
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
756
14300
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
757 if (inet_aton(query_data->hostname, &sin.sin_addr))
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
758 {
14306
7c3f2162a897 [gaim-migrate @ 16926]
Mark Doliner <markdoliner@pidgin.im>
parents: 14300
diff changeset
759 /*
7c3f2162a897 [gaim-migrate @ 16926]
Mark Doliner <markdoliner@pidgin.im>
parents: 14300
diff changeset
760 * The given "hostname" is actually an IP address, so we
7c3f2162a897 [gaim-migrate @ 16926]
Mark Doliner <markdoliner@pidgin.im>
parents: 14300
diff changeset
761 * don't need to do anything.
7c3f2162a897 [gaim-migrate @ 16926]
Mark Doliner <markdoliner@pidgin.im>
parents: 14300
diff changeset
762 */
14243
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
763 GSList *hosts = NULL;
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
764 sin.sin_family = AF_INET;
14300
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
765 sin.sin_port = htons(query_data->port);
14243
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
766 hosts = g_slist_append(hosts, GINT_TO_POINTER(sizeof(sin)));
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
767 hosts = g_slist_append(hosts, g_memdup(&sin, sizeof(sin)));
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
768 purple_dnsquery_resolved(query_data, hosts);
14300
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
769 }
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
770 else
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
771 {
14306
7c3f2162a897 [gaim-migrate @ 16926]
Mark Doliner <markdoliner@pidgin.im>
parents: 14300
diff changeset
772 /*
7c3f2162a897 [gaim-migrate @ 16926]
Mark Doliner <markdoliner@pidgin.im>
parents: 14300
diff changeset
773 * Spin off a separate thread to perform the DNS lookup so
7c3f2162a897 [gaim-migrate @ 16926]
Mark Doliner <markdoliner@pidgin.im>
parents: 14300
diff changeset
774 * that we don't block the UI.
7c3f2162a897 [gaim-migrate @ 16926]
Mark Doliner <markdoliner@pidgin.im>
parents: 14300
diff changeset
775 */
14300
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
776 query_data->resolver = g_thread_create(dns_thread,
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
777 query_data, FALSE, &err);
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
778 if (query_data->resolver == NULL)
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
779 {
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
780 char message[1024];
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
781 g_snprintf(message, sizeof(message), _("Thread creation failure: %s"),
15859
98b7f9bf8e28 Minor cleanup.
Daniel Atallah <datallah@pidgin.im>
parents: 15775
diff changeset
782 (err && err->message) ? err->message : _("Unknown reason"));
14300
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
783 g_error_free(err);
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
784 purple_dnsquery_failed(query_data, message);
14300
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
785 }
14243
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
786 }
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
787
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
788 return FALSE;
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
789 }
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
790
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
791 PurpleDnsQueryData *
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
792 purple_dnsquery_a(const char *hostname, int port,
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
793 PurpleDnsQueryConnectFunction callback, gpointer data)
14243
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
diff changeset
794 {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
795 PurpleDnsQueryData *query_data;
14300
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
796
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
797 g_return_val_if_fail(hostname != NULL, NULL);
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
798 g_return_val_if_fail(port != 0, NULL);
14420
3c78e468b45a [gaim-migrate @ 17064]
Mark Doliner <markdoliner@pidgin.im>
parents: 14349
diff changeset
799 g_return_val_if_fail(callback != NULL, NULL);
14300
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
800
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
801 purple_debug_info("dnsquery", "Performing DNS lookup for %s\n", hostname);
14306
7c3f2162a897 [gaim-migrate @ 16926]
Mark Doliner <markdoliner@pidgin.im>
parents: 14300
diff changeset
802
20212
9bf576eeaac0 applied changes from 77376fe079e753b612b3b8c901060e689f3dee11
Luke Schierer <lschiere@pidgin.im>
parents: 20147
diff changeset
803 query_data = g_new0(PurpleDnsQueryData, 1);
14300
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
804 query_data->hostname = g_strdup(hostname);
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
805 g_strstrip(query_data->hostname);
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
806 query_data->port = port;
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
807 query_data->callback = callback;
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
808 query_data->data = data;
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
809
14528
b8e4715b2953 [gaim-migrate @ 17180]
Mark Doliner <markdoliner@pidgin.im>
parents: 14454
diff changeset
810 if (strlen(query_data->hostname) == 0)
b8e4715b2953 [gaim-migrate @ 17180]
Mark Doliner <markdoliner@pidgin.im>
parents: 14454
diff changeset
811 {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
812 purple_dnsquery_destroy(query_data);
14528
b8e4715b2953 [gaim-migrate @ 17180]
Mark Doliner <markdoliner@pidgin.im>
parents: 14454
diff changeset
813 g_return_val_if_reached(NULL);
b8e4715b2953 [gaim-migrate @ 17180]
Mark Doliner <markdoliner@pidgin.im>
parents: 14454
diff changeset
814 }
b8e4715b2953 [gaim-migrate @ 17180]
Mark Doliner <markdoliner@pidgin.im>
parents: 14454
diff changeset
815
14300
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
816 /* Don't call the callback before returning */
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
817 query_data->timeout = purple_timeout_add(0, resolve_host, query_data);
14300
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
818
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
819 return query_data;
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
820 }
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
821
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
822 #else /* not PURPLE_DNSQUERY_USE_FORK or _WIN32 */
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
823
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
824 /*
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
825 * 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
826 * fail-safe name resolution code, which is blocking.
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
827 */
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
828
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
829 static gboolean
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
830 resolve_host(gpointer data)
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
831 {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
832 PurpleDnsQueryData *query_data;
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
833 struct sockaddr_in sin;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
834 GSList *hosts = NULL;
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 query_data = data;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
837 query_data->timeout = 0;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
838
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
839 if (purple_dnsquery_ui_resolve(query_data))
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
840 {
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
841 /* The UI is handling the resolve; we're done */
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
842 return FALSE;
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
843 }
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
844
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
845 if (!inet_aton(query_data->hostname, &sin.sin_addr)) {
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
846 struct hostent *hp;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
847 if(!(hp = gethostbyname(query_data->hostname))) {
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
848 char message[1024];
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
849 g_snprintf(message, sizeof(message), _("Error resolving %s: %d"),
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
850 query_data->hostname, h_errno);
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
851 purple_dnsquery_failed(query_data, message);
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
852 return FALSE;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
853 }
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
854 memset(&sin, 0, sizeof(struct sockaddr_in));
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
855 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
856 sin.sin_family = hp->h_addrtype;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
857 } else
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
858 sin.sin_family = AF_INET;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
859 sin.sin_port = htons(query_data->port);
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
860
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
861 hosts = g_slist_append(hosts, GINT_TO_POINTER(sizeof(sin)));
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
862 hosts = g_slist_append(hosts, g_memdup(&sin, sizeof(sin)));
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
863
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
864 purple_dnsquery_resolved(query_data, hosts);
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
865
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
866 return FALSE;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
867 }
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
868
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
869 PurpleDnsQueryData *
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
870 purple_dnsquery_a(const char *hostname, int port,
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
871 PurpleDnsQueryConnectFunction callback, gpointer data)
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
872 {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
873 PurpleDnsQueryData *query_data;
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
874
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
875 g_return_val_if_fail(hostname != NULL, NULL);
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
876 g_return_val_if_fail(port != 0, NULL);
14528
b8e4715b2953 [gaim-migrate @ 17180]
Mark Doliner <markdoliner@pidgin.im>
parents: 14454
diff changeset
877 g_return_val_if_fail(callback != NULL, NULL);
14349
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 query_data = g_new(PurpleDnsQueryData, 1);
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
880 query_data->hostname = g_strdup(hostname);
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
881 g_strstrip(query_data->hostname);
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
882 query_data->port = port;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
883 query_data->callback = callback;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
884 query_data->data = data;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
885
14528
b8e4715b2953 [gaim-migrate @ 17180]
Mark Doliner <markdoliner@pidgin.im>
parents: 14454
diff changeset
886 if (strlen(query_data->hostname) == 0)
b8e4715b2953 [gaim-migrate @ 17180]
Mark Doliner <markdoliner@pidgin.im>
parents: 14454
diff changeset
887 {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
888 purple_dnsquery_destroy(query_data);
14528
b8e4715b2953 [gaim-migrate @ 17180]
Mark Doliner <markdoliner@pidgin.im>
parents: 14454
diff changeset
889 g_return_val_if_reached(NULL);
b8e4715b2953 [gaim-migrate @ 17180]
Mark Doliner <markdoliner@pidgin.im>
parents: 14454
diff changeset
890 }
b8e4715b2953 [gaim-migrate @ 17180]
Mark Doliner <markdoliner@pidgin.im>
parents: 14454
diff changeset
891
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
892 /* Don't call the callback before returning */
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
893 query_data->timeout = purple_timeout_add(0, resolve_host, query_data);
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
894
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
895 return query_data;
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
896 }
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
897
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
898 #endif /* not PURPLE_DNSQUERY_USE_FORK or _WIN32 */
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
899
14300
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
900 void
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
901 purple_dnsquery_destroy(PurpleDnsQueryData *query_data)
14300
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
902 {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
903 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
904
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
905 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
906 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
907
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
908 #if defined(PURPLE_DNSQUERY_USE_FORK)
14711
404c5a931bb2 [gaim-migrate @ 17395]
Mark Doliner <markdoliner@pidgin.im>
parents: 14572
diff changeset
909 queued_requests = g_slist_remove(queued_requests, query_data);
14572
80e79a4926b4 [gaim-migrate @ 17230]
Mark Doliner <markdoliner@pidgin.im>
parents: 14528
diff changeset
910
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
911 if (query_data->resolver != NULL)
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
912 /*
24321
0d6d024049eb Improve a few comments
Mark Doliner <markdoliner@pidgin.im>
parents: 24318
diff changeset
913 * 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
914 * query. Ideally we would tell our resolver child to stop
0d6d024049eb Improve a few comments
Mark Doliner <markdoliner@pidgin.im>
parents: 24318
diff changeset
915 * 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
916 * 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
917 * 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
918 * 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
919 * have more stuff to resolve.
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
920 */
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
921 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
922 #elif defined _WIN32 /* end PURPLE_DNSQUERY_USE_FORK */
14300
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
923 if (query_data->resolver != NULL)
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
924 {
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
925 /*
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
926 * 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
927 * just set the callback to NULL and let the DNS lookup
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
928 * finish.
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
929 */
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
930 query_data->callback = NULL;
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
931 return;
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
932 }
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
933
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
934 while (query_data->hosts != NULL)
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
935 {
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
936 /* Discard the length... */
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
937 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
938 /* Free the address... */
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
939 g_free(query_data->hosts->data);
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
940 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
941 }
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
942 g_free(query_data->error_message);
24321
0d6d024049eb Improve a few comments
Mark Doliner <markdoliner@pidgin.im>
parents: 24318
diff changeset
943 #endif /* end _WIN32 */
14300
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
944
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
945 if (query_data->timeout > 0)
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
946 purple_timeout_remove(query_data->timeout);
14300
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
947
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
948 g_free(query_data->hostname);
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
949 g_free(query_data);
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
950 }
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
951
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 char *
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
953 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
954 {
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
955 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
956
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
957 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
958 }
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
959
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
960 unsigned short
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
961 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
962 {
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
963 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
964
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
965 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
966 }
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
967
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
968 void
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
969 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
970 {
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
971 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
972 }
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
973
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
974 PurpleDnsQueryUiOps *
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
975 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
976 {
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
977 /* 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
978 * 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
979 */
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
980 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
981 }
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
982
14300
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
983 void
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
984 purple_dnsquery_init(void)
14300
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
985 {
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
986 }
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
987
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
988 void
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
989 purple_dnsquery_uninit(void)
14300
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
990 {
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
991 #if defined(PURPLE_DNSQUERY_USE_FORK)
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
992 while (free_dns_children != NULL)
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
993 {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15775
diff changeset
994 purple_dnsquery_resolver_destroy(free_dns_children->data);
14349
6b7a67b5f56d [gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents: 14325
diff changeset
995 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
996 }
24321
0d6d024049eb Improve a few comments
Mark Doliner <markdoliner@pidgin.im>
parents: 24318
diff changeset
997 #endif /* end PURPLE_DNSQUERY_USE_FORK */
14300
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
998 }

mercurial