Tue, 17 Jan 2006 00:04:11 +0000
[gaim-migrate @ 15249]
A patch from Bleeter that "adds a GTK_STOCK_REFRESH for the 'get list' button, remove a redundant cb to a g_free, and adds a 'add room' button to the roomlist dialog". He renamed the button to "Add Chat" after he wrote that description. :)
committer: Richard Laager <rlaager@pidgin.im>
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1 | /** |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
2 | * @file proxy.c Proxy API |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
3 | * @ingroup core |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
4 | * |
| 1 | 5 | * gaim |
| 6 | * | |
| 8046 | 7 | * Gaim is the legal property of its developers, whose names are too numerous |
| 8 | * to list here. Please refer to the COPYRIGHT file distributed with this | |
| 9 | * source distribution. | |
| 1 | 10 | * |
| 11 | * This program is free software; you can redistribute it and/or modify | |
| 12 | * it under the terms of the GNU General Public License as published by | |
| 13 | * the Free Software Foundation; either version 2 of the License, or | |
| 14 | * (at your option) any later version. | |
| 15 | * | |
| 16 | * This program is distributed in the hope that it will be useful, | |
| 17 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 18 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
| 19 | * GNU General Public License for more details. | |
| 20 | * | |
| 21 | * You should have received a copy of the GNU General Public License | |
| 22 | * along with this program; if not, write to the Free Software | |
| 23 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | |
| 24 | * | |
| 25 | */ | |
| 26 | ||
| 27 | /* this is a little piece of code to handle proxy connection */ | |
| 28 | /* it is intended to : 1st handle http proxy, using the CONNECT command | |
|
6856
5ed6b8356ebc
[gaim-migrate @ 7401]
Mark Doliner <markdoliner@pidgin.im>
parents:
6621
diff
changeset
|
29 | , 2nd provide an easy way to add socks support |
|
5ed6b8356ebc
[gaim-migrate @ 7401]
Mark Doliner <markdoliner@pidgin.im>
parents:
6621
diff
changeset
|
30 | , 3rd draw women to it like flies to honey */ |
| 1 | 31 | |
|
5872
754c63f29b77
[gaim-migrate @ 6304]
Christian Hammond <chipx86@chipx86.com>
parents:
5681
diff
changeset
|
32 | #include "internal.h" |
|
10684
0325b164a7eb
[gaim-migrate @ 12231]
Luke Schierer <lschiere@pidgin.im>
parents:
10626
diff
changeset
|
33 | #include "cipher.h" |
|
5872
754c63f29b77
[gaim-migrate @ 6304]
Christian Hammond <chipx86@chipx86.com>
parents:
5681
diff
changeset
|
34 | #include "debug.h" |
|
6621
2a18ef3e5224
[gaim-migrate @ 7145]
Robert McQueen <robot101@debian.org>
parents:
6320
diff
changeset
|
35 | #include "notify.h" |
| 12391 | 36 | #include "ntlm.h" |
|
5872
754c63f29b77
[gaim-migrate @ 6304]
Christian Hammond <chipx86@chipx86.com>
parents:
5681
diff
changeset
|
37 | #include "prefs.h" |
| 1 | 38 | #include "proxy.h" |
|
5872
754c63f29b77
[gaim-migrate @ 6304]
Christian Hammond <chipx86@chipx86.com>
parents:
5681
diff
changeset
|
39 | #include "util.h" |
| 3630 | 40 | |
|
9729
246f126db809
[gaim-migrate @ 10590]
Mark Doliner <markdoliner@pidgin.im>
parents:
9657
diff
changeset
|
41 | static GaimProxyInfo *global_proxy_info = NULL; |
|
5872
754c63f29b77
[gaim-migrate @ 6304]
Christian Hammond <chipx86@chipx86.com>
parents:
5681
diff
changeset
|
42 | |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
43 | struct PHB { |
|
2090
bab8b7e309db
[gaim-migrate @ 2100]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2048
diff
changeset
|
44 | GaimInputFunction func; |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
45 | gpointer data; |
|
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
46 | char *host; |
|
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
47 | int port; |
|
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
48 | gint inpa; |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
49 | GaimProxyInfo *gpi; |
|
5563
d5a7852aa0cb
[gaim-migrate @ 5965]
Christian Hammond <chipx86@chipx86.com>
parents:
5532
diff
changeset
|
50 | GaimAccount *account; |
| 9129 | 51 | GSList *hosts; |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
52 | }; |
|
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
53 | |
| 9129 | 54 | static void try_connect(struct PHB *); |
| 55 | ||
|
12246
7af1ef3b1cc4
[gaim-migrate @ 14548]
Mark Doliner <markdoliner@pidgin.im>
parents:
12156
diff
changeset
|
56 | static const char *socks5errors[] = { |
|
7982
db8c1b6137eb
[gaim-migrate @ 8659]
Gavan Fantom <gavan@users.sourceforge.net>
parents:
7834
diff
changeset
|
57 | "succeeded\n", |
|
db8c1b6137eb
[gaim-migrate @ 8659]
Gavan Fantom <gavan@users.sourceforge.net>
parents:
7834
diff
changeset
|
58 | "general SOCKS server failure\n", |
|
db8c1b6137eb
[gaim-migrate @ 8659]
Gavan Fantom <gavan@users.sourceforge.net>
parents:
7834
diff
changeset
|
59 | "connection not allowed by ruleset\n", |
|
db8c1b6137eb
[gaim-migrate @ 8659]
Gavan Fantom <gavan@users.sourceforge.net>
parents:
7834
diff
changeset
|
60 | "Network unreachable\n", |
|
db8c1b6137eb
[gaim-migrate @ 8659]
Gavan Fantom <gavan@users.sourceforge.net>
parents:
7834
diff
changeset
|
61 | "Host unreachable\n", |
|
db8c1b6137eb
[gaim-migrate @ 8659]
Gavan Fantom <gavan@users.sourceforge.net>
parents:
7834
diff
changeset
|
62 | "Connection refused\n", |
|
db8c1b6137eb
[gaim-migrate @ 8659]
Gavan Fantom <gavan@users.sourceforge.net>
parents:
7834
diff
changeset
|
63 | "TTL expired\n", |
|
db8c1b6137eb
[gaim-migrate @ 8659]
Gavan Fantom <gavan@users.sourceforge.net>
parents:
7834
diff
changeset
|
64 | "Command not supported\n", |
|
db8c1b6137eb
[gaim-migrate @ 8659]
Gavan Fantom <gavan@users.sourceforge.net>
parents:
7834
diff
changeset
|
65 | "Address type not supported\n" |
|
db8c1b6137eb
[gaim-migrate @ 8659]
Gavan Fantom <gavan@users.sourceforge.net>
parents:
7834
diff
changeset
|
66 | }; |
|
db8c1b6137eb
[gaim-migrate @ 8659]
Gavan Fantom <gavan@users.sourceforge.net>
parents:
7834
diff
changeset
|
67 | |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
68 | /************************************************************************** |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
69 | * Proxy structure API |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
70 | **************************************************************************/ |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
71 | GaimProxyInfo * |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
72 | gaim_proxy_info_new(void) |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
73 | { |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
74 | return g_new0(GaimProxyInfo, 1); |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
75 | } |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
76 | |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
77 | void |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
78 | gaim_proxy_info_destroy(GaimProxyInfo *info) |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
79 | { |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
80 | g_return_if_fail(info != NULL); |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
81 | |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
82 | if (info->host != NULL) g_free(info->host); |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
83 | if (info->username != NULL) g_free(info->username); |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
84 | if (info->password != NULL) g_free(info->password); |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
85 | |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
86 | g_free(info); |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
87 | } |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
88 | |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
89 | void |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
90 | gaim_proxy_info_set_type(GaimProxyInfo *info, GaimProxyType type) |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
91 | { |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
92 | g_return_if_fail(info != NULL); |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
93 | |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
94 | info->type = type; |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
95 | } |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
96 | |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
97 | void |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
98 | gaim_proxy_info_set_host(GaimProxyInfo *info, const char *host) |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
99 | { |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
100 | g_return_if_fail(info != NULL); |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
101 | |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
102 | if (info->host != NULL) |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
103 | g_free(info->host); |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
104 | |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
105 | info->host = (host == NULL ? NULL : g_strdup(host)); |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
106 | } |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
107 | |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
108 | void |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
109 | gaim_proxy_info_set_port(GaimProxyInfo *info, int port) |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
110 | { |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
111 | g_return_if_fail(info != NULL); |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
112 | |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
113 | info->port = port; |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
114 | } |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
115 | |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
116 | void |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
117 | gaim_proxy_info_set_username(GaimProxyInfo *info, const char *username) |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
118 | { |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
119 | g_return_if_fail(info != NULL); |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
120 | |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
121 | if (info->username != NULL) |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
122 | g_free(info->username); |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
123 | |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
124 | info->username = (username == NULL ? NULL : g_strdup(username)); |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
125 | } |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
126 | |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
127 | void |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
128 | gaim_proxy_info_set_password(GaimProxyInfo *info, const char *password) |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
129 | { |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
130 | g_return_if_fail(info != NULL); |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
131 | |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
132 | if (info->password != NULL) |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
133 | g_free(info->password); |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
134 | |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
135 | info->password = (password == NULL ? NULL : g_strdup(password)); |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
136 | } |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
137 | |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
138 | GaimProxyType |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
139 | gaim_proxy_info_get_type(const GaimProxyInfo *info) |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
140 | { |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
141 | g_return_val_if_fail(info != NULL, GAIM_PROXY_NONE); |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
142 | |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
143 | return info->type; |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
144 | } |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
145 | |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
146 | const char * |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
147 | gaim_proxy_info_get_host(const GaimProxyInfo *info) |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
148 | { |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
149 | g_return_val_if_fail(info != NULL, NULL); |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
150 | |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
151 | return info->host; |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
152 | } |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
153 | |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
154 | int |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
155 | gaim_proxy_info_get_port(const GaimProxyInfo *info) |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
156 | { |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
157 | g_return_val_if_fail(info != NULL, 0); |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
158 | |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
159 | return info->port; |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
160 | } |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
161 | |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
162 | const char * |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
163 | gaim_proxy_info_get_username(const GaimProxyInfo *info) |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
164 | { |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
165 | g_return_val_if_fail(info != NULL, NULL); |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
166 | |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
167 | return info->username; |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
168 | } |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
169 | |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
170 | const char * |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
171 | gaim_proxy_info_get_password(const GaimProxyInfo *info) |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
172 | { |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
173 | g_return_val_if_fail(info != NULL, NULL); |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
174 | |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
175 | return info->password; |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
176 | } |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
177 | |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
178 | /************************************************************************** |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
179 | * Global Proxy API |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
180 | **************************************************************************/ |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
181 | GaimProxyInfo * |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
182 | gaim_global_proxy_get_info(void) |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
183 | { |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
184 | return global_proxy_info; |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
185 | } |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
186 | |
|
12412
8abe3226695e
[gaim-migrate @ 14719]
Richard Laager <rlaager@pidgin.im>
parents:
12391
diff
changeset
|
187 | static GaimProxyInfo * |
| 11878 | 188 | gaim_gnome_proxy_get_info(void) |
| 189 | { | |
| 190 | static GaimProxyInfo info = {0, NULL, 0, NULL, NULL}; | |
| 191 | gchar *path; | |
| 192 | if ((path = g_find_program_in_path("gconftool-2"))) { | |
| 193 | gchar *tmp; | |
|
12156
58a027264d6c
[gaim-migrate @ 14457]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
11878
diff
changeset
|
194 | |
|
58a027264d6c
[gaim-migrate @ 14457]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
11878
diff
changeset
|
195 | g_free(path); |
|
58a027264d6c
[gaim-migrate @ 14457]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
11878
diff
changeset
|
196 | |
| 11878 | 197 | /* See whether to use a proxy. */ |
| 198 | if (!g_spawn_command_line_sync("gconftool-2 -g /system/http_proxy/use_http_proxy", &tmp, | |
| 199 | NULL, NULL, NULL)) | |
| 200 | return gaim_global_proxy_get_info(); | |
|
12811
492f9a7ecad2
[gaim-migrate @ 15159]
Daniel Atallah <datallah@pidgin.im>
parents:
12765
diff
changeset
|
201 | if (!strcmp(tmp, "false\n")) { |
| 11878 | 202 | info.type = GAIM_PROXY_NONE; |
| 203 | g_free(tmp); | |
|
12811
492f9a7ecad2
[gaim-migrate @ 15159]
Daniel Atallah <datallah@pidgin.im>
parents:
12765
diff
changeset
|
204 | return &info; |
|
492f9a7ecad2
[gaim-migrate @ 15159]
Daniel Atallah <datallah@pidgin.im>
parents:
12765
diff
changeset
|
205 | } else if (strcmp(tmp, "true\n")) { |
|
492f9a7ecad2
[gaim-migrate @ 15159]
Daniel Atallah <datallah@pidgin.im>
parents:
12765
diff
changeset
|
206 | g_free(tmp); |
| 11878 | 207 | return gaim_global_proxy_get_info(); |
| 208 | } | |
|
12156
58a027264d6c
[gaim-migrate @ 14457]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
11878
diff
changeset
|
209 | |
| 11878 | 210 | g_free(tmp); |
| 211 | info.type = GAIM_PROXY_HTTP; | |
|
12156
58a027264d6c
[gaim-migrate @ 14457]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
11878
diff
changeset
|
212 | |
| 11878 | 213 | /* Free the old fields */ |
| 214 | if (info.host) { | |
| 215 | g_free(info.host); | |
| 216 | info.host = NULL; | |
| 217 | } | |
| 218 | if (info.username) { | |
| 219 | g_free(info.username); | |
| 220 | info.username = NULL; | |
| 221 | } | |
| 222 | if (info.password) { | |
| 223 | g_free(info.password); | |
| 224 | info.password = NULL; | |
| 225 | } | |
|
12156
58a027264d6c
[gaim-migrate @ 14457]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
11878
diff
changeset
|
226 | |
| 11878 | 227 | /* Get the new ones */ |
| 228 | if (!g_spawn_command_line_sync("gconftool-2 -g /system/http_proxy/host", &info.host, | |
| 229 | NULL, NULL, NULL)) | |
| 230 | return gaim_global_proxy_get_info(); | |
| 231 | g_strchomp(info.host); | |
|
12156
58a027264d6c
[gaim-migrate @ 14457]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
11878
diff
changeset
|
232 | |
| 11878 | 233 | if (!g_spawn_command_line_sync("gconftool-2 -g /system/http_proxy/authentication_user", &info.username, |
| 234 | NULL, NULL, NULL)) | |
| 235 | return gaim_global_proxy_get_info(); | |
| 236 | g_strchomp(info.username); | |
| 237 | ||
| 238 | if (!g_spawn_command_line_sync("gconftool-2 -g /system/http_proxy/authentication_password", &info.password, | |
| 239 | NULL, NULL, NULL)) | |
| 240 | return gaim_global_proxy_get_info(); | |
| 241 | g_strchomp(info.password); | |
| 242 | ||
| 243 | if (!g_spawn_command_line_sync("gconftool-2 -g /system/http_proxy/port", &tmp, | |
| 244 | NULL, NULL, NULL)) | |
| 245 | return gaim_global_proxy_get_info(); | |
| 246 | info.port = atoi(tmp); | |
|
12156
58a027264d6c
[gaim-migrate @ 14457]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
11878
diff
changeset
|
247 | g_free(tmp); |
| 11878 | 248 | |
| 249 | return &info; | |
| 250 | } | |
| 251 | return gaim_global_proxy_get_info(); | |
| 252 | } | |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
253 | /************************************************************************** |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
254 | * Proxy API |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
255 | **************************************************************************/ |
|
4366
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
256 | |
|
10626
659572951067
[gaim-migrate @ 12101]
Daniel Atallah <datallah@pidgin.im>
parents:
10619
diff
changeset
|
257 | #ifdef __unix__ |
|
4366
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
258 | |
|
10711
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
259 | /* |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
260 | * This structure represents both a pending DNS request and |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
261 | * a free child process. |
|
4366
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
262 | */ |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
263 | typedef struct { |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
264 | char *host; |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
265 | int port; |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
266 | dns_callback_t callback; |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
267 | gpointer data; |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
268 | gint inpa; |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
269 | int fd_in, fd_out; |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
270 | pid_t dns_pid; |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
271 | } pending_dns_request_t; |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
272 | |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
273 | static GSList *free_dns_children = NULL; |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
274 | static GQueue *queued_requests = NULL; |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
275 | |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
276 | static int number_of_dns_children = 0; |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
277 | |
|
12246
7af1ef3b1cc4
[gaim-migrate @ 14548]
Mark Doliner <markdoliner@pidgin.im>
parents:
12156
diff
changeset
|
278 | static const int MAX_DNS_CHILDREN = 2; |
|
4366
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
279 | |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
280 | typedef struct { |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
281 | char hostname[512]; |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
282 | int port; |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
283 | } dns_params_t; |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
284 | |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
285 | typedef struct { |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
286 | dns_params_t params; |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
287 | dns_callback_t callback; |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
288 | gpointer data; |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
289 | } queued_dns_request_t; |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
290 | |
|
10711
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
291 | /* |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
292 | * Begin the DNS resolver child process functions. |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
293 | */ |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
294 | #ifdef HAVE_SIGNAL_H |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
295 | static void |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
296 | trap_gdb_bug() |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
297 | { |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
298 | const char *message = |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
299 | "Gaim's DNS child got a SIGTRAP signal. \n" |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
300 | "This can be caused by trying to run gaim inside gdb.\n" |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
301 | "There is a known gdb bug which prevents this. Supposedly gaim\n" |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
302 | "should have detected you were using gdb and used an ugly hack,\n" |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
303 | "check cope_with_gdb_brokenness() in proxy.c.\n\n" |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
304 | "For more info about this bug, see http://sources.redhat.com/ml/gdb/2001-07/msg00349.html\n"; |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
305 | fputs("\n* * *\n",stderr); |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
306 | fputs(message,stderr); |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
307 | fputs("* * *\n\n",stderr); |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
308 | execlp("xmessage","xmessage","-center", message, NULL); |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
309 | _exit(1); |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
310 | } |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
311 | #endif |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
312 | |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
313 | static void |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
314 | cope_with_gdb_brokenness() |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
315 | { |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
316 | #ifdef __linux__ |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
317 | static gboolean already_done = FALSE; |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
318 | char s[256], e[512]; |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
319 | int n; |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
320 | pid_t ppid; |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
321 | |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
322 | if(already_done) |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
323 | return; |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
324 | already_done = TRUE; |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
325 | ppid = getppid(); |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
326 | snprintf(s, sizeof(s), "/proc/%d/exe", ppid); |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
327 | n = readlink(s, e, sizeof(e)); |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
328 | if(n < 0) |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
329 | return; |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
330 | |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
331 | e[MIN(n,sizeof(e)-1)] = '\0'; |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
332 | |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
333 | if(strstr(e,"gdb")) { |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
334 | gaim_debug_info("dns", |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
335 | "Debugger detected, performing useless query...\n"); |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
336 | gethostbyname("x.x.x.x.x"); |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
337 | } |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
338 | #endif |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
339 | } |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
340 | |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
341 | static void |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
342 | gaim_dns_resolverthread(int child_out, int child_in, gboolean show_debug) |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
343 | { |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
344 | dns_params_t dns_params; |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
345 | const size_t zero = 0; |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
346 | int rc; |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
347 | #if HAVE_GETADDRINFO |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
348 | struct addrinfo hints, *res, *tmp; |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
349 | char servname[20]; |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
350 | #else |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
351 | struct sockaddr_in sin; |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
352 | const size_t addrlen = sizeof(sin); |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
353 | #endif |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
354 | |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
355 | #ifdef HAVE_SIGNAL_H |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
356 | signal(SIGHUP, SIG_DFL); |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
357 | signal(SIGINT, SIG_DFL); |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
358 | signal(SIGQUIT, SIG_DFL); |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
359 | signal(SIGCHLD, SIG_DFL); |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
360 | signal(SIGTERM, SIG_DFL); |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
361 | signal(SIGTRAP, trap_gdb_bug); |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
362 | #endif |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
363 | |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
364 | /* |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
365 | * We resolve 1 host name for each iteration of this |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
366 | * while loop. |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
367 | * |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
368 | * The top half of this reads in the hostname and port |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
369 | * number from the socket with our parent. The bottom |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
370 | * half of this resolves the IP (blocking) and sends |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
371 | * the result back to our parent, when finished. |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
372 | */ |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
373 | while (1) { |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
374 | const char ch = 'Y'; |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
375 | fd_set fds; |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
376 | struct timeval tv = { .tv_sec = 40 , .tv_usec = 0 }; |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
377 | FD_ZERO(&fds); |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
378 | FD_SET(child_in, &fds); |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
379 | rc = select(child_in + 1, &fds, NULL, NULL, &tv); |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
380 | if (!rc) { |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
381 | if (show_debug) |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
382 | fprintf(stderr,"dns[%d]: nobody needs me... =(\n", getpid()); |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
383 | break; |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
384 | } |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
385 | rc = read(child_in, &dns_params, sizeof(dns_params_t)); |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
386 | if (rc < 0) { |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
387 | perror("read()"); |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
388 | break; |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
389 | } |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
390 | if (rc == 0) { |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
391 | if (show_debug) |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
392 | fprintf(stderr,"dns[%d]: Oops, father has gone, wait for me, wait...!\n", getpid()); |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
393 | _exit(0); |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
394 | } |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
395 | if (dns_params.hostname[0] == '\0') { |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
396 | fprintf(stderr, "dns[%d]: hostname = \"\" (port = %d)!!!\n", getpid(), dns_params.port); |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
397 | _exit(1); |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
398 | } |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
399 | /* Tell our parent that we read the data successfully */ |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
400 | write(child_out, &ch, sizeof(ch)); |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
401 | |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
402 | /* We have the hostname and port, now resolve the IP */ |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
403 | |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
404 | #if HAVE_GETADDRINFO |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
405 | g_snprintf(servname, sizeof(servname), "%d", dns_params.port); |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
406 | memset(&hints, 0, sizeof(hints)); |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
407 | |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
408 | /* This is only used to convert a service |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
409 | * name to a port number. As we know we are |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
410 | * passing a number already, we know this |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
411 | * value will not be really used by the C |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
412 | * library. |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
413 | */ |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
414 | hints.ai_socktype = SOCK_STREAM; |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
415 | rc = getaddrinfo(dns_params.hostname, servname, &hints, &res); |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
416 | write(child_out, &rc, sizeof(rc)); |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
417 | if (rc != 0) { |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
418 | close(child_out); |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
419 | if (show_debug) |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
420 | fprintf(stderr,"dns[%d] Error: getaddrinfo returned %d\n", |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
421 | getpid(), rc); |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
422 | dns_params.hostname[0] = '\0'; |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
423 | continue; |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
424 | } |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
425 | tmp = res; |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
426 | while (res) { |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
427 | size_t ai_addrlen = res->ai_addrlen; |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
428 | write(child_out, &ai_addrlen, sizeof(ai_addrlen)); |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
429 | write(child_out, res->ai_addr, res->ai_addrlen); |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
430 | res = res->ai_next; |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
431 | } |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
432 | freeaddrinfo(tmp); |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
433 | write(child_out, &zero, sizeof(zero)); |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
434 | #else |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
435 | if (!inet_aton(dns_params.hostname, &sin.sin_addr)) { |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
436 | struct hostent *hp; |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
437 | if (!(hp = gethostbyname(dns_params.hostname))) { |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
438 | write(child_out, &h_errno, sizeof(int)); |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
439 | close(child_out); |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
440 | if (show_debug) |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
441 | fprintf(stderr,"DNS Error: %d\n", h_errno); |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
442 | _exit(0); |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
443 | } |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
444 | memset(&sin, 0, sizeof(struct sockaddr_in)); |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
445 | memcpy(&sin.sin_addr.s_addr, hp->h_addr, hp->h_length); |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
446 | sin.sin_family = hp->h_addrtype; |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
447 | } else |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
448 | sin.sin_family = AF_INET; |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
449 | |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
450 | sin.sin_port = htons(dns_params.port); |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
451 | write(child_out, &addrlen, sizeof(addrlen)); |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
452 | write(child_out, &sin, addrlen); |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
453 | write(child_out, &zero, sizeof(zero)); |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
454 | #endif |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
455 | dns_params.hostname[0] = '\0'; |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
456 | } |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
457 | |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
458 | close(child_out); |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
459 | close(child_in); |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
460 | |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
461 | _exit(0); |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
462 | } |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
463 | |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
464 | static pending_dns_request_t * |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
465 | gaim_dns_new_resolverthread(gboolean show_debug) |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
466 | { |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
467 | pending_dns_request_t *req; |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
468 | int child_out[2], child_in[2]; |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
469 | |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
470 | /* Create pipes for communicating with the child process */ |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
471 | if (pipe(child_out) || pipe(child_in)) { |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
472 | gaim_debug_error("dns", |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
473 | "Could not create pipes: %s\n", strerror(errno)); |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
474 | return NULL; |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
475 | } |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
476 | |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
477 | req = g_new(pending_dns_request_t, 1); |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
478 | |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
479 | cope_with_gdb_brokenness(); |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
480 | |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
481 | /* Fork! */ |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
482 | req->dns_pid = fork(); |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
483 | |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
484 | /* If we are the child process... */ |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
485 | if (req->dns_pid == 0) { |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
486 | /* We should not access the parent's side of the pipes, so close them */ |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
487 | close(child_out[0]); |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
488 | close(child_in[1]); |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
489 | |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
490 | gaim_dns_resolverthread(child_out[1], child_in[0], show_debug); |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
491 | /* The thread calls _exit() rather than returning, so we never get here */ |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
492 | } |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
493 | |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
494 | /* We should not access the child's side of the pipes, so close them */ |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
495 | close(child_out[1]); |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
496 | close(child_in[0]); |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
497 | if (req->dns_pid == -1) { |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
498 | gaim_debug_error("dns", |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
499 | "Could not create child process for DNS: %s\n", |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
500 | strerror(errno)); |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
501 | g_free(req); |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
502 | return NULL; |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
503 | } |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
504 | |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
505 | req->fd_out = child_out[0]; |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
506 | req->fd_in = child_in[1]; |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
507 | number_of_dns_children++; |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
508 | gaim_debug_info("dns", |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
509 | "Created new DNS child %d, there are now %d children.\n", |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
510 | req->dns_pid, number_of_dns_children); |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
511 | |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
512 | return req; |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
513 | } |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
514 | /* |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
515 | * End the DNS resolver child process functions. |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
516 | */ |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
517 | |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
518 | /* |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
519 | * Begin the functions for dealing with the DNS child processes. |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
520 | */ |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
521 | static void |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
522 | req_free(pending_dns_request_t *req) |
| 4434 | 523 | { |
| 524 | g_return_if_fail(req != NULL); | |
|
10707
c8951a5dea41
[gaim-migrate @ 12296]
Mark Doliner <markdoliner@pidgin.im>
parents:
10706
diff
changeset
|
525 | |
| 4434 | 526 | close(req->fd_in); |
| 527 | close(req->fd_out); | |
|
10707
c8951a5dea41
[gaim-migrate @ 12296]
Mark Doliner <markdoliner@pidgin.im>
parents:
10706
diff
changeset
|
528 | |
|
c8951a5dea41
[gaim-migrate @ 12296]
Mark Doliner <markdoliner@pidgin.im>
parents:
10706
diff
changeset
|
529 | g_free(req->host); |
| 4434 | 530 | g_free(req); |
|
10707
c8951a5dea41
[gaim-migrate @ 12296]
Mark Doliner <markdoliner@pidgin.im>
parents:
10706
diff
changeset
|
531 | |
| 4434 | 532 | number_of_dns_children--; |
| 533 | } | |
| 534 | ||
|
10711
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
535 | static int |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
536 | send_dns_request_to_child(pending_dns_request_t *req, dns_params_t *dns_params) |
|
4366
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
537 | { |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
538 | char ch; |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
539 | int rc; |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
540 | |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
541 | /* Are you alive? */ |
|
10707
c8951a5dea41
[gaim-migrate @ 12296]
Mark Doliner <markdoliner@pidgin.im>
parents:
10706
diff
changeset
|
542 | if (kill(req->dns_pid, 0) != 0) { |
|
10309
073906008cb2
[gaim-migrate @ 11501]
Mark Doliner <markdoliner@pidgin.im>
parents:
10307
diff
changeset
|
543 | gaim_debug_warning("dns", |
|
5218
b19d74418232
[gaim-migrate @ 5588]
Christian Hammond <chipx86@chipx86.com>
parents:
5211
diff
changeset
|
544 | "DNS child %d no longer exists\n", req->dns_pid); |
|
4366
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
545 | return -1; |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
546 | } |
| 9129 | 547 | |
|
4366
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
548 | /* Let's contact this lost child! */ |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
549 | rc = write(req->fd_in, dns_params, sizeof(*dns_params)); |
|
10707
c8951a5dea41
[gaim-migrate @ 12296]
Mark Doliner <markdoliner@pidgin.im>
parents:
10706
diff
changeset
|
550 | if (rc < 0) { |
|
10309
073906008cb2
[gaim-migrate @ 11501]
Mark Doliner <markdoliner@pidgin.im>
parents:
10307
diff
changeset
|
551 | gaim_debug_error("dns", |
|
5211
94d9756c381f
[gaim-migrate @ 5581]
Christian Hammond <chipx86@chipx86.com>
parents:
4993
diff
changeset
|
552 | "Unable to write to DNS child %d: %d\n", |
|
94d9756c381f
[gaim-migrate @ 5581]
Christian Hammond <chipx86@chipx86.com>
parents:
4993
diff
changeset
|
553 | req->dns_pid, strerror(errno)); |
| 4434 | 554 | close(req->fd_in); |
|
4366
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
555 | return -1; |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
556 | } |
| 9129 | 557 | |
|
4366
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
558 | g_return_val_if_fail(rc == sizeof(*dns_params), -1); |
| 9129 | 559 | |
|
4366
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
560 | /* Did you hear me? (This avoids some race conditions) */ |
|
10707
c8951a5dea41
[gaim-migrate @ 12296]
Mark Doliner <markdoliner@pidgin.im>
parents:
10706
diff
changeset
|
561 | rc = read(req->fd_out, &ch, sizeof(ch)); |
|
c8951a5dea41
[gaim-migrate @ 12296]
Mark Doliner <markdoliner@pidgin.im>
parents:
10706
diff
changeset
|
562 | if (rc != 1 || ch != 'Y') |
|
c8951a5dea41
[gaim-migrate @ 12296]
Mark Doliner <markdoliner@pidgin.im>
parents:
10706
diff
changeset
|
563 | { |
|
10309
073906008cb2
[gaim-migrate @ 11501]
Mark Doliner <markdoliner@pidgin.im>
parents:
10307
diff
changeset
|
564 | gaim_debug_warning("dns", |
|
5211
94d9756c381f
[gaim-migrate @ 5581]
Christian Hammond <chipx86@chipx86.com>
parents:
4993
diff
changeset
|
565 | "DNS child %d not responding. Killing it!\n", |
|
94d9756c381f
[gaim-migrate @ 5581]
Christian Hammond <chipx86@chipx86.com>
parents:
4993
diff
changeset
|
566 | req->dns_pid); |
|
4366
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
567 | kill(req->dns_pid, SIGKILL); |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
568 | return -1; |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
569 | } |
| 9655 | 570 | |
|
10309
073906008cb2
[gaim-migrate @ 11501]
Mark Doliner <markdoliner@pidgin.im>
parents:
10307
diff
changeset
|
571 | gaim_debug_info("dns", |
|
5211
94d9756c381f
[gaim-migrate @ 5581]
Christian Hammond <chipx86@chipx86.com>
parents:
4993
diff
changeset
|
572 | "Successfully sent DNS request to child %d\n", req->dns_pid); |
|
10707
c8951a5dea41
[gaim-migrate @ 12296]
Mark Doliner <markdoliner@pidgin.im>
parents:
10706
diff
changeset
|
573 | |
|
4366
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
574 | return 0; |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
575 | } |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
576 | |
|
10711
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
577 | static void |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
578 | host_resolved(gpointer data, gint source, GaimInputCondition cond); |
|
4366
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
579 | |
|
10711
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
580 | static void |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
581 | release_dns_child(pending_dns_request_t *req) |
|
2911
b20669ca1281
[gaim-migrate @ 2924]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2907
diff
changeset
|
582 | { |
|
4366
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
583 | g_free(req->host); |
|
10707
c8951a5dea41
[gaim-migrate @ 12296]
Mark Doliner <markdoliner@pidgin.im>
parents:
10706
diff
changeset
|
584 | req->host = NULL; |
|
4366
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
585 | |
|
10707
c8951a5dea41
[gaim-migrate @ 12296]
Mark Doliner <markdoliner@pidgin.im>
parents:
10706
diff
changeset
|
586 | if (queued_requests && !g_queue_is_empty(queued_requests)) { |
|
4366
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
587 | queued_dns_request_t *r = g_queue_pop_head(queued_requests); |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
588 | req->host = g_strdup(r->params.hostname); |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
589 | req->port = r->params.port; |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
590 | req->callback = r->callback; |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
591 | req->data = r->data; |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
592 | |
|
10309
073906008cb2
[gaim-migrate @ 11501]
Mark Doliner <markdoliner@pidgin.im>
parents:
10307
diff
changeset
|
593 | gaim_debug_info("dns", |
|
5211
94d9756c381f
[gaim-migrate @ 5581]
Christian Hammond <chipx86@chipx86.com>
parents:
4993
diff
changeset
|
594 | "Processing queued DNS query for '%s' with child %d\n", |
|
94d9756c381f
[gaim-migrate @ 5581]
Christian Hammond <chipx86@chipx86.com>
parents:
4993
diff
changeset
|
595 | req->host, req->dns_pid); |
|
4366
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
596 | |
|
10707
c8951a5dea41
[gaim-migrate @ 12296]
Mark Doliner <markdoliner@pidgin.im>
parents:
10706
diff
changeset
|
597 | if (send_dns_request_to_child(req, &(r->params)) != 0) { |
| 4434 | 598 | req_free(req); |
|
4366
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
599 | req = NULL; |
|
5211
94d9756c381f
[gaim-migrate @ 5581]
Christian Hammond <chipx86@chipx86.com>
parents:
4993
diff
changeset
|
600 | |
|
10309
073906008cb2
[gaim-migrate @ 11501]
Mark Doliner <markdoliner@pidgin.im>
parents:
10307
diff
changeset
|
601 | gaim_debug_warning("dns", |
|
5211
94d9756c381f
[gaim-migrate @ 5581]
Christian Hammond <chipx86@chipx86.com>
parents:
4993
diff
changeset
|
602 | "Intent of process queued query of '%s' failed, " |
|
94d9756c381f
[gaim-migrate @ 5581]
Christian Hammond <chipx86@chipx86.com>
parents:
4993
diff
changeset
|
603 | "requeueing...\n", r->params.hostname); |
|
4366
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
604 | g_queue_push_head(queued_requests, r); |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
605 | } else { |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
606 | req->inpa = gaim_input_add(req->fd_out, GAIM_INPUT_READ, host_resolved, req); |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
607 | g_free(r); |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
608 | } |
| 9655 | 609 | |
|
4366
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
610 | } else { |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
611 | req->host = NULL; |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
612 | req->callback = NULL; |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
613 | req->data = NULL; |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
614 | free_dns_children = g_slist_append(free_dns_children, req); |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
615 | } |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
616 | } |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
617 | |
|
10711
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
618 | static void |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
619 | host_resolved(gpointer data, gint source, GaimInputCondition cond) |
|
4366
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
620 | { |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
621 | pending_dns_request_t *req = (pending_dns_request_t*)data; |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
622 | int rc, err; |
| 4678 | 623 | GSList *hosts = NULL; |
|
4366
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
624 | struct sockaddr *addr = NULL; |
| 8436 | 625 | size_t addrlen; |
|
4366
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
626 | |
|
10309
073906008cb2
[gaim-migrate @ 11501]
Mark Doliner <markdoliner@pidgin.im>
parents:
10307
diff
changeset
|
627 | gaim_debug_info("dns", "Host '%s' resolved\n", req->host); |
|
4366
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
628 | gaim_input_remove(req->inpa); |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
629 | |
|
10707
c8951a5dea41
[gaim-migrate @ 12296]
Mark Doliner <markdoliner@pidgin.im>
parents:
10706
diff
changeset
|
630 | rc = read(req->fd_out, &err, sizeof(err)); |
|
c8951a5dea41
[gaim-migrate @ 12296]
Mark Doliner <markdoliner@pidgin.im>
parents:
10706
diff
changeset
|
631 | if ((rc == 4) && (err != 0)) |
|
c8951a5dea41
[gaim-migrate @ 12296]
Mark Doliner <markdoliner@pidgin.im>
parents:
10706
diff
changeset
|
632 | { |
|
4366
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
633 | char message[1024]; |
|
8977
74162f1be34a
[gaim-migrate @ 9751]
Mark Doliner <markdoliner@pidgin.im>
parents:
8917
diff
changeset
|
634 | #if HAVE_GETADDRINFO |
|
4366
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
635 | g_snprintf(message, sizeof(message), "DNS error: %s (pid=%d)", |
|
8977
74162f1be34a
[gaim-migrate @ 9751]
Mark Doliner <markdoliner@pidgin.im>
parents:
8917
diff
changeset
|
636 | gai_strerror(err), req->dns_pid); |
|
4366
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
637 | #else |
|
8977
74162f1be34a
[gaim-migrate @ 9751]
Mark Doliner <markdoliner@pidgin.im>
parents:
8917
diff
changeset
|
638 | g_snprintf(message, sizeof(message), "DNS error: %d (pid=%d)", |
|
74162f1be34a
[gaim-migrate @ 9751]
Mark Doliner <markdoliner@pidgin.im>
parents:
8917
diff
changeset
|
639 | err, req->dns_pid); |
|
4366
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
640 | #endif |
|
10309
073906008cb2
[gaim-migrate @ 11501]
Mark Doliner <markdoliner@pidgin.im>
parents:
10307
diff
changeset
|
641 | gaim_debug_error("dns", "%s\n", message); |
| 4678 | 642 | req->callback(NULL, req->data, message); |
| 643 | release_dns_child(req); | |
|
4366
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
644 | return; |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
645 | } |
|
10707
c8951a5dea41
[gaim-migrate @ 12296]
Mark Doliner <markdoliner@pidgin.im>
parents:
10706
diff
changeset
|
646 | if (rc > 0) |
|
c8951a5dea41
[gaim-migrate @ 12296]
Mark Doliner <markdoliner@pidgin.im>
parents:
10706
diff
changeset
|
647 | { |
|
c8951a5dea41
[gaim-migrate @ 12296]
Mark Doliner <markdoliner@pidgin.im>
parents:
10706
diff
changeset
|
648 | while (rc > 0) { |
|
c8951a5dea41
[gaim-migrate @ 12296]
Mark Doliner <markdoliner@pidgin.im>
parents:
10706
diff
changeset
|
649 | rc = read(req->fd_out, &addrlen, sizeof(addrlen)); |
|
c8951a5dea41
[gaim-migrate @ 12296]
Mark Doliner <markdoliner@pidgin.im>
parents:
10706
diff
changeset
|
650 | if (rc > 0 && addrlen > 0) { |
|
c8951a5dea41
[gaim-migrate @ 12296]
Mark Doliner <markdoliner@pidgin.im>
parents:
10706
diff
changeset
|
651 | addr = g_malloc(addrlen); |
|
c8951a5dea41
[gaim-migrate @ 12296]
Mark Doliner <markdoliner@pidgin.im>
parents:
10706
diff
changeset
|
652 | rc = read(req->fd_out, addr, addrlen); |
| 4678 | 653 | hosts = g_slist_append(hosts, GINT_TO_POINTER(addrlen)); |
| 654 | hosts = g_slist_append(hosts, addr); | |
| 655 | } else { | |
| 656 | break; | |
| 657 | } | |
|
4366
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
658 | } |
|
10707
c8951a5dea41
[gaim-migrate @ 12296]
Mark Doliner <markdoliner@pidgin.im>
parents:
10706
diff
changeset
|
659 | } else if (rc == -1) { |
|
4366
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
660 | char message[1024]; |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
661 | g_snprintf(message, sizeof(message), "Error reading from DNS child: %s",strerror(errno)); |
|
10309
073906008cb2
[gaim-migrate @ 11501]
Mark Doliner <markdoliner@pidgin.im>
parents:
10307
diff
changeset
|
662 | gaim_debug_error("dns", "%s\n", message); |
| 4678 | 663 | req->callback(NULL, req->data, message); |
| 4434 | 664 | req_free(req); |
|
4366
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
665 | return; |
|
10707
c8951a5dea41
[gaim-migrate @ 12296]
Mark Doliner <markdoliner@pidgin.im>
parents:
10706
diff
changeset
|
666 | } else if (rc == 0) { |
|
4366
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
667 | char message[1024]; |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
668 | g_snprintf(message, sizeof(message), "EOF reading from DNS child"); |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
669 | close(req->fd_out); |
|
10309
073906008cb2
[gaim-migrate @ 11501]
Mark Doliner <markdoliner@pidgin.im>
parents:
10307
diff
changeset
|
670 | gaim_debug_error("dns", "%s\n", message); |
| 4678 | 671 | req->callback(NULL, req->data, message); |
| 4434 | 672 | req_free(req); |
|
4366
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
673 | return; |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
674 | } |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
675 | |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
676 | /* wait4(req->dns_pid, NULL, WNOHANG, NULL); */ |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
677 | |
| 4678 | 678 | req->callback(hosts, req->data, NULL); |
|
4366
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
679 | |
| 4678 | 680 | release_dns_child(req); |
|
4366
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
681 | } |
|
10711
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
682 | /* |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
683 | * End the functions for dealing with the DNS child processes. |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
684 | */ |
|
9657
aef0dc1d354d
[gaim-migrate @ 10505]
Mark Doliner <markdoliner@pidgin.im>
parents:
9656
diff
changeset
|
685 | |
|
10711
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
686 | int |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
687 | gaim_gethostbyname_async(const char *hostname, int port, dns_callback_t callback, gpointer data) |
|
4366
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
688 | { |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
689 | pending_dns_request_t *req = NULL; |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
690 | dns_params_t dns_params; |
|
9656
17f7a689012e
[gaim-migrate @ 10504]
Mark Doliner <markdoliner@pidgin.im>
parents:
9655
diff
changeset
|
691 | gchar *host_temp; |
|
10307
f3ba80364053
[gaim-migrate @ 11497]
Mark Doliner <markdoliner@pidgin.im>
parents:
10305
diff
changeset
|
692 | gboolean show_debug; |
|
f3ba80364053
[gaim-migrate @ 11497]
Mark Doliner <markdoliner@pidgin.im>
parents:
10305
diff
changeset
|
693 | |
|
f3ba80364053
[gaim-migrate @ 11497]
Mark Doliner <markdoliner@pidgin.im>
parents:
10305
diff
changeset
|
694 | show_debug = gaim_debug_is_enabled(); |
| 9655 | 695 | |
|
9656
17f7a689012e
[gaim-migrate @ 10504]
Mark Doliner <markdoliner@pidgin.im>
parents:
9655
diff
changeset
|
696 | host_temp = g_strstrip(g_strdup(hostname)); |
|
17f7a689012e
[gaim-migrate @ 10504]
Mark Doliner <markdoliner@pidgin.im>
parents:
9655
diff
changeset
|
697 | strncpy(dns_params.hostname, host_temp, sizeof(dns_params.hostname) - 1); |
| 9655 | 698 | g_free(host_temp); |
|
9656
17f7a689012e
[gaim-migrate @ 10504]
Mark Doliner <markdoliner@pidgin.im>
parents:
9655
diff
changeset
|
699 | dns_params.hostname[sizeof(dns_params.hostname) - 1] = '\0'; |
|
4366
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
700 | dns_params.port = port; |
| 9129 | 701 | |
|
9656
17f7a689012e
[gaim-migrate @ 10504]
Mark Doliner <markdoliner@pidgin.im>
parents:
9655
diff
changeset
|
702 | /* |
|
17f7a689012e
[gaim-migrate @ 10504]
Mark Doliner <markdoliner@pidgin.im>
parents:
9655
diff
changeset
|
703 | * If we have any children, attempt to have them perform the DNS |
|
17f7a689012e
[gaim-migrate @ 10504]
Mark Doliner <markdoliner@pidgin.im>
parents:
9655
diff
changeset
|
704 | * query. If we're able to send the query to a child, then req |
|
17f7a689012e
[gaim-migrate @ 10504]
Mark Doliner <markdoliner@pidgin.im>
parents:
9655
diff
changeset
|
705 | * will be set to the pending_dns_request_t. Otherwise, req will |
|
17f7a689012e
[gaim-migrate @ 10504]
Mark Doliner <markdoliner@pidgin.im>
parents:
9655
diff
changeset
|
706 | * be NULL and we'll need to create a new DNS request child. |
|
17f7a689012e
[gaim-migrate @ 10504]
Mark Doliner <markdoliner@pidgin.im>
parents:
9655
diff
changeset
|
707 | */ |
|
17f7a689012e
[gaim-migrate @ 10504]
Mark Doliner <markdoliner@pidgin.im>
parents:
9655
diff
changeset
|
708 | while (free_dns_children != NULL) { |
|
17f7a689012e
[gaim-migrate @ 10504]
Mark Doliner <markdoliner@pidgin.im>
parents:
9655
diff
changeset
|
709 | req = free_dns_children->data; |
|
17f7a689012e
[gaim-migrate @ 10504]
Mark Doliner <markdoliner@pidgin.im>
parents:
9655
diff
changeset
|
710 | free_dns_children = g_slist_remove(free_dns_children, req); |
| 9129 | 711 | |
|
9656
17f7a689012e
[gaim-migrate @ 10504]
Mark Doliner <markdoliner@pidgin.im>
parents:
9655
diff
changeset
|
712 | if (send_dns_request_to_child(req, &dns_params) == 0) |
|
17f7a689012e
[gaim-migrate @ 10504]
Mark Doliner <markdoliner@pidgin.im>
parents:
9655
diff
changeset
|
713 | /* We found an acceptable child, yay */ |
|
17f7a689012e
[gaim-migrate @ 10504]
Mark Doliner <markdoliner@pidgin.im>
parents:
9655
diff
changeset
|
714 | break; |
| 9129 | 715 | |
|
9656
17f7a689012e
[gaim-migrate @ 10504]
Mark Doliner <markdoliner@pidgin.im>
parents:
9655
diff
changeset
|
716 | req_free(req); |
|
9657
aef0dc1d354d
[gaim-migrate @ 10505]
Mark Doliner <markdoliner@pidgin.im>
parents:
9656
diff
changeset
|
717 | req = NULL; |
|
4366
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
718 | } |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
719 | |
|
9657
aef0dc1d354d
[gaim-migrate @ 10505]
Mark Doliner <markdoliner@pidgin.im>
parents:
9656
diff
changeset
|
720 | /* We need to create a new DNS request child */ |
|
9656
17f7a689012e
[gaim-migrate @ 10504]
Mark Doliner <markdoliner@pidgin.im>
parents:
9655
diff
changeset
|
721 | if (req == NULL) { |
|
17f7a689012e
[gaim-migrate @ 10504]
Mark Doliner <markdoliner@pidgin.im>
parents:
9655
diff
changeset
|
722 | if (number_of_dns_children >= MAX_DNS_CHILDREN) { |
|
4366
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
723 | queued_dns_request_t *r = g_new(queued_dns_request_t, 1); |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
724 | memcpy(&(r->params), &dns_params, sizeof(dns_params)); |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
725 | r->callback = callback; |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
726 | r->data = data; |
|
9656
17f7a689012e
[gaim-migrate @ 10504]
Mark Doliner <markdoliner@pidgin.im>
parents:
9655
diff
changeset
|
727 | if (!queued_requests) |
|
4366
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
728 | queued_requests = g_queue_new(); |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
729 | g_queue_push_tail(queued_requests, r); |
|
5211
94d9756c381f
[gaim-migrate @ 5581]
Christian Hammond <chipx86@chipx86.com>
parents:
4993
diff
changeset
|
730 | |
|
10309
073906008cb2
[gaim-migrate @ 11501]
Mark Doliner <markdoliner@pidgin.im>
parents:
10307
diff
changeset
|
731 | gaim_debug_info("dns", |
|
9656
17f7a689012e
[gaim-migrate @ 10504]
Mark Doliner <markdoliner@pidgin.im>
parents:
9655
diff
changeset
|
732 | "DNS query for '%s' queued\n", dns_params.hostname); |
|
5211
94d9756c381f
[gaim-migrate @ 5581]
Christian Hammond <chipx86@chipx86.com>
parents:
4993
diff
changeset
|
733 | |
|
4366
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
734 | return 0; |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
735 | } |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
736 | |
|
10711
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
737 | req = gaim_dns_new_resolverthread(show_debug); |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
738 | send_dns_request_to_child(req, &dns_params); |
|
4366
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
739 | } |
|
9656
17f7a689012e
[gaim-migrate @ 10504]
Mark Doliner <markdoliner@pidgin.im>
parents:
9655
diff
changeset
|
740 | |
|
9657
aef0dc1d354d
[gaim-migrate @ 10505]
Mark Doliner <markdoliner@pidgin.im>
parents:
9656
diff
changeset
|
741 | req->host = g_strdup(hostname); |
|
9656
17f7a689012e
[gaim-migrate @ 10504]
Mark Doliner <markdoliner@pidgin.im>
parents:
9655
diff
changeset
|
742 | req->port = port; |
|
17f7a689012e
[gaim-migrate @ 10504]
Mark Doliner <markdoliner@pidgin.im>
parents:
9655
diff
changeset
|
743 | req->callback = callback; |
|
17f7a689012e
[gaim-migrate @ 10504]
Mark Doliner <markdoliner@pidgin.im>
parents:
9655
diff
changeset
|
744 | req->data = data; |
|
4366
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
745 | req->inpa = gaim_input_add(req->fd_out, GAIM_INPUT_READ, host_resolved, req); |
|
9656
17f7a689012e
[gaim-migrate @ 10504]
Mark Doliner <markdoliner@pidgin.im>
parents:
9655
diff
changeset
|
746 | |
|
4366
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
747 | return 0; |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
748 | } |
|
10237
93c682ab4b27
[gaim-migrate @ 11373]
Herman Bloggs <herman@bluedigits.com>
parents:
10172
diff
changeset
|
749 | |
|
10626
659572951067
[gaim-migrate @ 12101]
Daniel Atallah <datallah@pidgin.im>
parents:
10619
diff
changeset
|
750 | #elif defined _WIN32 /* end __unix__ */ |
|
10237
93c682ab4b27
[gaim-migrate @ 11373]
Herman Bloggs <herman@bluedigits.com>
parents:
10172
diff
changeset
|
751 | |
|
93c682ab4b27
[gaim-migrate @ 11373]
Herman Bloggs <herman@bluedigits.com>
parents:
10172
diff
changeset
|
752 | typedef struct _dns_tdata { |
|
93c682ab4b27
[gaim-migrate @ 11373]
Herman Bloggs <herman@bluedigits.com>
parents:
10172
diff
changeset
|
753 | char *hostname; |
|
93c682ab4b27
[gaim-migrate @ 11373]
Herman Bloggs <herman@bluedigits.com>
parents:
10172
diff
changeset
|
754 | int port; |
|
93c682ab4b27
[gaim-migrate @ 11373]
Herman Bloggs <herman@bluedigits.com>
parents:
10172
diff
changeset
|
755 | dns_callback_t callback; |
|
93c682ab4b27
[gaim-migrate @ 11373]
Herman Bloggs <herman@bluedigits.com>
parents:
10172
diff
changeset
|
756 | gpointer data; |
|
93c682ab4b27
[gaim-migrate @ 11373]
Herman Bloggs <herman@bluedigits.com>
parents:
10172
diff
changeset
|
757 | GSList *hosts; |
|
93c682ab4b27
[gaim-migrate @ 11373]
Herman Bloggs <herman@bluedigits.com>
parents:
10172
diff
changeset
|
758 | char *errmsg; |
|
93c682ab4b27
[gaim-migrate @ 11373]
Herman Bloggs <herman@bluedigits.com>
parents:
10172
diff
changeset
|
759 | } dns_tdata; |
|
93c682ab4b27
[gaim-migrate @ 11373]
Herman Bloggs <herman@bluedigits.com>
parents:
10172
diff
changeset
|
760 | |
|
93c682ab4b27
[gaim-migrate @ 11373]
Herman Bloggs <herman@bluedigits.com>
parents:
10172
diff
changeset
|
761 | static gboolean dns_main_thread_cb(gpointer data) { |
|
93c682ab4b27
[gaim-migrate @ 11373]
Herman Bloggs <herman@bluedigits.com>
parents:
10172
diff
changeset
|
762 | dns_tdata *td = (dns_tdata*)data; |
|
10562
000641c00f7d
[gaim-migrate @ 11942]
Daniel Atallah <datallah@pidgin.im>
parents:
10561
diff
changeset
|
763 | if (td->errmsg != NULL) { |
|
000641c00f7d
[gaim-migrate @ 11942]
Daniel Atallah <datallah@pidgin.im>
parents:
10561
diff
changeset
|
764 | gaim_debug_info("dns", "%s\n", td->errmsg); |
|
000641c00f7d
[gaim-migrate @ 11942]
Daniel Atallah <datallah@pidgin.im>
parents:
10561
diff
changeset
|
765 | } |
|
10237
93c682ab4b27
[gaim-migrate @ 11373]
Herman Bloggs <herman@bluedigits.com>
parents:
10172
diff
changeset
|
766 | td->callback(td->hosts, td->data, td->errmsg); |
|
93c682ab4b27
[gaim-migrate @ 11373]
Herman Bloggs <herman@bluedigits.com>
parents:
10172
diff
changeset
|
767 | g_free(td->hostname); |
|
10562
000641c00f7d
[gaim-migrate @ 11942]
Daniel Atallah <datallah@pidgin.im>
parents:
10561
diff
changeset
|
768 | g_free(td->errmsg); |
|
10237
93c682ab4b27
[gaim-migrate @ 11373]
Herman Bloggs <herman@bluedigits.com>
parents:
10172
diff
changeset
|
769 | g_free(td); |
|
93c682ab4b27
[gaim-migrate @ 11373]
Herman Bloggs <herman@bluedigits.com>
parents:
10172
diff
changeset
|
770 | return FALSE; |
|
93c682ab4b27
[gaim-migrate @ 11373]
Herman Bloggs <herman@bluedigits.com>
parents:
10172
diff
changeset
|
771 | } |
|
93c682ab4b27
[gaim-migrate @ 11373]
Herman Bloggs <herman@bluedigits.com>
parents:
10172
diff
changeset
|
772 | |
|
93c682ab4b27
[gaim-migrate @ 11373]
Herman Bloggs <herman@bluedigits.com>
parents:
10172
diff
changeset
|
773 | static gpointer dns_thread(gpointer data) { |
|
10619
07ef9839d751
[gaim-migrate @ 12086]
Daniel Atallah <datallah@pidgin.im>
parents:
10613
diff
changeset
|
774 | |
|
07ef9839d751
[gaim-migrate @ 12086]
Daniel Atallah <datallah@pidgin.im>
parents:
10613
diff
changeset
|
775 | #if HAVE_GETADDRINFO |
|
07ef9839d751
[gaim-migrate @ 12086]
Daniel Atallah <datallah@pidgin.im>
parents:
10613
diff
changeset
|
776 | int rc; |
|
07ef9839d751
[gaim-migrate @ 12086]
Daniel Atallah <datallah@pidgin.im>
parents:
10613
diff
changeset
|
777 | struct addrinfo hints, *res, *tmp; |
|
07ef9839d751
[gaim-migrate @ 12086]
Daniel Atallah <datallah@pidgin.im>
parents:
10613
diff
changeset
|
778 | char servname[20]; |
|
07ef9839d751
[gaim-migrate @ 12086]
Daniel Atallah <datallah@pidgin.im>
parents:
10613
diff
changeset
|
779 | #else |
|
10237
93c682ab4b27
[gaim-migrate @ 11373]
Herman Bloggs <herman@bluedigits.com>
parents:
10172
diff
changeset
|
780 | struct sockaddr_in sin; |
|
10619
07ef9839d751
[gaim-migrate @ 12086]
Daniel Atallah <datallah@pidgin.im>
parents:
10613
diff
changeset
|
781 | struct hostent *hp; |
|
07ef9839d751
[gaim-migrate @ 12086]
Daniel Atallah <datallah@pidgin.im>
parents:
10613
diff
changeset
|
782 | #endif |
|
10237
93c682ab4b27
[gaim-migrate @ 11373]
Herman Bloggs <herman@bluedigits.com>
parents:
10172
diff
changeset
|
783 | dns_tdata *td = (dns_tdata*)data; |
|
10619
07ef9839d751
[gaim-migrate @ 12086]
Daniel Atallah <datallah@pidgin.im>
parents:
10613
diff
changeset
|
784 | |
|
07ef9839d751
[gaim-migrate @ 12086]
Daniel Atallah <datallah@pidgin.im>
parents:
10613
diff
changeset
|
785 | #if HAVE_GETADDRINFO |
|
07ef9839d751
[gaim-migrate @ 12086]
Daniel Atallah <datallah@pidgin.im>
parents:
10613
diff
changeset
|
786 | g_snprintf(servname, sizeof(servname), "%d", td->port); |
|
07ef9839d751
[gaim-migrate @ 12086]
Daniel Atallah <datallah@pidgin.im>
parents:
10613
diff
changeset
|
787 | memset(&hints,0,sizeof(hints)); |
|
10237
93c682ab4b27
[gaim-migrate @ 11373]
Herman Bloggs <herman@bluedigits.com>
parents:
10172
diff
changeset
|
788 | |
|
10619
07ef9839d751
[gaim-migrate @ 12086]
Daniel Atallah <datallah@pidgin.im>
parents:
10613
diff
changeset
|
789 | /* This is only used to convert a service |
|
07ef9839d751
[gaim-migrate @ 12086]
Daniel Atallah <datallah@pidgin.im>
parents:
10613
diff
changeset
|
790 | * name to a port number. As we know we are |
|
07ef9839d751
[gaim-migrate @ 12086]
Daniel Atallah <datallah@pidgin.im>
parents:
10613
diff
changeset
|
791 | * passing a number already, we know this |
|
07ef9839d751
[gaim-migrate @ 12086]
Daniel Atallah <datallah@pidgin.im>
parents:
10613
diff
changeset
|
792 | * value will not be really used by the C |
|
07ef9839d751
[gaim-migrate @ 12086]
Daniel Atallah <datallah@pidgin.im>
parents:
10613
diff
changeset
|
793 | * library. |
|
07ef9839d751
[gaim-migrate @ 12086]
Daniel Atallah <datallah@pidgin.im>
parents:
10613
diff
changeset
|
794 | */ |
|
07ef9839d751
[gaim-migrate @ 12086]
Daniel Atallah <datallah@pidgin.im>
parents:
10613
diff
changeset
|
795 | hints.ai_socktype = SOCK_STREAM; |
|
07ef9839d751
[gaim-migrate @ 12086]
Daniel Atallah <datallah@pidgin.im>
parents:
10613
diff
changeset
|
796 | if ((rc = getaddrinfo(td->hostname, servname, &hints, &res)) == 0) { |
|
07ef9839d751
[gaim-migrate @ 12086]
Daniel Atallah <datallah@pidgin.im>
parents:
10613
diff
changeset
|
797 | tmp = res; |
|
07ef9839d751
[gaim-migrate @ 12086]
Daniel Atallah <datallah@pidgin.im>
parents:
10613
diff
changeset
|
798 | while(res) { |
|
07ef9839d751
[gaim-migrate @ 12086]
Daniel Atallah <datallah@pidgin.im>
parents:
10613
diff
changeset
|
799 | td->hosts = g_slist_append(td->hosts, |
|
07ef9839d751
[gaim-migrate @ 12086]
Daniel Atallah <datallah@pidgin.im>
parents:
10613
diff
changeset
|
800 | GSIZE_TO_POINTER(res->ai_addrlen)); |
|
07ef9839d751
[gaim-migrate @ 12086]
Daniel Atallah <datallah@pidgin.im>
parents:
10613
diff
changeset
|
801 | td->hosts = g_slist_append(td->hosts, |
|
07ef9839d751
[gaim-migrate @ 12086]
Daniel Atallah <datallah@pidgin.im>
parents:
10613
diff
changeset
|
802 | g_memdup(res->ai_addr, res->ai_addrlen)); |
|
07ef9839d751
[gaim-migrate @ 12086]
Daniel Atallah <datallah@pidgin.im>
parents:
10613
diff
changeset
|
803 | res = res->ai_next; |
|
07ef9839d751
[gaim-migrate @ 12086]
Daniel Atallah <datallah@pidgin.im>
parents:
10613
diff
changeset
|
804 | } |
|
07ef9839d751
[gaim-migrate @ 12086]
Daniel Atallah <datallah@pidgin.im>
parents:
10613
diff
changeset
|
805 | freeaddrinfo(tmp); |
|
07ef9839d751
[gaim-migrate @ 12086]
Daniel Atallah <datallah@pidgin.im>
parents:
10613
diff
changeset
|
806 | } else { |
|
07ef9839d751
[gaim-migrate @ 12086]
Daniel Atallah <datallah@pidgin.im>
parents:
10613
diff
changeset
|
807 | td->errmsg = g_strdup_printf("DNS getaddrinfo(\"%s\", \"%s\") error: %d", td->hostname, servname, rc); |
|
07ef9839d751
[gaim-migrate @ 12086]
Daniel Atallah <datallah@pidgin.im>
parents:
10613
diff
changeset
|
808 | } |
|
07ef9839d751
[gaim-migrate @ 12086]
Daniel Atallah <datallah@pidgin.im>
parents:
10613
diff
changeset
|
809 | #else |
|
10562
000641c00f7d
[gaim-migrate @ 11942]
Daniel Atallah <datallah@pidgin.im>
parents:
10561
diff
changeset
|
810 | if ((hp = gethostbyname(td->hostname))) { |
|
000641c00f7d
[gaim-migrate @ 11942]
Daniel Atallah <datallah@pidgin.im>
parents:
10561
diff
changeset
|
811 | memset(&sin, 0, sizeof(struct sockaddr_in)); |
|
000641c00f7d
[gaim-migrate @ 11942]
Daniel Atallah <datallah@pidgin.im>
parents:
10561
diff
changeset
|
812 | memcpy(&sin.sin_addr.s_addr, hp->h_addr, hp->h_length); |
|
000641c00f7d
[gaim-migrate @ 11942]
Daniel Atallah <datallah@pidgin.im>
parents:
10561
diff
changeset
|
813 | sin.sin_family = hp->h_addrtype; |
|
000641c00f7d
[gaim-migrate @ 11942]
Daniel Atallah <datallah@pidgin.im>
parents:
10561
diff
changeset
|
814 | sin.sin_port = htons(td->port); |
|
10305
0b8022b3abae
[gaim-migrate @ 11490]
Mark Doliner <markdoliner@pidgin.im>
parents:
10264
diff
changeset
|
815 | |
|
10562
000641c00f7d
[gaim-migrate @ 11942]
Daniel Atallah <datallah@pidgin.im>
parents:
10561
diff
changeset
|
816 | td->hosts = g_slist_append(td->hosts, |
|
10619
07ef9839d751
[gaim-migrate @ 12086]
Daniel Atallah <datallah@pidgin.im>
parents:
10613
diff
changeset
|
817 | GSIZE_TO_POINTER(sizeof(sin))); |
|
10562
000641c00f7d
[gaim-migrate @ 11942]
Daniel Atallah <datallah@pidgin.im>
parents:
10561
diff
changeset
|
818 | td->hosts = g_slist_append(td->hosts, |
|
000641c00f7d
[gaim-migrate @ 11942]
Daniel Atallah <datallah@pidgin.im>
parents:
10561
diff
changeset
|
819 | g_memdup(&sin, sizeof(sin))); |
|
000641c00f7d
[gaim-migrate @ 11942]
Daniel Atallah <datallah@pidgin.im>
parents:
10561
diff
changeset
|
820 | } else { |
|
10619
07ef9839d751
[gaim-migrate @ 12086]
Daniel Atallah <datallah@pidgin.im>
parents:
10613
diff
changeset
|
821 | td->errmsg = g_strdup_printf("DNS gethostbyname(\"%s\") error: %d", td->hostname, h_errno); |
|
10562
000641c00f7d
[gaim-migrate @ 11942]
Daniel Atallah <datallah@pidgin.im>
parents:
10561
diff
changeset
|
822 | } |
|
10619
07ef9839d751
[gaim-migrate @ 12086]
Daniel Atallah <datallah@pidgin.im>
parents:
10613
diff
changeset
|
823 | #endif |
|
10237
93c682ab4b27
[gaim-migrate @ 11373]
Herman Bloggs <herman@bluedigits.com>
parents:
10172
diff
changeset
|
824 | /* back to main thread */ |
|
93c682ab4b27
[gaim-migrate @ 11373]
Herman Bloggs <herman@bluedigits.com>
parents:
10172
diff
changeset
|
825 | g_idle_add(dns_main_thread_cb, td); |
|
93c682ab4b27
[gaim-migrate @ 11373]
Herman Bloggs <herman@bluedigits.com>
parents:
10172
diff
changeset
|
826 | return 0; |
|
10305
0b8022b3abae
[gaim-migrate @ 11490]
Mark Doliner <markdoliner@pidgin.im>
parents:
10264
diff
changeset
|
827 | } |
|
10237
93c682ab4b27
[gaim-migrate @ 11373]
Herman Bloggs <herman@bluedigits.com>
parents:
10172
diff
changeset
|
828 | |
|
10711
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
829 | int |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
830 | gaim_gethostbyname_async(const char *hostname, int port, |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
831 | dns_callback_t callback, gpointer data) |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
832 | { |
|
10237
93c682ab4b27
[gaim-migrate @ 11373]
Herman Bloggs <herman@bluedigits.com>
parents:
10172
diff
changeset
|
833 | dns_tdata *td; |
|
93c682ab4b27
[gaim-migrate @ 11373]
Herman Bloggs <herman@bluedigits.com>
parents:
10172
diff
changeset
|
834 | struct sockaddr_in sin; |
|
93c682ab4b27
[gaim-migrate @ 11373]
Herman Bloggs <herman@bluedigits.com>
parents:
10172
diff
changeset
|
835 | GError* err = NULL; |
|
93c682ab4b27
[gaim-migrate @ 11373]
Herman Bloggs <herman@bluedigits.com>
parents:
10172
diff
changeset
|
836 | |
|
93c682ab4b27
[gaim-migrate @ 11373]
Herman Bloggs <herman@bluedigits.com>
parents:
10172
diff
changeset
|
837 | if(inet_aton(hostname, &sin.sin_addr)) { |
|
93c682ab4b27
[gaim-migrate @ 11373]
Herman Bloggs <herman@bluedigits.com>
parents:
10172
diff
changeset
|
838 | GSList *hosts = NULL; |
|
93c682ab4b27
[gaim-migrate @ 11373]
Herman Bloggs <herman@bluedigits.com>
parents:
10172
diff
changeset
|
839 | sin.sin_family = AF_INET; |
|
93c682ab4b27
[gaim-migrate @ 11373]
Herman Bloggs <herman@bluedigits.com>
parents:
10172
diff
changeset
|
840 | sin.sin_port = htons(port); |
|
93c682ab4b27
[gaim-migrate @ 11373]
Herman Bloggs <herman@bluedigits.com>
parents:
10172
diff
changeset
|
841 | hosts = g_slist_append(hosts, GINT_TO_POINTER(sizeof(sin))); |
|
93c682ab4b27
[gaim-migrate @ 11373]
Herman Bloggs <herman@bluedigits.com>
parents:
10172
diff
changeset
|
842 | hosts = g_slist_append(hosts, g_memdup(&sin, sizeof(sin))); |
|
93c682ab4b27
[gaim-migrate @ 11373]
Herman Bloggs <herman@bluedigits.com>
parents:
10172
diff
changeset
|
843 | callback(hosts, data, NULL); |
|
93c682ab4b27
[gaim-migrate @ 11373]
Herman Bloggs <herman@bluedigits.com>
parents:
10172
diff
changeset
|
844 | return 0; |
|
93c682ab4b27
[gaim-migrate @ 11373]
Herman Bloggs <herman@bluedigits.com>
parents:
10172
diff
changeset
|
845 | } |
|
93c682ab4b27
[gaim-migrate @ 11373]
Herman Bloggs <herman@bluedigits.com>
parents:
10172
diff
changeset
|
846 | |
|
93c682ab4b27
[gaim-migrate @ 11373]
Herman Bloggs <herman@bluedigits.com>
parents:
10172
diff
changeset
|
847 | gaim_debug_info("dns", "DNS Lookup for: %s\n", hostname); |
|
93c682ab4b27
[gaim-migrate @ 11373]
Herman Bloggs <herman@bluedigits.com>
parents:
10172
diff
changeset
|
848 | td = g_new0(dns_tdata, 1); |
|
93c682ab4b27
[gaim-migrate @ 11373]
Herman Bloggs <herman@bluedigits.com>
parents:
10172
diff
changeset
|
849 | td->hostname = g_strdup(hostname); |
|
93c682ab4b27
[gaim-migrate @ 11373]
Herman Bloggs <herman@bluedigits.com>
parents:
10172
diff
changeset
|
850 | td->port = port; |
|
93c682ab4b27
[gaim-migrate @ 11373]
Herman Bloggs <herman@bluedigits.com>
parents:
10172
diff
changeset
|
851 | td->callback = callback; |
|
93c682ab4b27
[gaim-migrate @ 11373]
Herman Bloggs <herman@bluedigits.com>
parents:
10172
diff
changeset
|
852 | td->data = data; |
|
93c682ab4b27
[gaim-migrate @ 11373]
Herman Bloggs <herman@bluedigits.com>
parents:
10172
diff
changeset
|
853 | |
|
93c682ab4b27
[gaim-migrate @ 11373]
Herman Bloggs <herman@bluedigits.com>
parents:
10172
diff
changeset
|
854 | if(!g_thread_create(dns_thread, td, FALSE, &err)) { |
|
93c682ab4b27
[gaim-migrate @ 11373]
Herman Bloggs <herman@bluedigits.com>
parents:
10172
diff
changeset
|
855 | gaim_debug_error("dns", "DNS thread create failure: %s\n", err?err->message:""); |
|
93c682ab4b27
[gaim-migrate @ 11373]
Herman Bloggs <herman@bluedigits.com>
parents:
10172
diff
changeset
|
856 | g_error_free(err); |
|
93c682ab4b27
[gaim-migrate @ 11373]
Herman Bloggs <herman@bluedigits.com>
parents:
10172
diff
changeset
|
857 | g_free(td->hostname); |
|
93c682ab4b27
[gaim-migrate @ 11373]
Herman Bloggs <herman@bluedigits.com>
parents:
10172
diff
changeset
|
858 | g_free(td); |
|
93c682ab4b27
[gaim-migrate @ 11373]
Herman Bloggs <herman@bluedigits.com>
parents:
10172
diff
changeset
|
859 | return -1; |
|
93c682ab4b27
[gaim-migrate @ 11373]
Herman Bloggs <herman@bluedigits.com>
parents:
10172
diff
changeset
|
860 | } |
|
93c682ab4b27
[gaim-migrate @ 11373]
Herman Bloggs <herman@bluedigits.com>
parents:
10172
diff
changeset
|
861 | return 0; |
|
93c682ab4b27
[gaim-migrate @ 11373]
Herman Bloggs <herman@bluedigits.com>
parents:
10172
diff
changeset
|
862 | } |
|
93c682ab4b27
[gaim-migrate @ 11373]
Herman Bloggs <herman@bluedigits.com>
parents:
10172
diff
changeset
|
863 | |
|
10626
659572951067
[gaim-migrate @ 12101]
Daniel Atallah <datallah@pidgin.im>
parents:
10619
diff
changeset
|
864 | #else /* not __unix__ or _WIN32 */ |
|
4366
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
865 | |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
866 | typedef struct { |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
867 | gpointer data; |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
868 | size_t addrlen; |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
869 | struct sockaddr *addr; |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
870 | dns_callback_t callback; |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
871 | } pending_dns_request_t; |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
872 | |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
873 | static gboolean host_resolved(gpointer data) |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
874 | { |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
875 | pending_dns_request_t *req = (pending_dns_request_t*)data; |
| 4678 | 876 | GSList *hosts = NULL; |
| 877 | hosts = g_slist_append(hosts, GINT_TO_POINTER(req->addrlen)); | |
| 878 | hosts = g_slist_append(hosts, req->addr); | |
| 879 | req->callback(hosts, req->data, NULL); | |
|
4366
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
880 | g_free(req); |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
881 | return FALSE; |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
882 | } |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
883 | |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
884 | int |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
885 | gaim_gethostbyname_async(const char *hostname, int port, |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
886 | dns_callback_t callback, gpointer data) |
|
4366
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
887 | { |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
888 | struct sockaddr_in sin; |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
889 | pending_dns_request_t *req; |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
890 | |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
891 | if (!inet_aton(hostname, &sin.sin_addr)) { |
|
2911
b20669ca1281
[gaim-migrate @ 2924]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2907
diff
changeset
|
892 | struct hostent *hp; |
|
4366
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
893 | if(!(hp = gethostbyname(hostname))) { |
|
10309
073906008cb2
[gaim-migrate @ 11501]
Mark Doliner <markdoliner@pidgin.im>
parents:
10307
diff
changeset
|
894 | gaim_debug_error("dns", |
|
8977
74162f1be34a
[gaim-migrate @ 9751]
Mark Doliner <markdoliner@pidgin.im>
parents:
8917
diff
changeset
|
895 | "gaim_gethostbyname(\"%s\", %d) failed: %d\n", |
|
74162f1be34a
[gaim-migrate @ 9751]
Mark Doliner <markdoliner@pidgin.im>
parents:
8917
diff
changeset
|
896 | hostname, port, h_errno); |
|
4366
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
897 | return -1; |
|
2911
b20669ca1281
[gaim-migrate @ 2924]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2907
diff
changeset
|
898 | } |
|
b20669ca1281
[gaim-migrate @ 2924]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2907
diff
changeset
|
899 | memset(&sin, 0, sizeof(struct sockaddr_in)); |
|
b20669ca1281
[gaim-migrate @ 2924]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2907
diff
changeset
|
900 | memcpy(&sin.sin_addr.s_addr, hp->h_addr, hp->h_length); |
|
b20669ca1281
[gaim-migrate @ 2924]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2907
diff
changeset
|
901 | sin.sin_family = hp->h_addrtype; |
|
b20669ca1281
[gaim-migrate @ 2924]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2907
diff
changeset
|
902 | } else |
|
b20669ca1281
[gaim-migrate @ 2924]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2907
diff
changeset
|
903 | sin.sin_family = AF_INET; |
|
b20669ca1281
[gaim-migrate @ 2924]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2907
diff
changeset
|
904 | sin.sin_port = htons(port); |
|
b20669ca1281
[gaim-migrate @ 2924]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2907
diff
changeset
|
905 | |
|
4366
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
906 | req = g_new(pending_dns_request_t, 1); |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
907 | req->addr = (struct sockaddr*) g_memdup(&sin, sizeof(sin)); |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
908 | req->addrlen = sizeof(sin); |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
909 | req->data = data; |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
910 | req->callback = callback; |
| 8273 | 911 | gaim_timeout_add(10, host_resolved, req); |
|
4366
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
912 | return 0; |
|
2911
b20669ca1281
[gaim-migrate @ 2924]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2907
diff
changeset
|
913 | } |
|
b20669ca1281
[gaim-migrate @ 2924]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2907
diff
changeset
|
914 | |
|
10237
93c682ab4b27
[gaim-migrate @ 11373]
Herman Bloggs <herman@bluedigits.com>
parents:
10172
diff
changeset
|
915 | #endif /* not __unix__ or _WIN32 */ |
|
4366
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
916 | |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
917 | static void |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
918 | no_one_calls(gpointer data, gint source, GaimInputCondition cond) |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
919 | { |
|
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
920 | struct PHB *phb = data; |
|
2048
4ac8b9622c9e
[gaim-migrate @ 2058]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1881
diff
changeset
|
921 | unsigned int len; |
| 8273 | 922 | int error=0, ret; |
|
3717
2fc0789e04e8
[gaim-migrate @ 3850]
Herman Bloggs <herman@bluedigits.com>
parents:
3630
diff
changeset
|
923 | |
|
10309
073906008cb2
[gaim-migrate @ 11501]
Mark Doliner <markdoliner@pidgin.im>
parents:
10307
diff
changeset
|
924 | gaim_debug_info("proxy", "Connected.\n"); |
|
3717
2fc0789e04e8
[gaim-migrate @ 3850]
Herman Bloggs <herman@bluedigits.com>
parents:
3630
diff
changeset
|
925 | |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
926 | len = sizeof(error); |
|
4648
22f8080928e0
[gaim-migrate @ 4959]
Herman Bloggs <herman@bluedigits.com>
parents:
4634
diff
changeset
|
927 | |
| 8273 | 928 | /* |
| 929 | * getsockopt after a non-blocking connect returns -1 if something is | |
| 930 | * really messed up (bad descriptor, usually). Otherwise, it returns 0 and | |
| 931 | * error holds what connect would have returned if it blocked until now. | |
| 932 | * Thus, error == 0 is success, error == EINPROGRESS means "try again", | |
| 933 | * and anything else is a real error. | |
| 934 | * | |
| 935 | * (error == EINPROGRESS can happen after a select because the kernel can | |
| 936 | * be overly optimistic sometimes. select is just a hint that you might be | |
| 937 | * able to do something.) | |
| 938 | */ | |
| 939 | ret = getsockopt(source, SOL_SOCKET, SO_ERROR, &error, &len); | |
| 940 | if (ret == 0 && error == EINPROGRESS) | |
|
9863
323e4fe28791
[gaim-migrate @ 10742]
Mark Doliner <markdoliner@pidgin.im>
parents:
9792
diff
changeset
|
941 | return; /* we'll be called again later */ |
| 8273 | 942 | if (ret < 0 || error != 0) { |
| 9100 | 943 | if(ret!=0) error = errno; |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
944 | close(source); |
|
2090
bab8b7e309db
[gaim-migrate @ 2100]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2048
diff
changeset
|
945 | gaim_input_remove(phb->inpa); |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
946 | |
|
10309
073906008cb2
[gaim-migrate @ 11501]
Mark Doliner <markdoliner@pidgin.im>
parents:
10307
diff
changeset
|
947 | gaim_debug_error("proxy", |
| 9100 | 948 | "getsockopt SO_ERROR check: %s\n", strerror(error)); |
| 9129 | 949 | |
| 950 | try_connect(phb); | |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
951 | return; |
|
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
952 | } |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
953 | |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
954 | fcntl(source, F_SETFL, 0); |
|
2090
bab8b7e309db
[gaim-migrate @ 2100]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2048
diff
changeset
|
955 | gaim_input_remove(phb->inpa); |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
956 | |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
957 | if (phb->account == NULL || |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
958 | gaim_account_get_connection(phb->account) != NULL) { |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
959 | |
| 4993 | 960 | phb->func(phb->data, source, GAIM_INPUT_READ); |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
961 | } |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
962 | |
|
4366
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
963 | g_free(phb->host); |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
964 | g_free(phb); |
|
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
965 | } |
|
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
966 | |
|
1868
31b44ef2b061
[gaim-migrate @ 1878]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1844
diff
changeset
|
967 | static gboolean clean_connect(gpointer data) |
|
31b44ef2b061
[gaim-migrate @ 1878]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1844
diff
changeset
|
968 | { |
|
31b44ef2b061
[gaim-migrate @ 1878]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1844
diff
changeset
|
969 | struct PHB *phb = data; |
|
31b44ef2b061
[gaim-migrate @ 1878]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1844
diff
changeset
|
970 | |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
971 | if (phb->account == NULL || |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
972 | gaim_account_get_connection(phb->account) != NULL) { |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
973 | |
| 4993 | 974 | phb->func(phb->data, phb->port, GAIM_INPUT_READ); |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
975 | } |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
976 | |
|
4366
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
977 | g_free(phb->host); |
|
1868
31b44ef2b061
[gaim-migrate @ 1878]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1844
diff
changeset
|
978 | g_free(phb); |
|
31b44ef2b061
[gaim-migrate @ 1878]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1844
diff
changeset
|
979 | |
|
31b44ef2b061
[gaim-migrate @ 1878]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1844
diff
changeset
|
980 | return FALSE; |
|
31b44ef2b061
[gaim-migrate @ 1878]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1844
diff
changeset
|
981 | } |
|
31b44ef2b061
[gaim-migrate @ 1878]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1844
diff
changeset
|
982 | |
|
31b44ef2b061
[gaim-migrate @ 1878]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1844
diff
changeset
|
983 | |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
984 | static int |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
985 | proxy_connect_none(struct PHB *phb, struct sockaddr *addr, socklen_t addrlen) |
| 1 | 986 | { |
|
1087
bc9c6b635358
[gaim-migrate @ 1097]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1057
diff
changeset
|
987 | int fd = -1; |
|
3717
2fc0789e04e8
[gaim-migrate @ 3850]
Herman Bloggs <herman@bluedigits.com>
parents:
3630
diff
changeset
|
988 | |
|
10309
073906008cb2
[gaim-migrate @ 11501]
Mark Doliner <markdoliner@pidgin.im>
parents:
10307
diff
changeset
|
989 | gaim_debug_info("proxy", |
|
5211
94d9756c381f
[gaim-migrate @ 5581]
Christian Hammond <chipx86@chipx86.com>
parents:
4993
diff
changeset
|
990 | "Connecting to %s:%d with no proxy\n", phb->host, phb->port); |
|
1087
bc9c6b635358
[gaim-migrate @ 1097]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1057
diff
changeset
|
991 | |
|
4366
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
992 | if ((fd = socket(addr->sa_family, SOCK_STREAM, 0)) < 0) { |
|
10309
073906008cb2
[gaim-migrate @ 11501]
Mark Doliner <markdoliner@pidgin.im>
parents:
10307
diff
changeset
|
993 | gaim_debug_error("proxy", |
|
5211
94d9756c381f
[gaim-migrate @ 5581]
Christian Hammond <chipx86@chipx86.com>
parents:
4993
diff
changeset
|
994 | "Unable to create socket: %s\n", strerror(errno)); |
|
1087
bc9c6b635358
[gaim-migrate @ 1097]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1057
diff
changeset
|
995 | return -1; |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
996 | } |
|
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
997 | fcntl(fd, F_SETFL, O_NONBLOCK); |
|
10172
8400788b226c
[gaim-migrate @ 11275]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10170
diff
changeset
|
998 | #ifndef _WIN32 |
| 10170 | 999 | fcntl(fd, F_SETFD, FD_CLOEXEC); |
|
10172
8400788b226c
[gaim-migrate @ 11275]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10170
diff
changeset
|
1000 | #endif |
|
3717
2fc0789e04e8
[gaim-migrate @ 3850]
Herman Bloggs <herman@bluedigits.com>
parents:
3630
diff
changeset
|
1001 | |
|
4366
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
1002 | if (connect(fd, (struct sockaddr *)addr, addrlen) < 0) { |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1003 | if ((errno == EINPROGRESS) || (errno == EINTR)) { |
|
10309
073906008cb2
[gaim-migrate @ 11501]
Mark Doliner <markdoliner@pidgin.im>
parents:
10307
diff
changeset
|
1004 | gaim_debug_warning("proxy", |
|
5211
94d9756c381f
[gaim-migrate @ 5581]
Christian Hammond <chipx86@chipx86.com>
parents:
4993
diff
changeset
|
1005 | "Connect would have blocked.\n"); |
|
2090
bab8b7e309db
[gaim-migrate @ 2100]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2048
diff
changeset
|
1006 | phb->inpa = gaim_input_add(fd, GAIM_INPUT_WRITE, no_one_calls, phb); |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1007 | } |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1008 | else { |
|
10309
073906008cb2
[gaim-migrate @ 11501]
Mark Doliner <markdoliner@pidgin.im>
parents:
10307
diff
changeset
|
1009 | gaim_debug_error("proxy", |
| 9100 | 1010 | "Connect failed: %s\n", strerror(errno)); |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1011 | close(fd); |
|
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1012 | return -1; |
|
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1013 | } |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1014 | } |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1015 | else { |
|
2048
4ac8b9622c9e
[gaim-migrate @ 2058]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1881
diff
changeset
|
1016 | unsigned int len; |
|
4ac8b9622c9e
[gaim-migrate @ 2058]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1881
diff
changeset
|
1017 | int error = ETIMEDOUT; |
|
10309
073906008cb2
[gaim-migrate @ 11501]
Mark Doliner <markdoliner@pidgin.im>
parents:
10307
diff
changeset
|
1018 | gaim_debug_misc("proxy", "Connect didn't block.\n"); |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1019 | len = sizeof(error); |
|
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1020 | if (getsockopt(fd, SOL_SOCKET, SO_ERROR, &error, &len) < 0) { |
|
10309
073906008cb2
[gaim-migrate @ 11501]
Mark Doliner <markdoliner@pidgin.im>
parents:
10307
diff
changeset
|
1021 | gaim_debug_error("proxy", "getsockopt failed.\n"); |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1022 | close(fd); |
|
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1023 | return -1; |
|
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1024 | } |
|
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1025 | fcntl(fd, F_SETFL, 0); |
|
2372
c24942700dfd
[gaim-migrate @ 2385]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2306
diff
changeset
|
1026 | phb->port = fd; /* bleh */ |
| 8273 | 1027 | gaim_timeout_add(50, clean_connect, phb); /* we do this because we never |
|
2372
c24942700dfd
[gaim-migrate @ 2385]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2306
diff
changeset
|
1028 | want to call our callback |
|
c24942700dfd
[gaim-migrate @ 2385]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2306
diff
changeset
|
1029 | before we return. */ |
|
1087
bc9c6b635358
[gaim-migrate @ 1097]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1057
diff
changeset
|
1030 | } |
|
bc9c6b635358
[gaim-migrate @ 1097]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1057
diff
changeset
|
1031 | |
|
bc9c6b635358
[gaim-migrate @ 1097]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1057
diff
changeset
|
1032 | return fd; |
|
bc9c6b635358
[gaim-migrate @ 1097]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1057
diff
changeset
|
1033 | } |
|
bc9c6b635358
[gaim-migrate @ 1097]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1057
diff
changeset
|
1034 | |
| 3376 | 1035 | #define HTTP_GOODSTRING "HTTP/1.0 200" |
| 1036 | #define HTTP_GOODSTRING2 "HTTP/1.1 200" | |
|
1087
bc9c6b635358
[gaim-migrate @ 1097]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1057
diff
changeset
|
1037 | |
| 7834 | 1038 | static void |
| 1039 | http_complete(struct PHB *phb, gint source) | |
| 1040 | { | |
|
10309
073906008cb2
[gaim-migrate @ 11501]
Mark Doliner <markdoliner@pidgin.im>
parents:
10307
diff
changeset
|
1041 | gaim_debug_info("http proxy", "proxy connection established\n"); |
| 9129 | 1042 | if(source < 0) { |
| 1043 | try_connect(phb); | |
| 1044 | } else if(!phb->account || phb->account->gc) { | |
| 7834 | 1045 | phb->func(phb->data, source, GAIM_INPUT_READ); |
| 9129 | 1046 | g_free(phb->host); |
| 1047 | g_free(phb); | |
| 1048 | } | |
| 7834 | 1049 | } |
| 1050 | ||
| 1051 | ||
| 1052 | /* read the response to the CONNECT request, if we are requesting a non-port-80 tunnel */ | |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1053 | static void |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1054 | http_canread(gpointer data, gint source, GaimInputCondition cond) |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1055 | { |
|
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1056 | int nlc = 0; |
|
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1057 | int pos = 0; |
| 12391 | 1058 | int minor, major, status = 0, error=0; |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1059 | struct PHB *phb = data; |
|
4366
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
1060 | char inputline[8192], *p; |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1061 | |
|
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1062 | |
|
8118
7f5315bb4506
[gaim-migrate @ 8822]
Douglas Thrift <douglas@douglasthrift.net>
parents:
8046
diff
changeset
|
1063 | while ((pos < sizeof(inputline)-1) && (nlc != 2) && (read(source, &inputline[pos++], 1) == 1)) { |
|
2372
c24942700dfd
[gaim-migrate @ 2385]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2306
diff
changeset
|
1064 | if (inputline[pos - 1] == '\n') |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1065 | nlc++; |
|
2372
c24942700dfd
[gaim-migrate @ 2385]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2306
diff
changeset
|
1066 | else if (inputline[pos - 1] != '\r') |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1067 | nlc = 0; |
|
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1068 | } |
|
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1069 | inputline[pos] = '\0'; |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1070 | |
|
4366
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
1071 | error = strncmp(inputline, "HTTP/", 5) != 0; |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
1072 | if(!error) { |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
1073 | p = inputline + 5; |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
1074 | major = strtol(p, &p, 10); |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
1075 | error = (major==0) || (*p != '.'); |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
1076 | if(!error) { |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
1077 | p++; |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
1078 | minor = strtol(p, &p, 10); |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
1079 | error = (*p!=' '); |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
1080 | if(!error) { |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
1081 | p++; |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
1082 | status = strtol(p, &p, 10); |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
1083 | error = (*p!=' '); |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
1084 | } |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
1085 | } |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
1086 | } |
| 9129 | 1087 | |
| 12391 | 1088 | /* Read the contents */ |
| 1089 | p = g_strrstr(inputline, "Content-Length: "); | |
|
12440
d468e6ecf65a
[gaim-migrate @ 14747]
Richard Laager <rlaager@pidgin.im>
parents:
12412
diff
changeset
|
1090 | if(p != NULL) { |
| 12391 | 1091 | gchar *tmp; |
| 1092 | int len = 0; | |
| 1093 | char tmpc; | |
| 1094 | p += strlen("Content-Length: "); | |
| 1095 | tmp = strchr(p, '\r'); | |
| 1096 | *tmp = 0; | |
| 1097 | len = atoi(p); | |
| 1098 | *tmp = '\r'; | |
| 1099 | while(len--) read(source, &tmpc, 1); | |
| 1100 | } | |
|
4366
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
1101 | if(error) { |
|
10309
073906008cb2
[gaim-migrate @ 11501]
Mark Doliner <markdoliner@pidgin.im>
parents:
10307
diff
changeset
|
1102 | gaim_debug_error("proxy", |
|
5211
94d9756c381f
[gaim-migrate @ 5581]
Christian Hammond <chipx86@chipx86.com>
parents:
4993
diff
changeset
|
1103 | "Unable to parse proxy's response: %s\n", inputline); |
|
4366
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
1104 | close(source); |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
1105 | source=-1; |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1106 | } |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1107 | else if(status!=200) { |
|
10309
073906008cb2
[gaim-migrate @ 11501]
Mark Doliner <markdoliner@pidgin.im>
parents:
10307
diff
changeset
|
1108 | gaim_debug_error("proxy", |
| 12391 | 1109 | "Proxy server replied with:\n%s\n", inputline); |
| 9129 | 1110 | |
| 1111 | /* XXX: why in the hell are we calling gaim_connection_error() here? */ | |
| 12391 | 1112 | if ( status == 407 /* Proxy Auth */ ) { |
| 1113 | gchar *ntlm; | |
| 1114 | if( (ntlm = g_strrstr(inputline, "Proxy-Authenticate: NTLM "))) { /* Check for Type-2 */ | |
| 1115 | gchar *nonce = ntlm; | |
| 1116 | gchar *domain = (gchar*)gaim_proxy_info_get_username(phb->gpi); | |
| 1117 | gchar *username; | |
| 1118 | gchar *request; | |
| 1119 | gchar *response; | |
| 1120 | if(!(username = strchr(domain, '\\'))) { | |
| 1121 | char *msg = g_strdup_printf(_("Proxy connection error %d"), status); | |
| 1122 | close(source); | |
| 1123 | source = -1; | |
| 1124 | gaim_connection_error(phb->account->gc, msg); | |
| 1125 | g_free(msg); | |
| 1126 | gaim_input_remove(phb->inpa); | |
| 1127 | return; | |
| 1128 | } | |
| 1129 | *username = 0; | |
| 1130 | username ++; | |
| 1131 | ntlm += strlen("Proxy-Authenticate: NTLM "); | |
| 1132 | while(*nonce != '\r' && *nonce != '\0') nonce ++; | |
| 1133 | *nonce = 0; | |
| 1134 | nonce = gaim_ntlm_parse_type2(ntlm); | |
| 1135 | response = gaim_ntlm_gen_type3(username, (gchar*)gaim_proxy_info_get_password(phb->gpi), (gchar*)gaim_proxy_info_get_host(phb->gpi), domain, nonce); | |
| 1136 | username--; | |
| 1137 | *username = '\\'; | |
| 1138 | request = g_strdup_printf("CONNECT %s:%d HTTP/1.1\r\nHost: %s:%d\r\nProxy-Authorization: NTLM %s\r\nProxy-Connection: Keep-Alive\r\n\r\n", | |
| 1139 | phb->host, phb->port, phb->host, phb->port, | |
| 1140 | response); | |
| 1141 | write(source, request, strlen(request)); | |
| 1142 | g_free(request); | |
| 1143 | g_free(response); | |
| 1144 | return; | |
| 1145 | } else if((ntlm = g_strrstr(inputline, "Proxy-Authenticate: NTLM"))) { /* Empty message */ | |
| 1146 | gchar request[2048]; | |
| 1147 | gchar *domain = (gchar*)gaim_proxy_info_get_username(phb->gpi); | |
| 1148 | gchar *username; | |
| 1149 | int request_len; | |
| 1150 | if(!(username = strchr(domain, '\\'))) { | |
| 1151 | char *msg = g_strdup_printf(_("Proxy connection error %d"), status); | |
| 1152 | close(source); | |
| 1153 | source = -1; | |
| 1154 | gaim_connection_error(phb->account->gc, msg); | |
| 1155 | g_free(msg); | |
| 1156 | gaim_input_remove(phb->inpa); | |
| 1157 | return; | |
| 1158 | } | |
| 1159 | *username = 0; | |
| 1160 | ||
| 1161 | request_len = g_snprintf(request, sizeof(request), | |
| 1162 | "CONNECT %s:%d HTTP/1.1\r\nHost: %s:%d\r\n", | |
| 1163 | phb->host, phb->port, phb->host, phb->port); | |
| 1164 | ||
| 1165 | g_return_if_fail(request_len < sizeof(request)); | |
| 1166 | request_len += g_snprintf(request + request_len, | |
| 1167 | sizeof(request) - request_len, | |
| 1168 | "Proxy-Authorization: NTLM %s\r\nProxy-Connection: Keep-Alive\r\n\r\n", gaim_ntlm_gen_type1((gchar*)gaim_proxy_info_get_host(phb->gpi),domain)); | |
| 1169 | *username = '\\'; | |
| 1170 | write(source, request, request_len); | |
| 1171 | return; | |
| 1172 | } else { | |
| 1173 | char *msg = g_strdup_printf(_("Proxy connection error %d"), status); | |
| 1174 | close(source); | |
| 1175 | source = -1; | |
| 1176 | gaim_connection_error(phb->account->gc, msg); | |
| 1177 | g_free(msg); | |
| 1178 | } | |
| 1179 | } | |
|
8917
1301b17bc141
[gaim-migrate @ 9687]
Mark Doliner <markdoliner@pidgin.im>
parents:
8889
diff
changeset
|
1180 | if ( status == 403 /* Forbidden */ ) { |
|
1301b17bc141
[gaim-migrate @ 9687]
Mark Doliner <markdoliner@pidgin.im>
parents:
8889
diff
changeset
|
1181 | gchar *msg = g_strdup_printf(_("Access denied: proxy server forbids port %d tunnelling."), phb->port); |
|
1301b17bc141
[gaim-migrate @ 9687]
Mark Doliner <markdoliner@pidgin.im>
parents:
8889
diff
changeset
|
1182 | gaim_connection_error(phb->account->gc, msg); |
|
1301b17bc141
[gaim-migrate @ 9687]
Mark Doliner <markdoliner@pidgin.im>
parents:
8889
diff
changeset
|
1183 | g_free(msg); |
|
1301b17bc141
[gaim-migrate @ 9687]
Mark Doliner <markdoliner@pidgin.im>
parents:
8889
diff
changeset
|
1184 | } else { |
| 7834 | 1185 | char *msg = g_strdup_printf(_("Proxy connection error %d"), status); |
| 1186 | gaim_connection_error(phb->account->gc, msg); | |
| 1187 | g_free(msg); | |
| 1188 | } | |
| 1189 | } else { | |
| 1190 | http_complete(phb, source); | |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1191 | } |
| 9129 | 1192 | |
| 12391 | 1193 | gaim_input_remove(phb->inpa); |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1194 | return; |
|
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1195 | } |
|
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1196 | |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1197 | static void |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1198 | http_canwrite(gpointer data, gint source, GaimInputCondition cond) |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1199 | { |
|
4366
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
1200 | char request[8192]; |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
1201 | int request_len = 0; |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1202 | struct PHB *phb = data; |
|
2048
4ac8b9622c9e
[gaim-migrate @ 2058]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1881
diff
changeset
|
1203 | unsigned int len; |
|
4ac8b9622c9e
[gaim-migrate @ 2058]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1881
diff
changeset
|
1204 | int error = ETIMEDOUT; |
|
3717
2fc0789e04e8
[gaim-migrate @ 3850]
Herman Bloggs <herman@bluedigits.com>
parents:
3630
diff
changeset
|
1205 | |
|
10309
073906008cb2
[gaim-migrate @ 11501]
Mark Doliner <markdoliner@pidgin.im>
parents:
10307
diff
changeset
|
1206 | gaim_debug_info("http proxy", "Connected.\n"); |
|
5211
94d9756c381f
[gaim-migrate @ 5581]
Christian Hammond <chipx86@chipx86.com>
parents:
4993
diff
changeset
|
1207 | |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1208 | if (phb->inpa > 0) |
|
2090
bab8b7e309db
[gaim-migrate @ 2100]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2048
diff
changeset
|
1209 | gaim_input_remove(phb->inpa); |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1210 | |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1211 | len = sizeof(error); |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1212 | |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1213 | if (getsockopt(source, SOL_SOCKET, SO_ERROR, &error, &len) < 0) { |
|
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1214 | close(source); |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1215 | |
| 9129 | 1216 | try_connect(phb); |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1217 | return; |
|
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1218 | } |
| 7834 | 1219 | |
|
10309
073906008cb2
[gaim-migrate @ 11501]
Mark Doliner <markdoliner@pidgin.im>
parents:
10307
diff
changeset
|
1220 | gaim_debug_info("proxy", "using CONNECT tunnelling for %s:%d\n", phb->host, phb->port); |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1221 | request_len = g_snprintf(request, sizeof(request), |
| 7834 | 1222 | "CONNECT %s:%d HTTP/1.1\r\nHost: %s:%d\r\n", |
| 1223 | phb->host, phb->port, phb->host, phb->port); | |
|
1843
aeeac3ee7ac5
[gaim-migrate @ 1853]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1840
diff
changeset
|
1224 | |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1225 | if (gaim_proxy_info_get_username(phb->gpi) != NULL) { |
|
1843
aeeac3ee7ac5
[gaim-migrate @ 1853]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1840
diff
changeset
|
1226 | char *t1, *t2; |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1227 | t1 = g_strdup_printf("%s:%s", |
| 7834 | 1228 | gaim_proxy_info_get_username(phb->gpi), |
|
11143
f606fb334190
[gaim-migrate @ 13207]
Mark Doliner <markdoliner@pidgin.im>
parents:
11033
diff
changeset
|
1229 | gaim_proxy_info_get_password(phb->gpi) ? |
| 7834 | 1230 | gaim_proxy_info_get_password(phb->gpi) : ""); |
|
11143
f606fb334190
[gaim-migrate @ 13207]
Mark Doliner <markdoliner@pidgin.im>
parents:
11033
diff
changeset
|
1231 | t2 = gaim_base64_encode((const guchar *)t1, strlen(t1)); |
|
1843
aeeac3ee7ac5
[gaim-migrate @ 1853]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1840
diff
changeset
|
1232 | g_free(t1); |
|
4366
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
1233 | g_return_if_fail(request_len < sizeof(request)); |
| 12391 | 1234 | |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1235 | request_len += g_snprintf(request + request_len, |
| 7834 | 1236 | sizeof(request) - request_len, |
|
12758
b8b26879aa34
[gaim-migrate @ 15105]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
12440
diff
changeset
|
1237 | "Proxy-Authorization: Basic %s\r\nProxy-Authorization: NTLM %s\r\nProxy-Connection: Keep-Alive\r\n", t2, gaim_ntlm_gen_type1((gchar*)gaim_proxy_info_get_host(phb->gpi),"")); |
|
1843
aeeac3ee7ac5
[gaim-migrate @ 1853]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1840
diff
changeset
|
1238 | g_free(t2); |
|
aeeac3ee7ac5
[gaim-migrate @ 1853]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1840
diff
changeset
|
1239 | } |
|
aeeac3ee7ac5
[gaim-migrate @ 1853]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1840
diff
changeset
|
1240 | |
|
4366
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
1241 | g_return_if_fail(request_len < sizeof(request)); |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
1242 | strcpy(request + request_len, "\r\n"); |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
1243 | request_len += 2; |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
1244 | |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
1245 | if (write(source, request, request_len) < 0) { |
|
1843
aeeac3ee7ac5
[gaim-migrate @ 1853]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1840
diff
changeset
|
1246 | close(source); |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1247 | |
| 9129 | 1248 | try_connect(phb); |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1249 | return; |
|
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1250 | } |
|
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1251 | |
| 7834 | 1252 | /* register the response handler for the CONNECT request */ |
|
2090
bab8b7e309db
[gaim-migrate @ 2100]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2048
diff
changeset
|
1253 | phb->inpa = gaim_input_add(source, GAIM_INPUT_READ, http_canread, phb); |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1254 | } |
|
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1255 | |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1256 | static int |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1257 | proxy_connect_http(struct PHB *phb, struct sockaddr *addr, socklen_t addrlen) |
|
1087
bc9c6b635358
[gaim-migrate @ 1097]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1057
diff
changeset
|
1258 | { |
|
bc9c6b635358
[gaim-migrate @ 1097]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1057
diff
changeset
|
1259 | int fd = -1; |
| 1 | 1260 | |
|
10309
073906008cb2
[gaim-migrate @ 11501]
Mark Doliner <markdoliner@pidgin.im>
parents:
10307
diff
changeset
|
1261 | gaim_debug_info("http proxy", |
|
5211
94d9756c381f
[gaim-migrate @ 5581]
Christian Hammond <chipx86@chipx86.com>
parents:
4993
diff
changeset
|
1262 | "Connecting to %s:%d via %s:%d using HTTP\n", |
|
12273
e81f70df6280
[gaim-migrate @ 14575]
Evan Schoenberg <evands@pidgin.im>
parents:
12246
diff
changeset
|
1263 | (phb->host ? phb->host : "(null)"), phb->port, |
|
e81f70df6280
[gaim-migrate @ 14575]
Evan Schoenberg <evands@pidgin.im>
parents:
12246
diff
changeset
|
1264 | (gaim_proxy_info_get_host(phb->gpi) ? gaim_proxy_info_get_host(phb->gpi) : "(null)"), |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1265 | gaim_proxy_info_get_port(phb->gpi)); |
|
1087
bc9c6b635358
[gaim-migrate @ 1097]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1057
diff
changeset
|
1266 | |
|
4366
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
1267 | if ((fd = socket(addr->sa_family, SOCK_STREAM, 0)) < 0) { |
|
1087
bc9c6b635358
[gaim-migrate @ 1097]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1057
diff
changeset
|
1268 | return -1; |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1269 | } |
|
1087
bc9c6b635358
[gaim-migrate @ 1097]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1057
diff
changeset
|
1270 | |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1271 | fcntl(fd, F_SETFL, O_NONBLOCK); |
|
10172
8400788b226c
[gaim-migrate @ 11275]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10170
diff
changeset
|
1272 | #ifndef _WIN32 |
| 10170 | 1273 | fcntl(fd, F_SETFD, FD_CLOEXEC); |
|
10172
8400788b226c
[gaim-migrate @ 11275]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10170
diff
changeset
|
1274 | #endif |
|
3717
2fc0789e04e8
[gaim-migrate @ 3850]
Herman Bloggs <herman@bluedigits.com>
parents:
3630
diff
changeset
|
1275 | |
|
4366
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
1276 | if (connect(fd, addr, addrlen) < 0) { |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1277 | if ((errno == EINPROGRESS) || (errno == EINTR)) { |
|
10309
073906008cb2
[gaim-migrate @ 11501]
Mark Doliner <markdoliner@pidgin.im>
parents:
10307
diff
changeset
|
1278 | gaim_debug_warning("http proxy", |
|
5211
94d9756c381f
[gaim-migrate @ 5581]
Christian Hammond <chipx86@chipx86.com>
parents:
4993
diff
changeset
|
1279 | "Connect would have blocked.\n"); |
| 9655 | 1280 | |
| 7834 | 1281 | if (phb->port != 80) { |
| 1282 | /* we need to do CONNECT first */ | |
| 1283 | phb->inpa = gaim_input_add(fd, GAIM_INPUT_WRITE, | |
| 1284 | http_canwrite, phb); | |
| 1285 | } else { | |
| 1286 | http_complete(phb, fd); | |
| 1287 | } | |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1288 | } else { |
|
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1289 | close(fd); |
|
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1290 | return -1; |
|
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1291 | } |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1292 | } |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1293 | else { |
|
2048
4ac8b9622c9e
[gaim-migrate @ 2058]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1881
diff
changeset
|
1294 | unsigned int len; |
|
4ac8b9622c9e
[gaim-migrate @ 2058]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1881
diff
changeset
|
1295 | int error = ETIMEDOUT; |
|
3717
2fc0789e04e8
[gaim-migrate @ 3850]
Herman Bloggs <herman@bluedigits.com>
parents:
3630
diff
changeset
|
1296 | |
|
10309
073906008cb2
[gaim-migrate @ 11501]
Mark Doliner <markdoliner@pidgin.im>
parents:
10307
diff
changeset
|
1297 | gaim_debug_misc("http proxy", |
|
5211
94d9756c381f
[gaim-migrate @ 5581]
Christian Hammond <chipx86@chipx86.com>
parents:
4993
diff
changeset
|
1298 | "Connect didn't block.\n"); |
|
94d9756c381f
[gaim-migrate @ 5581]
Christian Hammond <chipx86@chipx86.com>
parents:
4993
diff
changeset
|
1299 | |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1300 | len = sizeof(error); |
|
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1301 | if (getsockopt(fd, SOL_SOCKET, SO_ERROR, &error, &len) < 0) { |
|
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1302 | close(fd); |
|
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1303 | return -1; |
|
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1304 | } |
|
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1305 | fcntl(fd, F_SETFL, 0); |
|
2090
bab8b7e309db
[gaim-migrate @ 2100]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2048
diff
changeset
|
1306 | http_canwrite(phb, fd, GAIM_INPUT_WRITE); |
|
1695
30db76d87de8
[gaim-migrate @ 1705]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1451
diff
changeset
|
1307 | } |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1308 | |
|
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1309 | return fd; |
|
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1310 | } |
|
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1311 | |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1312 | static void |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1313 | s4_canread(gpointer data, gint source, GaimInputCondition cond) |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1314 | { |
|
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1315 | unsigned char packet[12]; |
|
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1316 | struct PHB *phb = data; |
|
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1317 | |
|
2090
bab8b7e309db
[gaim-migrate @ 2100]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2048
diff
changeset
|
1318 | gaim_input_remove(phb->inpa); |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1319 | |
|
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1320 | memset(packet, 0, sizeof(packet)); |
|
3717
2fc0789e04e8
[gaim-migrate @ 3850]
Herman Bloggs <herman@bluedigits.com>
parents:
3630
diff
changeset
|
1321 | |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1322 | if (read(source, packet, 9) >= 4 && packet[1] == 90) { |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1323 | if (phb->account == NULL || |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1324 | gaim_account_get_connection(phb->account) != NULL) { |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1325 | |
| 6017 | 1326 | phb->func(phb->data, source, GAIM_INPUT_READ); |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1327 | } |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1328 | |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1329 | g_free(phb->host); |
|
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1330 | g_free(phb); |
|
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1331 | return; |
|
1695
30db76d87de8
[gaim-migrate @ 1705]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1451
diff
changeset
|
1332 | } |
|
1087
bc9c6b635358
[gaim-migrate @ 1097]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1057
diff
changeset
|
1333 | |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1334 | close(source); |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1335 | |
| 9129 | 1336 | try_connect(phb); |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1337 | } |
|
1705
cc63a8819c1c
[gaim-migrate @ 1715]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1695
diff
changeset
|
1338 | |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1339 | static void |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1340 | s4_canwrite(gpointer data, gint source, GaimInputCondition cond) |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1341 | { |
|
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1342 | unsigned char packet[12]; |
|
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1343 | struct hostent *hp; |
|
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1344 | struct PHB *phb = data; |
|
2048
4ac8b9622c9e
[gaim-migrate @ 2058]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1881
diff
changeset
|
1345 | unsigned int len; |
|
4ac8b9622c9e
[gaim-migrate @ 2058]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1881
diff
changeset
|
1346 | int error = ETIMEDOUT; |
|
3717
2fc0789e04e8
[gaim-migrate @ 3850]
Herman Bloggs <herman@bluedigits.com>
parents:
3630
diff
changeset
|
1347 | |
| 11033 | 1348 | gaim_debug_info("socks4 proxy", "Connected.\n"); |
|
5211
94d9756c381f
[gaim-migrate @ 5581]
Christian Hammond <chipx86@chipx86.com>
parents:
4993
diff
changeset
|
1349 | |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1350 | if (phb->inpa > 0) |
|
2090
bab8b7e309db
[gaim-migrate @ 2100]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2048
diff
changeset
|
1351 | gaim_input_remove(phb->inpa); |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1352 | |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1353 | len = sizeof(error); |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1354 | |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1355 | if (getsockopt(source, SOL_SOCKET, SO_ERROR, &error, &len) < 0) { |
|
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1356 | close(source); |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1357 | |
| 9129 | 1358 | try_connect(phb); |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1359 | return; |
|
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1360 | } |
|
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1361 | fcntl(source, F_SETFL, 0); |
|
3717
2fc0789e04e8
[gaim-migrate @ 3850]
Herman Bloggs <herman@bluedigits.com>
parents:
3630
diff
changeset
|
1362 | |
| 10561 | 1363 | /* |
| 1364 | * The socks4 spec doesn't include support for doing host name | |
| 1365 | * lookups by the proxy. Some socks4 servers do this via | |
| 1366 | * extensions to the protocol. Since we don't know if a | |
| 1367 | * server supports this, it would need to be implemented | |
| 1368 | * with an option, or some detection mechanism - in the | |
| 1369 | * meantime, stick with plain old SOCKS4. | |
| 1370 | */ | |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1371 | if (!(hp = gethostbyname(phb->host))) { |
|
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1372 | close(source); |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1373 | |
| 9129 | 1374 | try_connect(phb); |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1375 | return; |
|
1087
bc9c6b635358
[gaim-migrate @ 1097]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1057
diff
changeset
|
1376 | } |
|
bc9c6b635358
[gaim-migrate @ 1097]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1057
diff
changeset
|
1377 | |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1378 | packet[0] = 4; |
|
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1379 | packet[1] = 1; |
|
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1380 | packet[2] = phb->port >> 8; |
|
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1381 | packet[3] = phb->port & 0xff; |
|
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1382 | packet[4] = (unsigned char)(hp->h_addr_list[0])[0]; |
|
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1383 | packet[5] = (unsigned char)(hp->h_addr_list[0])[1]; |
|
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1384 | packet[6] = (unsigned char)(hp->h_addr_list[0])[2]; |
|
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1385 | packet[7] = (unsigned char)(hp->h_addr_list[0])[3]; |
|
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1386 | packet[8] = 0; |
|
3717
2fc0789e04e8
[gaim-migrate @ 3850]
Herman Bloggs <herman@bluedigits.com>
parents:
3630
diff
changeset
|
1387 | |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1388 | if (write(source, packet, 9) != 9) { |
|
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1389 | close(source); |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1390 | |
| 9129 | 1391 | try_connect(phb); |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1392 | return; |
|
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1393 | } |
|
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1394 | |
|
2090
bab8b7e309db
[gaim-migrate @ 2100]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2048
diff
changeset
|
1395 | phb->inpa = gaim_input_add(source, GAIM_INPUT_READ, s4_canread, phb); |
| 1 | 1396 | } |
| 1397 | ||
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1398 | static int |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1399 | proxy_connect_socks4(struct PHB *phb, struct sockaddr *addr, socklen_t addrlen) |
| 1 | 1400 | { |
|
1087
bc9c6b635358
[gaim-migrate @ 1097]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1057
diff
changeset
|
1401 | int fd = -1; |
| 1 | 1402 | |
|
10309
073906008cb2
[gaim-migrate @ 11501]
Mark Doliner <markdoliner@pidgin.im>
parents:
10307
diff
changeset
|
1403 | gaim_debug_info("socks4 proxy", |
|
5211
94d9756c381f
[gaim-migrate @ 5581]
Christian Hammond <chipx86@chipx86.com>
parents:
4993
diff
changeset
|
1404 | "Connecting to %s:%d via %s:%d using SOCKS4\n", |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1405 | phb->host, phb->port, |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1406 | gaim_proxy_info_get_host(phb->gpi), |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1407 | gaim_proxy_info_get_port(phb->gpi)); |
| 1 | 1408 | |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1409 | if ((fd = socket(addr->sa_family, SOCK_STREAM, 0)) < 0) |
|
1087
bc9c6b635358
[gaim-migrate @ 1097]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1057
diff
changeset
|
1410 | return -1; |
| 1 | 1411 | |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1412 | fcntl(fd, F_SETFL, O_NONBLOCK); |
|
10172
8400788b226c
[gaim-migrate @ 11275]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10170
diff
changeset
|
1413 | #ifndef _WIN32 |
| 10170 | 1414 | fcntl(fd, F_SETFD, FD_CLOEXEC); |
|
10172
8400788b226c
[gaim-migrate @ 11275]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10170
diff
changeset
|
1415 | #endif |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1416 | |
|
4366
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
1417 | if (connect(fd, addr, addrlen) < 0) { |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1418 | if ((errno == EINPROGRESS) || (errno == EINTR)) { |
|
10309
073906008cb2
[gaim-migrate @ 11501]
Mark Doliner <markdoliner@pidgin.im>
parents:
10307
diff
changeset
|
1419 | gaim_debug_warning("socks4 proxy", |
|
5211
94d9756c381f
[gaim-migrate @ 5581]
Christian Hammond <chipx86@chipx86.com>
parents:
4993
diff
changeset
|
1420 | "Connect would have blocked.\n"); |
|
2090
bab8b7e309db
[gaim-migrate @ 2100]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2048
diff
changeset
|
1421 | phb->inpa = gaim_input_add(fd, GAIM_INPUT_WRITE, s4_canwrite, phb); |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1422 | } |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1423 | else { |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1424 | close(fd); |
|
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1425 | return -1; |
|
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1426 | } |
|
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1427 | } else { |
|
2048
4ac8b9622c9e
[gaim-migrate @ 2058]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1881
diff
changeset
|
1428 | unsigned int len; |
|
4ac8b9622c9e
[gaim-migrate @ 2058]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1881
diff
changeset
|
1429 | int error = ETIMEDOUT; |
|
3717
2fc0789e04e8
[gaim-migrate @ 3850]
Herman Bloggs <herman@bluedigits.com>
parents:
3630
diff
changeset
|
1430 | |
|
10309
073906008cb2
[gaim-migrate @ 11501]
Mark Doliner <markdoliner@pidgin.im>
parents:
10307
diff
changeset
|
1431 | gaim_debug_misc("socks4 proxy", |
|
5211
94d9756c381f
[gaim-migrate @ 5581]
Christian Hammond <chipx86@chipx86.com>
parents:
4993
diff
changeset
|
1432 | "Connect didn't block.\n"); |
|
94d9756c381f
[gaim-migrate @ 5581]
Christian Hammond <chipx86@chipx86.com>
parents:
4993
diff
changeset
|
1433 | |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1434 | len = sizeof(error); |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1435 | |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1436 | if (getsockopt(fd, SOL_SOCKET, SO_ERROR, &error, &len) < 0) { |
|
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1437 | close(fd); |
|
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1438 | return -1; |
|
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1439 | } |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1440 | |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1441 | fcntl(fd, F_SETFL, 0); |
|
2090
bab8b7e309db
[gaim-migrate @ 2100]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2048
diff
changeset
|
1442 | s4_canwrite(phb, fd, GAIM_INPUT_WRITE); |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1443 | } |
|
670
1690e6b432ae
[gaim-migrate @ 680]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
664
diff
changeset
|
1444 | |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1445 | return fd; |
|
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1446 | } |
|
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1447 | |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1448 | static void |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1449 | s5_canread_again(gpointer data, gint source, GaimInputCondition cond) |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1450 | { |
|
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1451 | unsigned char buf[512]; |
|
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1452 | struct PHB *phb = data; |
|
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1453 | |
|
2090
bab8b7e309db
[gaim-migrate @ 2100]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2048
diff
changeset
|
1454 | gaim_input_remove(phb->inpa); |
|
10309
073906008cb2
[gaim-migrate @ 11501]
Mark Doliner <markdoliner@pidgin.im>
parents:
10307
diff
changeset
|
1455 | gaim_debug_info("socks5 proxy", "Able to read again.\n"); |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1456 | |
| 8262 | 1457 | if (read(source, buf, 4) < 4) { |
|
10309
073906008cb2
[gaim-migrate @ 11501]
Mark Doliner <markdoliner@pidgin.im>
parents:
10307
diff
changeset
|
1458 | gaim_debug_warning("socks5 proxy", "or not...\n"); |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1459 | close(source); |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1460 | |
| 9129 | 1461 | try_connect(phb); |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1462 | return; |
|
1087
bc9c6b635358
[gaim-migrate @ 1097]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1057
diff
changeset
|
1463 | } |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1464 | if ((buf[0] != 0x05) || (buf[1] != 0x00)) { |
|
7982
db8c1b6137eb
[gaim-migrate @ 8659]
Gavan Fantom <gavan@users.sourceforge.net>
parents:
7834
diff
changeset
|
1465 | if ((buf[0] == 0x05) && (buf[1] < 0x09)) |
|
10309
073906008cb2
[gaim-migrate @ 11501]
Mark Doliner <markdoliner@pidgin.im>
parents:
10307
diff
changeset
|
1466 | gaim_debug_error("socks5 proxy", socks5errors[buf[1]]); |
|
7982
db8c1b6137eb
[gaim-migrate @ 8659]
Gavan Fantom <gavan@users.sourceforge.net>
parents:
7834
diff
changeset
|
1467 | else |
|
10309
073906008cb2
[gaim-migrate @ 11501]
Mark Doliner <markdoliner@pidgin.im>
parents:
10307
diff
changeset
|
1468 | gaim_debug_error("socks5 proxy", "Bad data.\n"); |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1469 | close(source); |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1470 | |
| 9129 | 1471 | try_connect(phb); |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1472 | return; |
|
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1473 | } |
|
670
1690e6b432ae
[gaim-migrate @ 680]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
664
diff
changeset
|
1474 | |
| 8262 | 1475 | /* Skip past BND.ADDR */ |
| 1476 | switch(buf[3]) { | |
| 1477 | case 0x01: /* the address is a version-4 IP address, with a length of 4 octets */ | |
| 8269 | 1478 | read(source, buf, 4); |
| 8262 | 1479 | break; |
| 1480 | case 0x03: /* the address field contains a fully-qualified domain name. The first | |
| 1481 | octet of the address field contains the number of octets of name that | |
| 1482 | follow, there is no terminating NUL octet. */ | |
| 8269 | 1483 | read(source, buf, 1); |
| 1484 | read(source, buf, buf[0]); | |
| 8262 | 1485 | break; |
| 1486 | case 0x04: /* the address is a version-6 IP address, with a length of 16 octets */ | |
| 8269 | 1487 | read(source, buf, 16); |
| 8262 | 1488 | break; |
| 1489 | } | |
| 1490 | ||
| 1491 | /* Skip past BND.PORT */ | |
| 8269 | 1492 | read(source, buf, 2); |
| 8262 | 1493 | |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1494 | if (phb->account == NULL || |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1495 | gaim_account_get_connection(phb->account) != NULL) { |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1496 | |
| 4993 | 1497 | phb->func(phb->data, source, GAIM_INPUT_READ); |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1498 | } |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1499 | |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1500 | g_free(phb->host); |
|
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1501 | g_free(phb); |
| 1 | 1502 | } |
| 1503 | ||
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1504 | static void |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1505 | s5_sendconnect(gpointer data, gint source) |
|
1087
bc9c6b635358
[gaim-migrate @ 1097]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1057
diff
changeset
|
1506 | { |
|
bc9c6b635358
[gaim-migrate @ 1097]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1057
diff
changeset
|
1507 | unsigned char buf[512]; |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1508 | struct PHB *phb = data; |
|
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1509 | int hlen = strlen(phb->host); |
|
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1510 | |
|
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1511 | buf[0] = 0x05; |
|
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1512 | buf[1] = 0x01; /* CONNECT */ |
|
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1513 | buf[2] = 0x00; /* reserved */ |
|
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1514 | buf[3] = 0x03; /* address type -- host name */ |
|
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1515 | buf[4] = hlen; |
|
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1516 | memcpy(buf + 5, phb->host, hlen); |
| 10561 | 1517 | buf[5 + hlen] = phb->port >> 8; |
| 1518 | buf[5 + hlen + 1] = phb->port & 0xff; | |
|
1087
bc9c6b635358
[gaim-migrate @ 1097]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1057
diff
changeset
|
1519 | |
| 10561 | 1520 | if (write(source, buf, (5 + hlen + 2)) < (5 + hlen + 2)) { |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1521 | close(source); |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1522 | |
| 9129 | 1523 | try_connect(phb); |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1524 | return; |
|
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1525 | } |
|
1087
bc9c6b635358
[gaim-migrate @ 1097]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1057
diff
changeset
|
1526 | |
|
2090
bab8b7e309db
[gaim-migrate @ 2100]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2048
diff
changeset
|
1527 | phb->inpa = gaim_input_add(source, GAIM_INPUT_READ, s5_canread_again, phb); |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1528 | } |
|
1087
bc9c6b635358
[gaim-migrate @ 1097]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1057
diff
changeset
|
1529 | |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1530 | static void |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1531 | s5_readauth(gpointer data, gint source, GaimInputCondition cond) |
|
1844
161c00c36474
[gaim-migrate @ 1854]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1843
diff
changeset
|
1532 | { |
|
161c00c36474
[gaim-migrate @ 1854]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1843
diff
changeset
|
1533 | unsigned char buf[512]; |
|
161c00c36474
[gaim-migrate @ 1854]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1843
diff
changeset
|
1534 | struct PHB *phb = data; |
|
161c00c36474
[gaim-migrate @ 1854]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1843
diff
changeset
|
1535 | |
|
2090
bab8b7e309db
[gaim-migrate @ 2100]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2048
diff
changeset
|
1536 | gaim_input_remove(phb->inpa); |
|
10309
073906008cb2
[gaim-migrate @ 11501]
Mark Doliner <markdoliner@pidgin.im>
parents:
10307
diff
changeset
|
1537 | gaim_debug_info("socks5 proxy", "Got auth response.\n"); |
|
1844
161c00c36474
[gaim-migrate @ 1854]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1843
diff
changeset
|
1538 | |
|
161c00c36474
[gaim-migrate @ 1854]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1843
diff
changeset
|
1539 | if (read(source, buf, 2) < 2) { |
|
161c00c36474
[gaim-migrate @ 1854]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1843
diff
changeset
|
1540 | close(source); |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1541 | |
| 9129 | 1542 | try_connect(phb); |
|
1844
161c00c36474
[gaim-migrate @ 1854]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1843
diff
changeset
|
1543 | return; |
|
161c00c36474
[gaim-migrate @ 1854]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1843
diff
changeset
|
1544 | } |
|
161c00c36474
[gaim-migrate @ 1854]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1843
diff
changeset
|
1545 | |
| 2790 | 1546 | if ((buf[0] != 0x01) || (buf[1] != 0x00)) { |
|
1844
161c00c36474
[gaim-migrate @ 1854]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1843
diff
changeset
|
1547 | close(source); |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1548 | |
| 9129 | 1549 | try_connect(phb); |
|
1844
161c00c36474
[gaim-migrate @ 1854]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1843
diff
changeset
|
1550 | return; |
|
161c00c36474
[gaim-migrate @ 1854]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1843
diff
changeset
|
1551 | } |
|
161c00c36474
[gaim-migrate @ 1854]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1843
diff
changeset
|
1552 | |
|
161c00c36474
[gaim-migrate @ 1854]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1843
diff
changeset
|
1553 | s5_sendconnect(phb, source); |
|
161c00c36474
[gaim-migrate @ 1854]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1843
diff
changeset
|
1554 | } |
|
161c00c36474
[gaim-migrate @ 1854]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1843
diff
changeset
|
1555 | |
| 10561 | 1556 | static void hmacmd5_chap(const unsigned char * challenge, int challen, const char * passwd, unsigned char * response) |
| 1557 | { | |
|
10684
0325b164a7eb
[gaim-migrate @ 12231]
Luke Schierer <lschiere@pidgin.im>
parents:
10626
diff
changeset
|
1558 | GaimCipher *cipher; |
|
0325b164a7eb
[gaim-migrate @ 12231]
Luke Schierer <lschiere@pidgin.im>
parents:
10626
diff
changeset
|
1559 | GaimCipherContext *ctx; |
| 10561 | 1560 | int i; |
| 1561 | unsigned char Kxoripad[65]; | |
| 1562 | unsigned char Kxoropad[65]; | |
| 1563 | int pwlen; | |
| 1564 | ||
|
10684
0325b164a7eb
[gaim-migrate @ 12231]
Luke Schierer <lschiere@pidgin.im>
parents:
10626
diff
changeset
|
1565 | cipher = gaim_ciphers_find_cipher("md5"); |
|
0325b164a7eb
[gaim-migrate @ 12231]
Luke Schierer <lschiere@pidgin.im>
parents:
10626
diff
changeset
|
1566 | ctx = gaim_cipher_context_new(cipher, NULL); |
|
0325b164a7eb
[gaim-migrate @ 12231]
Luke Schierer <lschiere@pidgin.im>
parents:
10626
diff
changeset
|
1567 | |
|
12765
0c1580860d16
[gaim-migrate @ 15112]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
12758
diff
changeset
|
1568 | memset(Kxoripad,0,sizeof(Kxoripad)); |
|
0c1580860d16
[gaim-migrate @ 15112]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
12758
diff
changeset
|
1569 | memset(Kxoropad,0,sizeof(Kxoropad)); |
|
0c1580860d16
[gaim-migrate @ 15112]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
12758
diff
changeset
|
1570 | |
| 10561 | 1571 | pwlen=strlen(passwd); |
| 1572 | if (pwlen>64) { | |
|
11183
be87fe695c93
[gaim-migrate @ 13295]
Mark Doliner <markdoliner@pidgin.im>
parents:
11143
diff
changeset
|
1573 | gaim_cipher_context_append(ctx, (const guchar *)passwd, strlen(passwd)); |
|
12765
0c1580860d16
[gaim-migrate @ 15112]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
12758
diff
changeset
|
1574 | gaim_cipher_context_digest(ctx, sizeof(Kxoripad), Kxoripad, NULL); |
| 10561 | 1575 | pwlen=16; |
|
12765
0c1580860d16
[gaim-migrate @ 15112]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
12758
diff
changeset
|
1576 | } else { |
|
0c1580860d16
[gaim-migrate @ 15112]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
12758
diff
changeset
|
1577 | memcpy(Kxoripad, passwd, pwlen); |
| 10561 | 1578 | } |
|
12765
0c1580860d16
[gaim-migrate @ 15112]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
12758
diff
changeset
|
1579 | memcpy(Kxoropad,Kxoripad,pwlen); |
| 10561 | 1580 | |
| 1581 | for (i=0;i<64;i++) { | |
| 1582 | Kxoripad[i]^=0x36; | |
| 1583 | Kxoropad[i]^=0x5c; | |
| 1584 | } | |
|
10684
0325b164a7eb
[gaim-migrate @ 12231]
Luke Schierer <lschiere@pidgin.im>
parents:
10626
diff
changeset
|
1585 | |
|
0325b164a7eb
[gaim-migrate @ 12231]
Luke Schierer <lschiere@pidgin.im>
parents:
10626
diff
changeset
|
1586 | gaim_cipher_context_reset(ctx, NULL); |
|
0325b164a7eb
[gaim-migrate @ 12231]
Luke Schierer <lschiere@pidgin.im>
parents:
10626
diff
changeset
|
1587 | gaim_cipher_context_append(ctx, Kxoripad, 64); |
|
0325b164a7eb
[gaim-migrate @ 12231]
Luke Schierer <lschiere@pidgin.im>
parents:
10626
diff
changeset
|
1588 | gaim_cipher_context_append(ctx, challenge, challen); |
| 10687 | 1589 | gaim_cipher_context_digest(ctx, sizeof(Kxoripad), Kxoripad, NULL); |
| 10561 | 1590 | |
|
10684
0325b164a7eb
[gaim-migrate @ 12231]
Luke Schierer <lschiere@pidgin.im>
parents:
10626
diff
changeset
|
1591 | gaim_cipher_context_reset(ctx, NULL); |
|
0325b164a7eb
[gaim-migrate @ 12231]
Luke Schierer <lschiere@pidgin.im>
parents:
10626
diff
changeset
|
1592 | gaim_cipher_context_append(ctx, Kxoropad, 64); |
|
0325b164a7eb
[gaim-migrate @ 12231]
Luke Schierer <lschiere@pidgin.im>
parents:
10626
diff
changeset
|
1593 | gaim_cipher_context_append(ctx, Kxoripad, 16); |
|
12765
0c1580860d16
[gaim-migrate @ 15112]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
12758
diff
changeset
|
1594 | gaim_cipher_context_digest(ctx, 16, response, NULL); |
|
10684
0325b164a7eb
[gaim-migrate @ 12231]
Luke Schierer <lschiere@pidgin.im>
parents:
10626
diff
changeset
|
1595 | |
|
0325b164a7eb
[gaim-migrate @ 12231]
Luke Schierer <lschiere@pidgin.im>
parents:
10626
diff
changeset
|
1596 | gaim_cipher_context_destroy(ctx); |
| 10561 | 1597 | } |
| 1598 | ||
| 1599 | static void | |
| 1600 | s5_readchap(gpointer data, gint source, GaimInputCondition cond) | |
| 1601 | { | |
| 1602 | unsigned char buf[260]; | |
| 1603 | unsigned char cmdbuf[20]; | |
| 1604 | struct PHB *phb = data; | |
| 1605 | ||
| 1606 | int navas, currentav; | |
| 1607 | ||
| 1608 | gaim_input_remove(phb->inpa); | |
| 1609 | gaim_debug(GAIM_DEBUG_INFO, "socks5 proxy", "Got CHAP response.\n"); | |
| 1610 | ||
| 1611 | if (read(source, cmdbuf, 2) < 2) { | |
| 1612 | close(source); | |
| 1613 | ||
| 1614 | try_connect(phb); | |
| 1615 | return; | |
| 1616 | } | |
| 1617 | ||
| 1618 | if (cmdbuf[0] != 0x01) { | |
| 1619 | close(source); | |
| 1620 | ||
| 1621 | try_connect(phb); | |
| 1622 | return; | |
| 1623 | } | |
| 1624 | ||
| 1625 | navas = cmdbuf[1]; | |
| 1626 | ||
| 1627 | for (currentav = 0; currentav < navas; currentav++) { | |
| 1628 | if (read(source, cmdbuf, 2) < 2) { | |
| 1629 | close(source); | |
| 1630 | ||
| 1631 | try_connect(phb); | |
| 1632 | return; | |
| 1633 | } | |
| 1634 | if (read(source, buf, cmdbuf[1]) < cmdbuf[1]) { | |
| 1635 | close(source); | |
| 1636 | ||
| 1637 | try_connect(phb); | |
| 1638 | return; | |
| 1639 | } | |
| 1640 | switch (cmdbuf[0]) { | |
| 1641 | case 0x00: | |
| 1642 | /* Did auth work? */ | |
| 1643 | if (buf[0] == 0x00) { | |
| 1644 | /* Success */ | |
|
10613
33c94d9a9e89
[gaim-migrate @ 12072]
Torrey McMahon <tmcmahon2@users.sourceforge.net>
parents:
10562
diff
changeset
|
1645 | s5_sendconnect(phb, source); |
|
33c94d9a9e89
[gaim-migrate @ 12072]
Torrey McMahon <tmcmahon2@users.sourceforge.net>
parents:
10562
diff
changeset
|
1646 | return; |
| 10561 | 1647 | } else { |
| 1648 | /* Failure */ | |
| 1649 | gaim_debug_warning("proxy", "socks5 CHAP authentication " | |
| 1650 | "failed. Disconnecting..."); | |
| 1651 | close(source); | |
| 1652 | ||
| 1653 | try_connect(phb); | |
| 1654 | return; | |
| 1655 | } | |
| 1656 | break; | |
| 1657 | case 0x03: | |
| 1658 | /* Server wants our credentials */ | |
| 1659 | hmacmd5_chap(buf, cmdbuf[1], | |
| 1660 | gaim_proxy_info_get_password(phb->gpi), | |
| 1661 | buf + 4); | |
| 1662 | buf[0] = 0x01; | |
| 1663 | buf[1] = 0x01; | |
| 1664 | buf[2] = 0x04; | |
| 1665 | buf[3] = 0x10; | |
| 1666 | if (write(source, buf, 20) < 20) { | |
| 1667 | close(source); | |
| 1668 | ||
| 1669 | try_connect(phb); | |
| 1670 | return; | |
| 1671 | } | |
| 1672 | break; | |
| 1673 | case 0x11: | |
| 1674 | /* Server wants to select an algorithm */ | |
| 1675 | if (buf[0] != 0x85) { | |
| 1676 | /* Only currently support HMAC-MD5 */ | |
| 1677 | gaim_debug_warning("proxy", "Server tried to select an " | |
| 1678 | "algorithm that we did not advertise " | |
| 1679 | "as supporting. This is a violation " | |
| 1680 | "of the socks5 CHAP specification. " | |
| 1681 | "Disconnecting..."); | |
| 1682 | close(source); | |
| 1683 | ||
| 1684 | try_connect(phb); | |
| 1685 | return; | |
| 1686 | } | |
| 1687 | break; | |
| 1688 | } | |
| 1689 | } | |
| 1690 | /* Fell through. We ran out of CHAP events to process, but haven't | |
| 1691 | * succeeded or failed authentication - there may be more to come. | |
| 1692 | * If this is the case, come straight back here. */ | |
| 1693 | phb->inpa = gaim_input_add(source, GAIM_INPUT_READ, s5_readchap, phb); | |
| 1694 | } | |
| 1695 | ||
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1696 | static void |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1697 | s5_canread(gpointer data, gint source, GaimInputCondition cond) |
|
1844
161c00c36474
[gaim-migrate @ 1854]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1843
diff
changeset
|
1698 | { |
|
161c00c36474
[gaim-migrate @ 1854]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1843
diff
changeset
|
1699 | unsigned char buf[512]; |
|
161c00c36474
[gaim-migrate @ 1854]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1843
diff
changeset
|
1700 | struct PHB *phb = data; |
|
161c00c36474
[gaim-migrate @ 1854]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1843
diff
changeset
|
1701 | |
|
2090
bab8b7e309db
[gaim-migrate @ 2100]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2048
diff
changeset
|
1702 | gaim_input_remove(phb->inpa); |
|
10309
073906008cb2
[gaim-migrate @ 11501]
Mark Doliner <markdoliner@pidgin.im>
parents:
10307
diff
changeset
|
1703 | gaim_debug_info("socks5 proxy", "Able to read.\n"); |
|
1844
161c00c36474
[gaim-migrate @ 1854]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1843
diff
changeset
|
1704 | |
|
161c00c36474
[gaim-migrate @ 1854]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1843
diff
changeset
|
1705 | if (read(source, buf, 2) < 2) { |
|
161c00c36474
[gaim-migrate @ 1854]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1843
diff
changeset
|
1706 | close(source); |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1707 | |
| 9129 | 1708 | try_connect(phb); |
|
1844
161c00c36474
[gaim-migrate @ 1854]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1843
diff
changeset
|
1709 | return; |
|
161c00c36474
[gaim-migrate @ 1854]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1843
diff
changeset
|
1710 | } |
|
161c00c36474
[gaim-migrate @ 1854]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1843
diff
changeset
|
1711 | |
|
161c00c36474
[gaim-migrate @ 1854]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1843
diff
changeset
|
1712 | if ((buf[0] != 0x05) || (buf[1] == 0xff)) { |
|
161c00c36474
[gaim-migrate @ 1854]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1843
diff
changeset
|
1713 | close(source); |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1714 | |
| 9129 | 1715 | try_connect(phb); |
|
1844
161c00c36474
[gaim-migrate @ 1854]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1843
diff
changeset
|
1716 | return; |
|
161c00c36474
[gaim-migrate @ 1854]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1843
diff
changeset
|
1717 | } |
|
161c00c36474
[gaim-migrate @ 1854]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1843
diff
changeset
|
1718 | |
|
161c00c36474
[gaim-migrate @ 1854]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1843
diff
changeset
|
1719 | if (buf[1] == 0x02) { |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1720 | unsigned int i, j; |
|
10912
ec7c127a435b
[gaim-migrate @ 12667]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10711
diff
changeset
|
1721 | const char *u, *p; |
| 9129 | 1722 | |
|
10912
ec7c127a435b
[gaim-migrate @ 12667]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10711
diff
changeset
|
1723 | u = gaim_proxy_info_get_username(phb->gpi); |
|
ec7c127a435b
[gaim-migrate @ 12667]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10711
diff
changeset
|
1724 | p = gaim_proxy_info_get_password(phb->gpi); |
|
ec7c127a435b
[gaim-migrate @ 12667]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10711
diff
changeset
|
1725 | |
|
ec7c127a435b
[gaim-migrate @ 12667]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10711
diff
changeset
|
1726 | i = (u == NULL) ? 0 : strlen(u); |
|
ec7c127a435b
[gaim-migrate @ 12667]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10711
diff
changeset
|
1727 | j = (p == NULL) ? 0 : strlen(p); |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1728 | |
|
2372
c24942700dfd
[gaim-migrate @ 2385]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2306
diff
changeset
|
1729 | buf[0] = 0x01; /* version 1 */ |
|
1844
161c00c36474
[gaim-migrate @ 1854]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1843
diff
changeset
|
1730 | buf[1] = i; |
|
10917
f32ea2da503b
[gaim-migrate @ 12678]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10912
diff
changeset
|
1731 | if (u != NULL) |
|
f32ea2da503b
[gaim-migrate @ 12678]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10912
diff
changeset
|
1732 | memcpy(buf + 2, u, i); |
|
2372
c24942700dfd
[gaim-migrate @ 2385]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2306
diff
changeset
|
1733 | buf[2 + i] = j; |
|
10917
f32ea2da503b
[gaim-migrate @ 12678]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10912
diff
changeset
|
1734 | if (p != NULL) |
|
f32ea2da503b
[gaim-migrate @ 12678]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10912
diff
changeset
|
1735 | memcpy(buf + 2 + i + 1, p, j); |
|
3717
2fc0789e04e8
[gaim-migrate @ 3850]
Herman Bloggs <herman@bluedigits.com>
parents:
3630
diff
changeset
|
1736 | |
|
2372
c24942700dfd
[gaim-migrate @ 2385]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2306
diff
changeset
|
1737 | if (write(source, buf, 3 + i + j) < 3 + i + j) { |
|
1844
161c00c36474
[gaim-migrate @ 1854]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1843
diff
changeset
|
1738 | close(source); |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1739 | |
| 9129 | 1740 | try_connect(phb); |
|
1844
161c00c36474
[gaim-migrate @ 1854]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1843
diff
changeset
|
1741 | return; |
|
161c00c36474
[gaim-migrate @ 1854]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1843
diff
changeset
|
1742 | } |
|
161c00c36474
[gaim-migrate @ 1854]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1843
diff
changeset
|
1743 | |
|
2090
bab8b7e309db
[gaim-migrate @ 2100]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2048
diff
changeset
|
1744 | phb->inpa = gaim_input_add(source, GAIM_INPUT_READ, s5_readauth, phb); |
| 10561 | 1745 | } else if (buf[1] == 0x03) { |
| 1746 | unsigned int userlen; | |
| 1747 | userlen = strlen(gaim_proxy_info_get_username(phb->gpi)); | |
| 1748 | buf[0] = 0x01; | |
| 1749 | buf[1] = 0x02; | |
| 1750 | buf[2] = 0x11; | |
| 1751 | buf[3] = 0x01; | |
| 1752 | buf[4] = 0x85; | |
| 1753 | buf[5] = 0x02; | |
| 1754 | buf[6] = userlen; | |
| 1755 | memcpy(buf + 7, gaim_proxy_info_get_username(phb->gpi), userlen); | |
| 1756 | if (write(source, buf, 7 + userlen) < 7 + userlen) { | |
| 1757 | close(source); | |
| 1758 | ||
| 1759 | try_connect(phb); | |
| 1760 | return; | |
| 1761 | } | |
| 1762 | ||
| 1763 | phb->inpa = gaim_input_add(source, GAIM_INPUT_READ, s5_readchap, phb); | |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1764 | } |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1765 | else { |
|
1844
161c00c36474
[gaim-migrate @ 1854]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1843
diff
changeset
|
1766 | s5_sendconnect(phb, source); |
|
161c00c36474
[gaim-migrate @ 1854]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1843
diff
changeset
|
1767 | } |
|
161c00c36474
[gaim-migrate @ 1854]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1843
diff
changeset
|
1768 | } |
|
161c00c36474
[gaim-migrate @ 1854]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1843
diff
changeset
|
1769 | |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1770 | static void |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1771 | s5_canwrite(gpointer data, gint source, GaimInputCondition cond) |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1772 | { |
|
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1773 | unsigned char buf[512]; |
|
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1774 | int i; |
|
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1775 | struct PHB *phb = data; |
|
2048
4ac8b9622c9e
[gaim-migrate @ 2058]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1881
diff
changeset
|
1776 | unsigned int len; |
|
4ac8b9622c9e
[gaim-migrate @ 2058]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1881
diff
changeset
|
1777 | int error = ETIMEDOUT; |
|
3717
2fc0789e04e8
[gaim-migrate @ 3850]
Herman Bloggs <herman@bluedigits.com>
parents:
3630
diff
changeset
|
1778 | |
|
10309
073906008cb2
[gaim-migrate @ 11501]
Mark Doliner <markdoliner@pidgin.im>
parents:
10307
diff
changeset
|
1779 | gaim_debug_info("socks5 proxy", "Connected.\n"); |
|
5211
94d9756c381f
[gaim-migrate @ 5581]
Christian Hammond <chipx86@chipx86.com>
parents:
4993
diff
changeset
|
1780 | |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1781 | if (phb->inpa > 0) |
|
2090
bab8b7e309db
[gaim-migrate @ 2100]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2048
diff
changeset
|
1782 | gaim_input_remove(phb->inpa); |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1783 | |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1784 | len = sizeof(error); |
|
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1785 | if (getsockopt(source, SOL_SOCKET, SO_ERROR, &error, &len) < 0) { |
|
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1786 | close(source); |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1787 | |
| 9129 | 1788 | try_connect(phb); |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1789 | return; |
|
1087
bc9c6b635358
[gaim-migrate @ 1097]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1057
diff
changeset
|
1790 | } |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1791 | fcntl(source, F_SETFL, 0); |
|
1087
bc9c6b635358
[gaim-migrate @ 1097]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1057
diff
changeset
|
1792 | |
|
bc9c6b635358
[gaim-migrate @ 1097]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1057
diff
changeset
|
1793 | i = 0; |
|
1252
94fbface2d84
[gaim-migrate @ 1262]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1087
diff
changeset
|
1794 | buf[0] = 0x05; /* SOCKS version 5 */ |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1795 | |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1796 | if (gaim_proxy_info_get_username(phb->gpi) != NULL) { |
| 10561 | 1797 | buf[1] = 0x03; /* three methods */ |
|
1844
161c00c36474
[gaim-migrate @ 1854]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1843
diff
changeset
|
1798 | buf[2] = 0x00; /* no authentication */ |
| 10561 | 1799 | buf[3] = 0x03; /* CHAP authentication */ |
| 1800 | buf[4] = 0x02; /* username/password authentication */ | |
| 1801 | i = 5; | |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1802 | } |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1803 | else { |
|
1844
161c00c36474
[gaim-migrate @ 1854]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1843
diff
changeset
|
1804 | buf[1] = 0x01; |
|
161c00c36474
[gaim-migrate @ 1854]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1843
diff
changeset
|
1805 | buf[2] = 0x00; |
|
161c00c36474
[gaim-migrate @ 1854]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1843
diff
changeset
|
1806 | i = 3; |
|
161c00c36474
[gaim-migrate @ 1854]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1843
diff
changeset
|
1807 | } |
|
3717
2fc0789e04e8
[gaim-migrate @ 3850]
Herman Bloggs <herman@bluedigits.com>
parents:
3630
diff
changeset
|
1808 | |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1809 | if (write(source, buf, i) < i) { |
|
10309
073906008cb2
[gaim-migrate @ 11501]
Mark Doliner <markdoliner@pidgin.im>
parents:
10307
diff
changeset
|
1810 | gaim_debug_error("socks5 proxy", "Unable to write\n"); |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1811 | close(source); |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1812 | |
| 9129 | 1813 | try_connect(phb); |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1814 | return; |
|
1087
bc9c6b635358
[gaim-migrate @ 1097]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1057
diff
changeset
|
1815 | } |
|
bc9c6b635358
[gaim-migrate @ 1097]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1057
diff
changeset
|
1816 | |
|
2090
bab8b7e309db
[gaim-migrate @ 2100]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2048
diff
changeset
|
1817 | phb->inpa = gaim_input_add(source, GAIM_INPUT_READ, s5_canread, phb); |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1818 | } |
|
1087
bc9c6b635358
[gaim-migrate @ 1097]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1057
diff
changeset
|
1819 | |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1820 | static int |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1821 | proxy_connect_socks5(struct PHB *phb, struct sockaddr *addr, socklen_t addrlen) |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1822 | { |
|
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1823 | int fd = -1; |
|
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1824 | |
|
10309
073906008cb2
[gaim-migrate @ 11501]
Mark Doliner <markdoliner@pidgin.im>
parents:
10307
diff
changeset
|
1825 | gaim_debug_info("socks5 proxy", |
|
5211
94d9756c381f
[gaim-migrate @ 5581]
Christian Hammond <chipx86@chipx86.com>
parents:
4993
diff
changeset
|
1826 | "Connecting to %s:%d via %s:%d using SOCKS5\n", |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1827 | phb->host, phb->port, |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1828 | gaim_proxy_info_get_host(phb->gpi), |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1829 | gaim_proxy_info_get_port(phb->gpi)); |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1830 | |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1831 | if ((fd = socket(addr->sa_family, SOCK_STREAM, 0)) < 0) |
|
1087
bc9c6b635358
[gaim-migrate @ 1097]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1057
diff
changeset
|
1832 | return -1; |
|
bc9c6b635358
[gaim-migrate @ 1097]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1057
diff
changeset
|
1833 | |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1834 | fcntl(fd, F_SETFL, O_NONBLOCK); |
|
10172
8400788b226c
[gaim-migrate @ 11275]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10170
diff
changeset
|
1835 | #ifndef _WIN32 |
| 10170 | 1836 | fcntl(fd, F_SETFD, FD_CLOEXEC); |
|
10172
8400788b226c
[gaim-migrate @ 11275]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10170
diff
changeset
|
1837 | #endif |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1838 | |
|
4366
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
1839 | if (connect(fd, addr, addrlen) < 0) { |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1840 | if ((errno == EINPROGRESS) || (errno == EINTR)) { |
|
10309
073906008cb2
[gaim-migrate @ 11501]
Mark Doliner <markdoliner@pidgin.im>
parents:
10307
diff
changeset
|
1841 | gaim_debug_warning("socks5 proxy", |
|
5211
94d9756c381f
[gaim-migrate @ 5581]
Christian Hammond <chipx86@chipx86.com>
parents:
4993
diff
changeset
|
1842 | "Connect would have blocked.\n"); |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1843 | |
|
2090
bab8b7e309db
[gaim-migrate @ 2100]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2048
diff
changeset
|
1844 | phb->inpa = gaim_input_add(fd, GAIM_INPUT_WRITE, s5_canwrite, phb); |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1845 | } |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1846 | else { |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1847 | close(fd); |
|
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1848 | return -1; |
|
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1849 | } |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1850 | } |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1851 | else { |
|
2048
4ac8b9622c9e
[gaim-migrate @ 2058]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1881
diff
changeset
|
1852 | unsigned int len; |
|
4ac8b9622c9e
[gaim-migrate @ 2058]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1881
diff
changeset
|
1853 | int error = ETIMEDOUT; |
|
3717
2fc0789e04e8
[gaim-migrate @ 3850]
Herman Bloggs <herman@bluedigits.com>
parents:
3630
diff
changeset
|
1854 | |
|
10309
073906008cb2
[gaim-migrate @ 11501]
Mark Doliner <markdoliner@pidgin.im>
parents:
10307
diff
changeset
|
1855 | gaim_debug_misc("socks5 proxy", |
|
5211
94d9756c381f
[gaim-migrate @ 5581]
Christian Hammond <chipx86@chipx86.com>
parents:
4993
diff
changeset
|
1856 | "Connect didn't block.\n"); |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1857 | |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1858 | len = sizeof(error); |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1859 | |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1860 | if (getsockopt(fd, SOL_SOCKET, SO_ERROR, &error, &len) < 0) { |
|
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1861 | close(fd); |
|
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1862 | return -1; |
|
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1863 | } |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1864 | |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1865 | fcntl(fd, F_SETFL, 0); |
|
2090
bab8b7e309db
[gaim-migrate @ 2100]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2048
diff
changeset
|
1866 | s5_canwrite(phb, fd, GAIM_INPUT_WRITE); |
|
1087
bc9c6b635358
[gaim-migrate @ 1097]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1057
diff
changeset
|
1867 | } |
|
bc9c6b635358
[gaim-migrate @ 1097]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1057
diff
changeset
|
1868 | |
|
bc9c6b635358
[gaim-migrate @ 1097]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1057
diff
changeset
|
1869 | return fd; |
|
bc9c6b635358
[gaim-migrate @ 1097]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1057
diff
changeset
|
1870 | } |
|
bc9c6b635358
[gaim-migrate @ 1097]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1057
diff
changeset
|
1871 | |
| 9129 | 1872 | static void try_connect(struct PHB *phb) |
|
4366
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
1873 | { |
| 4678 | 1874 | size_t addrlen; |
| 1875 | struct sockaddr *addr; | |
| 1876 | int ret = -1; | |
| 4634 | 1877 | |
| 9129 | 1878 | while (phb->hosts) { |
| 1879 | addrlen = GPOINTER_TO_INT(phb->hosts->data); | |
| 1880 | phb->hosts = g_slist_remove(phb->hosts, phb->hosts->data); | |
| 1881 | addr = phb->hosts->data; | |
| 1882 | phb->hosts = g_slist_remove(phb->hosts, phb->hosts->data); | |
|
4366
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
1883 | |
| 9129 | 1884 | switch (gaim_proxy_info_get_type(phb->gpi)) { |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1885 | case GAIM_PROXY_NONE: |
| 4678 | 1886 | ret = proxy_connect_none(phb, addr, addrlen); |
| 1887 | break; | |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1888 | |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1889 | case GAIM_PROXY_HTTP: |
| 4678 | 1890 | ret = proxy_connect_http(phb, addr, addrlen); |
| 1891 | break; | |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1892 | |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1893 | case GAIM_PROXY_SOCKS4: |
| 4678 | 1894 | ret = proxy_connect_socks4(phb, addr, addrlen); |
| 1895 | break; | |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1896 | |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1897 | case GAIM_PROXY_SOCKS5: |
| 4678 | 1898 | ret = proxy_connect_socks5(phb, addr, addrlen); |
| 1899 | break; | |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1900 | |
|
6621
2a18ef3e5224
[gaim-migrate @ 7145]
Robert McQueen <robot101@debian.org>
parents:
6320
diff
changeset
|
1901 | case GAIM_PROXY_USE_ENVVAR: |
|
2a18ef3e5224
[gaim-migrate @ 7145]
Robert McQueen <robot101@debian.org>
parents:
6320
diff
changeset
|
1902 | ret = proxy_connect_http(phb, addr, addrlen); |
|
2a18ef3e5224
[gaim-migrate @ 7145]
Robert McQueen <robot101@debian.org>
parents:
6320
diff
changeset
|
1903 | break; |
|
2a18ef3e5224
[gaim-migrate @ 7145]
Robert McQueen <robot101@debian.org>
parents:
6320
diff
changeset
|
1904 | |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1905 | default: |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1906 | break; |
| 4678 | 1907 | } |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1908 | |
| 9129 | 1909 | g_free(addr); |
| 1910 | ||
| 4678 | 1911 | if (ret > 0) |
|
4366
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
1912 | break; |
| 4678 | 1913 | } |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1914 | |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1915 | if (ret < 0) { |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1916 | if (phb->account == NULL || |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1917 | gaim_account_get_connection(phb->account) != NULL) { |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1918 | |
| 4993 | 1919 | phb->func(phb->data, -1, GAIM_INPUT_READ); |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1920 | } |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1921 | |
| 4678 | 1922 | g_free(phb->host); |
| 1923 | g_free(phb); | |
|
4366
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
1924 | } |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
1925 | } |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
1926 | |
| 9129 | 1927 | static void |
| 1928 | connection_host_resolved(GSList *hosts, gpointer data, | |
| 1929 | const char *error_message) | |
| 1930 | { | |
| 1931 | struct PHB *phb = (struct PHB*)data; | |
| 1932 | ||
| 1933 | phb->hosts = hosts; | |
| 1934 | ||
| 1935 | try_connect(phb); | |
| 1936 | } | |
| 1937 | ||
| 4452 | 1938 | int |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1939 | gaim_proxy_connect(GaimAccount *account, const char *host, int port, |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1940 | GaimInputFunction func, gpointer data) |
|
1087
bc9c6b635358
[gaim-migrate @ 1097]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1057
diff
changeset
|
1941 | { |
|
5580
a5a3e6dfb409
[gaim-migrate @ 5984]
Christian Hammond <chipx86@chipx86.com>
parents:
5572
diff
changeset
|
1942 | const char *connecthost = host; |
|
4366
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
1943 | int connectport = port; |
|
6040
ab00305db747
[gaim-migrate @ 6490]
Mark Doliner <markdoliner@pidgin.im>
parents:
6017
diff
changeset
|
1944 | struct PHB *phb; |
|
6621
2a18ef3e5224
[gaim-migrate @ 7145]
Robert McQueen <robot101@debian.org>
parents:
6320
diff
changeset
|
1945 | const gchar *tmp; |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1946 | |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1947 | g_return_val_if_fail(host != NULL, -1); |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1948 | g_return_val_if_fail(port != 0 && port != -1, -1); |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1949 | g_return_val_if_fail(func != NULL, -1); |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1950 | |
|
6040
ab00305db747
[gaim-migrate @ 6490]
Mark Doliner <markdoliner@pidgin.im>
parents:
6017
diff
changeset
|
1951 | phb = g_new0(struct PHB, 1); |
|
ab00305db747
[gaim-migrate @ 6490]
Mark Doliner <markdoliner@pidgin.im>
parents:
6017
diff
changeset
|
1952 | |
| 11878 | 1953 | if (account && gaim_account_get_proxy_info(account) != NULL) |
| 1954 | phb->gpi = gaim_account_get_proxy_info(account); | |
| 1955 | else if (gaim_running_gnome()) | |
| 1956 | phb->gpi = gaim_gnome_proxy_get_info(); | |
| 1957 | else | |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1958 | phb->gpi = gaim_global_proxy_get_info(); |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1959 | |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1960 | phb->func = func; |
|
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1961 | phb->data = data; |
|
4366
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
1962 | phb->host = g_strdup(host); |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
1963 | phb->port = port; |
| 4993 | 1964 | phb->account = account; |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1965 | |
|
6621
2a18ef3e5224
[gaim-migrate @ 7145]
Robert McQueen <robot101@debian.org>
parents:
6320
diff
changeset
|
1966 | if (gaim_proxy_info_get_type(phb->gpi) == GAIM_PROXY_USE_ENVVAR) { |
|
2a18ef3e5224
[gaim-migrate @ 7145]
Robert McQueen <robot101@debian.org>
parents:
6320
diff
changeset
|
1967 | if ((tmp = g_getenv("HTTP_PROXY")) != NULL || |
|
2a18ef3e5224
[gaim-migrate @ 7145]
Robert McQueen <robot101@debian.org>
parents:
6320
diff
changeset
|
1968 | (tmp = g_getenv("http_proxy")) != NULL || |
|
10534
c28eef1b882a
[gaim-migrate @ 11866]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10320
diff
changeset
|
1969 | (tmp = g_getenv("HTTPPROXY")) != NULL) { |
| 9227 | 1970 | char *proxyhost,*proxypath,*proxyuser,*proxypasswd; |
|
7652
d60ba2565661
[gaim-migrate @ 8296]
Björn Voigt <bjoern@cs.tu-berlin.de>
parents:
7475
diff
changeset
|
1971 | int proxyport; |
|
6621
2a18ef3e5224
[gaim-migrate @ 7145]
Robert McQueen <robot101@debian.org>
parents:
6320
diff
changeset
|
1972 | |
| 9129 | 1973 | /* http_proxy-format: |
| 9227 | 1974 | * export http_proxy="http://user:passwd@your.proxy.server:port/" |
|
7652
d60ba2565661
[gaim-migrate @ 8296]
Björn Voigt <bjoern@cs.tu-berlin.de>
parents:
7475
diff
changeset
|
1975 | */ |
| 9227 | 1976 | if(gaim_url_parse(tmp, &proxyhost, &proxyport, &proxypath, &proxyuser, &proxypasswd)) { |
|
7652
d60ba2565661
[gaim-migrate @ 8296]
Björn Voigt <bjoern@cs.tu-berlin.de>
parents:
7475
diff
changeset
|
1977 | gaim_proxy_info_set_host(phb->gpi, proxyhost); |
|
d60ba2565661
[gaim-migrate @ 8296]
Björn Voigt <bjoern@cs.tu-berlin.de>
parents:
7475
diff
changeset
|
1978 | g_free(proxyhost); |
|
d60ba2565661
[gaim-migrate @ 8296]
Björn Voigt <bjoern@cs.tu-berlin.de>
parents:
7475
diff
changeset
|
1979 | g_free(proxypath); |
| 9227 | 1980 | if (proxyuser != NULL) { |
| 1981 | gaim_proxy_info_set_username(phb->gpi, proxyuser); | |
| 1982 | g_free(proxyuser); | |
| 1983 | } | |
| 1984 | if (proxypasswd != NULL) { | |
| 1985 | gaim_proxy_info_set_password(phb->gpi, proxypasswd); | |
| 1986 | g_free(proxypasswd); | |
| 1987 | } | |
|
7652
d60ba2565661
[gaim-migrate @ 8296]
Björn Voigt <bjoern@cs.tu-berlin.de>
parents:
7475
diff
changeset
|
1988 | |
|
d60ba2565661
[gaim-migrate @ 8296]
Björn Voigt <bjoern@cs.tu-berlin.de>
parents:
7475
diff
changeset
|
1989 | /* only for backward compatibility */ |
| 9129 | 1990 | if (proxyport == 80 && |
|
7652
d60ba2565661
[gaim-migrate @ 8296]
Björn Voigt <bjoern@cs.tu-berlin.de>
parents:
7475
diff
changeset
|
1991 | ((tmp = g_getenv("HTTP_PROXY_PORT")) != NULL || |
|
d60ba2565661
[gaim-migrate @ 8296]
Björn Voigt <bjoern@cs.tu-berlin.de>
parents:
7475
diff
changeset
|
1992 | (tmp = g_getenv("http_proxy_port")) != NULL || |
|
d60ba2565661
[gaim-migrate @ 8296]
Björn Voigt <bjoern@cs.tu-berlin.de>
parents:
7475
diff
changeset
|
1993 | (tmp = g_getenv("HTTPPROXYPORT")) != NULL)) |
|
d60ba2565661
[gaim-migrate @ 8296]
Björn Voigt <bjoern@cs.tu-berlin.de>
parents:
7475
diff
changeset
|
1994 | proxyport = atoi(tmp); |
| 9129 | 1995 | |
|
7652
d60ba2565661
[gaim-migrate @ 8296]
Björn Voigt <bjoern@cs.tu-berlin.de>
parents:
7475
diff
changeset
|
1996 | gaim_proxy_info_set_port(phb->gpi, proxyport); |
|
d60ba2565661
[gaim-migrate @ 8296]
Björn Voigt <bjoern@cs.tu-berlin.de>
parents:
7475
diff
changeset
|
1997 | } |
|
10534
c28eef1b882a
[gaim-migrate @ 11866]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10320
diff
changeset
|
1998 | } else { |
|
c28eef1b882a
[gaim-migrate @ 11866]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10320
diff
changeset
|
1999 | /* no proxy environment variable found, don't use a proxy */ |
|
c28eef1b882a
[gaim-migrate @ 11866]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10320
diff
changeset
|
2000 | gaim_debug_info("proxy", "No environment settings found, not using a proxy\n"); |
|
c28eef1b882a
[gaim-migrate @ 11866]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10320
diff
changeset
|
2001 | gaim_proxy_info_set_type(phb->gpi, GAIM_PROXY_NONE); |
|
6621
2a18ef3e5224
[gaim-migrate @ 7145]
Robert McQueen <robot101@debian.org>
parents:
6320
diff
changeset
|
2002 | } |
|
2a18ef3e5224
[gaim-migrate @ 7145]
Robert McQueen <robot101@debian.org>
parents:
6320
diff
changeset
|
2003 | |
| 9227 | 2004 | /* XXX: Do we want to skip this step if user/password were part of url? */ |
|
6621
2a18ef3e5224
[gaim-migrate @ 7145]
Robert McQueen <robot101@debian.org>
parents:
6320
diff
changeset
|
2005 | if ((tmp = g_getenv("HTTP_PROXY_USER")) != NULL || |
|
2a18ef3e5224
[gaim-migrate @ 7145]
Robert McQueen <robot101@debian.org>
parents:
6320
diff
changeset
|
2006 | (tmp = g_getenv("http_proxy_user")) != NULL || |
|
2a18ef3e5224
[gaim-migrate @ 7145]
Robert McQueen <robot101@debian.org>
parents:
6320
diff
changeset
|
2007 | (tmp = g_getenv("HTTPPROXYUSER")) != NULL) |
|
2a18ef3e5224
[gaim-migrate @ 7145]
Robert McQueen <robot101@debian.org>
parents:
6320
diff
changeset
|
2008 | gaim_proxy_info_set_username(phb->gpi, tmp); |
|
2a18ef3e5224
[gaim-migrate @ 7145]
Robert McQueen <robot101@debian.org>
parents:
6320
diff
changeset
|
2009 | |
|
2a18ef3e5224
[gaim-migrate @ 7145]
Robert McQueen <robot101@debian.org>
parents:
6320
diff
changeset
|
2010 | if ((tmp = g_getenv("HTTP_PROXY_PASS")) != NULL || |
|
2a18ef3e5224
[gaim-migrate @ 7145]
Robert McQueen <robot101@debian.org>
parents:
6320
diff
changeset
|
2011 | (tmp = g_getenv("http_proxy_pass")) != NULL || |
|
2a18ef3e5224
[gaim-migrate @ 7145]
Robert McQueen <robot101@debian.org>
parents:
6320
diff
changeset
|
2012 | (tmp = g_getenv("HTTPPROXYPASS")) != NULL) |
|
2a18ef3e5224
[gaim-migrate @ 7145]
Robert McQueen <robot101@debian.org>
parents:
6320
diff
changeset
|
2013 | gaim_proxy_info_set_password(phb->gpi, tmp); |
|
2a18ef3e5224
[gaim-migrate @ 7145]
Robert McQueen <robot101@debian.org>
parents:
6320
diff
changeset
|
2014 | } |
|
2a18ef3e5224
[gaim-migrate @ 7145]
Robert McQueen <robot101@debian.org>
parents:
6320
diff
changeset
|
2015 | |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
2016 | if ((gaim_proxy_info_get_type(phb->gpi) != GAIM_PROXY_NONE) && |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
2017 | (gaim_proxy_info_get_host(phb->gpi) == NULL || |
|
6621
2a18ef3e5224
[gaim-migrate @ 7145]
Robert McQueen <robot101@debian.org>
parents:
6320
diff
changeset
|
2018 | gaim_proxy_info_get_port(phb->gpi) <= 0)) { |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
2019 | |
|
6621
2a18ef3e5224
[gaim-migrate @ 7145]
Robert McQueen <robot101@debian.org>
parents:
6320
diff
changeset
|
2020 | gaim_notify_error(NULL, NULL, _("Invalid proxy settings"), _("Either the host name or port number specified for your given proxy type is invalid.")); |
|
2a18ef3e5224
[gaim-migrate @ 7145]
Robert McQueen <robot101@debian.org>
parents:
6320
diff
changeset
|
2021 | g_free(phb->host); |
|
2a18ef3e5224
[gaim-migrate @ 7145]
Robert McQueen <robot101@debian.org>
parents:
6320
diff
changeset
|
2022 | g_free(phb); |
|
2a18ef3e5224
[gaim-migrate @ 7145]
Robert McQueen <robot101@debian.org>
parents:
6320
diff
changeset
|
2023 | return -1; |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
2024 | } |
|
4366
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
2025 | |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
2026 | switch (gaim_proxy_info_get_type(phb->gpi)) |
|
4366
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
2027 | { |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
2028 | case GAIM_PROXY_NONE: |
|
4366
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
2029 | break; |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
2030 | |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
2031 | case GAIM_PROXY_HTTP: |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
2032 | case GAIM_PROXY_SOCKS4: |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
2033 | case GAIM_PROXY_SOCKS5: |
|
6621
2a18ef3e5224
[gaim-migrate @ 7145]
Robert McQueen <robot101@debian.org>
parents:
6320
diff
changeset
|
2034 | case GAIM_PROXY_USE_ENVVAR: |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
2035 | connecthost = gaim_proxy_info_get_host(phb->gpi); |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
2036 | connectport = gaim_proxy_info_get_port(phb->gpi); |
|
4366
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
2037 | break; |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
2038 | |
|
4366
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
2039 | default: |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
2040 | g_free(phb->host); |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
2041 | g_free(phb); |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
2042 | return -1; |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
2043 | } |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
2044 | |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
2045 | return gaim_gethostbyname_async(connecthost, connectport, |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
2046 | connection_host_resolved, phb); |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
2047 | } |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
2048 | |
| 8262 | 2049 | int |
| 2050 | gaim_proxy_connect_socks5(GaimProxyInfo *gpi, const char *host, int port, | |
| 2051 | GaimInputFunction func, gpointer data) | |
| 2052 | { | |
| 2053 | struct PHB *phb; | |
| 2054 | ||
| 2055 | phb = g_new0(struct PHB, 1); | |
| 2056 | phb->gpi = gpi; | |
| 2057 | phb->func = func; | |
| 2058 | phb->data = data; | |
| 2059 | phb->host = g_strdup(host); | |
| 2060 | phb->port = port; | |
| 2061 | ||
| 2062 | return gaim_gethostbyname_async(gaim_proxy_info_get_host(gpi), gaim_proxy_info_get_port(gpi), | |
| 2063 | connection_host_resolved, phb); | |
| 2064 | } | |
| 2065 | ||
| 2066 | ||
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
2067 | static void |
|
12816
5f93e09fa9a6
[gaim-migrate @ 15164]
Mark Doliner <markdoliner@pidgin.im>
parents:
12811
diff
changeset
|
2068 | proxy_pref_cb(const char *name, GaimPrefType type, |
|
5f93e09fa9a6
[gaim-migrate @ 15164]
Mark Doliner <markdoliner@pidgin.im>
parents:
12811
diff
changeset
|
2069 | gconstpointer value, gpointer data) |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
2070 | { |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
2071 | GaimProxyInfo *info = gaim_global_proxy_get_info(); |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
2072 | |
|
6001
1abbeff6571c
[gaim-migrate @ 6449]
Mark Doliner <markdoliner@pidgin.im>
parents:
5970
diff
changeset
|
2073 | if (!strcmp(name, "/core/proxy/type")) { |
|
1abbeff6571c
[gaim-migrate @ 6449]
Mark Doliner <markdoliner@pidgin.im>
parents:
5970
diff
changeset
|
2074 | int proxytype; |
|
12816
5f93e09fa9a6
[gaim-migrate @ 15164]
Mark Doliner <markdoliner@pidgin.im>
parents:
12811
diff
changeset
|
2075 | const char *type = value; |
|
6001
1abbeff6571c
[gaim-migrate @ 6449]
Mark Doliner <markdoliner@pidgin.im>
parents:
5970
diff
changeset
|
2076 | |
|
1abbeff6571c
[gaim-migrate @ 6449]
Mark Doliner <markdoliner@pidgin.im>
parents:
5970
diff
changeset
|
2077 | if (!strcmp(type, "none")) |
|
1abbeff6571c
[gaim-migrate @ 6449]
Mark Doliner <markdoliner@pidgin.im>
parents:
5970
diff
changeset
|
2078 | proxytype = GAIM_PROXY_NONE; |
|
1abbeff6571c
[gaim-migrate @ 6449]
Mark Doliner <markdoliner@pidgin.im>
parents:
5970
diff
changeset
|
2079 | else if (!strcmp(type, "http")) |
|
1abbeff6571c
[gaim-migrate @ 6449]
Mark Doliner <markdoliner@pidgin.im>
parents:
5970
diff
changeset
|
2080 | proxytype = GAIM_PROXY_HTTP; |
|
1abbeff6571c
[gaim-migrate @ 6449]
Mark Doliner <markdoliner@pidgin.im>
parents:
5970
diff
changeset
|
2081 | else if (!strcmp(type, "socks4")) |
|
1abbeff6571c
[gaim-migrate @ 6449]
Mark Doliner <markdoliner@pidgin.im>
parents:
5970
diff
changeset
|
2082 | proxytype = GAIM_PROXY_SOCKS4; |
|
1abbeff6571c
[gaim-migrate @ 6449]
Mark Doliner <markdoliner@pidgin.im>
parents:
5970
diff
changeset
|
2083 | else if (!strcmp(type, "socks5")) |
|
1abbeff6571c
[gaim-migrate @ 6449]
Mark Doliner <markdoliner@pidgin.im>
parents:
5970
diff
changeset
|
2084 | proxytype = GAIM_PROXY_SOCKS5; |
|
6621
2a18ef3e5224
[gaim-migrate @ 7145]
Robert McQueen <robot101@debian.org>
parents:
6320
diff
changeset
|
2085 | else if (!strcmp(type, "envvar")) |
|
2a18ef3e5224
[gaim-migrate @ 7145]
Robert McQueen <robot101@debian.org>
parents:
6320
diff
changeset
|
2086 | proxytype = GAIM_PROXY_USE_ENVVAR; |
|
6001
1abbeff6571c
[gaim-migrate @ 6449]
Mark Doliner <markdoliner@pidgin.im>
parents:
5970
diff
changeset
|
2087 | else |
|
1abbeff6571c
[gaim-migrate @ 6449]
Mark Doliner <markdoliner@pidgin.im>
parents:
5970
diff
changeset
|
2088 | proxytype = -1; |
|
1abbeff6571c
[gaim-migrate @ 6449]
Mark Doliner <markdoliner@pidgin.im>
parents:
5970
diff
changeset
|
2089 | |
|
1abbeff6571c
[gaim-migrate @ 6449]
Mark Doliner <markdoliner@pidgin.im>
parents:
5970
diff
changeset
|
2090 | gaim_proxy_info_set_type(info, proxytype); |
|
1abbeff6571c
[gaim-migrate @ 6449]
Mark Doliner <markdoliner@pidgin.im>
parents:
5970
diff
changeset
|
2091 | } else if (!strcmp(name, "/core/proxy/host")) |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
2092 | gaim_proxy_info_set_host(info, value); |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
2093 | else if (!strcmp(name, "/core/proxy/port")) |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
2094 | gaim_proxy_info_set_port(info, GPOINTER_TO_INT(value)); |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
2095 | else if (!strcmp(name, "/core/proxy/username")) |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
2096 | gaim_proxy_info_set_username(info, value); |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
2097 | else if (!strcmp(name, "/core/proxy/password")) |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
2098 | gaim_proxy_info_set_password(info, value); |
|
1087
bc9c6b635358
[gaim-migrate @ 1097]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1057
diff
changeset
|
2099 | } |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
2100 | |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
2101 | void |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
2102 | gaim_proxy_init(void) |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
2103 | { |
|
10087
e5b80a38939d
[gaim-migrate @ 11098]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
9863
diff
changeset
|
2104 | void *handle; |
|
e5b80a38939d
[gaim-migrate @ 11098]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
9863
diff
changeset
|
2105 | |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
2106 | /* Initialize a default proxy info struct. */ |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
2107 | global_proxy_info = gaim_proxy_info_new(); |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
2108 | |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
2109 | /* Proxy */ |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
2110 | gaim_prefs_add_none("/core/proxy"); |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
2111 | gaim_prefs_add_string("/core/proxy/type", "none"); |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
2112 | gaim_prefs_add_string("/core/proxy/host", ""); |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
2113 | gaim_prefs_add_int("/core/proxy/port", 0); |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
2114 | gaim_prefs_add_string("/core/proxy/username", ""); |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
2115 | gaim_prefs_add_string("/core/proxy/password", ""); |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
2116 | |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
2117 | /* Setup callbacks for the preferences. */ |
|
10087
e5b80a38939d
[gaim-migrate @ 11098]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
9863
diff
changeset
|
2118 | handle = gaim_proxy_get_handle(); |
|
e5b80a38939d
[gaim-migrate @ 11098]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
9863
diff
changeset
|
2119 | gaim_prefs_connect_callback(handle, "/core/proxy/type", |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
2120 | proxy_pref_cb, NULL); |
|
10087
e5b80a38939d
[gaim-migrate @ 11098]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
9863
diff
changeset
|
2121 | gaim_prefs_connect_callback(handle, "/core/proxy/host", |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
2122 | proxy_pref_cb, NULL); |
|
10087
e5b80a38939d
[gaim-migrate @ 11098]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
9863
diff
changeset
|
2123 | gaim_prefs_connect_callback(handle, "/core/proxy/port", |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
2124 | proxy_pref_cb, NULL); |
|
10087
e5b80a38939d
[gaim-migrate @ 11098]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
9863
diff
changeset
|
2125 | gaim_prefs_connect_callback(handle, "/core/proxy/username", |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
2126 | proxy_pref_cb, NULL); |
|
10087
e5b80a38939d
[gaim-migrate @ 11098]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
9863
diff
changeset
|
2127 | gaim_prefs_connect_callback(handle, "/core/proxy/password", |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
2128 | proxy_pref_cb, NULL); |
|
10626
659572951067
[gaim-migrate @ 12101]
Daniel Atallah <datallah@pidgin.im>
parents:
10619
diff
changeset
|
2129 | #ifdef _WIN32 |
|
10237
93c682ab4b27
[gaim-migrate @ 11373]
Herman Bloggs <herman@bluedigits.com>
parents:
10172
diff
changeset
|
2130 | if(!g_thread_supported()) |
|
93c682ab4b27
[gaim-migrate @ 11373]
Herman Bloggs <herman@bluedigits.com>
parents:
10172
diff
changeset
|
2131 | g_thread_init(NULL); |
|
10626
659572951067
[gaim-migrate @ 12101]
Daniel Atallah <datallah@pidgin.im>
parents:
10619
diff
changeset
|
2132 | #endif |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
2133 | } |
|
10087
e5b80a38939d
[gaim-migrate @ 11098]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
9863
diff
changeset
|
2134 | |
|
e5b80a38939d
[gaim-migrate @ 11098]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
9863
diff
changeset
|
2135 | void * |
|
e5b80a38939d
[gaim-migrate @ 11098]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
9863
diff
changeset
|
2136 | gaim_proxy_get_handle() |
|
e5b80a38939d
[gaim-migrate @ 11098]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
9863
diff
changeset
|
2137 | { |
|
e5b80a38939d
[gaim-migrate @ 11098]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
9863
diff
changeset
|
2138 | static int handle; |
|
e5b80a38939d
[gaim-migrate @ 11098]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
9863
diff
changeset
|
2139 | |
|
e5b80a38939d
[gaim-migrate @ 11098]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
9863
diff
changeset
|
2140 | return &handle; |
|
e5b80a38939d
[gaim-migrate @ 11098]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
9863
diff
changeset
|
2141 | } |