Tue, 27 May 2008 01:11:46 +0000
A patch from Peter O'Gorman at The Written Word, Inc. to fix various
portability issues. These changes seemed reasonable, even though I wasn't
able to test or verify them all in particular. Hopefully we don't break
anything on another OS.
Refs #3798
committer: Richard Laager <rlaager@pidgin.im>
|
11373
80fd6df6fbe0
[gaim-migrate @ 13598]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
1 | /** |
|
11379
a5a66b0e8b6e
[gaim-migrate @ 13605]
Daniel Atallah <datallah@pidgin.im>
parents:
11373
diff
changeset
|
2 | * @file dnssrv.c |
|
20330
650a7af9c238
remove gpl boilerplate from doxygen docs
Sean Egan <seanegan@pidgin.im>
parents:
19859
diff
changeset
|
3 | */ |
|
650a7af9c238
remove gpl boilerplate from doxygen docs
Sean Egan <seanegan@pidgin.im>
parents:
19859
diff
changeset
|
4 | |
|
650a7af9c238
remove gpl boilerplate from doxygen docs
Sean Egan <seanegan@pidgin.im>
parents:
19859
diff
changeset
|
5 | /* purple |
|
11373
80fd6df6fbe0
[gaim-migrate @ 13598]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
6 | * |
|
80fd6df6fbe0
[gaim-migrate @ 13598]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
7 | * Copyright (C) 2005 Thomas Butter <butter@uni-mannheim.de> |
|
80fd6df6fbe0
[gaim-migrate @ 13598]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
8 | * |
|
80fd6df6fbe0
[gaim-migrate @ 13598]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
9 | * This program is free software; you can redistribute it and/or modify |
|
80fd6df6fbe0
[gaim-migrate @ 13598]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
10 | * it under the terms of the GNU General Public License as published by |
|
80fd6df6fbe0
[gaim-migrate @ 13598]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
11 | * the Free Software Foundation; either version 2 of the License, or |
|
80fd6df6fbe0
[gaim-migrate @ 13598]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
12 | * (at your option) any later version. |
|
80fd6df6fbe0
[gaim-migrate @ 13598]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
13 | * |
|
80fd6df6fbe0
[gaim-migrate @ 13598]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
14 | * This program is distributed in the hope that it will be useful, |
|
80fd6df6fbe0
[gaim-migrate @ 13598]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
15 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
80fd6df6fbe0
[gaim-migrate @ 13598]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
16 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
80fd6df6fbe0
[gaim-migrate @ 13598]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
17 | * GNU General Public License for more details. |
|
80fd6df6fbe0
[gaim-migrate @ 13598]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
18 | * |
|
80fd6df6fbe0
[gaim-migrate @ 13598]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
19 | * You should have received a copy of the GNU General Public License |
|
80fd6df6fbe0
[gaim-migrate @ 13598]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
20 | * 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:
18555
diff
changeset
|
21 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA |
|
11373
80fd6df6fbe0
[gaim-migrate @ 13598]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
22 | */ |
|
11898
a40601f1aed2
[gaim-migrate @ 14189]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
11630
diff
changeset
|
23 | |
|
a40601f1aed2
[gaim-migrate @ 14189]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
11630
diff
changeset
|
24 | #include "internal.h" |
|
15718
216ce4a9db5b
Include util.h to fix a warning I introduced
Evan Schoenberg <evands@pidgin.im>
parents:
15707
diff
changeset
|
25 | #include "util.h" |
|
11898
a40601f1aed2
[gaim-migrate @ 14189]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
11630
diff
changeset
|
26 | |
|
11379
a5a66b0e8b6e
[gaim-migrate @ 13605]
Daniel Atallah <datallah@pidgin.im>
parents:
11373
diff
changeset
|
27 | #ifndef _WIN32 |
|
23352
9714223ca7a7
A patch from Peter O'Gorman at The Written Word, Inc. to fix various
Peter O'Gorman <pogma@thewrittenword.com>
parents:
22351
diff
changeset
|
28 | #include <arpa/nameser.h> |
|
11373
80fd6df6fbe0
[gaim-migrate @ 13598]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
29 | #include <resolv.h> |
|
12568
717c7d5cbb77
[gaim-migrate @ 14887]
Richard Laager <rlaager@pidgin.im>
parents:
12451
diff
changeset
|
30 | #ifdef HAVE_ARPA_NAMESER_COMPAT_H |
|
11373
80fd6df6fbe0
[gaim-migrate @ 13598]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
31 | #include <arpa/nameser_compat.h> |
|
12568
717c7d5cbb77
[gaim-migrate @ 14887]
Richard Laager <rlaager@pidgin.im>
parents:
12451
diff
changeset
|
32 | #endif |
|
11373
80fd6df6fbe0
[gaim-migrate @ 13598]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
33 | #ifndef T_SRV |
|
80fd6df6fbe0
[gaim-migrate @ 13598]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
34 | #define T_SRV 33 |
|
80fd6df6fbe0
[gaim-migrate @ 13598]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
35 | #endif |
|
11379
a5a66b0e8b6e
[gaim-migrate @ 13605]
Daniel Atallah <datallah@pidgin.im>
parents:
11373
diff
changeset
|
36 | #else |
|
a5a66b0e8b6e
[gaim-migrate @ 13605]
Daniel Atallah <datallah@pidgin.im>
parents:
11373
diff
changeset
|
37 | #include <windns.h> |
|
a5a66b0e8b6e
[gaim-migrate @ 13605]
Daniel Atallah <datallah@pidgin.im>
parents:
11373
diff
changeset
|
38 | /* Missing from the mingw headers */ |
|
a5a66b0e8b6e
[gaim-migrate @ 13605]
Daniel Atallah <datallah@pidgin.im>
parents:
11373
diff
changeset
|
39 | #ifndef DNS_TYPE_SRV |
|
a5a66b0e8b6e
[gaim-migrate @ 13605]
Daniel Atallah <datallah@pidgin.im>
parents:
11373
diff
changeset
|
40 | # define DNS_TYPE_SRV 33 |
|
a5a66b0e8b6e
[gaim-migrate @ 13605]
Daniel Atallah <datallah@pidgin.im>
parents:
11373
diff
changeset
|
41 | #endif |
|
a5a66b0e8b6e
[gaim-migrate @ 13605]
Daniel Atallah <datallah@pidgin.im>
parents:
11373
diff
changeset
|
42 | #endif |
|
11373
80fd6df6fbe0
[gaim-migrate @ 13598]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
43 | |
|
80fd6df6fbe0
[gaim-migrate @ 13598]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
44 | #include "dnssrv.h" |
|
80fd6df6fbe0
[gaim-migrate @ 13598]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
45 | #include "eventloop.h" |
|
80fd6df6fbe0
[gaim-migrate @ 13598]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
46 | #include "debug.h" |
|
80fd6df6fbe0
[gaim-migrate @ 13598]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
47 | |
|
11379
a5a66b0e8b6e
[gaim-migrate @ 13605]
Daniel Atallah <datallah@pidgin.im>
parents:
11373
diff
changeset
|
48 | #ifndef _WIN32 |
|
11373
80fd6df6fbe0
[gaim-migrate @ 13598]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
49 | typedef union { |
|
80fd6df6fbe0
[gaim-migrate @ 13598]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
50 | HEADER hdr; |
|
80fd6df6fbe0
[gaim-migrate @ 13598]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
51 | u_char buf[1024]; |
|
80fd6df6fbe0
[gaim-migrate @ 13598]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
52 | } queryans; |
|
11395
1b19bd77adf6
[gaim-migrate @ 13626]
Daniel Atallah <datallah@pidgin.im>
parents:
11382
diff
changeset
|
53 | #else |
|
18555
ececd1bd99e3
Fix up some linkage to compile on Visual Studio. He claims this doesn't
Nick Hebner <hebnern@gmail.com>
parents:
16957
diff
changeset
|
54 | static DNS_STATUS (WINAPI *MyDnsQuery_UTF8) ( |
|
11395
1b19bd77adf6
[gaim-migrate @ 13626]
Daniel Atallah <datallah@pidgin.im>
parents:
11382
diff
changeset
|
55 | PCSTR lpstrName, WORD wType, DWORD fOptions, |
|
1b19bd77adf6
[gaim-migrate @ 13626]
Daniel Atallah <datallah@pidgin.im>
parents:
11382
diff
changeset
|
56 | PIP4_ARRAY aipServers, PDNS_RECORD* ppQueryResultsSet, |
|
1b19bd77adf6
[gaim-migrate @ 13626]
Daniel Atallah <datallah@pidgin.im>
parents:
11382
diff
changeset
|
57 | PVOID* pReserved) = NULL; |
|
18555
ececd1bd99e3
Fix up some linkage to compile on Visual Studio. He claims this doesn't
Nick Hebner <hebnern@gmail.com>
parents:
16957
diff
changeset
|
58 | static void (WINAPI *MyDnsRecordListFree) (PDNS_RECORD pRecordList, |
|
11395
1b19bd77adf6
[gaim-migrate @ 13626]
Daniel Atallah <datallah@pidgin.im>
parents:
11382
diff
changeset
|
59 | DNS_FREE_TYPE FreeType) = NULL; |
|
11379
a5a66b0e8b6e
[gaim-migrate @ 13605]
Daniel Atallah <datallah@pidgin.im>
parents:
11373
diff
changeset
|
60 | #endif |
|
11373
80fd6df6fbe0
[gaim-migrate @ 13598]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
61 | |
| 15884 | 62 | struct _PurpleSrvQueryData { |
| 63 | PurpleSrvCallback cb; | |
|
11382
4458ab177b10
[gaim-migrate @ 13609]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11381
diff
changeset
|
64 | gpointer extradata; |
|
11373
80fd6df6fbe0
[gaim-migrate @ 13598]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
65 | guint handle; |
|
14374
a93eedc7aa6b
[gaim-migrate @ 17002]
Daniel Atallah <datallah@pidgin.im>
parents:
14370
diff
changeset
|
66 | #ifdef _WIN32 |
|
14370
12ef3d4096ee
[gaim-migrate @ 16998]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
67 | GThread *resolver; |
|
11379
a5a66b0e8b6e
[gaim-migrate @ 13605]
Daniel Atallah <datallah@pidgin.im>
parents:
11373
diff
changeset
|
68 | char *query; |
|
14370
12ef3d4096ee
[gaim-migrate @ 16998]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
69 | char *error_message; |
|
11379
a5a66b0e8b6e
[gaim-migrate @ 13605]
Daniel Atallah <datallah@pidgin.im>
parents:
11373
diff
changeset
|
70 | GSList *results; |
|
15776
cba54f9d2e51
Patch from Graham Booker which ensures that a process forked by dnsserv cleans up afterwards, calling waitpid() to make sure no zombies are left over.
Evan Schoenberg <evands@pidgin.im>
parents:
15718
diff
changeset
|
71 | #else |
|
20678
a36cc6a8d1ae
Close the pipes to the dnssrv child process. Fixes #3245
Daniel Atallah <datallah@pidgin.im>
parents:
20330
diff
changeset
|
72 | int fd_in, fd_out; |
|
15776
cba54f9d2e51
Patch from Graham Booker which ensures that a process forked by dnsserv cleans up afterwards, calling waitpid() to make sure no zombies are left over.
Evan Schoenberg <evands@pidgin.im>
parents:
15718
diff
changeset
|
73 | pid_t pid; |
|
11379
a5a66b0e8b6e
[gaim-migrate @ 13605]
Daniel Atallah <datallah@pidgin.im>
parents:
11373
diff
changeset
|
74 | #endif |
|
11373
80fd6df6fbe0
[gaim-migrate @ 13598]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
75 | }; |
|
80fd6df6fbe0
[gaim-migrate @ 13598]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
76 | |
|
14370
12ef3d4096ee
[gaim-migrate @ 16998]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
77 | static gint |
|
12ef3d4096ee
[gaim-migrate @ 16998]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
78 | responsecompare(gconstpointer ar, gconstpointer br) |
|
12ef3d4096ee
[gaim-migrate @ 16998]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
79 | { |
| 15884 | 80 | PurpleSrvResponse *a = (PurpleSrvResponse*)ar; |
| 81 | PurpleSrvResponse *b = (PurpleSrvResponse*)br; | |
|
11373
80fd6df6fbe0
[gaim-migrate @ 13598]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
82 | |
|
80fd6df6fbe0
[gaim-migrate @ 13598]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
83 | if(a->pref == b->pref) { |
|
80fd6df6fbe0
[gaim-migrate @ 13598]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
84 | if(a->weight == b->weight) |
|
80fd6df6fbe0
[gaim-migrate @ 13598]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
85 | return 0; |
|
80fd6df6fbe0
[gaim-migrate @ 13598]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
86 | if(a->weight < b->weight) |
|
80fd6df6fbe0
[gaim-migrate @ 13598]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
87 | return -1; |
|
80fd6df6fbe0
[gaim-migrate @ 13598]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
88 | return 1; |
|
80fd6df6fbe0
[gaim-migrate @ 13598]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
89 | } |
|
80fd6df6fbe0
[gaim-migrate @ 13598]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
90 | if(a->pref < b->pref) |
|
80fd6df6fbe0
[gaim-migrate @ 13598]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
91 | return -1; |
|
80fd6df6fbe0
[gaim-migrate @ 13598]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
92 | return 1; |
|
80fd6df6fbe0
[gaim-migrate @ 13598]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
93 | } |
|
14370
12ef3d4096ee
[gaim-migrate @ 16998]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
94 | |
|
11379
a5a66b0e8b6e
[gaim-migrate @ 13605]
Daniel Atallah <datallah@pidgin.im>
parents:
11373
diff
changeset
|
95 | #ifndef _WIN32 |
|
14370
12ef3d4096ee
[gaim-migrate @ 16998]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
96 | |
|
16701
0b41f23396cc
Mark two functions as "noreturn"
Mark Doliner <markdoliner@pidgin.im>
parents:
15890
diff
changeset
|
97 | G_GNUC_NORETURN static void |
|
14370
12ef3d4096ee
[gaim-migrate @ 16998]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
98 | resolve(int in, int out) |
|
12ef3d4096ee
[gaim-migrate @ 16998]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
99 | { |
|
11373
80fd6df6fbe0
[gaim-migrate @ 13598]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
100 | GList *ret = NULL; |
| 15884 | 101 | PurpleSrvResponse *srvres; |
|
11373
80fd6df6fbe0
[gaim-migrate @ 13598]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
102 | queryans answer; |
|
80fd6df6fbe0
[gaim-migrate @ 13598]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
103 | int size; |
|
80fd6df6fbe0
[gaim-migrate @ 13598]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
104 | int qdcount; |
|
80fd6df6fbe0
[gaim-migrate @ 13598]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
105 | int ancount; |
|
11381
d3d53604fe0f
[gaim-migrate @ 13608]
Mark Doliner <markdoliner@pidgin.im>
parents:
11379
diff
changeset
|
106 | guchar *end; |
|
d3d53604fe0f
[gaim-migrate @ 13608]
Mark Doliner <markdoliner@pidgin.im>
parents:
11379
diff
changeset
|
107 | guchar *cp; |
|
11373
80fd6df6fbe0
[gaim-migrate @ 13598]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
108 | gchar name[256]; |
|
13127
0adfbecc67ac
[gaim-migrate @ 15488]
Mark Doliner <markdoliner@pidgin.im>
parents:
12847
diff
changeset
|
109 | guint16 type, dlen, pref, weight, port; |
|
11373
80fd6df6fbe0
[gaim-migrate @ 13598]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
110 | gchar query[256]; |
|
80fd6df6fbe0
[gaim-migrate @ 13598]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
111 | |
|
15707
e9d3280caf69
Restore default signal handlers in fork()'d children. This adds a gaim_restore_default_signal_handlers() utility function since children are made in multiple places.
Evan Schoenberg <evands@pidgin.im>
parents:
15435
diff
changeset
|
112 | #ifdef HAVE_SIGNAL_H |
| 15884 | 113 | purple_restore_default_signal_handlers(); |
|
15707
e9d3280caf69
Restore default signal handlers in fork()'d children. This adds a gaim_restore_default_signal_handlers() utility function since children are made in multiple places.
Evan Schoenberg <evands@pidgin.im>
parents:
15435
diff
changeset
|
114 | #endif |
| 15859 | 115 | |
|
20678
a36cc6a8d1ae
Close the pipes to the dnssrv child process. Fixes #3245
Daniel Atallah <datallah@pidgin.im>
parents:
20330
diff
changeset
|
116 | if (read(in, query, 256) <= 0) { |
|
a36cc6a8d1ae
Close the pipes to the dnssrv child process. Fixes #3245
Daniel Atallah <datallah@pidgin.im>
parents:
20330
diff
changeset
|
117 | close(out); |
|
a36cc6a8d1ae
Close the pipes to the dnssrv child process. Fixes #3245
Daniel Atallah <datallah@pidgin.im>
parents:
20330
diff
changeset
|
118 | close(in); |
|
11373
80fd6df6fbe0
[gaim-migrate @ 13598]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
119 | _exit(0); |
|
20678
a36cc6a8d1ae
Close the pipes to the dnssrv child process. Fixes #3245
Daniel Atallah <datallah@pidgin.im>
parents:
20330
diff
changeset
|
120 | } |
|
14370
12ef3d4096ee
[gaim-migrate @ 16998]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
121 | |
|
11373
80fd6df6fbe0
[gaim-migrate @ 13598]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
122 | size = res_query( query, C_IN, T_SRV, (u_char*)&answer, sizeof( answer)); |
|
80fd6df6fbe0
[gaim-migrate @ 13598]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
123 | |
|
80fd6df6fbe0
[gaim-migrate @ 13598]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
124 | qdcount = ntohs(answer.hdr.qdcount); |
|
80fd6df6fbe0
[gaim-migrate @ 13598]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
125 | ancount = ntohs(answer.hdr.ancount); |
|
80fd6df6fbe0
[gaim-migrate @ 13598]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
126 | |
|
11381
d3d53604fe0f
[gaim-migrate @ 13608]
Mark Doliner <markdoliner@pidgin.im>
parents:
11379
diff
changeset
|
127 | cp = (guchar*)&answer + sizeof(HEADER); |
|
d3d53604fe0f
[gaim-migrate @ 13608]
Mark Doliner <markdoliner@pidgin.im>
parents:
11379
diff
changeset
|
128 | end = (guchar*)&answer + size; |
|
11373
80fd6df6fbe0
[gaim-migrate @ 13598]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
129 | |
|
80fd6df6fbe0
[gaim-migrate @ 13598]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
130 | /* skip over unwanted stuff */ |
|
80fd6df6fbe0
[gaim-migrate @ 13598]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
131 | while (qdcount-- > 0 && cp < end) { |
|
11381
d3d53604fe0f
[gaim-migrate @ 13608]
Mark Doliner <markdoliner@pidgin.im>
parents:
11379
diff
changeset
|
132 | size = dn_expand( (unsigned char*)&answer, end, cp, name, 256); |
|
11373
80fd6df6fbe0
[gaim-migrate @ 13598]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
133 | if(size < 0) goto end; |
|
80fd6df6fbe0
[gaim-migrate @ 13598]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
134 | cp += size + QFIXEDSZ; |
|
80fd6df6fbe0
[gaim-migrate @ 13598]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
135 | } |
|
80fd6df6fbe0
[gaim-migrate @ 13598]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
136 | |
|
80fd6df6fbe0
[gaim-migrate @ 13598]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
137 | while (ancount-- > 0 && cp < end) { |
|
11381
d3d53604fe0f
[gaim-migrate @ 13608]
Mark Doliner <markdoliner@pidgin.im>
parents:
11379
diff
changeset
|
138 | size = dn_expand((unsigned char*)&answer, end, cp, name, 256); |
|
11373
80fd6df6fbe0
[gaim-migrate @ 13598]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
139 | if(size < 0) |
|
80fd6df6fbe0
[gaim-migrate @ 13598]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
140 | goto end; |
|
80fd6df6fbe0
[gaim-migrate @ 13598]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
141 | |
|
80fd6df6fbe0
[gaim-migrate @ 13598]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
142 | cp += size; |
|
11395
1b19bd77adf6
[gaim-migrate @ 13626]
Daniel Atallah <datallah@pidgin.im>
parents:
11382
diff
changeset
|
143 | |
|
13143
d0a29ff182c8
[gaim-migrate @ 15505]
Mark Doliner <markdoliner@pidgin.im>
parents:
13127
diff
changeset
|
144 | GETSHORT(type,cp); |
|
11373
80fd6df6fbe0
[gaim-migrate @ 13598]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
145 | |
|
13127
0adfbecc67ac
[gaim-migrate @ 15488]
Mark Doliner <markdoliner@pidgin.im>
parents:
12847
diff
changeset
|
146 | /* skip ttl and class since we already know it */ |
|
0adfbecc67ac
[gaim-migrate @ 15488]
Mark Doliner <markdoliner@pidgin.im>
parents:
12847
diff
changeset
|
147 | cp += 6; |
|
0adfbecc67ac
[gaim-migrate @ 15488]
Mark Doliner <markdoliner@pidgin.im>
parents:
12847
diff
changeset
|
148 | |
|
13143
d0a29ff182c8
[gaim-migrate @ 15505]
Mark Doliner <markdoliner@pidgin.im>
parents:
13127
diff
changeset
|
149 | GETSHORT(dlen,cp); |
|
11373
80fd6df6fbe0
[gaim-migrate @ 13598]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
150 | |
|
80fd6df6fbe0
[gaim-migrate @ 13598]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
151 | if (type == T_SRV) { |
|
13143
d0a29ff182c8
[gaim-migrate @ 15505]
Mark Doliner <markdoliner@pidgin.im>
parents:
13127
diff
changeset
|
152 | GETSHORT(pref,cp); |
|
11373
80fd6df6fbe0
[gaim-migrate @ 13598]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
153 | |
|
13143
d0a29ff182c8
[gaim-migrate @ 15505]
Mark Doliner <markdoliner@pidgin.im>
parents:
13127
diff
changeset
|
154 | GETSHORT(weight,cp); |
|
11373
80fd6df6fbe0
[gaim-migrate @ 13598]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
155 | |
|
13143
d0a29ff182c8
[gaim-migrate @ 15505]
Mark Doliner <markdoliner@pidgin.im>
parents:
13127
diff
changeset
|
156 | GETSHORT(port,cp); |
|
11373
80fd6df6fbe0
[gaim-migrate @ 13598]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
157 | |
|
11381
d3d53604fe0f
[gaim-migrate @ 13608]
Mark Doliner <markdoliner@pidgin.im>
parents:
11379
diff
changeset
|
158 | size = dn_expand( (unsigned char*)&answer, end, cp, name, 256); |
|
11373
80fd6df6fbe0
[gaim-migrate @ 13598]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
159 | if(size < 0 ) |
|
80fd6df6fbe0
[gaim-migrate @ 13598]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
160 | goto end; |
|
80fd6df6fbe0
[gaim-migrate @ 13598]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
161 | |
|
80fd6df6fbe0
[gaim-migrate @ 13598]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
162 | cp += size; |
|
80fd6df6fbe0
[gaim-migrate @ 13598]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
163 | |
| 15884 | 164 | srvres = g_new0(PurpleSrvResponse, 1); |
|
11373
80fd6df6fbe0
[gaim-migrate @ 13598]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
165 | strcpy(srvres->hostname, name); |
|
80fd6df6fbe0
[gaim-migrate @ 13598]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
166 | srvres->pref = pref; |
|
80fd6df6fbe0
[gaim-migrate @ 13598]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
167 | srvres->port = port; |
|
80fd6df6fbe0
[gaim-migrate @ 13598]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
168 | srvres->weight = weight; |
|
11395
1b19bd77adf6
[gaim-migrate @ 13626]
Daniel Atallah <datallah@pidgin.im>
parents:
11382
diff
changeset
|
169 | |
|
11373
80fd6df6fbe0
[gaim-migrate @ 13598]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
170 | ret = g_list_insert_sorted(ret, srvres, responsecompare); |
|
80fd6df6fbe0
[gaim-migrate @ 13598]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
171 | } else { |
|
80fd6df6fbe0
[gaim-migrate @ 13598]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
172 | cp += dlen; |
|
80fd6df6fbe0
[gaim-migrate @ 13598]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
173 | } |
|
80fd6df6fbe0
[gaim-migrate @ 13598]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
174 | } |
|
14370
12ef3d4096ee
[gaim-migrate @ 16998]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
175 | |
|
12ef3d4096ee
[gaim-migrate @ 16998]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
176 | end: |
|
12ef3d4096ee
[gaim-migrate @ 16998]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
177 | size = g_list_length(ret); |
|
11430
a532570de9d6
[gaim-migrate @ 13667]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11426
diff
changeset
|
178 | write(out, &size, sizeof(int)); |
|
14370
12ef3d4096ee
[gaim-migrate @ 16998]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
179 | while (ret != NULL) |
|
12ef3d4096ee
[gaim-migrate @ 16998]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
180 | { |
| 15884 | 181 | write(out, ret->data, sizeof(PurpleSrvResponse)); |
|
14370
12ef3d4096ee
[gaim-migrate @ 16998]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
182 | g_free(ret->data); |
|
12ef3d4096ee
[gaim-migrate @ 16998]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
183 | ret = g_list_remove(ret, ret->data); |
|
11373
80fd6df6fbe0
[gaim-migrate @ 13598]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
184 | } |
|
80fd6df6fbe0
[gaim-migrate @ 13598]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
185 | |
|
20678
a36cc6a8d1ae
Close the pipes to the dnssrv child process. Fixes #3245
Daniel Atallah <datallah@pidgin.im>
parents:
20330
diff
changeset
|
186 | close(out); |
|
a36cc6a8d1ae
Close the pipes to the dnssrv child process. Fixes #3245
Daniel Atallah <datallah@pidgin.im>
parents:
20330
diff
changeset
|
187 | close(in); |
|
a36cc6a8d1ae
Close the pipes to the dnssrv child process. Fixes #3245
Daniel Atallah <datallah@pidgin.im>
parents:
20330
diff
changeset
|
188 | |
|
11395
1b19bd77adf6
[gaim-migrate @ 13626]
Daniel Atallah <datallah@pidgin.im>
parents:
11382
diff
changeset
|
189 | _exit(0); |
|
11373
80fd6df6fbe0
[gaim-migrate @ 13598]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
190 | } |
|
80fd6df6fbe0
[gaim-migrate @ 13598]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
191 | |
|
14370
12ef3d4096ee
[gaim-migrate @ 16998]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
192 | static void |
| 15884 | 193 | resolved(gpointer data, gint source, PurpleInputCondition cond) |
|
14370
12ef3d4096ee
[gaim-migrate @ 16998]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
194 | { |
|
11373
80fd6df6fbe0
[gaim-migrate @ 13598]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
195 | int size; |
| 15884 | 196 | PurpleSrvQueryData *query_data = (PurpleSrvQueryData*)data; |
| 197 | PurpleSrvResponse *res; | |
| 198 | PurpleSrvResponse *tmp; | |
|
11426
46f761f5c7ad
[gaim-migrate @ 13663]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11395
diff
changeset
|
199 | int i; |
| 15884 | 200 | PurpleSrvCallback cb = query_data->cb; |
|
15776
cba54f9d2e51
Patch from Graham Booker which ensures that a process forked by dnsserv cleans up afterwards, calling waitpid() to make sure no zombies are left over.
Evan Schoenberg <evands@pidgin.im>
parents:
15718
diff
changeset
|
201 | int status; |
|
11373
80fd6df6fbe0
[gaim-migrate @ 13598]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
202 | |
|
22234
4d54e1c5c696
More compiler warning fixes from o_sukhodolsky (with additions by me).
Mark Doliner <markdoliner@pidgin.im>
parents:
20679
diff
changeset
|
203 | if (read(source, &size, sizeof(int)) == sizeof(int)) |
|
16957
b74ce411bea8
If the read() in resolved() fails, we should detect the failure and set size (which it would otherwise set, since it is passed by reference) to 0 and res to NULL. This ''may'' fix a rather odd crash described in Adium Trac #6623 (http://trac.adiumx.com/ticket/6623), and it is certainly good sanity checking.
Evan Schoenberg <evands@pidgin.im>
parents:
16701
diff
changeset
|
204 | { |
|
22234
4d54e1c5c696
More compiler warning fixes from o_sukhodolsky (with additions by me).
Mark Doliner <markdoliner@pidgin.im>
parents:
20679
diff
changeset
|
205 | ssize_t red; |
|
16957
b74ce411bea8
If the read() in resolved() fails, we should detect the failure and set size (which it would otherwise set, since it is passed by reference) to 0 and res to NULL. This ''may'' fix a rather odd crash described in Adium Trac #6623 (http://trac.adiumx.com/ticket/6623), and it is certainly good sanity checking.
Evan Schoenberg <evands@pidgin.im>
parents:
16701
diff
changeset
|
206 | purple_debug_info("dnssrv","found %d SRV entries\n", size); |
|
b74ce411bea8
If the read() in resolved() fails, we should detect the failure and set size (which it would otherwise set, since it is passed by reference) to 0 and res to NULL. This ''may'' fix a rather odd crash described in Adium Trac #6623 (http://trac.adiumx.com/ticket/6623), and it is certainly good sanity checking.
Evan Schoenberg <evands@pidgin.im>
parents:
16701
diff
changeset
|
207 | tmp = res = g_new0(PurpleSrvResponse, size); |
|
b74ce411bea8
If the read() in resolved() fails, we should detect the failure and set size (which it would otherwise set, since it is passed by reference) to 0 and res to NULL. This ''may'' fix a rather odd crash described in Adium Trac #6623 (http://trac.adiumx.com/ticket/6623), and it is certainly good sanity checking.
Evan Schoenberg <evands@pidgin.im>
parents:
16701
diff
changeset
|
208 | for (i = 0; i < size; i++) { |
|
22234
4d54e1c5c696
More compiler warning fixes from o_sukhodolsky (with additions by me).
Mark Doliner <markdoliner@pidgin.im>
parents:
20679
diff
changeset
|
209 | red = read(source, tmp++, sizeof(PurpleSrvResponse)); |
|
4d54e1c5c696
More compiler warning fixes from o_sukhodolsky (with additions by me).
Mark Doliner <markdoliner@pidgin.im>
parents:
20679
diff
changeset
|
210 | if (red != sizeof(PurpleSrvResponse)) { |
|
4d54e1c5c696
More compiler warning fixes from o_sukhodolsky (with additions by me).
Mark Doliner <markdoliner@pidgin.im>
parents:
20679
diff
changeset
|
211 | purple_debug_error("dnssrv","unable to read srv " |
|
4d54e1c5c696
More compiler warning fixes from o_sukhodolsky (with additions by me).
Mark Doliner <markdoliner@pidgin.im>
parents:
20679
diff
changeset
|
212 | "response: %s\n", g_strerror(errno)); |
|
4d54e1c5c696
More compiler warning fixes from o_sukhodolsky (with additions by me).
Mark Doliner <markdoliner@pidgin.im>
parents:
20679
diff
changeset
|
213 | size = 0; |
|
4d54e1c5c696
More compiler warning fixes from o_sukhodolsky (with additions by me).
Mark Doliner <markdoliner@pidgin.im>
parents:
20679
diff
changeset
|
214 | g_free(res); |
|
4d54e1c5c696
More compiler warning fixes from o_sukhodolsky (with additions by me).
Mark Doliner <markdoliner@pidgin.im>
parents:
20679
diff
changeset
|
215 | res = NULL; |
|
4d54e1c5c696
More compiler warning fixes from o_sukhodolsky (with additions by me).
Mark Doliner <markdoliner@pidgin.im>
parents:
20679
diff
changeset
|
216 | } |
|
16957
b74ce411bea8
If the read() in resolved() fails, we should detect the failure and set size (which it would otherwise set, since it is passed by reference) to 0 and res to NULL. This ''may'' fix a rather odd crash described in Adium Trac #6623 (http://trac.adiumx.com/ticket/6623), and it is certainly good sanity checking.
Evan Schoenberg <evands@pidgin.im>
parents:
16701
diff
changeset
|
217 | } |
|
b74ce411bea8
If the read() in resolved() fails, we should detect the failure and set size (which it would otherwise set, since it is passed by reference) to 0 and res to NULL. This ''may'' fix a rather odd crash described in Adium Trac #6623 (http://trac.adiumx.com/ticket/6623), and it is certainly good sanity checking.
Evan Schoenberg <evands@pidgin.im>
parents:
16701
diff
changeset
|
218 | } |
|
b74ce411bea8
If the read() in resolved() fails, we should detect the failure and set size (which it would otherwise set, since it is passed by reference) to 0 and res to NULL. This ''may'' fix a rather odd crash described in Adium Trac #6623 (http://trac.adiumx.com/ticket/6623), and it is certainly good sanity checking.
Evan Schoenberg <evands@pidgin.im>
parents:
16701
diff
changeset
|
219 | else |
|
b74ce411bea8
If the read() in resolved() fails, we should detect the failure and set size (which it would otherwise set, since it is passed by reference) to 0 and res to NULL. This ''may'' fix a rather odd crash described in Adium Trac #6623 (http://trac.adiumx.com/ticket/6623), and it is certainly good sanity checking.
Evan Schoenberg <evands@pidgin.im>
parents:
16701
diff
changeset
|
220 | { |
|
b74ce411bea8
If the read() in resolved() fails, we should detect the failure and set size (which it would otherwise set, since it is passed by reference) to 0 and res to NULL. This ''may'' fix a rather odd crash described in Adium Trac #6623 (http://trac.adiumx.com/ticket/6623), and it is certainly good sanity checking.
Evan Schoenberg <evands@pidgin.im>
parents:
16701
diff
changeset
|
221 | purple_debug_info("dnssrv","found 0 SRV entries; errno is %i\n", errno); |
|
b74ce411bea8
If the read() in resolved() fails, we should detect the failure and set size (which it would otherwise set, since it is passed by reference) to 0 and res to NULL. This ''may'' fix a rather odd crash described in Adium Trac #6623 (http://trac.adiumx.com/ticket/6623), and it is certainly good sanity checking.
Evan Schoenberg <evands@pidgin.im>
parents:
16701
diff
changeset
|
222 | size = 0; |
|
b74ce411bea8
If the read() in resolved() fails, we should detect the failure and set size (which it would otherwise set, since it is passed by reference) to 0 and res to NULL. This ''may'' fix a rather odd crash described in Adium Trac #6623 (http://trac.adiumx.com/ticket/6623), and it is certainly good sanity checking.
Evan Schoenberg <evands@pidgin.im>
parents:
16701
diff
changeset
|
223 | res = NULL; |
|
11373
80fd6df6fbe0
[gaim-migrate @ 13598]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
224 | } |
|
14370
12ef3d4096ee
[gaim-migrate @ 16998]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
225 | |
|
12ef3d4096ee
[gaim-migrate @ 16998]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
226 | cb(res, size, query_data->extradata); |
|
15776
cba54f9d2e51
Patch from Graham Booker which ensures that a process forked by dnsserv cleans up afterwards, calling waitpid() to make sure no zombies are left over.
Evan Schoenberg <evands@pidgin.im>
parents:
15718
diff
changeset
|
227 | waitpid(query_data->pid, &status, 0); |
|
14370
12ef3d4096ee
[gaim-migrate @ 16998]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
228 | |
| 15884 | 229 | purple_srv_cancel(query_data); |
|
11373
80fd6df6fbe0
[gaim-migrate @ 13598]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
230 | } |
|
80fd6df6fbe0
[gaim-migrate @ 13598]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
231 | |
|
11379
a5a66b0e8b6e
[gaim-migrate @ 13605]
Daniel Atallah <datallah@pidgin.im>
parents:
11373
diff
changeset
|
232 | #else /* _WIN32 */ |
|
a5a66b0e8b6e
[gaim-migrate @ 13605]
Daniel Atallah <datallah@pidgin.im>
parents:
11373
diff
changeset
|
233 | |
|
a5a66b0e8b6e
[gaim-migrate @ 13605]
Daniel Atallah <datallah@pidgin.im>
parents:
11373
diff
changeset
|
234 | /** The Jabber Server code was inspiration for parts of this. */ |
|
a5a66b0e8b6e
[gaim-migrate @ 13605]
Daniel Atallah <datallah@pidgin.im>
parents:
11373
diff
changeset
|
235 | |
|
14370
12ef3d4096ee
[gaim-migrate @ 16998]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
236 | static gboolean |
|
12ef3d4096ee
[gaim-migrate @ 16998]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
237 | res_main_thread_cb(gpointer data) |
|
12ef3d4096ee
[gaim-migrate @ 16998]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
238 | { |
| 15884 | 239 | PurpleSrvResponse *srvres = NULL; |
|
11379
a5a66b0e8b6e
[gaim-migrate @ 13605]
Daniel Atallah <datallah@pidgin.im>
parents:
11373
diff
changeset
|
240 | int size = 0; |
| 15884 | 241 | PurpleSrvQueryData *query_data = data; |
|
11379
a5a66b0e8b6e
[gaim-migrate @ 13605]
Daniel Atallah <datallah@pidgin.im>
parents:
11373
diff
changeset
|
242 | |
|
14374
a93eedc7aa6b
[gaim-migrate @ 17002]
Daniel Atallah <datallah@pidgin.im>
parents:
14370
diff
changeset
|
243 | if(query_data->error_message != NULL) |
| 15884 | 244 | purple_debug_error("dnssrv", query_data->error_message); |
|
14374
a93eedc7aa6b
[gaim-migrate @ 17002]
Daniel Atallah <datallah@pidgin.im>
parents:
14370
diff
changeset
|
245 | else { |
| 15884 | 246 | PurpleSrvResponse *srvres_tmp = NULL; |
|
14370
12ef3d4096ee
[gaim-migrate @ 16998]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
247 | GSList *lst = query_data->results; |
|
11379
a5a66b0e8b6e
[gaim-migrate @ 13605]
Daniel Atallah <datallah@pidgin.im>
parents:
11373
diff
changeset
|
248 | |
| 15859 | 249 | size = g_slist_length(lst); |
|
11379
a5a66b0e8b6e
[gaim-migrate @ 13605]
Daniel Atallah <datallah@pidgin.im>
parents:
11373
diff
changeset
|
250 | |
| 15859 | 251 | if(query_data->cb && size > 0) |
| 15884 | 252 | srvres_tmp = srvres = g_new0(PurpleSrvResponse, size); |
|
11379
a5a66b0e8b6e
[gaim-migrate @ 13605]
Daniel Atallah <datallah@pidgin.im>
parents:
11373
diff
changeset
|
253 | while (lst) { |
|
14374
a93eedc7aa6b
[gaim-migrate @ 17002]
Daniel Atallah <datallah@pidgin.im>
parents:
14370
diff
changeset
|
254 | if(query_data->cb) |
| 15884 | 255 | memcpy(srvres_tmp++, lst->data, sizeof(PurpleSrvResponse)); |
|
11379
a5a66b0e8b6e
[gaim-migrate @ 13605]
Daniel Atallah <datallah@pidgin.im>
parents:
11373
diff
changeset
|
256 | g_free(lst->data); |
|
a5a66b0e8b6e
[gaim-migrate @ 13605]
Daniel Atallah <datallah@pidgin.im>
parents:
11373
diff
changeset
|
257 | lst = g_slist_remove(lst, lst->data); |
|
a5a66b0e8b6e
[gaim-migrate @ 13605]
Daniel Atallah <datallah@pidgin.im>
parents:
11373
diff
changeset
|
258 | } |
|
a5a66b0e8b6e
[gaim-migrate @ 13605]
Daniel Atallah <datallah@pidgin.im>
parents:
11373
diff
changeset
|
259 | |
|
14374
a93eedc7aa6b
[gaim-migrate @ 17002]
Daniel Atallah <datallah@pidgin.im>
parents:
14370
diff
changeset
|
260 | query_data->results = NULL; |
| 15859 | 261 | |
| 15884 | 262 | purple_debug_info("dnssrv", "found %d SRV entries\n", size); |
|
11379
a5a66b0e8b6e
[gaim-migrate @ 13605]
Daniel Atallah <datallah@pidgin.im>
parents:
11373
diff
changeset
|
263 | } |
|
a5a66b0e8b6e
[gaim-migrate @ 13605]
Daniel Atallah <datallah@pidgin.im>
parents:
11373
diff
changeset
|
264 | |
|
14374
a93eedc7aa6b
[gaim-migrate @ 17002]
Daniel Atallah <datallah@pidgin.im>
parents:
14370
diff
changeset
|
265 | if(query_data->cb) |
|
a93eedc7aa6b
[gaim-migrate @ 17002]
Daniel Atallah <datallah@pidgin.im>
parents:
14370
diff
changeset
|
266 | query_data->cb(srvres, size, query_data->extradata); |
|
a93eedc7aa6b
[gaim-migrate @ 17002]
Daniel Atallah <datallah@pidgin.im>
parents:
14370
diff
changeset
|
267 | |
|
a93eedc7aa6b
[gaim-migrate @ 17002]
Daniel Atallah <datallah@pidgin.im>
parents:
14370
diff
changeset
|
268 | query_data->resolver = NULL; |
|
a93eedc7aa6b
[gaim-migrate @ 17002]
Daniel Atallah <datallah@pidgin.im>
parents:
14370
diff
changeset
|
269 | query_data->handle = 0; |
|
11379
a5a66b0e8b6e
[gaim-migrate @ 13605]
Daniel Atallah <datallah@pidgin.im>
parents:
11373
diff
changeset
|
270 | |
| 15884 | 271 | purple_srv_cancel(query_data); |
|
11379
a5a66b0e8b6e
[gaim-migrate @ 13605]
Daniel Atallah <datallah@pidgin.im>
parents:
11373
diff
changeset
|
272 | |
|
a5a66b0e8b6e
[gaim-migrate @ 13605]
Daniel Atallah <datallah@pidgin.im>
parents:
11373
diff
changeset
|
273 | return FALSE; |
|
a5a66b0e8b6e
[gaim-migrate @ 13605]
Daniel Atallah <datallah@pidgin.im>
parents:
11373
diff
changeset
|
274 | } |
|
a5a66b0e8b6e
[gaim-migrate @ 13605]
Daniel Atallah <datallah@pidgin.im>
parents:
11373
diff
changeset
|
275 | |
|
14370
12ef3d4096ee
[gaim-migrate @ 16998]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
276 | static gpointer |
|
12ef3d4096ee
[gaim-migrate @ 16998]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
277 | res_thread(gpointer data) |
|
12ef3d4096ee
[gaim-migrate @ 16998]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
278 | { |
|
12451
d9feea46dac4
[gaim-migrate @ 14760]
Daniel Atallah <datallah@pidgin.im>
parents:
12439
diff
changeset
|
279 | PDNS_RECORD dr = NULL; |
|
11379
a5a66b0e8b6e
[gaim-migrate @ 13605]
Daniel Atallah <datallah@pidgin.im>
parents:
11373
diff
changeset
|
280 | int type = DNS_TYPE_SRV; |
|
a5a66b0e8b6e
[gaim-migrate @ 13605]
Daniel Atallah <datallah@pidgin.im>
parents:
11373
diff
changeset
|
281 | DNS_STATUS ds; |
| 15884 | 282 | PurpleSrvQueryData *query_data = data; |
|
11379
a5a66b0e8b6e
[gaim-migrate @ 13605]
Daniel Atallah <datallah@pidgin.im>
parents:
11373
diff
changeset
|
283 | |
|
14370
12ef3d4096ee
[gaim-migrate @ 16998]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
284 | ds = MyDnsQuery_UTF8(query_data->query, type, DNS_QUERY_STANDARD, NULL, &dr, NULL); |
|
11379
a5a66b0e8b6e
[gaim-migrate @ 13605]
Daniel Atallah <datallah@pidgin.im>
parents:
11373
diff
changeset
|
285 | if (ds != ERROR_SUCCESS) { |
|
12691
4c178bccdba7
[gaim-migrate @ 15034]
Daniel Atallah <datallah@pidgin.im>
parents:
12686
diff
changeset
|
286 | gchar *msg = g_win32_error_message(ds); |
|
14370
12ef3d4096ee
[gaim-migrate @ 16998]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
287 | query_data->error_message = g_strdup_printf("Couldn't look up SRV record. %s (%lu).\n", msg, ds); |
|
12691
4c178bccdba7
[gaim-migrate @ 15034]
Daniel Atallah <datallah@pidgin.im>
parents:
12686
diff
changeset
|
288 | g_free(msg); |
|
11379
a5a66b0e8b6e
[gaim-migrate @ 13605]
Daniel Atallah <datallah@pidgin.im>
parents:
11373
diff
changeset
|
289 | } else { |
|
12451
d9feea46dac4
[gaim-migrate @ 14760]
Daniel Atallah <datallah@pidgin.im>
parents:
12439
diff
changeset
|
290 | PDNS_RECORD dr_tmp; |
|
d9feea46dac4
[gaim-migrate @ 14760]
Daniel Atallah <datallah@pidgin.im>
parents:
12439
diff
changeset
|
291 | GSList *lst = NULL; |
|
d9feea46dac4
[gaim-migrate @ 14760]
Daniel Atallah <datallah@pidgin.im>
parents:
12439
diff
changeset
|
292 | DNS_SRV_DATA *srv_data; |
| 15884 | 293 | PurpleSrvResponse *srvres; |
|
12451
d9feea46dac4
[gaim-migrate @ 14760]
Daniel Atallah <datallah@pidgin.im>
parents:
12439
diff
changeset
|
294 | |
|
d9feea46dac4
[gaim-migrate @ 14760]
Daniel Atallah <datallah@pidgin.im>
parents:
12439
diff
changeset
|
295 | for (dr_tmp = dr; dr_tmp != NULL; dr_tmp = dr_tmp->pNext) { |
|
11379
a5a66b0e8b6e
[gaim-migrate @ 13605]
Daniel Atallah <datallah@pidgin.im>
parents:
11373
diff
changeset
|
296 | /* Discard any incorrect entries. I'm not sure if this is necessary */ |
|
14370
12ef3d4096ee
[gaim-migrate @ 16998]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
297 | if (dr_tmp->wType != type || strcmp(dr_tmp->pName, query_data->query) != 0) { |
|
11379
a5a66b0e8b6e
[gaim-migrate @ 13605]
Daniel Atallah <datallah@pidgin.im>
parents:
11373
diff
changeset
|
298 | continue; |
|
a5a66b0e8b6e
[gaim-migrate @ 13605]
Daniel Atallah <datallah@pidgin.im>
parents:
11373
diff
changeset
|
299 | } |
|
a5a66b0e8b6e
[gaim-migrate @ 13605]
Daniel Atallah <datallah@pidgin.im>
parents:
11373
diff
changeset
|
300 | |
|
a5a66b0e8b6e
[gaim-migrate @ 13605]
Daniel Atallah <datallah@pidgin.im>
parents:
11373
diff
changeset
|
301 | srv_data = &dr_tmp->Data.SRV; |
| 15884 | 302 | srvres = g_new0(PurpleSrvResponse, 1); |
|
11379
a5a66b0e8b6e
[gaim-migrate @ 13605]
Daniel Atallah <datallah@pidgin.im>
parents:
11373
diff
changeset
|
303 | strncpy(srvres->hostname, srv_data->pNameTarget, 255); |
|
a5a66b0e8b6e
[gaim-migrate @ 13605]
Daniel Atallah <datallah@pidgin.im>
parents:
11373
diff
changeset
|
304 | srvres->hostname[255] = '\0'; |
|
a5a66b0e8b6e
[gaim-migrate @ 13605]
Daniel Atallah <datallah@pidgin.im>
parents:
11373
diff
changeset
|
305 | srvres->pref = srv_data->wPriority; |
|
a5a66b0e8b6e
[gaim-migrate @ 13605]
Daniel Atallah <datallah@pidgin.im>
parents:
11373
diff
changeset
|
306 | srvres->port = srv_data->wPort; |
|
a5a66b0e8b6e
[gaim-migrate @ 13605]
Daniel Atallah <datallah@pidgin.im>
parents:
11373
diff
changeset
|
307 | srvres->weight = srv_data->wWeight; |
|
a5a66b0e8b6e
[gaim-migrate @ 13605]
Daniel Atallah <datallah@pidgin.im>
parents:
11373
diff
changeset
|
308 | |
|
a5a66b0e8b6e
[gaim-migrate @ 13605]
Daniel Atallah <datallah@pidgin.im>
parents:
11373
diff
changeset
|
309 | lst = g_slist_insert_sorted(lst, srvres, responsecompare); |
|
a5a66b0e8b6e
[gaim-migrate @ 13605]
Daniel Atallah <datallah@pidgin.im>
parents:
11373
diff
changeset
|
310 | } |
|
a5a66b0e8b6e
[gaim-migrate @ 13605]
Daniel Atallah <datallah@pidgin.im>
parents:
11373
diff
changeset
|
311 | |
|
12451
d9feea46dac4
[gaim-migrate @ 14760]
Daniel Atallah <datallah@pidgin.im>
parents:
12439
diff
changeset
|
312 | MyDnsRecordListFree(dr, DnsFreeRecordList); |
|
14370
12ef3d4096ee
[gaim-migrate @ 16998]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
313 | query_data->results = lst; |
|
11379
a5a66b0e8b6e
[gaim-migrate @ 13605]
Daniel Atallah <datallah@pidgin.im>
parents:
11373
diff
changeset
|
314 | } |
|
a5a66b0e8b6e
[gaim-migrate @ 13605]
Daniel Atallah <datallah@pidgin.im>
parents:
11373
diff
changeset
|
315 | |
|
a5a66b0e8b6e
[gaim-migrate @ 13605]
Daniel Atallah <datallah@pidgin.im>
parents:
11373
diff
changeset
|
316 | /* back to main thread */ |
|
14374
a93eedc7aa6b
[gaim-migrate @ 17002]
Daniel Atallah <datallah@pidgin.im>
parents:
14370
diff
changeset
|
317 | /* Note: this should *not* be attached to query_data->handle - it will cause leakage */ |
|
22351
6ca0640b3d31
Change some g_idle_add(...) calls in libpurple to purple_timeout_add(0, ...)
Mark Doliner <markdoliner@pidgin.im>
parents:
22249
diff
changeset
|
318 | purple_timeout_add(0, res_main_thread_cb, query_data); |
|
11379
a5a66b0e8b6e
[gaim-migrate @ 13605]
Daniel Atallah <datallah@pidgin.im>
parents:
11373
diff
changeset
|
319 | |
|
12691
4c178bccdba7
[gaim-migrate @ 15034]
Daniel Atallah <datallah@pidgin.im>
parents:
12686
diff
changeset
|
320 | g_thread_exit(NULL); |
|
4c178bccdba7
[gaim-migrate @ 15034]
Daniel Atallah <datallah@pidgin.im>
parents:
12686
diff
changeset
|
321 | return NULL; |
|
11379
a5a66b0e8b6e
[gaim-migrate @ 13605]
Daniel Atallah <datallah@pidgin.im>
parents:
11373
diff
changeset
|
322 | } |
|
a5a66b0e8b6e
[gaim-migrate @ 13605]
Daniel Atallah <datallah@pidgin.im>
parents:
11373
diff
changeset
|
323 | |
|
a5a66b0e8b6e
[gaim-migrate @ 13605]
Daniel Atallah <datallah@pidgin.im>
parents:
11373
diff
changeset
|
324 | #endif |
|
a5a66b0e8b6e
[gaim-migrate @ 13605]
Daniel Atallah <datallah@pidgin.im>
parents:
11373
diff
changeset
|
325 | |
| 15884 | 326 | PurpleSrvQueryData * |
| 327 | purple_srv_resolve(const char *protocol, const char *transport, const char *domain, PurpleSrvCallback cb, gpointer extradata) | |
|
14370
12ef3d4096ee
[gaim-migrate @ 16998]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
328 | { |
|
12ef3d4096ee
[gaim-migrate @ 16998]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
329 | char *query; |
| 15884 | 330 | PurpleSrvQueryData *query_data; |
|
11379
a5a66b0e8b6e
[gaim-migrate @ 13605]
Daniel Atallah <datallah@pidgin.im>
parents:
11373
diff
changeset
|
331 | #ifndef _WIN32 |
|
11373
80fd6df6fbe0
[gaim-migrate @ 13598]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
332 | int in[2], out[2]; |
|
80fd6df6fbe0
[gaim-migrate @ 13598]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
333 | int pid; |
|
14370
12ef3d4096ee
[gaim-migrate @ 16998]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
334 | #else |
|
12ef3d4096ee
[gaim-migrate @ 16998]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
335 | GError* err = NULL; |
|
12ef3d4096ee
[gaim-migrate @ 16998]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
336 | static gboolean initialized = FALSE; |
|
12ef3d4096ee
[gaim-migrate @ 16998]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
337 | #endif |
|
12ef3d4096ee
[gaim-migrate @ 16998]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
338 | |
|
12ef3d4096ee
[gaim-migrate @ 16998]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
339 | query = g_strdup_printf("_%s._%s.%s", protocol, transport, domain); |
| 15884 | 340 | purple_debug_info("dnssrv","querying SRV record for %s\n", query); |
|
14370
12ef3d4096ee
[gaim-migrate @ 16998]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
341 | |
|
14374
a93eedc7aa6b
[gaim-migrate @ 17002]
Daniel Atallah <datallah@pidgin.im>
parents:
14370
diff
changeset
|
342 | #ifndef _WIN32 |
|
11373
80fd6df6fbe0
[gaim-migrate @ 13598]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
343 | if(pipe(in) || pipe(out)) { |
| 15884 | 344 | purple_debug_error("dnssrv", "Could not create pipe\n"); |
|
11373
80fd6df6fbe0
[gaim-migrate @ 13598]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
345 | g_free(query); |
|
11382
4458ab177b10
[gaim-migrate @ 13609]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11381
diff
changeset
|
346 | cb(NULL, 0, extradata); |
|
14370
12ef3d4096ee
[gaim-migrate @ 16998]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
347 | return NULL; |
|
11373
80fd6df6fbe0
[gaim-migrate @ 13598]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
348 | } |
|
80fd6df6fbe0
[gaim-migrate @ 13598]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
349 | |
|
80fd6df6fbe0
[gaim-migrate @ 13598]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
350 | pid = fork(); |
|
14370
12ef3d4096ee
[gaim-migrate @ 16998]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
351 | if (pid == -1) { |
| 15884 | 352 | purple_debug_error("dnssrv", "Could not create process!\n"); |
|
11382
4458ab177b10
[gaim-migrate @ 13609]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11381
diff
changeset
|
353 | cb(NULL, 0, extradata); |
|
11373
80fd6df6fbe0
[gaim-migrate @ 13598]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
354 | g_free(query); |
|
14370
12ef3d4096ee
[gaim-migrate @ 16998]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
355 | return NULL; |
|
11373
80fd6df6fbe0
[gaim-migrate @ 13598]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
356 | } |
|
14370
12ef3d4096ee
[gaim-migrate @ 16998]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
357 | |
|
11373
80fd6df6fbe0
[gaim-migrate @ 13598]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
358 | /* Child */ |
|
14370
12ef3d4096ee
[gaim-migrate @ 16998]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
359 | if (pid == 0) |
|
12ef3d4096ee
[gaim-migrate @ 16998]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
360 | { |
|
22249
18041843e873
Fix a memleak that doesn't matter because it's in a child process
Mark Doliner <markdoliner@pidgin.im>
parents:
22234
diff
changeset
|
361 | g_free(query); |
|
18041843e873
Fix a memleak that doesn't matter because it's in a child process
Mark Doliner <markdoliner@pidgin.im>
parents:
22234
diff
changeset
|
362 | |
|
11373
80fd6df6fbe0
[gaim-migrate @ 13598]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
363 | close(out[0]); |
|
80fd6df6fbe0
[gaim-migrate @ 13598]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
364 | close(in[1]); |
|
80fd6df6fbe0
[gaim-migrate @ 13598]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
365 | resolve(in[0], out[1]); |
|
22249
18041843e873
Fix a memleak that doesn't matter because it's in a child process
Mark Doliner <markdoliner@pidgin.im>
parents:
22234
diff
changeset
|
366 | /* resolve() does not return */ |
|
11373
80fd6df6fbe0
[gaim-migrate @ 13598]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
367 | } |
|
80fd6df6fbe0
[gaim-migrate @ 13598]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
368 | |
|
80fd6df6fbe0
[gaim-migrate @ 13598]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
369 | close(out[1]); |
|
80fd6df6fbe0
[gaim-migrate @ 13598]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
370 | close(in[0]); |
|
11395
1b19bd77adf6
[gaim-migrate @ 13626]
Daniel Atallah <datallah@pidgin.im>
parents:
11382
diff
changeset
|
371 | |
|
14370
12ef3d4096ee
[gaim-migrate @ 16998]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
372 | if (write(in[1], query, strlen(query)+1) < 0) |
| 15884 | 373 | purple_debug_error("dnssrv", "Could not write to SRV resolver\n"); |
|
14370
12ef3d4096ee
[gaim-migrate @ 16998]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
374 | |
| 15884 | 375 | query_data = g_new0(PurpleSrvQueryData, 1); |
|
14370
12ef3d4096ee
[gaim-migrate @ 16998]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
376 | query_data->cb = cb; |
|
12ef3d4096ee
[gaim-migrate @ 16998]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
377 | query_data->extradata = extradata; |
|
15776
cba54f9d2e51
Patch from Graham Booker which ensures that a process forked by dnsserv cleans up afterwards, calling waitpid() to make sure no zombies are left over.
Evan Schoenberg <evands@pidgin.im>
parents:
15718
diff
changeset
|
378 | query_data->pid = pid; |
|
20678
a36cc6a8d1ae
Close the pipes to the dnssrv child process. Fixes #3245
Daniel Atallah <datallah@pidgin.im>
parents:
20330
diff
changeset
|
379 | query_data->fd_out = out[0]; |
|
a36cc6a8d1ae
Close the pipes to the dnssrv child process. Fixes #3245
Daniel Atallah <datallah@pidgin.im>
parents:
20330
diff
changeset
|
380 | query_data->fd_in = in[1]; |
| 15884 | 381 | query_data->handle = purple_input_add(out[0], PURPLE_INPUT_READ, resolved, query_data); |
|
11379
a5a66b0e8b6e
[gaim-migrate @ 13605]
Daniel Atallah <datallah@pidgin.im>
parents:
11373
diff
changeset
|
382 | |
|
11373
80fd6df6fbe0
[gaim-migrate @ 13598]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
383 | g_free(query); |
|
14370
12ef3d4096ee
[gaim-migrate @ 16998]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
384 | |
|
12ef3d4096ee
[gaim-migrate @ 16998]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
385 | return query_data; |
|
11379
a5a66b0e8b6e
[gaim-migrate @ 13605]
Daniel Atallah <datallah@pidgin.im>
parents:
11373
diff
changeset
|
386 | #else |
|
a5a66b0e8b6e
[gaim-migrate @ 13605]
Daniel Atallah <datallah@pidgin.im>
parents:
11373
diff
changeset
|
387 | if (!initialized) { |
| 15884 | 388 | MyDnsQuery_UTF8 = (void*) wpurple_find_and_loadproc("dnsapi.dll", "DnsQuery_UTF8"); |
| 389 | MyDnsRecordListFree = (void*) wpurple_find_and_loadproc( | |
|
11379
a5a66b0e8b6e
[gaim-migrate @ 13605]
Daniel Atallah <datallah@pidgin.im>
parents:
11373
diff
changeset
|
390 | "dnsapi.dll", "DnsRecordListFree"); |
|
a5a66b0e8b6e
[gaim-migrate @ 13605]
Daniel Atallah <datallah@pidgin.im>
parents:
11373
diff
changeset
|
391 | initialized = TRUE; |
|
a5a66b0e8b6e
[gaim-migrate @ 13605]
Daniel Atallah <datallah@pidgin.im>
parents:
11373
diff
changeset
|
392 | } |
|
a5a66b0e8b6e
[gaim-migrate @ 13605]
Daniel Atallah <datallah@pidgin.im>
parents:
11373
diff
changeset
|
393 | |
| 15884 | 394 | query_data = g_new0(PurpleSrvQueryData, 1); |
|
14370
12ef3d4096ee
[gaim-migrate @ 16998]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
395 | query_data->cb = cb; |
|
12ef3d4096ee
[gaim-migrate @ 16998]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
396 | query_data->query = query; |
|
12ef3d4096ee
[gaim-migrate @ 16998]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
397 | query_data->extradata = extradata; |
|
11379
a5a66b0e8b6e
[gaim-migrate @ 13605]
Daniel Atallah <datallah@pidgin.im>
parents:
11373
diff
changeset
|
398 | |
| 15859 | 399 | if (!MyDnsQuery_UTF8 || !MyDnsRecordListFree) |
| 400 | query_data->error_message = g_strdup("System missing DNS API (Requires W2K+)\n"); | |
| 401 | else { | |
| 402 | query_data->resolver = g_thread_create(res_thread, query_data, FALSE, &err); | |
| 403 | if (query_data->resolver == NULL) { | |
| 404 | query_data->error_message = g_strdup_printf("SRV thread create failure: %s\n", (err && err->message) ? err->message : ""); | |
| 405 | g_error_free(err); | |
| 406 | } | |
|
14374
a93eedc7aa6b
[gaim-migrate @ 17002]
Daniel Atallah <datallah@pidgin.im>
parents:
14370
diff
changeset
|
407 | } |
|
a93eedc7aa6b
[gaim-migrate @ 17002]
Daniel Atallah <datallah@pidgin.im>
parents:
14370
diff
changeset
|
408 | |
| 15859 | 409 | /* The query isn't going to happen, so finish the SRV lookup now. |
| 410 | * Asynchronously call the callback since stuff may not expect | |
| 411 | * the callback to be called before this returns */ | |
| 412 | if (query_data->error_message != NULL) | |
|
22351
6ca0640b3d31
Change some g_idle_add(...) calls in libpurple to purple_timeout_add(0, ...)
Mark Doliner <markdoliner@pidgin.im>
parents:
22249
diff
changeset
|
413 | query_data->handle = purple_timeout_add(0, res_main_thread_cb, query_data); |
|
14374
a93eedc7aa6b
[gaim-migrate @ 17002]
Daniel Atallah <datallah@pidgin.im>
parents:
14370
diff
changeset
|
414 | |
|
14370
12ef3d4096ee
[gaim-migrate @ 16998]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
415 | return query_data; |
|
11379
a5a66b0e8b6e
[gaim-migrate @ 13605]
Daniel Atallah <datallah@pidgin.im>
parents:
11373
diff
changeset
|
416 | #endif |
|
11373
80fd6df6fbe0
[gaim-migrate @ 13598]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
417 | } |
|
11379
a5a66b0e8b6e
[gaim-migrate @ 13605]
Daniel Atallah <datallah@pidgin.im>
parents:
11373
diff
changeset
|
418 | |
|
14370
12ef3d4096ee
[gaim-migrate @ 16998]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
419 | void |
| 15884 | 420 | purple_srv_cancel(PurpleSrvQueryData *query_data) |
|
14370
12ef3d4096ee
[gaim-migrate @ 16998]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
421 | { |
|
12ef3d4096ee
[gaim-migrate @ 16998]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
422 | if (query_data->handle > 0) |
| 15884 | 423 | purple_input_remove(query_data->handle); |
|
14374
a93eedc7aa6b
[gaim-migrate @ 17002]
Daniel Atallah <datallah@pidgin.im>
parents:
14370
diff
changeset
|
424 | #ifdef _WIN32 |
|
14370
12ef3d4096ee
[gaim-migrate @ 16998]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
425 | if (query_data->resolver != NULL) |
|
12ef3d4096ee
[gaim-migrate @ 16998]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
426 | { |
|
12ef3d4096ee
[gaim-migrate @ 16998]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
427 | /* |
|
12ef3d4096ee
[gaim-migrate @ 16998]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
428 | * It's not really possible to kill a thread. So instead we |
|
12ef3d4096ee
[gaim-migrate @ 16998]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
429 | * just set the callback to NULL and let the DNS lookup |
|
12ef3d4096ee
[gaim-migrate @ 16998]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
430 | * finish. |
|
12ef3d4096ee
[gaim-migrate @ 16998]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
431 | */ |
|
14374
a93eedc7aa6b
[gaim-migrate @ 17002]
Daniel Atallah <datallah@pidgin.im>
parents:
14370
diff
changeset
|
432 | query_data->cb = NULL; |
|
14370
12ef3d4096ee
[gaim-migrate @ 16998]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
433 | return; |
|
12ef3d4096ee
[gaim-migrate @ 16998]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
434 | } |
|
12ef3d4096ee
[gaim-migrate @ 16998]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
435 | g_free(query_data->query); |
|
12ef3d4096ee
[gaim-migrate @ 16998]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
436 | g_free(query_data->error_message); |
|
20678
a36cc6a8d1ae
Close the pipes to the dnssrv child process. Fixes #3245
Daniel Atallah <datallah@pidgin.im>
parents:
20330
diff
changeset
|
437 | #else |
|
a36cc6a8d1ae
Close the pipes to the dnssrv child process. Fixes #3245
Daniel Atallah <datallah@pidgin.im>
parents:
20330
diff
changeset
|
438 | close(query_data->fd_out); |
|
a36cc6a8d1ae
Close the pipes to the dnssrv child process. Fixes #3245
Daniel Atallah <datallah@pidgin.im>
parents:
20330
diff
changeset
|
439 | close(query_data->fd_in); |
|
14370
12ef3d4096ee
[gaim-migrate @ 16998]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
440 | #endif |
|
12ef3d4096ee
[gaim-migrate @ 16998]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
441 | g_free(query_data); |
|
12ef3d4096ee
[gaim-migrate @ 16998]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
442 | } |