Sat, 11 Jul 2009 21:44:14 +0000
Don't fork a resolver process for IPs.
Patch from Aman "tmm1" Gupta.
committer: Paul Aurich <darkrain42@pidgin.im>
| 14243 | 1 | /** |
| 2 | * @file dnsquery.c DNS query API | |
| 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 | 7 | * |
| 15884 | 8 | * Purple is the legal property of its developers, whose names are too numerous |
| 14243 | 9 | * to list here. Please refer to the COPYRIGHT file distributed with this |
| 10 | * source distribution. | |
| 11 | * | |
| 12 | * This program is free software; you can redistribute it and/or modify | |
| 13 | * it under the terms of the GNU General Public License as published by | |
| 14 | * the Free Software Foundation; either version 2 of the License, or | |
| 15 | * (at your option) any later version. | |
| 16 | * | |
| 17 | * This program is distributed in the hope that it will be useful, | |
| 18 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 19 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
| 20 | * GNU General Public License for more details. | |
| 21 | * | |
| 22 | * You should have received a copy of the GNU General Public License | |
| 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 | 25 | * |
| 26 | */ | |
| 27 | ||
| 28 | #include "internal.h" | |
| 29 | #include "debug.h" | |
|
14300
68a0aa63f3b8
[gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
30 | #include "dnsquery.h" |
| 14243 | 31 | #include "notify.h" |
| 32 | #include "prefs.h" | |
| 33 | #include "util.h" | |
| 34 | ||
|
27157
609f187d0ac7
Call res_init() when DNS queries fail in case the failure indicates a timeout
Paul Aurich <darkrain42@pidgin.im>
parents:
27147
diff
changeset
|
35 | #ifndef _WIN32 |
|
609f187d0ac7
Call res_init() when DNS queries fail in case the failure indicates a timeout
Paul Aurich <darkrain42@pidgin.im>
parents:
27147
diff
changeset
|
36 | #include <resolv.h> |
|
609f187d0ac7
Call res_init() when DNS queries fail in case the failure indicates a timeout
Paul Aurich <darkrain42@pidgin.im>
parents:
27147
diff
changeset
|
37 | #endif |
|
609f187d0ac7
Call res_init() when DNS queries fail in case the failure indicates a timeout
Paul Aurich <darkrain42@pidgin.im>
parents:
27147
diff
changeset
|
38 | |
|
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
|
39 | #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
|
40 | #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
|
41 | #endif |
| 14243 | 42 | /************************************************************************** |
| 43 | * DNS query API | |
| 44 | **************************************************************************/ | |
| 45 | ||
| 15884 | 46 | 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
|
47 | |
| 15884 | 48 | typedef struct _PurpleDnsQueryResolverProcess PurpleDnsQueryResolverProcess; |
|
14300
68a0aa63f3b8
[gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
49 | |
| 15884 | 50 | struct _PurpleDnsQueryData { |
|
14300
68a0aa63f3b8
[gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
51 | char *hostname; |
|
68a0aa63f3b8
[gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
52 | int port; |
| 15884 | 53 | PurpleDnsQueryConnectFunction callback; |
|
14300
68a0aa63f3b8
[gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
54 | gpointer data; |
|
68a0aa63f3b8
[gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
55 | guint timeout; |
|
68a0aa63f3b8
[gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
56 | |
|
23352
9714223ca7a7
A patch from Peter O'Gorman at The Written Word, Inc. to fix various
Peter O'Gorman <pogma@thewrittenword.com>
parents:
22622
diff
changeset
|
57 | #if defined(PURPLE_DNSQUERY_USE_FORK) |
| 15884 | 58 | 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
|
59 | #elif defined _WIN32 /* end PURPLE_DNSQUERY_USE_FORK */ |
|
14300
68a0aa63f3b8
[gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
60 | GThread *resolver; |
|
68a0aa63f3b8
[gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
61 | GSList *hosts; |
|
68a0aa63f3b8
[gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
62 | gchar *error_message; |
|
14349
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
63 | #endif |
|
14245
8a215625c6cb
[gaim-migrate @ 16835]
Mark Doliner <markdoliner@pidgin.im>
parents:
14244
diff
changeset
|
64 | }; |
|
8a215625c6cb
[gaim-migrate @ 16835]
Mark Doliner <markdoliner@pidgin.im>
parents:
14244
diff
changeset
|
65 | |
|
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
|
66 | #if defined(PURPLE_DNSQUERY_USE_FORK) |
|
14349
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
67 | |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
68 | #define MAX_DNS_CHILDREN 4 |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
69 | |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
70 | /* |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
71 | * This structure keeps a reference to a child resolver process. |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
72 | */ |
| 15884 | 73 | struct _PurpleDnsQueryResolverProcess { |
|
14349
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
74 | guint inpa; |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
75 | int fd_in, fd_out; |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
76 | pid_t dns_pid; |
|
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 | |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
79 | static GSList *free_dns_children = NULL; |
|
27736
37496418416a
Fix a leak of the queued_requests from purple_dnsquery_a.
Aman Gupta <aman@tmm1.net>
parents:
27497
diff
changeset
|
80 | /* TODO: Make me a GQueue when we require >= glib 2.4 */ |
|
14711
404c5a931bb2
[gaim-migrate @ 17395]
Mark Doliner <markdoliner@pidgin.im>
parents:
14572
diff
changeset
|
81 | static GSList *queued_requests = NULL; |
|
14349
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
82 | |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
83 | static int number_of_dns_children = 0; |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
84 | |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
85 | /* |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
86 | * This is a convenience struct used to pass data to |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
87 | * the child resolver process. |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
88 | */ |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
89 | typedef struct { |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
90 | char hostname[512]; |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
91 | int port; |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
92 | } dns_params_t; |
|
24321
0d6d024049eb
Improve a few comments
Mark Doliner <markdoliner@pidgin.im>
parents:
24318
diff
changeset
|
93 | #endif /* end PURPLE_DNSQUERY_USE_FORK */ |
|
14349
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
94 | |
|
14300
68a0aa63f3b8
[gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
95 | static void |
| 15884 | 96 | purple_dnsquery_resolved(PurpleDnsQueryData *query_data, GSList *hosts) |
|
14300
68a0aa63f3b8
[gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
97 | { |
| 15884 | 98 | 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
|
99 | if (query_data->callback != NULL) |
|
68a0aa63f3b8
[gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
100 | query_data->callback(hosts, query_data->data, NULL); |
|
14420
3c78e468b45a
[gaim-migrate @ 17064]
Mark Doliner <markdoliner@pidgin.im>
parents:
14349
diff
changeset
|
101 | else |
|
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 | /* |
|
3c78e468b45a
[gaim-migrate @ 17064]
Mark Doliner <markdoliner@pidgin.im>
parents:
14349
diff
changeset
|
104 | * Callback is a required parameter, but it can get set to |
|
3c78e468b45a
[gaim-migrate @ 17064]
Mark Doliner <markdoliner@pidgin.im>
parents:
14349
diff
changeset
|
105 | * 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
|
106 | * to free hosts. |
|
3c78e468b45a
[gaim-migrate @ 17064]
Mark Doliner <markdoliner@pidgin.im>
parents:
14349
diff
changeset
|
107 | */ |
|
3c78e468b45a
[gaim-migrate @ 17064]
Mark Doliner <markdoliner@pidgin.im>
parents:
14349
diff
changeset
|
108 | while (hosts != NULL) |
|
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 | hosts = g_slist_remove(hosts, hosts->data); |
|
3c78e468b45a
[gaim-migrate @ 17064]
Mark Doliner <markdoliner@pidgin.im>
parents:
14349
diff
changeset
|
111 | g_free(hosts->data); |
|
3c78e468b45a
[gaim-migrate @ 17064]
Mark Doliner <markdoliner@pidgin.im>
parents:
14349
diff
changeset
|
112 | hosts = g_slist_remove(hosts, hosts->data); |
|
3c78e468b45a
[gaim-migrate @ 17064]
Mark Doliner <markdoliner@pidgin.im>
parents:
14349
diff
changeset
|
113 | } |
|
3c78e468b45a
[gaim-migrate @ 17064]
Mark Doliner <markdoliner@pidgin.im>
parents:
14349
diff
changeset
|
114 | } |
|
3c78e468b45a
[gaim-migrate @ 17064]
Mark Doliner <markdoliner@pidgin.im>
parents:
14349
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 | #ifdef PURPLE_DNSQUERY_USE_FORK |
|
24318
b2b1a42a7816
Revert my revision 3777b91f70ab86e67c1e039d08fb6d87e06f20d6, which
Mark Doliner <markdoliner@pidgin.im>
parents:
24287
diff
changeset
|
117 | /* |
|
24325
9b63613e82ab
Fix DNS resolution. I think I broke this this morning in my revision
Mark Doliner <markdoliner@pidgin.im>
parents:
24324
diff
changeset
|
118 | * 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
|
119 | * 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
|
120 | */ |
|
24325
9b63613e82ab
Fix DNS resolution. I think I broke this this morning in my revision
Mark Doliner <markdoliner@pidgin.im>
parents:
24324
diff
changeset
|
121 | 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
|
122 | 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
|
123 | #endif /* PURPLE_DNSQUERY_USE_FORK */ |
|
24318
b2b1a42a7816
Revert my revision 3777b91f70ab86e67c1e039d08fb6d87e06f20d6, which
Mark Doliner <markdoliner@pidgin.im>
parents:
24287
diff
changeset
|
124 | |
| 15884 | 125 | purple_dnsquery_destroy(query_data); |
|
14300
68a0aa63f3b8
[gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
126 | } |
|
68a0aa63f3b8
[gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
127 | |
|
68a0aa63f3b8
[gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
128 | static void |
| 15884 | 129 | purple_dnsquery_failed(PurpleDnsQueryData *query_data, const gchar *error_message) |
|
14300
68a0aa63f3b8
[gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
130 | { |
|
27497
2dc5a0e0c4c2
Increase the logging level of some debugging messages that seemed to be a
Mauro Brasil <mauro.brasil@tqi.com.br>
parents:
27157
diff
changeset
|
131 | purple_debug_error("dnsquery", "%s\n", error_message); |
|
14300
68a0aa63f3b8
[gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
132 | if (query_data->callback != NULL) |
|
68a0aa63f3b8
[gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
133 | query_data->callback(NULL, query_data->data, error_message); |
| 15884 | 134 | purple_dnsquery_destroy(query_data); |
|
14300
68a0aa63f3b8
[gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
135 | } |
|
68a0aa63f3b8
[gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
136 | |
|
15763
2b529e4350bc
The UI can now use the GaimDnsQueryUiOps to handle DNS resolving itself; if this is done, the platform-specific DNS query code won't be used. This will be used in Adium to use an efficient threads-based DNS resolve (since Adium is already multithreaded, this is significantly cheaper than fork()).
Evan Schoenberg <evands@pidgin.im>
parents:
15707
diff
changeset
|
137 | static gboolean |
| 15884 | 138 | purple_dnsquery_ui_resolve(PurpleDnsQueryData *query_data) |
|
15763
2b529e4350bc
The UI can now use the GaimDnsQueryUiOps to handle DNS resolving itself; if this is done, the platform-specific DNS query code won't be used. This will be used in Adium to use an efficient threads-based DNS resolve (since Adium is already multithreaded, this is significantly cheaper than fork()).
Evan Schoenberg <evands@pidgin.im>
parents:
15707
diff
changeset
|
139 | { |
| 15884 | 140 | PurpleDnsQueryUiOps *ops = purple_dnsquery_get_ui_ops(); |
|
15763
2b529e4350bc
The UI can now use the GaimDnsQueryUiOps to handle DNS resolving itself; if this is done, the platform-specific DNS query code won't be used. This will be used in Adium to use an efficient threads-based DNS resolve (since Adium is already multithreaded, this is significantly cheaper than fork()).
Evan Schoenberg <evands@pidgin.im>
parents:
15707
diff
changeset
|
141 | |
|
15775
a1aed6d0c33b
No changes; fixed a bunch of whitespace problems made by a text editor with 'use tabs' disabled. Sorry for the noise.
Evan Schoenberg <evands@pidgin.im>
parents:
15771
diff
changeset
|
142 | if (ops && ops->resolve_host) |
|
24323
fe88d45063e8
Simplify two bits of code a little
Mark Doliner <markdoliner@pidgin.im>
parents:
24322
diff
changeset
|
143 | return ops->resolve_host(query_data, purple_dnsquery_resolved, purple_dnsquery_failed); |
|
15763
2b529e4350bc
The UI can now use the GaimDnsQueryUiOps to handle DNS resolving itself; if this is done, the platform-specific DNS query code won't be used. This will be used in Adium to use an efficient threads-based DNS resolve (since Adium is already multithreaded, this is significantly cheaper than fork()).
Evan Schoenberg <evands@pidgin.im>
parents:
15707
diff
changeset
|
144 | |
|
2b529e4350bc
The UI can now use the GaimDnsQueryUiOps to handle DNS resolving itself; if this is done, the platform-specific DNS query code won't be used. This will be used in Adium to use an efficient threads-based DNS resolve (since Adium is already multithreaded, this is significantly cheaper than fork()).
Evan Schoenberg <evands@pidgin.im>
parents:
15707
diff
changeset
|
145 | return FALSE; |
|
2b529e4350bc
The UI can now use the GaimDnsQueryUiOps to handle DNS resolving itself; if this is done, the platform-specific DNS query code won't be used. This will be used in Adium to use an efficient threads-based DNS resolve (since Adium is already multithreaded, this is significantly cheaper than fork()).
Evan Schoenberg <evands@pidgin.im>
parents:
15707
diff
changeset
|
146 | } |
|
2b529e4350bc
The UI can now use the GaimDnsQueryUiOps to handle DNS resolving itself; if this is done, the platform-specific DNS query code won't be used. This will be used in Adium to use an efficient threads-based DNS resolve (since Adium is already multithreaded, this is significantly cheaper than fork()).
Evan Schoenberg <evands@pidgin.im>
parents:
15707
diff
changeset
|
147 | |
|
27737
d2abba8c8e1f
Don't fork a resolver process for IPs.
Aman Gupta <aman@tmm1.net>
parents:
27736
diff
changeset
|
148 | static gboolean |
|
d2abba8c8e1f
Don't fork a resolver process for IPs.
Aman Gupta <aman@tmm1.net>
parents:
27736
diff
changeset
|
149 | resolve_ip(PurpleDnsQueryData *query_data) |
|
d2abba8c8e1f
Don't fork a resolver process for IPs.
Aman Gupta <aman@tmm1.net>
parents:
27736
diff
changeset
|
150 | { |
|
d2abba8c8e1f
Don't fork a resolver process for IPs.
Aman Gupta <aman@tmm1.net>
parents:
27736
diff
changeset
|
151 | struct sockaddr_in sin; |
|
d2abba8c8e1f
Don't fork a resolver process for IPs.
Aman Gupta <aman@tmm1.net>
parents:
27736
diff
changeset
|
152 | if (inet_aton(query_data->hostname, &sin.sin_addr)) |
|
d2abba8c8e1f
Don't fork a resolver process for IPs.
Aman Gupta <aman@tmm1.net>
parents:
27736
diff
changeset
|
153 | { |
|
d2abba8c8e1f
Don't fork a resolver process for IPs.
Aman Gupta <aman@tmm1.net>
parents:
27736
diff
changeset
|
154 | /* |
|
d2abba8c8e1f
Don't fork a resolver process for IPs.
Aman Gupta <aman@tmm1.net>
parents:
27736
diff
changeset
|
155 | * The given "hostname" is actually an IP address, so we |
|
d2abba8c8e1f
Don't fork a resolver process for IPs.
Aman Gupta <aman@tmm1.net>
parents:
27736
diff
changeset
|
156 | * don't need to do anything. |
|
d2abba8c8e1f
Don't fork a resolver process for IPs.
Aman Gupta <aman@tmm1.net>
parents:
27736
diff
changeset
|
157 | */ |
|
d2abba8c8e1f
Don't fork a resolver process for IPs.
Aman Gupta <aman@tmm1.net>
parents:
27736
diff
changeset
|
158 | GSList *hosts = NULL; |
|
d2abba8c8e1f
Don't fork a resolver process for IPs.
Aman Gupta <aman@tmm1.net>
parents:
27736
diff
changeset
|
159 | sin.sin_family = AF_INET; |
|
d2abba8c8e1f
Don't fork a resolver process for IPs.
Aman Gupta <aman@tmm1.net>
parents:
27736
diff
changeset
|
160 | sin.sin_port = htons(query_data->port); |
|
d2abba8c8e1f
Don't fork a resolver process for IPs.
Aman Gupta <aman@tmm1.net>
parents:
27736
diff
changeset
|
161 | hosts = g_slist_append(hosts, GINT_TO_POINTER(sizeof(sin))); |
|
d2abba8c8e1f
Don't fork a resolver process for IPs.
Aman Gupta <aman@tmm1.net>
parents:
27736
diff
changeset
|
162 | hosts = g_slist_append(hosts, g_memdup(&sin, sizeof(sin))); |
|
d2abba8c8e1f
Don't fork a resolver process for IPs.
Aman Gupta <aman@tmm1.net>
parents:
27736
diff
changeset
|
163 | purple_dnsquery_resolved(query_data, hosts); |
|
d2abba8c8e1f
Don't fork a resolver process for IPs.
Aman Gupta <aman@tmm1.net>
parents:
27736
diff
changeset
|
164 | |
|
d2abba8c8e1f
Don't fork a resolver process for IPs.
Aman Gupta <aman@tmm1.net>
parents:
27736
diff
changeset
|
165 | return TRUE; |
|
d2abba8c8e1f
Don't fork a resolver process for IPs.
Aman Gupta <aman@tmm1.net>
parents:
27736
diff
changeset
|
166 | } |
|
d2abba8c8e1f
Don't fork a resolver process for IPs.
Aman Gupta <aman@tmm1.net>
parents:
27736
diff
changeset
|
167 | |
|
d2abba8c8e1f
Don't fork a resolver process for IPs.
Aman Gupta <aman@tmm1.net>
parents:
27736
diff
changeset
|
168 | return FALSE; |
|
d2abba8c8e1f
Don't fork a resolver process for IPs.
Aman Gupta <aman@tmm1.net>
parents:
27736
diff
changeset
|
169 | } |
|
d2abba8c8e1f
Don't fork a resolver process for IPs.
Aman Gupta <aman@tmm1.net>
parents:
27736
diff
changeset
|
170 | |
|
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
|
171 | #if defined(PURPLE_DNSQUERY_USE_FORK) |
|
14349
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
172 | |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
173 | /* |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
174 | * Unix! |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
175 | */ |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
176 | |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
177 | /* |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
178 | * Begin the DNS resolver child process functions. |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
179 | */ |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
180 | #ifdef HAVE_SIGNAL_H |
|
16701
0b41f23396cc
Mark two functions as "noreturn"
Mark Doliner <markdoliner@pidgin.im>
parents:
15890
diff
changeset
|
181 | 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
|
182 | trap_gdb_bug(int sig) |
|
14349
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
183 | { |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
184 | const char *message = |
| 15884 | 185 | "Purple's DNS child got a SIGTRAP signal.\n" |
| 186 | "This can be caused by trying to run purple inside gdb.\n" | |
| 187 | "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
|
188 | "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
|
189 | "check cope_with_gdb_brokenness() in dnsquery.c.\n\n" |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
190 | "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
|
191 | fputs("\n* * *\n",stderr); |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
192 | fputs(message,stderr); |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
193 | fputs("* * *\n\n",stderr); |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
194 | execlp("xmessage","xmessage","-center", message, NULL); |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
195 | _exit(1); |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
196 | } |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
197 | #endif |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
198 | |
|
22234
4d54e1c5c696
More compiler warning fixes from o_sukhodolsky (with additions by me).
Mark Doliner <markdoliner@pidgin.im>
parents:
22108
diff
changeset
|
199 | static void |
|
4d54e1c5c696
More compiler warning fixes from o_sukhodolsky (with additions by me).
Mark Doliner <markdoliner@pidgin.im>
parents:
22108
diff
changeset
|
200 | 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
|
201 | { |
|
4d54e1c5c696
More compiler warning fixes from o_sukhodolsky (with additions by me).
Mark Doliner <markdoliner@pidgin.im>
parents:
22108
diff
changeset
|
202 | ssize_t written; |
|
4d54e1c5c696
More compiler warning fixes from o_sukhodolsky (with additions by me).
Mark Doliner <markdoliner@pidgin.im>
parents:
22108
diff
changeset
|
203 | |
|
4d54e1c5c696
More compiler warning fixes from o_sukhodolsky (with additions by me).
Mark Doliner <markdoliner@pidgin.im>
parents:
22108
diff
changeset
|
204 | 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
|
205 | if (written != count) { |
|
4d54e1c5c696
More compiler warning fixes from o_sukhodolsky (with additions by me).
Mark Doliner <markdoliner@pidgin.im>
parents:
22108
diff
changeset
|
206 | if (written < 0) |
|
4d54e1c5c696
More compiler warning fixes from o_sukhodolsky (with additions by me).
Mark Doliner <markdoliner@pidgin.im>
parents:
22108
diff
changeset
|
207 | 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
|
208 | "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
|
209 | else |
|
4d54e1c5c696
More compiler warning fixes from o_sukhodolsky (with additions by me).
Mark Doliner <markdoliner@pidgin.im>
parents:
22108
diff
changeset
|
210 | 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
|
211 | 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
|
212 | "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
|
213 | getpid(), count, written); |
|
4d54e1c5c696
More compiler warning fixes from o_sukhodolsky (with additions by me).
Mark Doliner <markdoliner@pidgin.im>
parents:
22108
diff
changeset
|
214 | } |
|
4d54e1c5c696
More compiler warning fixes from o_sukhodolsky (with additions by me).
Mark Doliner <markdoliner@pidgin.im>
parents:
22108
diff
changeset
|
215 | } |
|
4d54e1c5c696
More compiler warning fixes from o_sukhodolsky (with additions by me).
Mark Doliner <markdoliner@pidgin.im>
parents:
22108
diff
changeset
|
216 | |
|
16701
0b41f23396cc
Mark two functions as "noreturn"
Mark Doliner <markdoliner@pidgin.im>
parents:
15890
diff
changeset
|
217 | G_GNUC_NORETURN static void |
| 15884 | 218 | 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
|
219 | { |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
220 | dns_params_t dns_params; |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
221 | const size_t zero = 0; |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
222 | int rc; |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
223 | #ifdef HAVE_GETADDRINFO |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
224 | struct addrinfo hints, *res, *tmp; |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
225 | char servname[20]; |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
226 | #else |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
227 | struct sockaddr_in sin; |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
228 | const size_t addrlen = sizeof(sin); |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
229 | #endif |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
230 | |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
231 | #ifdef HAVE_SIGNAL_H |
| 15884 | 232 | purple_restore_default_signal_handlers(); |
|
14349
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
233 | signal(SIGTRAP, trap_gdb_bug); |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
234 | #endif |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
235 | |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
236 | /* |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
237 | * We resolve 1 host name for each iteration of this |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
238 | * while loop. |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
239 | * |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
240 | * The top half of this reads in the hostname and port |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
241 | * number from the socket with our parent. The bottom |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
242 | * half of this resolves the IP (blocking) and sends |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
243 | * the result back to our parent, when finished. |
|
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 | while (1) { |
|
24318
b2b1a42a7816
Revert my revision 3777b91f70ab86e67c1e039d08fb6d87e06f20d6, which
Mark Doliner <markdoliner@pidgin.im>
parents:
24287
diff
changeset
|
246 | fd_set fds; |
|
b2b1a42a7816
Revert my revision 3777b91f70ab86e67c1e039d08fb6d87e06f20d6, which
Mark Doliner <markdoliner@pidgin.im>
parents:
24287
diff
changeset
|
247 | struct timeval tv = { .tv_sec = 20, .tv_usec = 0 }; |
|
b2b1a42a7816
Revert my revision 3777b91f70ab86e67c1e039d08fb6d87e06f20d6, which
Mark Doliner <markdoliner@pidgin.im>
parents:
24287
diff
changeset
|
248 | FD_ZERO(&fds); |
|
b2b1a42a7816
Revert my revision 3777b91f70ab86e67c1e039d08fb6d87e06f20d6, which
Mark Doliner <markdoliner@pidgin.im>
parents:
24287
diff
changeset
|
249 | FD_SET(child_in, &fds); |
|
b2b1a42a7816
Revert my revision 3777b91f70ab86e67c1e039d08fb6d87e06f20d6, which
Mark Doliner <markdoliner@pidgin.im>
parents:
24287
diff
changeset
|
250 | rc = select(child_in + 1, &fds, NULL, NULL, &tv); |
|
b2b1a42a7816
Revert my revision 3777b91f70ab86e67c1e039d08fb6d87e06f20d6, which
Mark Doliner <markdoliner@pidgin.im>
parents:
24287
diff
changeset
|
251 | if (!rc) { |
|
b2b1a42a7816
Revert my revision 3777b91f70ab86e67c1e039d08fb6d87e06f20d6, which
Mark Doliner <markdoliner@pidgin.im>
parents:
24287
diff
changeset
|
252 | if (show_debug) |
|
b2b1a42a7816
Revert my revision 3777b91f70ab86e67c1e039d08fb6d87e06f20d6, which
Mark Doliner <markdoliner@pidgin.im>
parents:
24287
diff
changeset
|
253 | printf("dns[%d]: nobody needs me... =(\n", getpid()); |
|
b2b1a42a7816
Revert my revision 3777b91f70ab86e67c1e039d08fb6d87e06f20d6, which
Mark Doliner <markdoliner@pidgin.im>
parents:
24287
diff
changeset
|
254 | break; |
|
b2b1a42a7816
Revert my revision 3777b91f70ab86e67c1e039d08fb6d87e06f20d6, which
Mark Doliner <markdoliner@pidgin.im>
parents:
24287
diff
changeset
|
255 | } |
|
14349
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
256 | rc = read(child_in, &dns_params, sizeof(dns_params_t)); |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
257 | 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
|
258 | 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
|
259 | "%s\n", getpid(), strerror(errno)); |
|
14349
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
260 | break; |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
261 | } |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
262 | if (rc == 0) { |
|
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]: Oops, father has gone, wait for me, wait...!\n", getpid()); |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
265 | _exit(0); |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
266 | } |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
267 | 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
|
268 | 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
|
269 | "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
|
270 | dns_params.port); |
|
14349
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
271 | _exit(1); |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
272 | } |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
273 | |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
274 | /* We have the hostname and port, now resolve the IP */ |
|
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 | #ifdef HAVE_GETADDRINFO |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
277 | g_snprintf(servname, sizeof(servname), "%d", dns_params.port); |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
278 | memset(&hints, 0, sizeof(hints)); |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
279 | |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
280 | /* This is only used to convert a service |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
281 | * name to a port number. As we know we are |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
282 | * passing a number already, we know this |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
283 | * value will not be really used by the C |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
284 | * library. |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
285 | */ |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
286 | hints.ai_socktype = SOCK_STREAM; |
|
27147
7f09d9398273
Don't do IPv6 AAAA lookups if there is no IPv6 address configured on
Mark Doliner <markdoliner@pidgin.im>
parents:
27116
diff
changeset
|
287 | #ifdef AI_ADDRCONFIG |
|
7f09d9398273
Don't do IPv6 AAAA lookups if there is no IPv6 address configured on
Mark Doliner <markdoliner@pidgin.im>
parents:
27116
diff
changeset
|
288 | hints.ai_flags |= AI_ADDRCONFIG; |
|
7f09d9398273
Don't do IPv6 AAAA lookups if there is no IPv6 address configured on
Mark Doliner <markdoliner@pidgin.im>
parents:
27116
diff
changeset
|
289 | #endif /* AI_ADDRCONFIG */ |
|
14349
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
290 | 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
|
291 | write_to_parent(child_out, &rc, sizeof(rc)); |
|
14349
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
292 | if (rc != 0) { |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
293 | close(child_out); |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
294 | if (show_debug) |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
295 | printf("dns[%d] Error: getaddrinfo returned %d\n", |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
296 | getpid(), rc); |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
297 | dns_params.hostname[0] = '\0'; |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
298 | continue; |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
299 | } |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
300 | tmp = res; |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
301 | while (res) { |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
302 | 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
|
303 | 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
|
304 | 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
|
305 | res = res->ai_next; |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
306 | } |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
307 | freeaddrinfo(tmp); |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
308 | #else |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
309 | if (!inet_aton(dns_params.hostname, &sin.sin_addr)) { |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
310 | struct hostent *hp; |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
311 | 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
|
312 | write_to_parent(child_out, &h_errno, sizeof(int)); |
|
14349
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
313 | close(child_out); |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
314 | if (show_debug) |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
315 | printf("DNS Error: %d\n", h_errno); |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
316 | _exit(0); |
|
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 | memset(&sin, 0, sizeof(struct sockaddr_in)); |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
319 | 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
|
320 | sin.sin_family = hp->h_addrtype; |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
321 | } else |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
322 | sin.sin_family = AF_INET; |
|
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 | sin.sin_port = htons(dns_params.port); |
|
25360
4315bf325ab4
Ludovico Cavedon noticed that on 64-bit platforms, when HAVE_GETADDRINFO isn't
Daniel Atallah <datallah@pidgin.im>
parents:
24701
diff
changeset
|
325 | rc = 0; |
|
4315bf325ab4
Ludovico Cavedon noticed that on 64-bit platforms, when HAVE_GETADDRINFO isn't
Daniel Atallah <datallah@pidgin.im>
parents:
24701
diff
changeset
|
326 | write_to_parent(child_out, &rc, sizeof(rc)); |
|
22234
4d54e1c5c696
More compiler warning fixes from o_sukhodolsky (with additions by me).
Mark Doliner <markdoliner@pidgin.im>
parents:
22108
diff
changeset
|
327 | 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
|
328 | write_to_parent(child_out, &sin, addrlen); |
|
25360
4315bf325ab4
Ludovico Cavedon noticed that on 64-bit platforms, when HAVE_GETADDRINFO isn't
Daniel Atallah <datallah@pidgin.im>
parents:
24701
diff
changeset
|
329 | #endif |
|
22234
4d54e1c5c696
More compiler warning fixes from o_sukhodolsky (with additions by me).
Mark Doliner <markdoliner@pidgin.im>
parents:
22108
diff
changeset
|
330 | write_to_parent(child_out, &zero, sizeof(zero)); |
|
14349
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
331 | dns_params.hostname[0] = '\0'; |
|
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 | |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
334 | close(child_out); |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
335 | close(child_in); |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
336 | |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
337 | _exit(0); |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
338 | } |
|
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 | * End the DNS resolver child process functions. |
|
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 | /* |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
344 | * Begin the functions for dealing with the DNS child processes. |
|
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 | 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
|
347 | cope_with_gdb_brokenness(void) |
|
14349
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 | #ifdef __linux__ |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
350 | static gboolean already_done = FALSE; |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
351 | char s[256], e[512]; |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
352 | int n; |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
353 | pid_t ppid; |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
354 | |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
355 | if(already_done) |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
356 | return; |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
357 | already_done = TRUE; |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
358 | ppid = getppid(); |
|
27116
19dff7b3ed0f
A patch from Scott Wolchok to replace snprintf() with g_snprintf() and
Richard Laager <rlaager@pidgin.im>
parents:
25360
diff
changeset
|
359 | g_snprintf(s, sizeof(s), "/proc/%d/exe", ppid); |
|
14349
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
360 | n = readlink(s, e, sizeof(e)); |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
361 | if(n < 0) |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
362 | return; |
|
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 | e[MIN(n,sizeof(e)-1)] = '\0'; |
|
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 | if(strstr(e,"gdb")) { |
| 15884 | 367 | purple_debug_info("dns", |
|
14349
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
368 | "Debugger detected, performing useless query...\n"); |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
369 | gethostbyname("x.x.x.x.x"); |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
370 | } |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
371 | #endif |
|
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 | |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
374 | static void |
| 15884 | 375 | purple_dnsquery_resolver_destroy(PurpleDnsQueryResolverProcess *resolver) |
|
14349
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
376 | { |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
377 | g_return_if_fail(resolver != NULL); |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
378 | |
|
24701
777f269be1b0
Fix a crash Jacky Lam noted on devel@pidgin.im:
Richard Laager <rlaager@pidgin.im>
parents:
24390
diff
changeset
|
379 | /* Keep this before the kill() call below. */ |
|
777f269be1b0
Fix a crash Jacky Lam noted on devel@pidgin.im:
Richard Laager <rlaager@pidgin.im>
parents:
24390
diff
changeset
|
380 | if (resolver->inpa != 0) { |
|
777f269be1b0
Fix a crash Jacky Lam noted on devel@pidgin.im:
Richard Laager <rlaager@pidgin.im>
parents:
24390
diff
changeset
|
381 | purple_input_remove(resolver->inpa); |
|
777f269be1b0
Fix a crash Jacky Lam noted on devel@pidgin.im:
Richard Laager <rlaager@pidgin.im>
parents:
24390
diff
changeset
|
382 | resolver->inpa = 0; |
|
777f269be1b0
Fix a crash Jacky Lam noted on devel@pidgin.im:
Richard Laager <rlaager@pidgin.im>
parents:
24390
diff
changeset
|
383 | } |
|
777f269be1b0
Fix a crash Jacky Lam noted on devel@pidgin.im:
Richard Laager <rlaager@pidgin.im>
parents:
24390
diff
changeset
|
384 | |
|
14349
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
385 | /* |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
386 | * 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
|
387 | * doesn't matter if this fails, because children will expire on |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
388 | * their own after a few seconds. |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
389 | */ |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
390 | if (resolver->dns_pid > 0) |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
391 | kill(resolver->dns_pid, SIGKILL); |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
392 | |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
393 | close(resolver->fd_in); |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
394 | close(resolver->fd_out); |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
395 | |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
396 | g_free(resolver); |
|
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 | number_of_dns_children--; |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
399 | } |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
400 | |
| 15884 | 401 | static PurpleDnsQueryResolverProcess * |
| 402 | purple_dnsquery_resolver_new(gboolean show_debug) | |
|
14349
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
403 | { |
| 15884 | 404 | PurpleDnsQueryResolverProcess *resolver; |
|
14349
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
405 | int child_out[2], child_in[2]; |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
406 | |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
407 | /* Create pipes for communicating with the child process */ |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
408 | if (pipe(child_out) || pipe(child_in)) { |
| 15884 | 409 | 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
|
410 | "Could not create pipes: %s\n", g_strerror(errno)); |
|
14349
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
411 | return NULL; |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
412 | } |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
413 | |
| 15884 | 414 | resolver = g_new(PurpleDnsQueryResolverProcess, 1); |
|
14349
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
415 | resolver->inpa = 0; |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
416 | |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
417 | cope_with_gdb_brokenness(); |
|
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 | /* "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
|
420 | resolver->dns_pid = fork(); |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
421 | |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
422 | /* If we are the child process... */ |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
423 | if (resolver->dns_pid == 0) { |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
424 | /* 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
|
425 | close(child_out[0]); |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
426 | close(child_in[1]); |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
427 | |
| 15884 | 428 | 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
|
429 | /* 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
|
430 | } |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
431 | |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
432 | /* 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
|
433 | close(child_out[1]); |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
434 | close(child_in[0]); |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
435 | if (resolver->dns_pid == -1) { |
| 15884 | 436 | purple_debug_error("dns", |
|
14349
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
437 | "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
|
438 | g_strerror(errno)); |
| 15884 | 439 | purple_dnsquery_resolver_destroy(resolver); |
|
14349
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
440 | return NULL; |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
441 | } |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
442 | |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
443 | resolver->fd_out = child_out[0]; |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
444 | resolver->fd_in = child_in[1]; |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
445 | number_of_dns_children++; |
| 15884 | 446 | purple_debug_info("dns", |
|
14349
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
447 | "Created new DNS child %d, there are now %d children.\n", |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
448 | resolver->dns_pid, number_of_dns_children); |
|
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 | return resolver; |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
451 | } |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
452 | |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
453 | /** |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
454 | * @return TRUE if the request was sent succesfully. FALSE |
|
24321
0d6d024049eb
Improve a few comments
Mark Doliner <markdoliner@pidgin.im>
parents:
24318
diff
changeset
|
455 | * if the request could not be sent. This isn't |
|
0d6d024049eb
Improve a few comments
Mark Doliner <markdoliner@pidgin.im>
parents:
24318
diff
changeset
|
456 | * necessarily an error. If the child has expired, |
|
0d6d024049eb
Improve a few comments
Mark Doliner <markdoliner@pidgin.im>
parents:
24318
diff
changeset
|
457 | * 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
|
458 | */ |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
459 | static gboolean |
| 15884 | 460 | send_dns_request_to_child(PurpleDnsQueryData *query_data, |
| 461 | PurpleDnsQueryResolverProcess *resolver) | |
|
14349
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
462 | { |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
463 | pid_t pid; |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
464 | 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
|
465 | ssize_t rc; |
|
14349
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
466 | |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
467 | /* 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
|
468 | * exited, or it might return an error if it exited "long |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
469 | * enough" ago that it has already been reaped; in either |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
470 | * instance, we can't use it. */ |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
471 | pid = waitpid(resolver->dns_pid, NULL, WNOHANG); |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
472 | if (pid > 0) { |
| 15884 | 473 | 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
|
474 | resolver->dns_pid); |
| 15884 | 475 | purple_dnsquery_resolver_destroy(resolver); |
|
14349
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
476 | return FALSE; |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
477 | } else if (pid < 0) { |
| 15884 | 478 | 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
|
479 | resolver->dns_pid, g_strerror(errno)); |
| 15884 | 480 | purple_dnsquery_resolver_destroy(resolver); |
|
14349
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
481 | return FALSE; |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
482 | } |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
483 | |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
484 | /* Copy the hostname and port into a single data structure */ |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
485 | 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
|
486 | dns_params.hostname[sizeof(dns_params.hostname) - 1] = '\0'; |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
487 | dns_params.port = query_data->port; |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
488 | |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
489 | /* Send the data structure to the child */ |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
490 | rc = write(resolver->fd_in, &dns_params, sizeof(dns_params)); |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
491 | 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
|
492 | 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
|
493 | resolver->dns_pid, g_strerror(errno)); |
| 15884 | 494 | purple_dnsquery_resolver_destroy(resolver); |
|
14349
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
495 | return FALSE; |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
496 | } |
|
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
|
497 | if (rc < sizeof(dns_params)) { |
|
24390
24755e1e9f11
Fix this debug message. Thanks to fledermaus who pointed it out.
Mark Doliner <markdoliner@pidgin.im>
parents:
24325
diff
changeset
|
498 | purple_debug_error("dns", "Tried to write %" G_GSSIZE_FORMAT |
|
24755e1e9f11
Fix this debug message. Thanks to fledermaus who pointed it out.
Mark Doliner <markdoliner@pidgin.im>
parents:
24325
diff
changeset
|
499 | " bytes to child but only wrote %" G_GSSIZE_FORMAT "\n", |
|
24287
a2e8d72efd34
Fix this g_return_val_if_fail. It should have been returning TRUE or
Mark Doliner <markdoliner@pidgin.im>
parents:
24286
diff
changeset
|
500 | 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
|
501 | 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
|
502 | 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
|
503 | } |
|
14349
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
504 | |
| 15884 | 505 | purple_debug_info("dns", |
|
14349
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
506 | "Successfully sent DNS request to child %d\n", |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
507 | resolver->dns_pid); |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
508 | |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
509 | query_data->resolver = resolver; |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
510 | |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
511 | return TRUE; |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
512 | } |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
513 | |
| 15884 | 514 | static void host_resolved(gpointer data, gint source, PurpleInputCondition cond); |
|
14349
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 | 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
|
517 | handle_next_queued_request(void) |
|
14349
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
518 | { |
| 15884 | 519 | PurpleDnsQueryData *query_data; |
| 520 | PurpleDnsQueryResolverProcess *resolver; | |
|
14349
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
521 | |
|
14711
404c5a931bb2
[gaim-migrate @ 17395]
Mark Doliner <markdoliner@pidgin.im>
parents:
14572
diff
changeset
|
522 | if (queued_requests == NULL) |
|
14349
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
523 | /* No more DNS queries, yay! */ |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
524 | return; |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
525 | |
|
14711
404c5a931bb2
[gaim-migrate @ 17395]
Mark Doliner <markdoliner@pidgin.im>
parents:
14572
diff
changeset
|
526 | query_data = queued_requests->data; |
|
404c5a931bb2
[gaim-migrate @ 17395]
Mark Doliner <markdoliner@pidgin.im>
parents:
14572
diff
changeset
|
527 | queued_requests = g_slist_delete_link(queued_requests, queued_requests); |
|
14349
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
528 | |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
529 | /* |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
530 | * 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
|
531 | * query. If we're able to send the query then resolver will be |
| 15884 | 532 | * set to the PurpleDnsQueryResolverProcess. Otherwise, resolver |
|
14349
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
533 | * 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
|
534 | */ |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
535 | while (free_dns_children != NULL) |
|
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 | resolver = free_dns_children->data; |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
538 | free_dns_children = g_slist_remove(free_dns_children, resolver); |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
539 | |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
540 | if (send_dns_request_to_child(query_data, resolver)) |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
541 | /* We found an acceptable child, yay */ |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
542 | break; |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
543 | } |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
544 | |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
545 | /* We need to create a new DNS request child */ |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
546 | if (query_data->resolver == NULL) |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
547 | { |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
548 | if (number_of_dns_children >= MAX_DNS_CHILDREN) |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
549 | { |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
550 | /* Apparently all our children are busy */ |
|
14711
404c5a931bb2
[gaim-migrate @ 17395]
Mark Doliner <markdoliner@pidgin.im>
parents:
14572
diff
changeset
|
551 | queued_requests = g_slist_prepend(queued_requests, query_data); |
|
14349
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
552 | return; |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
553 | } |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
554 | |
| 15884 | 555 | resolver = purple_dnsquery_resolver_new(purple_debug_is_enabled()); |
|
14349
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
556 | if (resolver == NULL) |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
557 | { |
| 15884 | 558 | 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
|
559 | return; |
|
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 | if (!send_dns_request_to_child(query_data, resolver)) |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
562 | { |
| 15884 | 563 | 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
|
564 | return; |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
565 | } |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
566 | } |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
567 | |
| 15884 | 568 | query_data->resolver->inpa = purple_input_add(query_data->resolver->fd_out, |
| 569 | PURPLE_INPUT_READ, host_resolved, query_data); | |
|
14349
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
570 | } |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
571 | |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
572 | /* |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
573 | * End the functions for dealing with the DNS child processes. |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
574 | */ |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
575 | |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
576 | static void |
| 15884 | 577 | host_resolved(gpointer data, gint source, PurpleInputCondition cond) |
|
14349
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
578 | { |
| 15884 | 579 | PurpleDnsQueryData *query_data; |
|
14349
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
580 | int rc, err; |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
581 | GSList *hosts = NULL; |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
582 | struct sockaddr *addr = NULL; |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
583 | size_t addrlen; |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
584 | char message[1024]; |
|
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 | query_data = data; |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
587 | |
| 15884 | 588 | purple_debug_info("dns", "Got response for '%s'\n", query_data->hostname); |
| 589 | purple_input_remove(query_data->resolver->inpa); | |
|
14349
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
590 | query_data->resolver->inpa = 0; |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
591 | |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
592 | rc = read(query_data->resolver->fd_out, &err, sizeof(err)); |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
593 | if ((rc == 4) && (err != 0)) |
|
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 | #ifdef HAVE_GETADDRINFO |
|
14454
df290cda81a3
[gaim-migrate @ 17099]
Mark Doliner <markdoliner@pidgin.im>
parents:
14420
diff
changeset
|
596 | 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
|
597 | query_data->hostname, purple_gai_strerror(err)); |
|
14349
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
598 | #else |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
599 | g_snprintf(message, sizeof(message), _("Error resolving %s: %d"), |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
600 | query_data->hostname, err); |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
601 | #endif |
|
27157
609f187d0ac7
Call res_init() when DNS queries fail in case the failure indicates a timeout
Paul Aurich <darkrain42@pidgin.im>
parents:
27147
diff
changeset
|
602 | /* Re-read resolv.conf and friends in case DNS servers have changed */ |
|
609f187d0ac7
Call res_init() when DNS queries fail in case the failure indicates a timeout
Paul Aurich <darkrain42@pidgin.im>
parents:
27147
diff
changeset
|
603 | res_init(); |
|
609f187d0ac7
Call res_init() when DNS queries fail in case the failure indicates a timeout
Paul Aurich <darkrain42@pidgin.im>
parents:
27147
diff
changeset
|
604 | |
| 15884 | 605 | purple_dnsquery_failed(query_data, message); |
|
14349
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
606 | } else if (rc > 0) { |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
607 | /* Success! */ |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
608 | while (rc > 0) { |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
609 | rc = read(query_data->resolver->fd_out, &addrlen, sizeof(addrlen)); |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
610 | if (rc > 0 && addrlen > 0) { |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
611 | addr = g_malloc(addrlen); |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
612 | rc = read(query_data->resolver->fd_out, addr, addrlen); |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
613 | hosts = g_slist_append(hosts, GINT_TO_POINTER(addrlen)); |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
614 | hosts = g_slist_append(hosts, addr); |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
615 | } else { |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
616 | break; |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
617 | } |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
618 | } |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
619 | /* wait4(resolver->dns_pid, NULL, WNOHANG, NULL); */ |
| 15884 | 620 | purple_dnsquery_resolved(query_data, hosts); |
|
14349
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
621 | |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
622 | } 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
|
623 | g_snprintf(message, sizeof(message), _("Error reading from resolver process:\n%s"), g_strerror(errno)); |
| 15884 | 624 | purple_dnsquery_failed(query_data, message); |
|
14349
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
625 | |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
626 | } 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
|
627 | g_snprintf(message, sizeof(message), _("Resolver process exited without answering our request")); |
| 15884 | 628 | purple_dnsquery_failed(query_data, message); |
|
14349
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
629 | } |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
630 | |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
631 | handle_next_queued_request(); |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
632 | } |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
633 | |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
634 | static gboolean |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
635 | resolve_host(gpointer data) |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
636 | { |
| 15884 | 637 | PurpleDnsQueryData *query_data; |
|
14349
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
638 | |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
639 | query_data = data; |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
640 | query_data->timeout = 0; |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
641 | |
|
27737
d2abba8c8e1f
Don't fork a resolver process for IPs.
Aman Gupta <aman@tmm1.net>
parents:
27736
diff
changeset
|
642 | if (resolve_ip(query_data)) |
|
d2abba8c8e1f
Don't fork a resolver process for IPs.
Aman Gupta <aman@tmm1.net>
parents:
27736
diff
changeset
|
643 | { |
|
d2abba8c8e1f
Don't fork a resolver process for IPs.
Aman Gupta <aman@tmm1.net>
parents:
27736
diff
changeset
|
644 | /* resolve_ip calls purple_dnsquery_resolved */ |
|
d2abba8c8e1f
Don't fork a resolver process for IPs.
Aman Gupta <aman@tmm1.net>
parents:
27736
diff
changeset
|
645 | return FALSE; |
|
d2abba8c8e1f
Don't fork a resolver process for IPs.
Aman Gupta <aman@tmm1.net>
parents:
27736
diff
changeset
|
646 | } |
|
d2abba8c8e1f
Don't fork a resolver process for IPs.
Aman Gupta <aman@tmm1.net>
parents:
27736
diff
changeset
|
647 | |
|
24324
a36c5d08a43c
There was a little weirdness with the code that called the UI function
Mark Doliner <markdoliner@pidgin.im>
parents:
24323
diff
changeset
|
648 | 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
|
649 | { |
|
a36c5d08a43c
There was a little weirdness with the code that called the UI function
Mark Doliner <markdoliner@pidgin.im>
parents:
24323
diff
changeset
|
650 | /* 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
|
651 | 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
|
652 | } |
|
a36c5d08a43c
There was a little weirdness with the code that called the UI function
Mark Doliner <markdoliner@pidgin.im>
parents:
24323
diff
changeset
|
653 | |
|
27736
37496418416a
Fix a leak of the queued_requests from purple_dnsquery_a.
Aman Gupta <aman@tmm1.net>
parents:
27497
diff
changeset
|
654 | queued_requests = g_slist_append(queued_requests, query_data); |
|
37496418416a
Fix a leak of the queued_requests from purple_dnsquery_a.
Aman Gupta <aman@tmm1.net>
parents:
27497
diff
changeset
|
655 | |
|
14349
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
656 | handle_next_queued_request(); |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
657 | |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
658 | return FALSE; |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
659 | } |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
660 | |
| 15884 | 661 | PurpleDnsQueryData * |
| 662 | purple_dnsquery_a(const char *hostname, int port, | |
| 663 | PurpleDnsQueryConnectFunction callback, gpointer data) | |
|
14349
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
664 | { |
| 15884 | 665 | PurpleDnsQueryData *query_data; |
|
14349
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
666 | |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
667 | 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
|
668 | g_return_val_if_fail(port != 0, NULL); |
|
14420
3c78e468b45a
[gaim-migrate @ 17064]
Mark Doliner <markdoliner@pidgin.im>
parents:
14349
diff
changeset
|
669 | g_return_val_if_fail(callback != NULL, NULL); |
|
14349
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
670 | |
| 15884 | 671 | query_data = g_new(PurpleDnsQueryData, 1); |
|
14349
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
672 | query_data->hostname = g_strdup(hostname); |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
673 | g_strstrip(query_data->hostname); |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
674 | query_data->port = port; |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
675 | query_data->callback = callback; |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
676 | query_data->data = data; |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
677 | query_data->resolver = NULL; |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
678 | |
|
24323
fe88d45063e8
Simplify two bits of code a little
Mark Doliner <markdoliner@pidgin.im>
parents:
24322
diff
changeset
|
679 | if (*query_data->hostname == '\0') |
|
14528
b8e4715b2953
[gaim-migrate @ 17180]
Mark Doliner <markdoliner@pidgin.im>
parents:
14454
diff
changeset
|
680 | { |
| 15884 | 681 | purple_dnsquery_destroy(query_data); |
|
14528
b8e4715b2953
[gaim-migrate @ 17180]
Mark Doliner <markdoliner@pidgin.im>
parents:
14454
diff
changeset
|
682 | g_return_val_if_reached(NULL); |
|
b8e4715b2953
[gaim-migrate @ 17180]
Mark Doliner <markdoliner@pidgin.im>
parents:
14454
diff
changeset
|
683 | } |
|
b8e4715b2953
[gaim-migrate @ 17180]
Mark Doliner <markdoliner@pidgin.im>
parents:
14454
diff
changeset
|
684 | |
| 15884 | 685 | 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
|
686 | |
| 15884 | 687 | 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
|
688 | |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
689 | return query_data; |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
690 | } |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
691 | |
|
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
|
692 | #elif defined _WIN32 /* end PURPLE_DNSQUERY_USE_FORK */ |
|
14349
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
693 | |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
694 | /* |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
695 | * Windows! |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
696 | */ |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
697 | |
|
14300
68a0aa63f3b8
[gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
698 | static gboolean |
|
68a0aa63f3b8
[gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
699 | dns_main_thread_cb(gpointer data) |
|
68a0aa63f3b8
[gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
700 | { |
|
20212
9bf576eeaac0
applied changes from 77376fe079e753b612b3b8c901060e689f3dee11
Luke Schierer <lschiere@pidgin.im>
parents:
20147
diff
changeset
|
701 | PurpleDnsQueryData *query_data = data; |
|
14300
68a0aa63f3b8
[gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
702 | |
|
20212
9bf576eeaac0
applied changes from 77376fe079e753b612b3b8c901060e689f3dee11
Luke Schierer <lschiere@pidgin.im>
parents:
20147
diff
changeset
|
703 | /* 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
|
704 | query_data->resolver = NULL; |
| 14243 | 705 | |
|
14300
68a0aa63f3b8
[gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
706 | if (query_data->error_message != NULL) |
| 15884 | 707 | purple_dnsquery_failed(query_data, query_data->error_message); |
|
14300
68a0aa63f3b8
[gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
708 | else |
|
68a0aa63f3b8
[gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
709 | { |
|
68a0aa63f3b8
[gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
710 | GSList *hosts; |
|
14306
7c3f2162a897
[gaim-migrate @ 16926]
Mark Doliner <markdoliner@pidgin.im>
parents:
14300
diff
changeset
|
711 | |
| 15884 | 712 | /* 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
|
713 | hosts = query_data->hosts; |
|
68a0aa63f3b8
[gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
714 | query_data->hosts = NULL; |
| 15884 | 715 | purple_dnsquery_resolved(query_data, hosts); |
| 14243 | 716 | } |
|
14300
68a0aa63f3b8
[gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
717 | |
| 14243 | 718 | return FALSE; |
| 719 | } | |
| 720 | ||
|
14300
68a0aa63f3b8
[gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
721 | static gpointer |
|
68a0aa63f3b8
[gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
722 | dns_thread(gpointer data) |
|
68a0aa63f3b8
[gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
723 | { |
| 15884 | 724 | PurpleDnsQueryData *query_data; |
|
14349
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
725 | #ifdef HAVE_GETADDRINFO |
| 14243 | 726 | int rc; |
| 727 | struct addrinfo hints, *res, *tmp; | |
| 728 | char servname[20]; | |
|
14349
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
729 | #else |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
730 | struct sockaddr_in sin; |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
731 | struct hostent *hp; |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
732 | #endif |
|
14300
68a0aa63f3b8
[gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
733 | |
|
68a0aa63f3b8
[gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
734 | query_data = data; |
| 14243 | 735 | |
|
14349
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
736 | #ifdef HAVE_GETADDRINFO |
|
14300
68a0aa63f3b8
[gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
737 | g_snprintf(servname, sizeof(servname), "%d", query_data->port); |
| 14243 | 738 | memset(&hints,0,sizeof(hints)); |
| 739 | ||
|
14300
68a0aa63f3b8
[gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
740 | /* |
|
68a0aa63f3b8
[gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
741 | * This is only used to convert a service |
| 14243 | 742 | * name to a port number. As we know we are |
| 743 | * passing a number already, we know this | |
| 744 | * value will not be really used by the C | |
| 745 | * library. | |
| 746 | */ | |
| 747 | hints.ai_socktype = SOCK_STREAM; | |
|
27147
7f09d9398273
Don't do IPv6 AAAA lookups if there is no IPv6 address configured on
Mark Doliner <markdoliner@pidgin.im>
parents:
27116
diff
changeset
|
748 | #ifdef AI_ADDRCONFIG |
|
7f09d9398273
Don't do IPv6 AAAA lookups if there is no IPv6 address configured on
Mark Doliner <markdoliner@pidgin.im>
parents:
27116
diff
changeset
|
749 | hints.ai_flags |= AI_ADDRCONFIG; |
|
7f09d9398273
Don't do IPv6 AAAA lookups if there is no IPv6 address configured on
Mark Doliner <markdoliner@pidgin.im>
parents:
27116
diff
changeset
|
750 | #endif /* AI_ADDRCONFIG */ |
|
14300
68a0aa63f3b8
[gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
751 | if ((rc = getaddrinfo(query_data->hostname, servname, &hints, &res)) == 0) { |
| 14243 | 752 | tmp = res; |
| 753 | while(res) { | |
|
14300
68a0aa63f3b8
[gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
754 | query_data->hosts = g_slist_append(query_data->hosts, |
| 14243 | 755 | GSIZE_TO_POINTER(res->ai_addrlen)); |
|
14300
68a0aa63f3b8
[gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
756 | query_data->hosts = g_slist_append(query_data->hosts, |
| 14243 | 757 | g_memdup(res->ai_addr, res->ai_addrlen)); |
| 758 | res = res->ai_next; | |
| 759 | } | |
| 760 | freeaddrinfo(tmp); | |
| 761 | } else { | |
|
21977
c87889698afb
Create a purple_gai_strerror() function similar to g_str_error() which
Mark Doliner <markdoliner@pidgin.im>
parents:
21389
diff
changeset
|
762 | query_data->error_message = g_strdup_printf(_("Error resolving %s:\n%s"), query_data->hostname, purple_gai_strerror(rc)); |
| 14243 | 763 | } |
|
14349
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
764 | #else |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
765 | if ((hp = gethostbyname(query_data->hostname))) { |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
766 | memset(&sin, 0, sizeof(struct sockaddr_in)); |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
767 | 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
|
768 | sin.sin_family = hp->h_addrtype; |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
769 | sin.sin_port = htons(query_data->port); |
| 14243 | 770 | |
|
14349
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
771 | query_data->hosts = g_slist_append(query_data->hosts, |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
772 | GSIZE_TO_POINTER(sizeof(sin))); |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
773 | query_data->hosts = g_slist_append(query_data->hosts, |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
774 | g_memdup(&sin, sizeof(sin))); |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
775 | } else { |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
776 | 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
|
777 | } |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
778 | #endif |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
779 | |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
780 | /* back to main thread */ |
|
20212
9bf576eeaac0
applied changes from 77376fe079e753b612b3b8c901060e689f3dee11
Luke Schierer <lschiere@pidgin.im>
parents:
20147
diff
changeset
|
781 | purple_timeout_add(0, dns_main_thread_cb, query_data); |
|
14300
68a0aa63f3b8
[gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
782 | |
| 14243 | 783 | return 0; |
| 784 | } | |
| 785 | ||
|
14300
68a0aa63f3b8
[gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
786 | static gboolean |
|
68a0aa63f3b8
[gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
787 | resolve_host(gpointer data) |
| 14243 | 788 | { |
| 15884 | 789 | PurpleDnsQueryData *query_data; |
|
14300
68a0aa63f3b8
[gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
790 | GError *err = NULL; |
| 14243 | 791 | |
|
14300
68a0aa63f3b8
[gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
792 | query_data = data; |
|
68a0aa63f3b8
[gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
793 | query_data->timeout = 0; |
|
68a0aa63f3b8
[gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
794 | |
| 15884 | 795 | 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
|
796 | { |
|
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
|
797 | /* 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
|
798 | 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
|
799 | } |
|
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
|
800 | |
|
27737
d2abba8c8e1f
Don't fork a resolver process for IPs.
Aman Gupta <aman@tmm1.net>
parents:
27736
diff
changeset
|
801 | if (!resolve_ip(query_data)) |
|
14300
68a0aa63f3b8
[gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
802 | { |
|
14306
7c3f2162a897
[gaim-migrate @ 16926]
Mark Doliner <markdoliner@pidgin.im>
parents:
14300
diff
changeset
|
803 | /* |
|
7c3f2162a897
[gaim-migrate @ 16926]
Mark Doliner <markdoliner@pidgin.im>
parents:
14300
diff
changeset
|
804 | * Spin off a separate thread to perform the DNS lookup so |
|
7c3f2162a897
[gaim-migrate @ 16926]
Mark Doliner <markdoliner@pidgin.im>
parents:
14300
diff
changeset
|
805 | * that we don't block the UI. |
|
7c3f2162a897
[gaim-migrate @ 16926]
Mark Doliner <markdoliner@pidgin.im>
parents:
14300
diff
changeset
|
806 | */ |
|
14300
68a0aa63f3b8
[gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
807 | query_data->resolver = g_thread_create(dns_thread, |
|
68a0aa63f3b8
[gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
808 | query_data, FALSE, &err); |
|
68a0aa63f3b8
[gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
809 | if (query_data->resolver == NULL) |
|
68a0aa63f3b8
[gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
810 | { |
|
68a0aa63f3b8
[gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
811 | char message[1024]; |
|
68a0aa63f3b8
[gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
812 | g_snprintf(message, sizeof(message), _("Thread creation failure: %s"), |
| 15859 | 813 | (err && err->message) ? err->message : _("Unknown reason")); |
|
14300
68a0aa63f3b8
[gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
814 | g_error_free(err); |
| 15884 | 815 | purple_dnsquery_failed(query_data, message); |
|
14300
68a0aa63f3b8
[gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
816 | } |
| 14243 | 817 | } |
| 818 | ||
| 819 | return FALSE; | |
| 820 | } | |
| 821 | ||
| 15884 | 822 | PurpleDnsQueryData * |
| 823 | purple_dnsquery_a(const char *hostname, int port, | |
| 824 | PurpleDnsQueryConnectFunction callback, gpointer data) | |
| 14243 | 825 | { |
| 15884 | 826 | PurpleDnsQueryData *query_data; |
|
14300
68a0aa63f3b8
[gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
827 | |
|
68a0aa63f3b8
[gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
828 | 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
|
829 | g_return_val_if_fail(port != 0, NULL); |
|
14420
3c78e468b45a
[gaim-migrate @ 17064]
Mark Doliner <markdoliner@pidgin.im>
parents:
14349
diff
changeset
|
830 | g_return_val_if_fail(callback != NULL, NULL); |
|
14300
68a0aa63f3b8
[gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
831 | |
| 15884 | 832 | 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
|
833 | |
|
20212
9bf576eeaac0
applied changes from 77376fe079e753b612b3b8c901060e689f3dee11
Luke Schierer <lschiere@pidgin.im>
parents:
20147
diff
changeset
|
834 | query_data = g_new0(PurpleDnsQueryData, 1); |
|
14300
68a0aa63f3b8
[gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
835 | query_data->hostname = g_strdup(hostname); |
|
68a0aa63f3b8
[gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
836 | g_strstrip(query_data->hostname); |
|
68a0aa63f3b8
[gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
837 | query_data->port = port; |
|
68a0aa63f3b8
[gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
838 | query_data->callback = callback; |
|
68a0aa63f3b8
[gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
839 | query_data->data = data; |
|
68a0aa63f3b8
[gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
840 | |
|
14528
b8e4715b2953
[gaim-migrate @ 17180]
Mark Doliner <markdoliner@pidgin.im>
parents:
14454
diff
changeset
|
841 | if (strlen(query_data->hostname) == 0) |
|
b8e4715b2953
[gaim-migrate @ 17180]
Mark Doliner <markdoliner@pidgin.im>
parents:
14454
diff
changeset
|
842 | { |
| 15884 | 843 | purple_dnsquery_destroy(query_data); |
|
14528
b8e4715b2953
[gaim-migrate @ 17180]
Mark Doliner <markdoliner@pidgin.im>
parents:
14454
diff
changeset
|
844 | g_return_val_if_reached(NULL); |
|
b8e4715b2953
[gaim-migrate @ 17180]
Mark Doliner <markdoliner@pidgin.im>
parents:
14454
diff
changeset
|
845 | } |
|
b8e4715b2953
[gaim-migrate @ 17180]
Mark Doliner <markdoliner@pidgin.im>
parents:
14454
diff
changeset
|
846 | |
|
14300
68a0aa63f3b8
[gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
847 | /* Don't call the callback before returning */ |
| 15884 | 848 | 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
|
849 | |
|
68a0aa63f3b8
[gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
850 | return query_data; |
|
68a0aa63f3b8
[gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
851 | } |
|
68a0aa63f3b8
[gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
852 | |
|
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
|
853 | #else /* not PURPLE_DNSQUERY_USE_FORK or _WIN32 */ |
|
14349
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
854 | |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
855 | /* |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
856 | * 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
|
857 | * fail-safe name resolution code, which is blocking. |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
858 | */ |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
859 | |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
860 | static gboolean |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
861 | resolve_host(gpointer data) |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
862 | { |
| 15884 | 863 | PurpleDnsQueryData *query_data; |
|
14349
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
864 | struct sockaddr_in sin; |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
865 | GSList *hosts = NULL; |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
866 | |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
867 | query_data = data; |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
868 | query_data->timeout = 0; |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
869 | |
| 15884 | 870 | 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
|
871 | { |
|
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
|
872 | /* 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
|
873 | 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
|
874 | } |
|
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
|
875 | |
|
14349
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
876 | if (!inet_aton(query_data->hostname, &sin.sin_addr)) { |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
877 | struct hostent *hp; |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
878 | if(!(hp = gethostbyname(query_data->hostname))) { |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
879 | char message[1024]; |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
880 | g_snprintf(message, sizeof(message), _("Error resolving %s: %d"), |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
881 | query_data->hostname, h_errno); |
| 15884 | 882 | purple_dnsquery_failed(query_data, message); |
|
14349
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
883 | return FALSE; |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
884 | } |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
885 | memset(&sin, 0, sizeof(struct sockaddr_in)); |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
886 | 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
|
887 | sin.sin_family = hp->h_addrtype; |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
888 | } else |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
889 | sin.sin_family = AF_INET; |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
890 | sin.sin_port = htons(query_data->port); |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
891 | |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
892 | hosts = g_slist_append(hosts, GINT_TO_POINTER(sizeof(sin))); |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
893 | hosts = g_slist_append(hosts, g_memdup(&sin, sizeof(sin))); |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
894 | |
| 15884 | 895 | purple_dnsquery_resolved(query_data, hosts); |
|
14349
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 | return FALSE; |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
898 | } |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
899 | |
| 15884 | 900 | PurpleDnsQueryData * |
| 901 | purple_dnsquery_a(const char *hostname, int port, | |
| 902 | PurpleDnsQueryConnectFunction callback, gpointer data) | |
|
14349
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
903 | { |
| 15884 | 904 | PurpleDnsQueryData *query_data; |
|
14349
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
905 | |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
906 | 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
|
907 | g_return_val_if_fail(port != 0, NULL); |
|
14528
b8e4715b2953
[gaim-migrate @ 17180]
Mark Doliner <markdoliner@pidgin.im>
parents:
14454
diff
changeset
|
908 | g_return_val_if_fail(callback != NULL, NULL); |
|
14349
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
909 | |
| 15884 | 910 | query_data = g_new(PurpleDnsQueryData, 1); |
|
14349
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
911 | query_data->hostname = g_strdup(hostname); |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
912 | g_strstrip(query_data->hostname); |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
913 | query_data->port = port; |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
914 | query_data->callback = callback; |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
915 | query_data->data = data; |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
916 | |
|
14528
b8e4715b2953
[gaim-migrate @ 17180]
Mark Doliner <markdoliner@pidgin.im>
parents:
14454
diff
changeset
|
917 | if (strlen(query_data->hostname) == 0) |
|
b8e4715b2953
[gaim-migrate @ 17180]
Mark Doliner <markdoliner@pidgin.im>
parents:
14454
diff
changeset
|
918 | { |
| 15884 | 919 | purple_dnsquery_destroy(query_data); |
|
14528
b8e4715b2953
[gaim-migrate @ 17180]
Mark Doliner <markdoliner@pidgin.im>
parents:
14454
diff
changeset
|
920 | g_return_val_if_reached(NULL); |
|
b8e4715b2953
[gaim-migrate @ 17180]
Mark Doliner <markdoliner@pidgin.im>
parents:
14454
diff
changeset
|
921 | } |
|
b8e4715b2953
[gaim-migrate @ 17180]
Mark Doliner <markdoliner@pidgin.im>
parents:
14454
diff
changeset
|
922 | |
|
14349
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
923 | /* Don't call the callback before returning */ |
| 15884 | 924 | 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
|
925 | |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
926 | return query_data; |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
927 | } |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
928 | |
|
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
|
929 | #endif /* not PURPLE_DNSQUERY_USE_FORK or _WIN32 */ |
|
14349
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
930 | |
|
14300
68a0aa63f3b8
[gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
931 | void |
| 15884 | 932 | purple_dnsquery_destroy(PurpleDnsQueryData *query_data) |
|
14300
68a0aa63f3b8
[gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
933 | { |
| 15884 | 934 | 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
|
935 | |
|
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
|
936 | 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
|
937 | 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
|
938 | |
|
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
|
939 | #if defined(PURPLE_DNSQUERY_USE_FORK) |
|
14711
404c5a931bb2
[gaim-migrate @ 17395]
Mark Doliner <markdoliner@pidgin.im>
parents:
14572
diff
changeset
|
940 | queued_requests = g_slist_remove(queued_requests, query_data); |
|
14572
80e79a4926b4
[gaim-migrate @ 17230]
Mark Doliner <markdoliner@pidgin.im>
parents:
14528
diff
changeset
|
941 | |
|
14349
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
942 | if (query_data->resolver != NULL) |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
943 | /* |
|
24321
0d6d024049eb
Improve a few comments
Mark Doliner <markdoliner@pidgin.im>
parents:
24318
diff
changeset
|
944 | * 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
|
945 | * query. Ideally we would tell our resolver child to stop |
|
0d6d024049eb
Improve a few comments
Mark Doliner <markdoliner@pidgin.im>
parents:
24318
diff
changeset
|
946 | * 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
|
947 | * 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
|
948 | * 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
|
949 | * 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
|
950 | * have more stuff to resolve. |
|
14349
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
951 | */ |
| 15884 | 952 | 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
|
953 | #elif defined _WIN32 /* end PURPLE_DNSQUERY_USE_FORK */ |
|
14300
68a0aa63f3b8
[gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
954 | if (query_data->resolver != NULL) |
|
68a0aa63f3b8
[gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
955 | { |
|
68a0aa63f3b8
[gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
956 | /* |
|
68a0aa63f3b8
[gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
957 | * 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
|
958 | * just set the callback to NULL and let the DNS lookup |
|
68a0aa63f3b8
[gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
959 | * finish. |
|
68a0aa63f3b8
[gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
960 | */ |
|
68a0aa63f3b8
[gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
961 | query_data->callback = NULL; |
|
68a0aa63f3b8
[gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
962 | return; |
|
68a0aa63f3b8
[gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
963 | } |
|
68a0aa63f3b8
[gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
964 | |
|
68a0aa63f3b8
[gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
965 | while (query_data->hosts != NULL) |
|
68a0aa63f3b8
[gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
966 | { |
|
68a0aa63f3b8
[gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
967 | /* Discard the length... */ |
|
68a0aa63f3b8
[gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
968 | 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
|
969 | /* Free the address... */ |
|
68a0aa63f3b8
[gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
970 | g_free(query_data->hosts->data); |
|
68a0aa63f3b8
[gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
971 | 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
|
972 | } |
|
68a0aa63f3b8
[gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
973 | g_free(query_data->error_message); |
|
24321
0d6d024049eb
Improve a few comments
Mark Doliner <markdoliner@pidgin.im>
parents:
24318
diff
changeset
|
974 | #endif /* end _WIN32 */ |
|
14300
68a0aa63f3b8
[gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
975 | |
|
68a0aa63f3b8
[gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
976 | if (query_data->timeout > 0) |
| 15884 | 977 | purple_timeout_remove(query_data->timeout); |
|
14300
68a0aa63f3b8
[gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
978 | |
|
68a0aa63f3b8
[gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
979 | g_free(query_data->hostname); |
|
68a0aa63f3b8
[gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
980 | g_free(query_data); |
|
68a0aa63f3b8
[gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
981 | } |
|
68a0aa63f3b8
[gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
982 | |
|
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
|
983 | char * |
| 15884 | 984 | 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
|
985 | { |
|
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
|
986 | 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
|
987 | |
|
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
|
988 | 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
|
989 | } |
|
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
|
990 | |
|
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
|
991 | unsigned short |
| 15884 | 992 | 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
|
993 | { |
|
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
|
994 | 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
|
995 | |
|
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
|
996 | 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
|
997 | } |
|
2b529e4350bc
The UI can now use the GaimDnsQueryUiOps to handle DNS resolving itself; if this is done, the platform-specific DNS query code won't be used. This will be used in Adium to use an efficient threads-based DNS resolve (since Adium is already multithreaded, this is significantly cheaper than fork()).
Evan Schoenberg <evands@pidgin.im>
parents:
15707
diff
changeset
|
998 | |
|
2b529e4350bc
The UI can now use the GaimDnsQueryUiOps to handle DNS resolving itself; if this is done, the platform-specific DNS query code won't be used. This will be used in Adium to use an efficient threads-based DNS resolve (since Adium is already multithreaded, this is significantly cheaper than fork()).
Evan Schoenberg <evands@pidgin.im>
parents:
15707
diff
changeset
|
999 | void |
| 15884 | 1000 | 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
|
1001 | { |
|
2b529e4350bc
The UI can now use the GaimDnsQueryUiOps to handle DNS resolving itself; if this is done, the platform-specific DNS query code won't be used. This will be used in Adium to use an efficient threads-based DNS resolve (since Adium is already multithreaded, this is significantly cheaper than fork()).
Evan Schoenberg <evands@pidgin.im>
parents:
15707
diff
changeset
|
1002 | 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
|
1003 | } |
|
2b529e4350bc
The UI can now use the GaimDnsQueryUiOps to handle DNS resolving itself; if this is done, the platform-specific DNS query code won't be used. This will be used in Adium to use an efficient threads-based DNS resolve (since Adium is already multithreaded, this is significantly cheaper than fork()).
Evan Schoenberg <evands@pidgin.im>
parents:
15707
diff
changeset
|
1004 | |
| 15884 | 1005 | PurpleDnsQueryUiOps * |
| 1006 | 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
|
1007 | { |
|
15771
848371e40d86
Remove a g_return_val_if_fail() which isn't needed, made gaim_dnsquery_get_port() return an unsigned short and return 0 if query_data is NULL, and fixed a whitespace mistake
Evan Schoenberg <evands@pidgin.im>
parents:
15764
diff
changeset
|
1008 | /* 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
|
1009 | * 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
|
1010 | */ |
|
15763
2b529e4350bc
The UI can now use the GaimDnsQueryUiOps to handle DNS resolving itself; if this is done, the platform-specific DNS query code won't be used. This will be used in Adium to use an efficient threads-based DNS resolve (since Adium is already multithreaded, this is significantly cheaper than fork()).
Evan Schoenberg <evands@pidgin.im>
parents:
15707
diff
changeset
|
1011 | 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
|
1012 | } |
|
2b529e4350bc
The UI can now use the GaimDnsQueryUiOps to handle DNS resolving itself; if this is done, the platform-specific DNS query code won't be used. This will be used in Adium to use an efficient threads-based DNS resolve (since Adium is already multithreaded, this is significantly cheaper than fork()).
Evan Schoenberg <evands@pidgin.im>
parents:
15707
diff
changeset
|
1013 | |
|
14300
68a0aa63f3b8
[gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
1014 | void |
| 15884 | 1015 | purple_dnsquery_init(void) |
|
14300
68a0aa63f3b8
[gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
1016 | { |
|
68a0aa63f3b8
[gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
1017 | } |
|
68a0aa63f3b8
[gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
1018 | |
|
68a0aa63f3b8
[gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
1019 | void |
| 15884 | 1020 | purple_dnsquery_uninit(void) |
|
14300
68a0aa63f3b8
[gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
1021 | { |
|
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
|
1022 | #if defined(PURPLE_DNSQUERY_USE_FORK) |
|
14349
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
1023 | while (free_dns_children != NULL) |
|
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
1024 | { |
| 15884 | 1025 | purple_dnsquery_resolver_destroy(free_dns_children->data); |
|
14349
6b7a67b5f56d
[gaim-migrate @ 16974]
Mark Doliner <markdoliner@pidgin.im>
parents:
14325
diff
changeset
|
1026 | 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
|
1027 | } |
|
24321
0d6d024049eb
Improve a few comments
Mark Doliner <markdoliner@pidgin.im>
parents:
24318
diff
changeset
|
1028 | #endif /* end PURPLE_DNSQUERY_USE_FORK */ |
|
14300
68a0aa63f3b8
[gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
1029 | } |