Mon, 14 Aug 2006 04:43:38 +0000
[gaim-migrate @ 16742]
Removing the "error_cb" parameter for gaim_proxy_connect(), changing it
back to how it was. As I started making changes to oscar to support
canceling connection attempts, I realized that having a separate callback
for errors would result in more code duplication than was needed.
Originally I thought the separate callback would make things cleaner.
Anyway, sorry for the noise.
|
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 | |
|
14152
0b6ba3b0f691
[gaim-migrate @ 16713]
Mark Doliner <markdoliner@pidgin.im>
parents:
14151
diff
changeset
|
41 | struct _GaimProxyConnectInfo { |
|
14151
34427f138b1f
[gaim-migrate @ 16712]
Mark Doliner <markdoliner@pidgin.im>
parents:
14097
diff
changeset
|
42 | GaimProxyConnectFunction connect_cb; |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
43 | gpointer data; |
|
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
44 | char *host; |
|
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
45 | int port; |
|
14165
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
46 | int fd; |
|
14151
34427f138b1f
[gaim-migrate @ 16712]
Mark Doliner <markdoliner@pidgin.im>
parents:
14097
diff
changeset
|
47 | guint inpa; |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
48 | GaimProxyInfo *gpi; |
|
14159
0fcdaa463a32
[gaim-migrate @ 16726]
Mark Doliner <markdoliner@pidgin.im>
parents:
14158
diff
changeset
|
49 | |
|
0fcdaa463a32
[gaim-migrate @ 16726]
Mark Doliner <markdoliner@pidgin.im>
parents:
14158
diff
changeset
|
50 | /** |
|
0fcdaa463a32
[gaim-migrate @ 16726]
Mark Doliner <markdoliner@pidgin.im>
parents:
14158
diff
changeset
|
51 | * This contains alternating length/char* values. The char* |
|
0fcdaa463a32
[gaim-migrate @ 16726]
Mark Doliner <markdoliner@pidgin.im>
parents:
14158
diff
changeset
|
52 | * values need to be freed when removed from the linked list. |
|
0fcdaa463a32
[gaim-migrate @ 16726]
Mark Doliner <markdoliner@pidgin.im>
parents:
14158
diff
changeset
|
53 | */ |
| 9129 | 54 | GSList *hosts; |
|
14159
0fcdaa463a32
[gaim-migrate @ 16726]
Mark Doliner <markdoliner@pidgin.im>
parents:
14158
diff
changeset
|
55 | |
|
14165
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
56 | /* |
|
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
57 | * All of the following variables are used when establishing a |
|
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
58 | * connection through a proxy. |
|
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
59 | */ |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
60 | guchar *write_buffer; |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
61 | gsize write_buf_len; |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
62 | gsize written_len; |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
63 | GaimInputFunction read_cb; |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
64 | guchar *read_buffer; |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
65 | gsize read_buf_len; |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
66 | gsize read_len; |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
67 | }; |
|
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
68 | |
|
12246
7af1ef3b1cc4
[gaim-migrate @ 14548]
Mark Doliner <markdoliner@pidgin.im>
parents:
12156
diff
changeset
|
69 | static const char *socks5errors[] = { |
|
7982
db8c1b6137eb
[gaim-migrate @ 8659]
Gavan Fantom <gavan@users.sourceforge.net>
parents:
7834
diff
changeset
|
70 | "succeeded\n", |
|
db8c1b6137eb
[gaim-migrate @ 8659]
Gavan Fantom <gavan@users.sourceforge.net>
parents:
7834
diff
changeset
|
71 | "general SOCKS server failure\n", |
|
db8c1b6137eb
[gaim-migrate @ 8659]
Gavan Fantom <gavan@users.sourceforge.net>
parents:
7834
diff
changeset
|
72 | "connection not allowed by ruleset\n", |
|
db8c1b6137eb
[gaim-migrate @ 8659]
Gavan Fantom <gavan@users.sourceforge.net>
parents:
7834
diff
changeset
|
73 | "Network unreachable\n", |
|
db8c1b6137eb
[gaim-migrate @ 8659]
Gavan Fantom <gavan@users.sourceforge.net>
parents:
7834
diff
changeset
|
74 | "Host unreachable\n", |
|
db8c1b6137eb
[gaim-migrate @ 8659]
Gavan Fantom <gavan@users.sourceforge.net>
parents:
7834
diff
changeset
|
75 | "Connection refused\n", |
|
db8c1b6137eb
[gaim-migrate @ 8659]
Gavan Fantom <gavan@users.sourceforge.net>
parents:
7834
diff
changeset
|
76 | "TTL expired\n", |
|
db8c1b6137eb
[gaim-migrate @ 8659]
Gavan Fantom <gavan@users.sourceforge.net>
parents:
7834
diff
changeset
|
77 | "Command not supported\n", |
|
db8c1b6137eb
[gaim-migrate @ 8659]
Gavan Fantom <gavan@users.sourceforge.net>
parents:
7834
diff
changeset
|
78 | "Address type not supported\n" |
|
db8c1b6137eb
[gaim-migrate @ 8659]
Gavan Fantom <gavan@users.sourceforge.net>
parents:
7834
diff
changeset
|
79 | }; |
|
db8c1b6137eb
[gaim-migrate @ 8659]
Gavan Fantom <gavan@users.sourceforge.net>
parents:
7834
diff
changeset
|
80 | |
|
14151
34427f138b1f
[gaim-migrate @ 16712]
Mark Doliner <markdoliner@pidgin.im>
parents:
14097
diff
changeset
|
81 | static GaimProxyInfo *global_proxy_info = NULL; |
|
14165
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
82 | |
|
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
83 | /* |
|
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
84 | * TODO: Once all callers of gaim_proxy_connect() are keeping track |
|
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
85 | * of the return value from that function this linked list |
|
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
86 | * will no longer be needed. |
|
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
87 | */ |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
88 | static GSList *connect_infos = NULL; |
|
14151
34427f138b1f
[gaim-migrate @ 16712]
Mark Doliner <markdoliner@pidgin.im>
parents:
14097
diff
changeset
|
89 | |
|
14165
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
90 | static void try_connect(GaimProxyConnectInfo *connect_info); |
|
14151
34427f138b1f
[gaim-migrate @ 16712]
Mark Doliner <markdoliner@pidgin.im>
parents:
14097
diff
changeset
|
91 | |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
92 | /************************************************************************** |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
93 | * Proxy structure API |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
94 | **************************************************************************/ |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
95 | GaimProxyInfo * |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
96 | gaim_proxy_info_new(void) |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
97 | { |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
98 | return g_new0(GaimProxyInfo, 1); |
|
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 | |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
101 | void |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
102 | gaim_proxy_info_destroy(GaimProxyInfo *info) |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
103 | { |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
104 | g_return_if_fail(info != NULL); |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
105 | |
|
14030
23144f1dc950
[gaim-migrate @ 16525]
Mark Doliner <markdoliner@pidgin.im>
parents:
13991
diff
changeset
|
106 | g_free(info->host); |
|
23144f1dc950
[gaim-migrate @ 16525]
Mark Doliner <markdoliner@pidgin.im>
parents:
13991
diff
changeset
|
107 | g_free(info->username); |
|
23144f1dc950
[gaim-migrate @ 16525]
Mark Doliner <markdoliner@pidgin.im>
parents:
13991
diff
changeset
|
108 | g_free(info->password); |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
109 | |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
110 | g_free(info); |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
111 | } |
|
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 | void |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
114 | gaim_proxy_info_set_type(GaimProxyInfo *info, GaimProxyType type) |
|
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 | g_return_if_fail(info != NULL); |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
117 | |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
118 | info->type = type; |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
119 | } |
|
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 | void |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
122 | gaim_proxy_info_set_host(GaimProxyInfo *info, const char *host) |
|
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 | g_return_if_fail(info != NULL); |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
125 | |
|
14030
23144f1dc950
[gaim-migrate @ 16525]
Mark Doliner <markdoliner@pidgin.im>
parents:
13991
diff
changeset
|
126 | g_free(info->host); |
|
14097
0c340861ab79
[gaim-migrate @ 16638]
Mark Doliner <markdoliner@pidgin.im>
parents:
14030
diff
changeset
|
127 | info->host = g_strdup(host); |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
128 | } |
|
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 | void |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
131 | gaim_proxy_info_set_port(GaimProxyInfo *info, int port) |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
132 | { |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
133 | g_return_if_fail(info != NULL); |
|
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->port = port; |
|
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 | void |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
139 | gaim_proxy_info_set_username(GaimProxyInfo *info, const char *username) |
|
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_if_fail(info != NULL); |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
142 | |
|
14030
23144f1dc950
[gaim-migrate @ 16525]
Mark Doliner <markdoliner@pidgin.im>
parents:
13991
diff
changeset
|
143 | g_free(info->username); |
|
14097
0c340861ab79
[gaim-migrate @ 16638]
Mark Doliner <markdoliner@pidgin.im>
parents:
14030
diff
changeset
|
144 | info->username = g_strdup(username); |
|
5681
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 | |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
147 | void |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
148 | gaim_proxy_info_set_password(GaimProxyInfo *info, const char *password) |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
149 | { |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
150 | g_return_if_fail(info != NULL); |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
151 | |
|
14030
23144f1dc950
[gaim-migrate @ 16525]
Mark Doliner <markdoliner@pidgin.im>
parents:
13991
diff
changeset
|
152 | g_free(info->password); |
|
14097
0c340861ab79
[gaim-migrate @ 16638]
Mark Doliner <markdoliner@pidgin.im>
parents:
14030
diff
changeset
|
153 | info->password = g_strdup(password); |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
154 | } |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
155 | |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
156 | GaimProxyType |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
157 | gaim_proxy_info_get_type(const GaimProxyInfo *info) |
|
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 | g_return_val_if_fail(info != NULL, GAIM_PROXY_NONE); |
|
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 | return info->type; |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
162 | } |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
163 | |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
164 | const char * |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
165 | gaim_proxy_info_get_host(const GaimProxyInfo *info) |
|
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 | g_return_val_if_fail(info != NULL, NULL); |
|
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 | return info->host; |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
170 | } |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
171 | |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
172 | int |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
173 | gaim_proxy_info_get_port(const GaimProxyInfo *info) |
|
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 | g_return_val_if_fail(info != NULL, 0); |
|
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 | return info->port; |
|
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 | |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
180 | const char * |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
181 | gaim_proxy_info_get_username(const GaimProxyInfo *info) |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
182 | { |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
183 | g_return_val_if_fail(info != NULL, NULL); |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
184 | |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
185 | return info->username; |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
186 | } |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
187 | |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
188 | const char * |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
189 | gaim_proxy_info_get_password(const GaimProxyInfo *info) |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
190 | { |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
191 | g_return_val_if_fail(info != NULL, NULL); |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
192 | |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
193 | return info->password; |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
194 | } |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
195 | |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
196 | /************************************************************************** |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
197 | * Global Proxy API |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
198 | **************************************************************************/ |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
199 | GaimProxyInfo * |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
200 | gaim_global_proxy_get_info(void) |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
201 | { |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
202 | return global_proxy_info; |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
203 | } |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
204 | |
|
12412
8abe3226695e
[gaim-migrate @ 14719]
Richard Laager <rlaager@pidgin.im>
parents:
12391
diff
changeset
|
205 | static GaimProxyInfo * |
| 11878 | 206 | gaim_gnome_proxy_get_info(void) |
| 207 | { | |
| 208 | static GaimProxyInfo info = {0, NULL, 0, NULL, NULL}; | |
| 209 | gchar *path; | |
| 210 | if ((path = g_find_program_in_path("gconftool-2"))) { | |
| 211 | gchar *tmp; | |
|
12156
58a027264d6c
[gaim-migrate @ 14457]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
11878
diff
changeset
|
212 | |
|
58a027264d6c
[gaim-migrate @ 14457]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
11878
diff
changeset
|
213 | g_free(path); |
|
58a027264d6c
[gaim-migrate @ 14457]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
11878
diff
changeset
|
214 | |
| 11878 | 215 | /* See whether to use a proxy. */ |
| 216 | if (!g_spawn_command_line_sync("gconftool-2 -g /system/http_proxy/use_http_proxy", &tmp, | |
| 217 | NULL, NULL, NULL)) | |
| 218 | return gaim_global_proxy_get_info(); | |
|
12811
492f9a7ecad2
[gaim-migrate @ 15159]
Daniel Atallah <datallah@pidgin.im>
parents:
12765
diff
changeset
|
219 | if (!strcmp(tmp, "false\n")) { |
| 11878 | 220 | info.type = GAIM_PROXY_NONE; |
| 221 | g_free(tmp); | |
|
12811
492f9a7ecad2
[gaim-migrate @ 15159]
Daniel Atallah <datallah@pidgin.im>
parents:
12765
diff
changeset
|
222 | return &info; |
|
492f9a7ecad2
[gaim-migrate @ 15159]
Daniel Atallah <datallah@pidgin.im>
parents:
12765
diff
changeset
|
223 | } else if (strcmp(tmp, "true\n")) { |
|
492f9a7ecad2
[gaim-migrate @ 15159]
Daniel Atallah <datallah@pidgin.im>
parents:
12765
diff
changeset
|
224 | g_free(tmp); |
| 11878 | 225 | return gaim_global_proxy_get_info(); |
| 226 | } | |
|
12156
58a027264d6c
[gaim-migrate @ 14457]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
11878
diff
changeset
|
227 | |
| 11878 | 228 | g_free(tmp); |
| 229 | info.type = GAIM_PROXY_HTTP; | |
|
12156
58a027264d6c
[gaim-migrate @ 14457]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
11878
diff
changeset
|
230 | |
| 11878 | 231 | /* Free the old fields */ |
| 232 | if (info.host) { | |
| 233 | g_free(info.host); | |
| 234 | info.host = NULL; | |
| 235 | } | |
| 236 | if (info.username) { | |
| 237 | g_free(info.username); | |
| 238 | info.username = NULL; | |
| 239 | } | |
| 240 | if (info.password) { | |
| 241 | g_free(info.password); | |
| 242 | info.password = NULL; | |
| 243 | } | |
|
12156
58a027264d6c
[gaim-migrate @ 14457]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
11878
diff
changeset
|
244 | |
| 11878 | 245 | /* Get the new ones */ |
| 246 | if (!g_spawn_command_line_sync("gconftool-2 -g /system/http_proxy/host", &info.host, | |
| 247 | NULL, NULL, NULL)) | |
| 248 | return gaim_global_proxy_get_info(); | |
| 249 | g_strchomp(info.host); | |
|
12156
58a027264d6c
[gaim-migrate @ 14457]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
11878
diff
changeset
|
250 | |
| 11878 | 251 | if (!g_spawn_command_line_sync("gconftool-2 -g /system/http_proxy/authentication_user", &info.username, |
| 252 | NULL, NULL, NULL)) | |
| 253 | return gaim_global_proxy_get_info(); | |
| 254 | g_strchomp(info.username); | |
| 255 | ||
| 256 | if (!g_spawn_command_line_sync("gconftool-2 -g /system/http_proxy/authentication_password", &info.password, | |
| 257 | NULL, NULL, NULL)) | |
| 258 | return gaim_global_proxy_get_info(); | |
| 259 | g_strchomp(info.password); | |
| 260 | ||
| 261 | if (!g_spawn_command_line_sync("gconftool-2 -g /system/http_proxy/port", &tmp, | |
| 262 | NULL, NULL, NULL)) | |
| 263 | return gaim_global_proxy_get_info(); | |
| 264 | info.port = atoi(tmp); | |
|
12156
58a027264d6c
[gaim-migrate @ 14457]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
11878
diff
changeset
|
265 | g_free(tmp); |
| 11878 | 266 | |
| 267 | return &info; | |
| 268 | } | |
| 269 | return gaim_global_proxy_get_info(); | |
| 270 | } | |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
271 | /************************************************************************** |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
272 | * Proxy API |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
273 | **************************************************************************/ |
|
4366
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
274 | |
|
14165
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
275 | /* |
|
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
276 | * This is used when the connection attempt to one particular IP |
|
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
277 | * address fails. We close the socket, remove the watcher and get |
|
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
278 | * rid of input and output buffers. Normally try_connect() will |
|
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
279 | * be called immediately after this. |
|
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
280 | */ |
|
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
281 | static void |
|
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
282 | gaim_proxy_connect_info_disconnect(GaimProxyConnectInfo *connect_info) |
|
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
283 | { |
|
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
284 | if (connect_info->inpa > 0) |
|
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
285 | { |
|
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
286 | gaim_input_remove(connect_info->inpa); |
|
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
287 | connect_info->inpa = 0; |
|
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
288 | } |
|
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
289 | |
|
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
290 | if (connect_info->fd >= 0) |
|
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
291 | { |
|
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
292 | close(connect_info->fd); |
|
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
293 | connect_info->fd = -1; |
|
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
294 | } |
|
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
295 | |
|
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
296 | g_free(connect_info->write_buffer); |
|
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
297 | connect_info->write_buffer = NULL; |
|
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
298 | |
|
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
299 | g_free(connect_info->read_buffer); |
|
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
300 | connect_info->read_buffer = NULL; |
|
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
301 | } |
|
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
302 | |
|
14151
34427f138b1f
[gaim-migrate @ 16712]
Mark Doliner <markdoliner@pidgin.im>
parents:
14097
diff
changeset
|
303 | static void |
|
14159
0fcdaa463a32
[gaim-migrate @ 16726]
Mark Doliner <markdoliner@pidgin.im>
parents:
14158
diff
changeset
|
304 | gaim_proxy_connect_info_destroy(GaimProxyConnectInfo *connect_info) |
|
14151
34427f138b1f
[gaim-migrate @ 16712]
Mark Doliner <markdoliner@pidgin.im>
parents:
14097
diff
changeset
|
305 | { |
|
14165
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
306 | gaim_proxy_connect_info_disconnect(connect_info); |
|
14151
34427f138b1f
[gaim-migrate @ 16712]
Mark Doliner <markdoliner@pidgin.im>
parents:
14097
diff
changeset
|
307 | |
|
14165
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
308 | connect_infos = g_slist_remove(connect_infos, connect_info); |
|
14151
34427f138b1f
[gaim-migrate @ 16712]
Mark Doliner <markdoliner@pidgin.im>
parents:
14097
diff
changeset
|
309 | |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
310 | while (connect_info->hosts != NULL) |
|
14151
34427f138b1f
[gaim-migrate @ 16712]
Mark Doliner <markdoliner@pidgin.im>
parents:
14097
diff
changeset
|
311 | { |
|
34427f138b1f
[gaim-migrate @ 16712]
Mark Doliner <markdoliner@pidgin.im>
parents:
14097
diff
changeset
|
312 | /* Discard the length... */ |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
313 | connect_info->hosts = g_slist_remove(connect_info->hosts, connect_info->hosts->data); |
|
14151
34427f138b1f
[gaim-migrate @ 16712]
Mark Doliner <markdoliner@pidgin.im>
parents:
14097
diff
changeset
|
314 | /* Free the address... */ |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
315 | g_free(connect_info->hosts->data); |
|
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
316 | connect_info->hosts = g_slist_remove(connect_info->hosts, connect_info->hosts->data); |
|
14151
34427f138b1f
[gaim-migrate @ 16712]
Mark Doliner <markdoliner@pidgin.im>
parents:
14097
diff
changeset
|
317 | } |
|
34427f138b1f
[gaim-migrate @ 16712]
Mark Doliner <markdoliner@pidgin.im>
parents:
14097
diff
changeset
|
318 | |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
319 | g_free(connect_info->host); |
|
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
320 | g_free(connect_info); |
|
14151
34427f138b1f
[gaim-migrate @ 16712]
Mark Doliner <markdoliner@pidgin.im>
parents:
14097
diff
changeset
|
321 | } |
|
34427f138b1f
[gaim-migrate @ 16712]
Mark Doliner <markdoliner@pidgin.im>
parents:
14097
diff
changeset
|
322 | |
|
34427f138b1f
[gaim-migrate @ 16712]
Mark Doliner <markdoliner@pidgin.im>
parents:
14097
diff
changeset
|
323 | static void |
|
14165
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
324 | gaim_proxy_connect_info_connected(GaimProxyConnectInfo *connect_info) |
|
14151
34427f138b1f
[gaim-migrate @ 16712]
Mark Doliner <markdoliner@pidgin.im>
parents:
14097
diff
changeset
|
325 | { |
|
14170
f611621bc8a0
[gaim-migrate @ 16742]
Mark Doliner <markdoliner@pidgin.im>
parents:
14165
diff
changeset
|
326 | connect_info->connect_cb(connect_info->data, connect_info->fd, NULL); |
|
14165
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
327 | |
|
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
328 | /* |
|
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
329 | * We've passed the file descriptor to the protocol, so it's no longer |
|
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
330 | * our responsibility, and we should be careful not to free it when |
|
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
331 | * we destroy the connect_info. |
|
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
332 | */ |
|
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
333 | connect_info->fd = -1; |
|
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
334 | |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
335 | gaim_proxy_connect_info_destroy(connect_info); |
|
14151
34427f138b1f
[gaim-migrate @ 16712]
Mark Doliner <markdoliner@pidgin.im>
parents:
14097
diff
changeset
|
336 | } |
|
34427f138b1f
[gaim-migrate @ 16712]
Mark Doliner <markdoliner@pidgin.im>
parents:
14097
diff
changeset
|
337 | |
|
34427f138b1f
[gaim-migrate @ 16712]
Mark Doliner <markdoliner@pidgin.im>
parents:
14097
diff
changeset
|
338 | /** |
|
34427f138b1f
[gaim-migrate @ 16712]
Mark Doliner <markdoliner@pidgin.im>
parents:
14097
diff
changeset
|
339 | * @param error An error message explaining why the connection |
|
34427f138b1f
[gaim-migrate @ 16712]
Mark Doliner <markdoliner@pidgin.im>
parents:
14097
diff
changeset
|
340 | * failed. This will be passed to the callback function |
|
34427f138b1f
[gaim-migrate @ 16712]
Mark Doliner <markdoliner@pidgin.im>
parents:
14097
diff
changeset
|
341 | * specified in the call to gaim_proxy_connect(). |
|
34427f138b1f
[gaim-migrate @ 16712]
Mark Doliner <markdoliner@pidgin.im>
parents:
14097
diff
changeset
|
342 | */ |
|
14161
e959d0e476be
[gaim-migrate @ 16728]
Mark Doliner <markdoliner@pidgin.im>
parents:
14159
diff
changeset
|
343 | /* |
|
e959d0e476be
[gaim-migrate @ 16728]
Mark Doliner <markdoliner@pidgin.im>
parents:
14159
diff
changeset
|
344 | * TODO: Make sure all callers of this function pass a really really |
|
e959d0e476be
[gaim-migrate @ 16728]
Mark Doliner <markdoliner@pidgin.im>
parents:
14159
diff
changeset
|
345 | * good error_message. |
|
e959d0e476be
[gaim-migrate @ 16728]
Mark Doliner <markdoliner@pidgin.im>
parents:
14159
diff
changeset
|
346 | */ |
|
14151
34427f138b1f
[gaim-migrate @ 16712]
Mark Doliner <markdoliner@pidgin.im>
parents:
14097
diff
changeset
|
347 | static void |
|
14159
0fcdaa463a32
[gaim-migrate @ 16726]
Mark Doliner <markdoliner@pidgin.im>
parents:
14158
diff
changeset
|
348 | gaim_proxy_connect_info_error(GaimProxyConnectInfo *connect_info, const gchar *error_message) |
|
14151
34427f138b1f
[gaim-migrate @ 16712]
Mark Doliner <markdoliner@pidgin.im>
parents:
14097
diff
changeset
|
349 | { |
|
14170
f611621bc8a0
[gaim-migrate @ 16742]
Mark Doliner <markdoliner@pidgin.im>
parents:
14165
diff
changeset
|
350 | connect_info->connect_cb(connect_info->data, -1, error_message); |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
351 | gaim_proxy_connect_info_destroy(connect_info); |
|
14151
34427f138b1f
[gaim-migrate @ 16712]
Mark Doliner <markdoliner@pidgin.im>
parents:
14097
diff
changeset
|
352 | } |
|
34427f138b1f
[gaim-migrate @ 16712]
Mark Doliner <markdoliner@pidgin.im>
parents:
14097
diff
changeset
|
353 | |
|
13649
b156749bec5b
[gaim-migrate @ 16049]
Evan Schoenberg <evands@pidgin.im>
parents:
13531
diff
changeset
|
354 | #if defined(__unix__) || defined(__APPLE__) |
|
4366
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
355 | |
|
10711
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
356 | /* |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
357 | * This structure represents both a pending DNS request and |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
358 | * a free child process. |
|
4366
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
359 | */ |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
360 | typedef struct { |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
361 | char *host; |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
362 | int port; |
|
14151
34427f138b1f
[gaim-migrate @ 16712]
Mark Doliner <markdoliner@pidgin.im>
parents:
14097
diff
changeset
|
363 | GaimProxyDnsConnectFunction callback; |
|
4366
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
364 | gpointer data; |
|
14151
34427f138b1f
[gaim-migrate @ 16712]
Mark Doliner <markdoliner@pidgin.im>
parents:
14097
diff
changeset
|
365 | guint inpa; |
|
4366
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
366 | int fd_in, fd_out; |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
367 | pid_t dns_pid; |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
368 | } pending_dns_request_t; |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
369 | |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
370 | static GSList *free_dns_children = NULL; |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
371 | static GQueue *queued_requests = NULL; |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
372 | |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
373 | static int number_of_dns_children = 0; |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
374 | |
|
12246
7af1ef3b1cc4
[gaim-migrate @ 14548]
Mark Doliner <markdoliner@pidgin.im>
parents:
12156
diff
changeset
|
375 | static const int MAX_DNS_CHILDREN = 2; |
|
4366
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
376 | |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
377 | typedef struct { |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
378 | char hostname[512]; |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
379 | int port; |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
380 | } dns_params_t; |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
381 | |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
382 | typedef struct { |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
383 | dns_params_t params; |
|
14151
34427f138b1f
[gaim-migrate @ 16712]
Mark Doliner <markdoliner@pidgin.im>
parents:
14097
diff
changeset
|
384 | GaimProxyDnsConnectFunction callback; |
|
4366
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
385 | gpointer data; |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
386 | } queued_dns_request_t; |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
387 | |
|
10711
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
388 | /* |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
389 | * Begin the DNS resolver child process functions. |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
390 | */ |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
391 | #ifdef HAVE_SIGNAL_H |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
392 | static void |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
393 | trap_gdb_bug() |
|
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 | const char *message = |
|
14030
23144f1dc950
[gaim-migrate @ 16525]
Mark Doliner <markdoliner@pidgin.im>
parents:
13991
diff
changeset
|
396 | "Gaim's DNS child got a SIGTRAP signal.\n" |
|
10711
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
397 | "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
|
398 | "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
|
399 | "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
|
400 | "check cope_with_gdb_brokenness() in proxy.c.\n\n" |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
401 | "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
|
402 | fputs("\n* * *\n",stderr); |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
403 | fputs(message,stderr); |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
404 | fputs("* * *\n\n",stderr); |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
405 | execlp("xmessage","xmessage","-center", message, NULL); |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
406 | _exit(1); |
|
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 | #endif |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
409 | |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
410 | static void |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
411 | cope_with_gdb_brokenness() |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
412 | { |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
413 | #ifdef __linux__ |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
414 | static gboolean already_done = FALSE; |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
415 | char s[256], e[512]; |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
416 | int n; |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
417 | pid_t ppid; |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
418 | |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
419 | if(already_done) |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
420 | return; |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
421 | already_done = TRUE; |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
422 | ppid = getppid(); |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
423 | snprintf(s, sizeof(s), "/proc/%d/exe", ppid); |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
424 | n = readlink(s, e, sizeof(e)); |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
425 | if(n < 0) |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
426 | return; |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
427 | |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
428 | e[MIN(n,sizeof(e)-1)] = '\0'; |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
429 | |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
430 | if(strstr(e,"gdb")) { |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
431 | gaim_debug_info("dns", |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
432 | "Debugger detected, performing useless query...\n"); |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
433 | gethostbyname("x.x.x.x.x"); |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
434 | } |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
435 | #endif |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
436 | } |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
437 | |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
438 | static void |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
439 | 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
|
440 | { |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
441 | dns_params_t dns_params; |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
442 | const size_t zero = 0; |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
443 | int rc; |
|
13426
032ea2c9ce2d
[gaim-migrate @ 15800]
Daniel Atallah <datallah@pidgin.im>
parents:
13405
diff
changeset
|
444 | #ifdef HAVE_GETADDRINFO |
|
10711
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
445 | struct addrinfo hints, *res, *tmp; |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
446 | char servname[20]; |
|
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 | struct sockaddr_in sin; |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
449 | const size_t addrlen = sizeof(sin); |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
450 | #endif |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
451 | |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
452 | #ifdef HAVE_SIGNAL_H |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
453 | signal(SIGHUP, SIG_DFL); |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
454 | signal(SIGINT, SIG_DFL); |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
455 | signal(SIGQUIT, SIG_DFL); |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
456 | signal(SIGCHLD, SIG_DFL); |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
457 | signal(SIGTERM, SIG_DFL); |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
458 | signal(SIGTRAP, trap_gdb_bug); |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
459 | #endif |
|
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 | /* |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
462 | * We resolve 1 host name for each iteration of this |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
463 | * while loop. |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
464 | * |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
465 | * The top half of this reads in the hostname and port |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
466 | * number from the socket with our parent. The bottom |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
467 | * half of this resolves the IP (blocking) and sends |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
468 | * the result back to our parent, when finished. |
|
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 | while (1) { |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
471 | const char ch = 'Y'; |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
472 | fd_set fds; |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
473 | struct timeval tv = { .tv_sec = 40 , .tv_usec = 0 }; |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
474 | FD_ZERO(&fds); |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
475 | FD_SET(child_in, &fds); |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
476 | rc = select(child_in + 1, &fds, NULL, NULL, &tv); |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
477 | if (!rc) { |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
478 | if (show_debug) |
|
13800
1ea3bfd84fe8
[gaim-migrate @ 16210]
Richard Laager <rlaager@pidgin.im>
parents:
13788
diff
changeset
|
479 | printf("dns[%d]: nobody needs me... =(\n", getpid()); |
|
10711
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
480 | break; |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
481 | } |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
482 | rc = read(child_in, &dns_params, sizeof(dns_params_t)); |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
483 | if (rc < 0) { |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
484 | perror("read()"); |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
485 | break; |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
486 | } |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
487 | if (rc == 0) { |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
488 | if (show_debug) |
|
13800
1ea3bfd84fe8
[gaim-migrate @ 16210]
Richard Laager <rlaager@pidgin.im>
parents:
13788
diff
changeset
|
489 | printf("dns[%d]: Oops, father has gone, wait for me, wait...!\n", getpid()); |
|
10711
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
490 | _exit(0); |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
491 | } |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
492 | if (dns_params.hostname[0] == '\0') { |
|
13800
1ea3bfd84fe8
[gaim-migrate @ 16210]
Richard Laager <rlaager@pidgin.im>
parents:
13788
diff
changeset
|
493 | printf("dns[%d]: hostname = \"\" (port = %d)!!!\n", getpid(), dns_params.port); |
|
10711
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
494 | _exit(1); |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
495 | } |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
496 | /* Tell our parent that we read the data successfully */ |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
497 | write(child_out, &ch, sizeof(ch)); |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
498 | |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
499 | /* We have the hostname and port, now resolve the IP */ |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
500 | |
|
13426
032ea2c9ce2d
[gaim-migrate @ 15800]
Daniel Atallah <datallah@pidgin.im>
parents:
13405
diff
changeset
|
501 | #ifdef HAVE_GETADDRINFO |
|
10711
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
502 | g_snprintf(servname, sizeof(servname), "%d", dns_params.port); |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
503 | memset(&hints, 0, sizeof(hints)); |
|
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 | /* This is only used to convert a service |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
506 | * name to a port number. As we know we are |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
507 | * passing a number already, we know this |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
508 | * value will not be really used by the C |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
509 | * library. |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
510 | */ |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
511 | hints.ai_socktype = SOCK_STREAM; |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
512 | rc = getaddrinfo(dns_params.hostname, servname, &hints, &res); |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
513 | write(child_out, &rc, sizeof(rc)); |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
514 | if (rc != 0) { |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
515 | close(child_out); |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
516 | if (show_debug) |
|
13800
1ea3bfd84fe8
[gaim-migrate @ 16210]
Richard Laager <rlaager@pidgin.im>
parents:
13788
diff
changeset
|
517 | printf("dns[%d] Error: getaddrinfo returned %d\n", |
|
10711
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
518 | getpid(), rc); |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
519 | dns_params.hostname[0] = '\0'; |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
520 | continue; |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
521 | } |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
522 | tmp = res; |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
523 | while (res) { |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
524 | size_t ai_addrlen = res->ai_addrlen; |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
525 | write(child_out, &ai_addrlen, sizeof(ai_addrlen)); |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
526 | write(child_out, res->ai_addr, res->ai_addrlen); |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
527 | res = res->ai_next; |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
528 | } |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
529 | freeaddrinfo(tmp); |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
530 | write(child_out, &zero, sizeof(zero)); |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
531 | #else |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
532 | if (!inet_aton(dns_params.hostname, &sin.sin_addr)) { |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
533 | struct hostent *hp; |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
534 | if (!(hp = gethostbyname(dns_params.hostname))) { |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
535 | write(child_out, &h_errno, sizeof(int)); |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
536 | close(child_out); |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
537 | if (show_debug) |
|
13800
1ea3bfd84fe8
[gaim-migrate @ 16210]
Richard Laager <rlaager@pidgin.im>
parents:
13788
diff
changeset
|
538 | printf("DNS Error: %d\n", h_errno); |
|
10711
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
539 | _exit(0); |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
540 | } |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
541 | memset(&sin, 0, sizeof(struct sockaddr_in)); |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
542 | 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
|
543 | sin.sin_family = hp->h_addrtype; |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
544 | } else |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
545 | sin.sin_family = AF_INET; |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
546 | |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
547 | sin.sin_port = htons(dns_params.port); |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
548 | write(child_out, &addrlen, sizeof(addrlen)); |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
549 | write(child_out, &sin, addrlen); |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
550 | write(child_out, &zero, sizeof(zero)); |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
551 | #endif |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
552 | dns_params.hostname[0] = '\0'; |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
553 | } |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
554 | |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
555 | close(child_out); |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
556 | close(child_in); |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
557 | |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
558 | _exit(0); |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
559 | } |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
560 | |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
561 | static pending_dns_request_t * |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
562 | gaim_dns_new_resolverthread(gboolean show_debug) |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
563 | { |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
564 | pending_dns_request_t *req; |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
565 | int child_out[2], child_in[2]; |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
566 | |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
567 | /* Create pipes for communicating with the child process */ |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
568 | if (pipe(child_out) || pipe(child_in)) { |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
569 | gaim_debug_error("dns", |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
570 | "Could not create pipes: %s\n", strerror(errno)); |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
571 | return NULL; |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
572 | } |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
573 | |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
574 | req = g_new(pending_dns_request_t, 1); |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
575 | |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
576 | cope_with_gdb_brokenness(); |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
577 | |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
578 | /* Fork! */ |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
579 | req->dns_pid = fork(); |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
580 | |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
581 | /* If we are the child process... */ |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
582 | if (req->dns_pid == 0) { |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
583 | /* 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
|
584 | close(child_out[0]); |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
585 | close(child_in[1]); |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
586 | |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
587 | gaim_dns_resolverthread(child_out[1], child_in[0], show_debug); |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
588 | /* 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
|
589 | } |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
590 | |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
591 | /* 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
|
592 | close(child_out[1]); |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
593 | close(child_in[0]); |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
594 | if (req->dns_pid == -1) { |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
595 | gaim_debug_error("dns", |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
596 | "Could not create child process for DNS: %s\n", |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
597 | strerror(errno)); |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
598 | g_free(req); |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
599 | return NULL; |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
600 | } |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
601 | |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
602 | req->fd_out = child_out[0]; |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
603 | req->fd_in = child_in[1]; |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
604 | number_of_dns_children++; |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
605 | gaim_debug_info("dns", |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
606 | "Created new DNS child %d, there are now %d children.\n", |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
607 | req->dns_pid, number_of_dns_children); |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
608 | |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
609 | return req; |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
610 | } |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
611 | /* |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
612 | * End the DNS resolver child process functions. |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
613 | */ |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
614 | |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
615 | /* |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
616 | * Begin the functions for dealing with the DNS child processes. |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
617 | */ |
|
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 | req_free(pending_dns_request_t *req) |
| 4434 | 620 | { |
| 621 | g_return_if_fail(req != NULL); | |
|
10707
c8951a5dea41
[gaim-migrate @ 12296]
Mark Doliner <markdoliner@pidgin.im>
parents:
10706
diff
changeset
|
622 | |
| 4434 | 623 | close(req->fd_in); |
| 624 | close(req->fd_out); | |
|
10707
c8951a5dea41
[gaim-migrate @ 12296]
Mark Doliner <markdoliner@pidgin.im>
parents:
10706
diff
changeset
|
625 | |
|
c8951a5dea41
[gaim-migrate @ 12296]
Mark Doliner <markdoliner@pidgin.im>
parents:
10706
diff
changeset
|
626 | g_free(req->host); |
| 4434 | 627 | g_free(req); |
|
10707
c8951a5dea41
[gaim-migrate @ 12296]
Mark Doliner <markdoliner@pidgin.im>
parents:
10706
diff
changeset
|
628 | |
| 4434 | 629 | number_of_dns_children--; |
| 630 | } | |
| 631 | ||
|
10711
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
632 | static int |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
633 | 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
|
634 | { |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
635 | char ch; |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
636 | int rc; |
| 13531 | 637 | pid_t pid; |
|
4366
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
638 | |
| 13531 | 639 | /* This waitpid might return the child's PID if it has recently |
| 640 | * exited, or it might return an error if it exited "long | |
| 641 | * enough" ago that it has already been reaped; in either | |
| 642 | * instance, we can't use it. */ | |
| 643 | if ((pid = waitpid (req->dns_pid, NULL, WNOHANG)) > 0) { | |
|
10309
073906008cb2
[gaim-migrate @ 11501]
Mark Doliner <markdoliner@pidgin.im>
parents:
10307
diff
changeset
|
644 | gaim_debug_warning("dns", |
|
5218
b19d74418232
[gaim-migrate @ 5588]
Christian Hammond <chipx86@chipx86.com>
parents:
5211
diff
changeset
|
645 | "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
|
646 | return -1; |
| 13531 | 647 | } else if (pid < 0) { |
| 648 | gaim_debug_warning("dns", | |
| 649 | "Wait for DNS child %d failed: %s\n", | |
| 650 | req->dns_pid, strerror(errno)); | |
| 651 | return -1; | |
|
4366
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
652 | } |
| 9129 | 653 | |
|
4366
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
654 | /* Let's contact this lost child! */ |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
655 | rc = write(req->fd_in, dns_params, sizeof(*dns_params)); |
|
10707
c8951a5dea41
[gaim-migrate @ 12296]
Mark Doliner <markdoliner@pidgin.im>
parents:
10706
diff
changeset
|
656 | if (rc < 0) { |
|
10309
073906008cb2
[gaim-migrate @ 11501]
Mark Doliner <markdoliner@pidgin.im>
parents:
10307
diff
changeset
|
657 | gaim_debug_error("dns", |
|
5211
94d9756c381f
[gaim-migrate @ 5581]
Christian Hammond <chipx86@chipx86.com>
parents:
4993
diff
changeset
|
658 | "Unable to write to DNS child %d: %d\n", |
|
94d9756c381f
[gaim-migrate @ 5581]
Christian Hammond <chipx86@chipx86.com>
parents:
4993
diff
changeset
|
659 | req->dns_pid, strerror(errno)); |
| 4434 | 660 | close(req->fd_in); |
|
4366
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
661 | return -1; |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
662 | } |
| 9129 | 663 | |
|
4366
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
664 | g_return_val_if_fail(rc == sizeof(*dns_params), -1); |
| 9129 | 665 | |
|
4366
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
666 | /* Did you hear me? (This avoids some race conditions) */ |
|
10707
c8951a5dea41
[gaim-migrate @ 12296]
Mark Doliner <markdoliner@pidgin.im>
parents:
10706
diff
changeset
|
667 | rc = read(req->fd_out, &ch, sizeof(ch)); |
|
c8951a5dea41
[gaim-migrate @ 12296]
Mark Doliner <markdoliner@pidgin.im>
parents:
10706
diff
changeset
|
668 | if (rc != 1 || ch != 'Y') |
|
c8951a5dea41
[gaim-migrate @ 12296]
Mark Doliner <markdoliner@pidgin.im>
parents:
10706
diff
changeset
|
669 | { |
|
10309
073906008cb2
[gaim-migrate @ 11501]
Mark Doliner <markdoliner@pidgin.im>
parents:
10307
diff
changeset
|
670 | gaim_debug_warning("dns", |
|
5211
94d9756c381f
[gaim-migrate @ 5581]
Christian Hammond <chipx86@chipx86.com>
parents:
4993
diff
changeset
|
671 | "DNS child %d not responding. Killing it!\n", |
|
94d9756c381f
[gaim-migrate @ 5581]
Christian Hammond <chipx86@chipx86.com>
parents:
4993
diff
changeset
|
672 | req->dns_pid); |
|
4366
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
673 | kill(req->dns_pid, SIGKILL); |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
674 | return -1; |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
675 | } |
| 9655 | 676 | |
|
10309
073906008cb2
[gaim-migrate @ 11501]
Mark Doliner <markdoliner@pidgin.im>
parents:
10307
diff
changeset
|
677 | gaim_debug_info("dns", |
|
5211
94d9756c381f
[gaim-migrate @ 5581]
Christian Hammond <chipx86@chipx86.com>
parents:
4993
diff
changeset
|
678 | "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
|
679 | |
|
4366
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
680 | return 0; |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
681 | } |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
682 | |
|
10711
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
683 | static void |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
684 | host_resolved(gpointer data, gint source, GaimInputCondition cond); |
|
4366
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
685 | |
|
10711
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
686 | static void |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
687 | release_dns_child(pending_dns_request_t *req) |
|
2911
b20669ca1281
[gaim-migrate @ 2924]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2907
diff
changeset
|
688 | { |
|
4366
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
689 | g_free(req->host); |
|
10707
c8951a5dea41
[gaim-migrate @ 12296]
Mark Doliner <markdoliner@pidgin.im>
parents:
10706
diff
changeset
|
690 | req->host = NULL; |
|
4366
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
691 | |
|
10707
c8951a5dea41
[gaim-migrate @ 12296]
Mark Doliner <markdoliner@pidgin.im>
parents:
10706
diff
changeset
|
692 | 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
|
693 | 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
|
694 | req->host = g_strdup(r->params.hostname); |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
695 | req->port = r->params.port; |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
696 | req->callback = r->callback; |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
697 | req->data = r->data; |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
698 | |
|
10309
073906008cb2
[gaim-migrate @ 11501]
Mark Doliner <markdoliner@pidgin.im>
parents:
10307
diff
changeset
|
699 | gaim_debug_info("dns", |
|
5211
94d9756c381f
[gaim-migrate @ 5581]
Christian Hammond <chipx86@chipx86.com>
parents:
4993
diff
changeset
|
700 | "Processing queued DNS query for '%s' with child %d\n", |
|
94d9756c381f
[gaim-migrate @ 5581]
Christian Hammond <chipx86@chipx86.com>
parents:
4993
diff
changeset
|
701 | req->host, req->dns_pid); |
|
4366
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
702 | |
|
10707
c8951a5dea41
[gaim-migrate @ 12296]
Mark Doliner <markdoliner@pidgin.im>
parents:
10706
diff
changeset
|
703 | if (send_dns_request_to_child(req, &(r->params)) != 0) { |
| 4434 | 704 | req_free(req); |
|
4366
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
705 | req = NULL; |
|
5211
94d9756c381f
[gaim-migrate @ 5581]
Christian Hammond <chipx86@chipx86.com>
parents:
4993
diff
changeset
|
706 | |
|
10309
073906008cb2
[gaim-migrate @ 11501]
Mark Doliner <markdoliner@pidgin.im>
parents:
10307
diff
changeset
|
707 | gaim_debug_warning("dns", |
|
5211
94d9756c381f
[gaim-migrate @ 5581]
Christian Hammond <chipx86@chipx86.com>
parents:
4993
diff
changeset
|
708 | "Intent of process queued query of '%s' failed, " |
|
94d9756c381f
[gaim-migrate @ 5581]
Christian Hammond <chipx86@chipx86.com>
parents:
4993
diff
changeset
|
709 | "requeueing...\n", r->params.hostname); |
|
4366
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
710 | g_queue_push_head(queued_requests, r); |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
711 | } else { |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
712 | 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
|
713 | g_free(r); |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
714 | } |
| 9655 | 715 | |
|
4366
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
716 | } else { |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
717 | req->host = NULL; |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
718 | req->callback = NULL; |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
719 | req->data = NULL; |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
720 | 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
|
721 | } |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
722 | } |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
723 | |
|
10711
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
724 | static void |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
725 | host_resolved(gpointer data, gint source, GaimInputCondition cond) |
|
4366
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
726 | { |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
727 | 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
|
728 | int rc, err; |
| 4678 | 729 | GSList *hosts = NULL; |
|
4366
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
730 | struct sockaddr *addr = NULL; |
| 8436 | 731 | size_t addrlen; |
|
4366
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
732 | |
|
13023
6c85f34839bf
[gaim-migrate @ 15376]
Mark Doliner <markdoliner@pidgin.im>
parents:
12991
diff
changeset
|
733 | gaim_debug_info("dns", "Got response for '%s'\n", req->host); |
|
4366
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
734 | gaim_input_remove(req->inpa); |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
735 | |
|
10707
c8951a5dea41
[gaim-migrate @ 12296]
Mark Doliner <markdoliner@pidgin.im>
parents:
10706
diff
changeset
|
736 | rc = read(req->fd_out, &err, sizeof(err)); |
|
c8951a5dea41
[gaim-migrate @ 12296]
Mark Doliner <markdoliner@pidgin.im>
parents:
10706
diff
changeset
|
737 | if ((rc == 4) && (err != 0)) |
|
c8951a5dea41
[gaim-migrate @ 12296]
Mark Doliner <markdoliner@pidgin.im>
parents:
10706
diff
changeset
|
738 | { |
|
4366
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
739 | char message[1024]; |
|
13426
032ea2c9ce2d
[gaim-migrate @ 15800]
Daniel Atallah <datallah@pidgin.im>
parents:
13405
diff
changeset
|
740 | #ifdef HAVE_GETADDRINFO |
|
4366
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
741 | g_snprintf(message, sizeof(message), "DNS error: %s (pid=%d)", |
|
8977
74162f1be34a
[gaim-migrate @ 9751]
Mark Doliner <markdoliner@pidgin.im>
parents:
8917
diff
changeset
|
742 | gai_strerror(err), req->dns_pid); |
|
4366
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
743 | #else |
|
8977
74162f1be34a
[gaim-migrate @ 9751]
Mark Doliner <markdoliner@pidgin.im>
parents:
8917
diff
changeset
|
744 | g_snprintf(message, sizeof(message), "DNS error: %d (pid=%d)", |
|
74162f1be34a
[gaim-migrate @ 9751]
Mark Doliner <markdoliner@pidgin.im>
parents:
8917
diff
changeset
|
745 | err, req->dns_pid); |
|
4366
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
746 | #endif |
|
10309
073906008cb2
[gaim-migrate @ 11501]
Mark Doliner <markdoliner@pidgin.im>
parents:
10307
diff
changeset
|
747 | gaim_debug_error("dns", "%s\n", message); |
| 4678 | 748 | req->callback(NULL, req->data, message); |
| 749 | release_dns_child(req); | |
|
4366
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
750 | return; |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
751 | } |
|
10707
c8951a5dea41
[gaim-migrate @ 12296]
Mark Doliner <markdoliner@pidgin.im>
parents:
10706
diff
changeset
|
752 | if (rc > 0) |
|
c8951a5dea41
[gaim-migrate @ 12296]
Mark Doliner <markdoliner@pidgin.im>
parents:
10706
diff
changeset
|
753 | { |
|
c8951a5dea41
[gaim-migrate @ 12296]
Mark Doliner <markdoliner@pidgin.im>
parents:
10706
diff
changeset
|
754 | while (rc > 0) { |
|
c8951a5dea41
[gaim-migrate @ 12296]
Mark Doliner <markdoliner@pidgin.im>
parents:
10706
diff
changeset
|
755 | rc = read(req->fd_out, &addrlen, sizeof(addrlen)); |
|
c8951a5dea41
[gaim-migrate @ 12296]
Mark Doliner <markdoliner@pidgin.im>
parents:
10706
diff
changeset
|
756 | if (rc > 0 && addrlen > 0) { |
|
c8951a5dea41
[gaim-migrate @ 12296]
Mark Doliner <markdoliner@pidgin.im>
parents:
10706
diff
changeset
|
757 | addr = g_malloc(addrlen); |
|
c8951a5dea41
[gaim-migrate @ 12296]
Mark Doliner <markdoliner@pidgin.im>
parents:
10706
diff
changeset
|
758 | rc = read(req->fd_out, addr, addrlen); |
| 4678 | 759 | hosts = g_slist_append(hosts, GINT_TO_POINTER(addrlen)); |
| 760 | hosts = g_slist_append(hosts, addr); | |
| 761 | } else { | |
| 762 | break; | |
| 763 | } | |
|
4366
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
764 | } |
|
10707
c8951a5dea41
[gaim-migrate @ 12296]
Mark Doliner <markdoliner@pidgin.im>
parents:
10706
diff
changeset
|
765 | } else if (rc == -1) { |
|
4366
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
766 | char message[1024]; |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
767 | 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
|
768 | gaim_debug_error("dns", "%s\n", message); |
| 4678 | 769 | req->callback(NULL, req->data, message); |
| 4434 | 770 | req_free(req); |
|
4366
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
771 | return; |
|
10707
c8951a5dea41
[gaim-migrate @ 12296]
Mark Doliner <markdoliner@pidgin.im>
parents:
10706
diff
changeset
|
772 | } else if (rc == 0) { |
|
4366
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
773 | char message[1024]; |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
774 | 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
|
775 | close(req->fd_out); |
|
10309
073906008cb2
[gaim-migrate @ 11501]
Mark Doliner <markdoliner@pidgin.im>
parents:
10307
diff
changeset
|
776 | gaim_debug_error("dns", "%s\n", message); |
| 4678 | 777 | req->callback(NULL, req->data, message); |
| 4434 | 778 | req_free(req); |
|
4366
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
779 | return; |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
780 | } |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
781 | |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
782 | /* wait4(req->dns_pid, NULL, WNOHANG, NULL); */ |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
783 | |
| 4678 | 784 | req->callback(hosts, req->data, NULL); |
|
4366
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
785 | |
| 4678 | 786 | release_dns_child(req); |
|
4366
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
787 | } |
|
10711
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
788 | /* |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
789 | * End the functions for dealing with the DNS child processes. |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
790 | */ |
|
9657
aef0dc1d354d
[gaim-migrate @ 10505]
Mark Doliner <markdoliner@pidgin.im>
parents:
9656
diff
changeset
|
791 | |
|
10711
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
792 | int |
|
14151
34427f138b1f
[gaim-migrate @ 16712]
Mark Doliner <markdoliner@pidgin.im>
parents:
14097
diff
changeset
|
793 | gaim_gethostbyname_async(const char *hostname, int port, GaimProxyDnsConnectFunction callback, gpointer data) |
|
4366
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
794 | { |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
795 | pending_dns_request_t *req = NULL; |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
796 | dns_params_t dns_params; |
|
9656
17f7a689012e
[gaim-migrate @ 10504]
Mark Doliner <markdoliner@pidgin.im>
parents:
9655
diff
changeset
|
797 | gchar *host_temp; |
|
10307
f3ba80364053
[gaim-migrate @ 11497]
Mark Doliner <markdoliner@pidgin.im>
parents:
10305
diff
changeset
|
798 | gboolean show_debug; |
|
f3ba80364053
[gaim-migrate @ 11497]
Mark Doliner <markdoliner@pidgin.im>
parents:
10305
diff
changeset
|
799 | |
|
f3ba80364053
[gaim-migrate @ 11497]
Mark Doliner <markdoliner@pidgin.im>
parents:
10305
diff
changeset
|
800 | show_debug = gaim_debug_is_enabled(); |
| 9655 | 801 | |
|
9656
17f7a689012e
[gaim-migrate @ 10504]
Mark Doliner <markdoliner@pidgin.im>
parents:
9655
diff
changeset
|
802 | host_temp = g_strstrip(g_strdup(hostname)); |
|
17f7a689012e
[gaim-migrate @ 10504]
Mark Doliner <markdoliner@pidgin.im>
parents:
9655
diff
changeset
|
803 | strncpy(dns_params.hostname, host_temp, sizeof(dns_params.hostname) - 1); |
| 9655 | 804 | g_free(host_temp); |
|
9656
17f7a689012e
[gaim-migrate @ 10504]
Mark Doliner <markdoliner@pidgin.im>
parents:
9655
diff
changeset
|
805 | 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
|
806 | dns_params.port = port; |
| 9129 | 807 | |
|
9656
17f7a689012e
[gaim-migrate @ 10504]
Mark Doliner <markdoliner@pidgin.im>
parents:
9655
diff
changeset
|
808 | /* |
|
17f7a689012e
[gaim-migrate @ 10504]
Mark Doliner <markdoliner@pidgin.im>
parents:
9655
diff
changeset
|
809 | * 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
|
810 | * 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
|
811 | * 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
|
812 | * 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
|
813 | */ |
|
17f7a689012e
[gaim-migrate @ 10504]
Mark Doliner <markdoliner@pidgin.im>
parents:
9655
diff
changeset
|
814 | while (free_dns_children != NULL) { |
|
17f7a689012e
[gaim-migrate @ 10504]
Mark Doliner <markdoliner@pidgin.im>
parents:
9655
diff
changeset
|
815 | req = free_dns_children->data; |
|
17f7a689012e
[gaim-migrate @ 10504]
Mark Doliner <markdoliner@pidgin.im>
parents:
9655
diff
changeset
|
816 | free_dns_children = g_slist_remove(free_dns_children, req); |
| 9129 | 817 | |
|
9656
17f7a689012e
[gaim-migrate @ 10504]
Mark Doliner <markdoliner@pidgin.im>
parents:
9655
diff
changeset
|
818 | if (send_dns_request_to_child(req, &dns_params) == 0) |
|
17f7a689012e
[gaim-migrate @ 10504]
Mark Doliner <markdoliner@pidgin.im>
parents:
9655
diff
changeset
|
819 | /* We found an acceptable child, yay */ |
|
17f7a689012e
[gaim-migrate @ 10504]
Mark Doliner <markdoliner@pidgin.im>
parents:
9655
diff
changeset
|
820 | break; |
| 9129 | 821 | |
|
9656
17f7a689012e
[gaim-migrate @ 10504]
Mark Doliner <markdoliner@pidgin.im>
parents:
9655
diff
changeset
|
822 | req_free(req); |
|
9657
aef0dc1d354d
[gaim-migrate @ 10505]
Mark Doliner <markdoliner@pidgin.im>
parents:
9656
diff
changeset
|
823 | req = NULL; |
|
4366
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
824 | } |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
825 | |
|
9657
aef0dc1d354d
[gaim-migrate @ 10505]
Mark Doliner <markdoliner@pidgin.im>
parents:
9656
diff
changeset
|
826 | /* We need to create a new DNS request child */ |
|
9656
17f7a689012e
[gaim-migrate @ 10504]
Mark Doliner <markdoliner@pidgin.im>
parents:
9655
diff
changeset
|
827 | if (req == NULL) { |
|
17f7a689012e
[gaim-migrate @ 10504]
Mark Doliner <markdoliner@pidgin.im>
parents:
9655
diff
changeset
|
828 | if (number_of_dns_children >= MAX_DNS_CHILDREN) { |
|
4366
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
829 | 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
|
830 | memcpy(&(r->params), &dns_params, sizeof(dns_params)); |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
831 | r->callback = callback; |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
832 | r->data = data; |
|
9656
17f7a689012e
[gaim-migrate @ 10504]
Mark Doliner <markdoliner@pidgin.im>
parents:
9655
diff
changeset
|
833 | if (!queued_requests) |
|
4366
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
834 | queued_requests = g_queue_new(); |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
835 | g_queue_push_tail(queued_requests, r); |
|
5211
94d9756c381f
[gaim-migrate @ 5581]
Christian Hammond <chipx86@chipx86.com>
parents:
4993
diff
changeset
|
836 | |
|
10309
073906008cb2
[gaim-migrate @ 11501]
Mark Doliner <markdoliner@pidgin.im>
parents:
10307
diff
changeset
|
837 | gaim_debug_info("dns", |
|
9656
17f7a689012e
[gaim-migrate @ 10504]
Mark Doliner <markdoliner@pidgin.im>
parents:
9655
diff
changeset
|
838 | "DNS query for '%s' queued\n", dns_params.hostname); |
|
5211
94d9756c381f
[gaim-migrate @ 5581]
Christian Hammond <chipx86@chipx86.com>
parents:
4993
diff
changeset
|
839 | |
|
4366
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
840 | return 0; |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
841 | } |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
842 | |
|
10711
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
843 | req = gaim_dns_new_resolverthread(show_debug); |
|
12977
df1a0ac6266a
[gaim-migrate @ 15330]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
12816
diff
changeset
|
844 | if (req == NULL) |
|
df1a0ac6266a
[gaim-migrate @ 15330]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
12816
diff
changeset
|
845 | { |
|
df1a0ac6266a
[gaim-migrate @ 15330]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
12816
diff
changeset
|
846 | gaim_debug_error("proxy", "oh dear, this is going to explode, I give up\n"); |
|
df1a0ac6266a
[gaim-migrate @ 15330]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
12816
diff
changeset
|
847 | return -1; |
|
df1a0ac6266a
[gaim-migrate @ 15330]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
12816
diff
changeset
|
848 | } |
|
10711
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
849 | send_dns_request_to_child(req, &dns_params); |
|
4366
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
850 | } |
|
9656
17f7a689012e
[gaim-migrate @ 10504]
Mark Doliner <markdoliner@pidgin.im>
parents:
9655
diff
changeset
|
851 | |
|
9657
aef0dc1d354d
[gaim-migrate @ 10505]
Mark Doliner <markdoliner@pidgin.im>
parents:
9656
diff
changeset
|
852 | req->host = g_strdup(hostname); |
|
9656
17f7a689012e
[gaim-migrate @ 10504]
Mark Doliner <markdoliner@pidgin.im>
parents:
9655
diff
changeset
|
853 | req->port = port; |
|
17f7a689012e
[gaim-migrate @ 10504]
Mark Doliner <markdoliner@pidgin.im>
parents:
9655
diff
changeset
|
854 | req->callback = callback; |
|
17f7a689012e
[gaim-migrate @ 10504]
Mark Doliner <markdoliner@pidgin.im>
parents:
9655
diff
changeset
|
855 | req->data = data; |
|
4366
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
856 | 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
|
857 | |
|
4366
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
858 | return 0; |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
859 | } |
|
10237
93c682ab4b27
[gaim-migrate @ 11373]
Herman Bloggs <herman@bluedigits.com>
parents:
10172
diff
changeset
|
860 | |
|
13649
b156749bec5b
[gaim-migrate @ 16049]
Evan Schoenberg <evands@pidgin.im>
parents:
13531
diff
changeset
|
861 | #elif defined _WIN32 /* end __unix__ || __APPLE__ */ |
|
10237
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 | typedef struct _dns_tdata { |
|
93c682ab4b27
[gaim-migrate @ 11373]
Herman Bloggs <herman@bluedigits.com>
parents:
10172
diff
changeset
|
864 | char *hostname; |
|
93c682ab4b27
[gaim-migrate @ 11373]
Herman Bloggs <herman@bluedigits.com>
parents:
10172
diff
changeset
|
865 | int port; |
|
14151
34427f138b1f
[gaim-migrate @ 16712]
Mark Doliner <markdoliner@pidgin.im>
parents:
14097
diff
changeset
|
866 | GaimProxyDnsConnectFunction callback; |
|
10237
93c682ab4b27
[gaim-migrate @ 11373]
Herman Bloggs <herman@bluedigits.com>
parents:
10172
diff
changeset
|
867 | gpointer data; |
|
93c682ab4b27
[gaim-migrate @ 11373]
Herman Bloggs <herman@bluedigits.com>
parents:
10172
diff
changeset
|
868 | GSList *hosts; |
|
93c682ab4b27
[gaim-migrate @ 11373]
Herman Bloggs <herman@bluedigits.com>
parents:
10172
diff
changeset
|
869 | char *errmsg; |
|
93c682ab4b27
[gaim-migrate @ 11373]
Herman Bloggs <herman@bluedigits.com>
parents:
10172
diff
changeset
|
870 | } dns_tdata; |
|
93c682ab4b27
[gaim-migrate @ 11373]
Herman Bloggs <herman@bluedigits.com>
parents:
10172
diff
changeset
|
871 | |
|
93c682ab4b27
[gaim-migrate @ 11373]
Herman Bloggs <herman@bluedigits.com>
parents:
10172
diff
changeset
|
872 | static gboolean dns_main_thread_cb(gpointer data) { |
|
93c682ab4b27
[gaim-migrate @ 11373]
Herman Bloggs <herman@bluedigits.com>
parents:
10172
diff
changeset
|
873 | dns_tdata *td = (dns_tdata*)data; |
|
10562
000641c00f7d
[gaim-migrate @ 11942]
Daniel Atallah <datallah@pidgin.im>
parents:
10561
diff
changeset
|
874 | if (td->errmsg != NULL) { |
|
000641c00f7d
[gaim-migrate @ 11942]
Daniel Atallah <datallah@pidgin.im>
parents:
10561
diff
changeset
|
875 | gaim_debug_info("dns", "%s\n", td->errmsg); |
|
000641c00f7d
[gaim-migrate @ 11942]
Daniel Atallah <datallah@pidgin.im>
parents:
10561
diff
changeset
|
876 | } |
|
10237
93c682ab4b27
[gaim-migrate @ 11373]
Herman Bloggs <herman@bluedigits.com>
parents:
10172
diff
changeset
|
877 | td->callback(td->hosts, td->data, td->errmsg); |
|
93c682ab4b27
[gaim-migrate @ 11373]
Herman Bloggs <herman@bluedigits.com>
parents:
10172
diff
changeset
|
878 | g_free(td->hostname); |
|
10562
000641c00f7d
[gaim-migrate @ 11942]
Daniel Atallah <datallah@pidgin.im>
parents:
10561
diff
changeset
|
879 | g_free(td->errmsg); |
|
10237
93c682ab4b27
[gaim-migrate @ 11373]
Herman Bloggs <herman@bluedigits.com>
parents:
10172
diff
changeset
|
880 | g_free(td); |
|
93c682ab4b27
[gaim-migrate @ 11373]
Herman Bloggs <herman@bluedigits.com>
parents:
10172
diff
changeset
|
881 | return FALSE; |
|
93c682ab4b27
[gaim-migrate @ 11373]
Herman Bloggs <herman@bluedigits.com>
parents:
10172
diff
changeset
|
882 | } |
|
93c682ab4b27
[gaim-migrate @ 11373]
Herman Bloggs <herman@bluedigits.com>
parents:
10172
diff
changeset
|
883 | |
|
93c682ab4b27
[gaim-migrate @ 11373]
Herman Bloggs <herman@bluedigits.com>
parents:
10172
diff
changeset
|
884 | static gpointer dns_thread(gpointer data) { |
|
10619
07ef9839d751
[gaim-migrate @ 12086]
Daniel Atallah <datallah@pidgin.im>
parents:
10613
diff
changeset
|
885 | |
|
13426
032ea2c9ce2d
[gaim-migrate @ 15800]
Daniel Atallah <datallah@pidgin.im>
parents:
13405
diff
changeset
|
886 | #ifdef HAVE_GETADDRINFO |
|
10619
07ef9839d751
[gaim-migrate @ 12086]
Daniel Atallah <datallah@pidgin.im>
parents:
10613
diff
changeset
|
887 | int rc; |
|
07ef9839d751
[gaim-migrate @ 12086]
Daniel Atallah <datallah@pidgin.im>
parents:
10613
diff
changeset
|
888 | struct addrinfo hints, *res, *tmp; |
|
07ef9839d751
[gaim-migrate @ 12086]
Daniel Atallah <datallah@pidgin.im>
parents:
10613
diff
changeset
|
889 | char servname[20]; |
|
07ef9839d751
[gaim-migrate @ 12086]
Daniel Atallah <datallah@pidgin.im>
parents:
10613
diff
changeset
|
890 | #else |
|
10237
93c682ab4b27
[gaim-migrate @ 11373]
Herman Bloggs <herman@bluedigits.com>
parents:
10172
diff
changeset
|
891 | struct sockaddr_in sin; |
|
10619
07ef9839d751
[gaim-migrate @ 12086]
Daniel Atallah <datallah@pidgin.im>
parents:
10613
diff
changeset
|
892 | struct hostent *hp; |
|
07ef9839d751
[gaim-migrate @ 12086]
Daniel Atallah <datallah@pidgin.im>
parents:
10613
diff
changeset
|
893 | #endif |
|
10237
93c682ab4b27
[gaim-migrate @ 11373]
Herman Bloggs <herman@bluedigits.com>
parents:
10172
diff
changeset
|
894 | dns_tdata *td = (dns_tdata*)data; |
|
10619
07ef9839d751
[gaim-migrate @ 12086]
Daniel Atallah <datallah@pidgin.im>
parents:
10613
diff
changeset
|
895 | |
|
13426
032ea2c9ce2d
[gaim-migrate @ 15800]
Daniel Atallah <datallah@pidgin.im>
parents:
13405
diff
changeset
|
896 | #ifdef HAVE_GETADDRINFO |
|
10619
07ef9839d751
[gaim-migrate @ 12086]
Daniel Atallah <datallah@pidgin.im>
parents:
10613
diff
changeset
|
897 | g_snprintf(servname, sizeof(servname), "%d", td->port); |
|
07ef9839d751
[gaim-migrate @ 12086]
Daniel Atallah <datallah@pidgin.im>
parents:
10613
diff
changeset
|
898 | memset(&hints,0,sizeof(hints)); |
|
10237
93c682ab4b27
[gaim-migrate @ 11373]
Herman Bloggs <herman@bluedigits.com>
parents:
10172
diff
changeset
|
899 | |
|
10619
07ef9839d751
[gaim-migrate @ 12086]
Daniel Atallah <datallah@pidgin.im>
parents:
10613
diff
changeset
|
900 | /* This is only used to convert a service |
|
07ef9839d751
[gaim-migrate @ 12086]
Daniel Atallah <datallah@pidgin.im>
parents:
10613
diff
changeset
|
901 | * name to a port number. As we know we are |
|
07ef9839d751
[gaim-migrate @ 12086]
Daniel Atallah <datallah@pidgin.im>
parents:
10613
diff
changeset
|
902 | * passing a number already, we know this |
|
07ef9839d751
[gaim-migrate @ 12086]
Daniel Atallah <datallah@pidgin.im>
parents:
10613
diff
changeset
|
903 | * value will not be really used by the C |
|
07ef9839d751
[gaim-migrate @ 12086]
Daniel Atallah <datallah@pidgin.im>
parents:
10613
diff
changeset
|
904 | * library. |
|
07ef9839d751
[gaim-migrate @ 12086]
Daniel Atallah <datallah@pidgin.im>
parents:
10613
diff
changeset
|
905 | */ |
|
07ef9839d751
[gaim-migrate @ 12086]
Daniel Atallah <datallah@pidgin.im>
parents:
10613
diff
changeset
|
906 | hints.ai_socktype = SOCK_STREAM; |
|
07ef9839d751
[gaim-migrate @ 12086]
Daniel Atallah <datallah@pidgin.im>
parents:
10613
diff
changeset
|
907 | if ((rc = getaddrinfo(td->hostname, servname, &hints, &res)) == 0) { |
|
07ef9839d751
[gaim-migrate @ 12086]
Daniel Atallah <datallah@pidgin.im>
parents:
10613
diff
changeset
|
908 | tmp = res; |
|
07ef9839d751
[gaim-migrate @ 12086]
Daniel Atallah <datallah@pidgin.im>
parents:
10613
diff
changeset
|
909 | while(res) { |
|
07ef9839d751
[gaim-migrate @ 12086]
Daniel Atallah <datallah@pidgin.im>
parents:
10613
diff
changeset
|
910 | td->hosts = g_slist_append(td->hosts, |
|
07ef9839d751
[gaim-migrate @ 12086]
Daniel Atallah <datallah@pidgin.im>
parents:
10613
diff
changeset
|
911 | GSIZE_TO_POINTER(res->ai_addrlen)); |
|
07ef9839d751
[gaim-migrate @ 12086]
Daniel Atallah <datallah@pidgin.im>
parents:
10613
diff
changeset
|
912 | td->hosts = g_slist_append(td->hosts, |
|
07ef9839d751
[gaim-migrate @ 12086]
Daniel Atallah <datallah@pidgin.im>
parents:
10613
diff
changeset
|
913 | g_memdup(res->ai_addr, res->ai_addrlen)); |
|
07ef9839d751
[gaim-migrate @ 12086]
Daniel Atallah <datallah@pidgin.im>
parents:
10613
diff
changeset
|
914 | res = res->ai_next; |
|
07ef9839d751
[gaim-migrate @ 12086]
Daniel Atallah <datallah@pidgin.im>
parents:
10613
diff
changeset
|
915 | } |
|
07ef9839d751
[gaim-migrate @ 12086]
Daniel Atallah <datallah@pidgin.im>
parents:
10613
diff
changeset
|
916 | freeaddrinfo(tmp); |
|
07ef9839d751
[gaim-migrate @ 12086]
Daniel Atallah <datallah@pidgin.im>
parents:
10613
diff
changeset
|
917 | } else { |
|
07ef9839d751
[gaim-migrate @ 12086]
Daniel Atallah <datallah@pidgin.im>
parents:
10613
diff
changeset
|
918 | 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
|
919 | } |
|
07ef9839d751
[gaim-migrate @ 12086]
Daniel Atallah <datallah@pidgin.im>
parents:
10613
diff
changeset
|
920 | #else |
|
10562
000641c00f7d
[gaim-migrate @ 11942]
Daniel Atallah <datallah@pidgin.im>
parents:
10561
diff
changeset
|
921 | if ((hp = gethostbyname(td->hostname))) { |
|
000641c00f7d
[gaim-migrate @ 11942]
Daniel Atallah <datallah@pidgin.im>
parents:
10561
diff
changeset
|
922 | memset(&sin, 0, sizeof(struct sockaddr_in)); |
|
000641c00f7d
[gaim-migrate @ 11942]
Daniel Atallah <datallah@pidgin.im>
parents:
10561
diff
changeset
|
923 | 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
|
924 | sin.sin_family = hp->h_addrtype; |
|
000641c00f7d
[gaim-migrate @ 11942]
Daniel Atallah <datallah@pidgin.im>
parents:
10561
diff
changeset
|
925 | sin.sin_port = htons(td->port); |
|
10305
0b8022b3abae
[gaim-migrate @ 11490]
Mark Doliner <markdoliner@pidgin.im>
parents:
10264
diff
changeset
|
926 | |
|
10562
000641c00f7d
[gaim-migrate @ 11942]
Daniel Atallah <datallah@pidgin.im>
parents:
10561
diff
changeset
|
927 | td->hosts = g_slist_append(td->hosts, |
|
10619
07ef9839d751
[gaim-migrate @ 12086]
Daniel Atallah <datallah@pidgin.im>
parents:
10613
diff
changeset
|
928 | GSIZE_TO_POINTER(sizeof(sin))); |
|
10562
000641c00f7d
[gaim-migrate @ 11942]
Daniel Atallah <datallah@pidgin.im>
parents:
10561
diff
changeset
|
929 | td->hosts = g_slist_append(td->hosts, |
|
000641c00f7d
[gaim-migrate @ 11942]
Daniel Atallah <datallah@pidgin.im>
parents:
10561
diff
changeset
|
930 | g_memdup(&sin, sizeof(sin))); |
|
000641c00f7d
[gaim-migrate @ 11942]
Daniel Atallah <datallah@pidgin.im>
parents:
10561
diff
changeset
|
931 | } else { |
|
10619
07ef9839d751
[gaim-migrate @ 12086]
Daniel Atallah <datallah@pidgin.im>
parents:
10613
diff
changeset
|
932 | 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
|
933 | } |
|
10619
07ef9839d751
[gaim-migrate @ 12086]
Daniel Atallah <datallah@pidgin.im>
parents:
10613
diff
changeset
|
934 | #endif |
|
10237
93c682ab4b27
[gaim-migrate @ 11373]
Herman Bloggs <herman@bluedigits.com>
parents:
10172
diff
changeset
|
935 | /* back to main thread */ |
|
93c682ab4b27
[gaim-migrate @ 11373]
Herman Bloggs <herman@bluedigits.com>
parents:
10172
diff
changeset
|
936 | g_idle_add(dns_main_thread_cb, td); |
|
93c682ab4b27
[gaim-migrate @ 11373]
Herman Bloggs <herman@bluedigits.com>
parents:
10172
diff
changeset
|
937 | return 0; |
|
10305
0b8022b3abae
[gaim-migrate @ 11490]
Mark Doliner <markdoliner@pidgin.im>
parents:
10264
diff
changeset
|
938 | } |
|
10237
93c682ab4b27
[gaim-migrate @ 11373]
Herman Bloggs <herman@bluedigits.com>
parents:
10172
diff
changeset
|
939 | |
|
10711
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
940 | int |
|
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
941 | gaim_gethostbyname_async(const char *hostname, int port, |
|
14151
34427f138b1f
[gaim-migrate @ 16712]
Mark Doliner <markdoliner@pidgin.im>
parents:
14097
diff
changeset
|
942 | GaimProxyDnsConnectFunction callback, gpointer data) |
|
10711
f6279a730e85
[gaim-migrate @ 12301]
Mark Doliner <markdoliner@pidgin.im>
parents:
10709
diff
changeset
|
943 | { |
|
10237
93c682ab4b27
[gaim-migrate @ 11373]
Herman Bloggs <herman@bluedigits.com>
parents:
10172
diff
changeset
|
944 | dns_tdata *td; |
|
93c682ab4b27
[gaim-migrate @ 11373]
Herman Bloggs <herman@bluedigits.com>
parents:
10172
diff
changeset
|
945 | struct sockaddr_in sin; |
|
93c682ab4b27
[gaim-migrate @ 11373]
Herman Bloggs <herman@bluedigits.com>
parents:
10172
diff
changeset
|
946 | GError* err = NULL; |
|
93c682ab4b27
[gaim-migrate @ 11373]
Herman Bloggs <herman@bluedigits.com>
parents:
10172
diff
changeset
|
947 | |
|
93c682ab4b27
[gaim-migrate @ 11373]
Herman Bloggs <herman@bluedigits.com>
parents:
10172
diff
changeset
|
948 | if(inet_aton(hostname, &sin.sin_addr)) { |
|
93c682ab4b27
[gaim-migrate @ 11373]
Herman Bloggs <herman@bluedigits.com>
parents:
10172
diff
changeset
|
949 | GSList *hosts = NULL; |
|
93c682ab4b27
[gaim-migrate @ 11373]
Herman Bloggs <herman@bluedigits.com>
parents:
10172
diff
changeset
|
950 | sin.sin_family = AF_INET; |
|
93c682ab4b27
[gaim-migrate @ 11373]
Herman Bloggs <herman@bluedigits.com>
parents:
10172
diff
changeset
|
951 | sin.sin_port = htons(port); |
|
93c682ab4b27
[gaim-migrate @ 11373]
Herman Bloggs <herman@bluedigits.com>
parents:
10172
diff
changeset
|
952 | hosts = g_slist_append(hosts, GINT_TO_POINTER(sizeof(sin))); |
|
93c682ab4b27
[gaim-migrate @ 11373]
Herman Bloggs <herman@bluedigits.com>
parents:
10172
diff
changeset
|
953 | hosts = g_slist_append(hosts, g_memdup(&sin, sizeof(sin))); |
|
93c682ab4b27
[gaim-migrate @ 11373]
Herman Bloggs <herman@bluedigits.com>
parents:
10172
diff
changeset
|
954 | callback(hosts, data, NULL); |
|
93c682ab4b27
[gaim-migrate @ 11373]
Herman Bloggs <herman@bluedigits.com>
parents:
10172
diff
changeset
|
955 | return 0; |
|
93c682ab4b27
[gaim-migrate @ 11373]
Herman Bloggs <herman@bluedigits.com>
parents:
10172
diff
changeset
|
956 | } |
|
93c682ab4b27
[gaim-migrate @ 11373]
Herman Bloggs <herman@bluedigits.com>
parents:
10172
diff
changeset
|
957 | |
|
93c682ab4b27
[gaim-migrate @ 11373]
Herman Bloggs <herman@bluedigits.com>
parents:
10172
diff
changeset
|
958 | gaim_debug_info("dns", "DNS Lookup for: %s\n", hostname); |
|
93c682ab4b27
[gaim-migrate @ 11373]
Herman Bloggs <herman@bluedigits.com>
parents:
10172
diff
changeset
|
959 | td = g_new0(dns_tdata, 1); |
|
93c682ab4b27
[gaim-migrate @ 11373]
Herman Bloggs <herman@bluedigits.com>
parents:
10172
diff
changeset
|
960 | td->hostname = g_strdup(hostname); |
|
93c682ab4b27
[gaim-migrate @ 11373]
Herman Bloggs <herman@bluedigits.com>
parents:
10172
diff
changeset
|
961 | td->port = port; |
|
93c682ab4b27
[gaim-migrate @ 11373]
Herman Bloggs <herman@bluedigits.com>
parents:
10172
diff
changeset
|
962 | td->callback = callback; |
|
93c682ab4b27
[gaim-migrate @ 11373]
Herman Bloggs <herman@bluedigits.com>
parents:
10172
diff
changeset
|
963 | td->data = data; |
|
93c682ab4b27
[gaim-migrate @ 11373]
Herman Bloggs <herman@bluedigits.com>
parents:
10172
diff
changeset
|
964 | |
|
93c682ab4b27
[gaim-migrate @ 11373]
Herman Bloggs <herman@bluedigits.com>
parents:
10172
diff
changeset
|
965 | if(!g_thread_create(dns_thread, td, FALSE, &err)) { |
|
93c682ab4b27
[gaim-migrate @ 11373]
Herman Bloggs <herman@bluedigits.com>
parents:
10172
diff
changeset
|
966 | 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
|
967 | g_error_free(err); |
|
93c682ab4b27
[gaim-migrate @ 11373]
Herman Bloggs <herman@bluedigits.com>
parents:
10172
diff
changeset
|
968 | g_free(td->hostname); |
|
93c682ab4b27
[gaim-migrate @ 11373]
Herman Bloggs <herman@bluedigits.com>
parents:
10172
diff
changeset
|
969 | g_free(td); |
|
93c682ab4b27
[gaim-migrate @ 11373]
Herman Bloggs <herman@bluedigits.com>
parents:
10172
diff
changeset
|
970 | return -1; |
|
93c682ab4b27
[gaim-migrate @ 11373]
Herman Bloggs <herman@bluedigits.com>
parents:
10172
diff
changeset
|
971 | } |
|
93c682ab4b27
[gaim-migrate @ 11373]
Herman Bloggs <herman@bluedigits.com>
parents:
10172
diff
changeset
|
972 | return 0; |
|
93c682ab4b27
[gaim-migrate @ 11373]
Herman Bloggs <herman@bluedigits.com>
parents:
10172
diff
changeset
|
973 | } |
|
93c682ab4b27
[gaim-migrate @ 11373]
Herman Bloggs <herman@bluedigits.com>
parents:
10172
diff
changeset
|
974 | |
|
13649
b156749bec5b
[gaim-migrate @ 16049]
Evan Schoenberg <evands@pidgin.im>
parents:
13531
diff
changeset
|
975 | #else /* not __unix__ or __APPLE__ or _WIN32 */ |
|
4366
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
976 | |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
977 | typedef struct { |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
978 | gpointer data; |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
979 | size_t addrlen; |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
980 | struct sockaddr *addr; |
|
14151
34427f138b1f
[gaim-migrate @ 16712]
Mark Doliner <markdoliner@pidgin.im>
parents:
14097
diff
changeset
|
981 | GaimProxyDnsConnectFunction callback; |
|
4366
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
982 | } pending_dns_request_t; |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
983 | |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
984 | static gboolean host_resolved(gpointer data) |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
985 | { |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
986 | pending_dns_request_t *req = (pending_dns_request_t*)data; |
| 4678 | 987 | GSList *hosts = NULL; |
| 988 | hosts = g_slist_append(hosts, GINT_TO_POINTER(req->addrlen)); | |
| 989 | hosts = g_slist_append(hosts, req->addr); | |
| 990 | req->callback(hosts, req->data, NULL); | |
|
4366
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
991 | g_free(req); |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
992 | return FALSE; |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
993 | } |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
994 | |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
995 | int |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
996 | gaim_gethostbyname_async(const char *hostname, int port, |
|
14151
34427f138b1f
[gaim-migrate @ 16712]
Mark Doliner <markdoliner@pidgin.im>
parents:
14097
diff
changeset
|
997 | GaimProxyDnsConnectFunction callback, gpointer data) |
|
4366
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
998 | { |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
999 | struct sockaddr_in sin; |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
1000 | pending_dns_request_t *req; |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
1001 | |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
1002 | if (!inet_aton(hostname, &sin.sin_addr)) { |
|
2911
b20669ca1281
[gaim-migrate @ 2924]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2907
diff
changeset
|
1003 | struct hostent *hp; |
|
4366
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
1004 | if(!(hp = gethostbyname(hostname))) { |
|
10309
073906008cb2
[gaim-migrate @ 11501]
Mark Doliner <markdoliner@pidgin.im>
parents:
10307
diff
changeset
|
1005 | gaim_debug_error("dns", |
|
8977
74162f1be34a
[gaim-migrate @ 9751]
Mark Doliner <markdoliner@pidgin.im>
parents:
8917
diff
changeset
|
1006 | "gaim_gethostbyname(\"%s\", %d) failed: %d\n", |
|
74162f1be34a
[gaim-migrate @ 9751]
Mark Doliner <markdoliner@pidgin.im>
parents:
8917
diff
changeset
|
1007 | hostname, port, h_errno); |
|
4366
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
1008 | return -1; |
|
2911
b20669ca1281
[gaim-migrate @ 2924]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2907
diff
changeset
|
1009 | } |
|
b20669ca1281
[gaim-migrate @ 2924]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2907
diff
changeset
|
1010 | memset(&sin, 0, sizeof(struct sockaddr_in)); |
|
b20669ca1281
[gaim-migrate @ 2924]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2907
diff
changeset
|
1011 | 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
|
1012 | sin.sin_family = hp->h_addrtype; |
|
b20669ca1281
[gaim-migrate @ 2924]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2907
diff
changeset
|
1013 | } else |
|
b20669ca1281
[gaim-migrate @ 2924]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2907
diff
changeset
|
1014 | sin.sin_family = AF_INET; |
|
b20669ca1281
[gaim-migrate @ 2924]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2907
diff
changeset
|
1015 | sin.sin_port = htons(port); |
|
b20669ca1281
[gaim-migrate @ 2924]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2907
diff
changeset
|
1016 | |
|
4366
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
1017 | req = g_new(pending_dns_request_t, 1); |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
1018 | req->addr = (struct sockaddr*) g_memdup(&sin, sizeof(sin)); |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
1019 | req->addrlen = sizeof(sin); |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
1020 | req->data = data; |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
1021 | req->callback = callback; |
| 8273 | 1022 | gaim_timeout_add(10, host_resolved, req); |
|
4366
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
1023 | return 0; |
|
2911
b20669ca1281
[gaim-migrate @ 2924]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2907
diff
changeset
|
1024 | } |
|
b20669ca1281
[gaim-migrate @ 2924]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2907
diff
changeset
|
1025 | |
|
13649
b156749bec5b
[gaim-migrate @ 16049]
Evan Schoenberg <evands@pidgin.im>
parents:
13531
diff
changeset
|
1026 | #endif /* not __unix__ or __APPLE__ or _WIN32 */ |
|
4366
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
1027 | |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1028 | static void |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1029 | no_one_calls(gpointer data, gint source, GaimInputCondition cond) |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1030 | { |
|
14159
0fcdaa463a32
[gaim-migrate @ 16726]
Mark Doliner <markdoliner@pidgin.im>
parents:
14158
diff
changeset
|
1031 | GaimProxyConnectInfo *connect_info = data; |
| 12991 | 1032 | socklen_t len; |
| 8273 | 1033 | int error=0, ret; |
|
3717
2fc0789e04e8
[gaim-migrate @ 3850]
Herman Bloggs <herman@bluedigits.com>
parents:
3630
diff
changeset
|
1034 | |
|
10309
073906008cb2
[gaim-migrate @ 11501]
Mark Doliner <markdoliner@pidgin.im>
parents:
10307
diff
changeset
|
1035 | gaim_debug_info("proxy", "Connected.\n"); |
|
3717
2fc0789e04e8
[gaim-migrate @ 3850]
Herman Bloggs <herman@bluedigits.com>
parents:
3630
diff
changeset
|
1036 | |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1037 | len = sizeof(error); |
|
4648
22f8080928e0
[gaim-migrate @ 4959]
Herman Bloggs <herman@bluedigits.com>
parents:
4634
diff
changeset
|
1038 | |
| 8273 | 1039 | /* |
| 1040 | * getsockopt after a non-blocking connect returns -1 if something is | |
| 1041 | * really messed up (bad descriptor, usually). Otherwise, it returns 0 and | |
| 1042 | * error holds what connect would have returned if it blocked until now. | |
| 1043 | * Thus, error == 0 is success, error == EINPROGRESS means "try again", | |
| 1044 | * and anything else is a real error. | |
| 1045 | * | |
| 1046 | * (error == EINPROGRESS can happen after a select because the kernel can | |
| 1047 | * be overly optimistic sometimes. select is just a hint that you might be | |
| 1048 | * able to do something.) | |
| 1049 | */ | |
|
14165
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
1050 | ret = getsockopt(connect_info->fd, SOL_SOCKET, SO_ERROR, &error, &len); |
| 8273 | 1051 | if (ret == 0 && error == EINPROGRESS) |
|
9863
323e4fe28791
[gaim-migrate @ 10742]
Mark Doliner <markdoliner@pidgin.im>
parents:
9792
diff
changeset
|
1052 | return; /* we'll be called again later */ |
| 8273 | 1053 | if (ret < 0 || error != 0) { |
|
14151
34427f138b1f
[gaim-migrate @ 16712]
Mark Doliner <markdoliner@pidgin.im>
parents:
14097
diff
changeset
|
1054 | if (ret!=0) |
|
34427f138b1f
[gaim-migrate @ 16712]
Mark Doliner <markdoliner@pidgin.im>
parents:
14097
diff
changeset
|
1055 | error = errno; |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1056 | |
|
10309
073906008cb2
[gaim-migrate @ 11501]
Mark Doliner <markdoliner@pidgin.im>
parents:
10307
diff
changeset
|
1057 | gaim_debug_error("proxy", |
| 9100 | 1058 | "getsockopt SO_ERROR check: %s\n", strerror(error)); |
| 9129 | 1059 | |
|
14165
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
1060 | gaim_proxy_connect_info_disconnect(connect_info); |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1061 | try_connect(connect_info); |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1062 | return; |
|
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1063 | } |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1064 | |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1065 | gaim_input_remove(connect_info->inpa); |
|
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1066 | connect_info->inpa = 0; |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1067 | |
|
14165
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
1068 | gaim_proxy_connect_info_connected(connect_info); |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1069 | } |
|
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1070 | |
|
14165
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
1071 | static gboolean |
|
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
1072 | clean_connect(gpointer data) |
|
1868
31b44ef2b061
[gaim-migrate @ 1878]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1844
diff
changeset
|
1073 | { |
|
14165
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
1074 | GaimProxyConnectInfo *connect_info; |
|
1868
31b44ef2b061
[gaim-migrate @ 1878]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1844
diff
changeset
|
1075 | |
|
14165
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
1076 | connect_info = data; |
|
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
1077 | gaim_proxy_connect_info_connected(connect_info); |
|
1868
31b44ef2b061
[gaim-migrate @ 1878]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1844
diff
changeset
|
1078 | |
|
31b44ef2b061
[gaim-migrate @ 1878]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1844
diff
changeset
|
1079 | return FALSE; |
|
31b44ef2b061
[gaim-migrate @ 1878]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1844
diff
changeset
|
1080 | } |
|
31b44ef2b061
[gaim-migrate @ 1878]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1844
diff
changeset
|
1081 | |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1082 | static int |
|
14159
0fcdaa463a32
[gaim-migrate @ 16726]
Mark Doliner <markdoliner@pidgin.im>
parents:
14158
diff
changeset
|
1083 | proxy_connect_none(GaimProxyConnectInfo *connect_info, struct sockaddr *addr, socklen_t addrlen) |
| 1 | 1084 | { |
|
14165
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
1085 | gaim_debug_info("proxy", "Connecting to %s:%d with no proxy\n", |
|
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
1086 | connect_info->host, connect_info->port); |
|
3717
2fc0789e04e8
[gaim-migrate @ 3850]
Herman Bloggs <herman@bluedigits.com>
parents:
3630
diff
changeset
|
1087 | |
|
14165
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
1088 | connect_info->fd = socket(addr->sa_family, SOCK_STREAM, 0); |
|
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
1089 | if (connect_info->fd < 0) |
|
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
1090 | { |
|
10309
073906008cb2
[gaim-migrate @ 11501]
Mark Doliner <markdoliner@pidgin.im>
parents:
10307
diff
changeset
|
1091 | gaim_debug_error("proxy", |
|
5211
94d9756c381f
[gaim-migrate @ 5581]
Christian Hammond <chipx86@chipx86.com>
parents:
4993
diff
changeset
|
1092 | "Unable to create socket: %s\n", strerror(errno)); |
|
1087
bc9c6b635358
[gaim-migrate @ 1097]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1057
diff
changeset
|
1093 | return -1; |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1094 | } |
|
14165
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
1095 | fcntl(connect_info->fd, F_SETFL, O_NONBLOCK); |
|
10172
8400788b226c
[gaim-migrate @ 11275]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10170
diff
changeset
|
1096 | #ifndef _WIN32 |
|
14165
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
1097 | fcntl(connect_info->fd, F_SETFD, FD_CLOEXEC); |
|
10172
8400788b226c
[gaim-migrate @ 11275]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10170
diff
changeset
|
1098 | #endif |
|
3717
2fc0789e04e8
[gaim-migrate @ 3850]
Herman Bloggs <herman@bluedigits.com>
parents:
3630
diff
changeset
|
1099 | |
|
14165
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
1100 | if (connect(connect_info->fd, (struct sockaddr *)addr, addrlen) != 0) |
|
14161
e959d0e476be
[gaim-migrate @ 16728]
Mark Doliner <markdoliner@pidgin.im>
parents:
14159
diff
changeset
|
1101 | { |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1102 | if ((errno == EINPROGRESS) || (errno == EINTR)) { |
|
14165
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
1103 | gaim_debug_info("proxy", "Connection in progress\n"); |
|
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
1104 | connect_info->inpa = gaim_input_add(connect_info->fd, GAIM_INPUT_WRITE, no_one_calls, connect_info); |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1105 | } |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1106 | else { |
|
10309
073906008cb2
[gaim-migrate @ 11501]
Mark Doliner <markdoliner@pidgin.im>
parents:
10307
diff
changeset
|
1107 | gaim_debug_error("proxy", |
| 9100 | 1108 | "Connect failed: %s\n", strerror(errno)); |
|
14165
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
1109 | close(connect_info->fd); |
|
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
1110 | connect_info->fd = -1; |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1111 | return -1; |
|
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1112 | } |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1113 | } |
|
14165
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
1114 | else |
|
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
1115 | { |
|
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
1116 | /* |
|
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
1117 | * The connection happened IMMEDIATELY... strange, but whatever. |
|
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
1118 | */ |
| 12991 | 1119 | socklen_t len; |
|
2048
4ac8b9622c9e
[gaim-migrate @ 2058]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1881
diff
changeset
|
1120 | int error = ETIMEDOUT; |
|
14165
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
1121 | gaim_debug_info("proxy", "Connected immediately.\n"); |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1122 | len = sizeof(error); |
|
14165
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
1123 | if (getsockopt(connect_info->fd, SOL_SOCKET, SO_ERROR, &error, &len) != 0) |
|
14161
e959d0e476be
[gaim-migrate @ 16728]
Mark Doliner <markdoliner@pidgin.im>
parents:
14159
diff
changeset
|
1124 | { |
|
10309
073906008cb2
[gaim-migrate @ 11501]
Mark Doliner <markdoliner@pidgin.im>
parents:
10307
diff
changeset
|
1125 | gaim_debug_error("proxy", "getsockopt failed.\n"); |
|
14165
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
1126 | close(connect_info->fd); |
|
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
1127 | connect_info->fd = -1; |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1128 | return -1; |
|
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1129 | } |
|
14165
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
1130 | |
|
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
1131 | /* |
|
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
1132 | * We want to call the "connected" callback eventually, but we |
|
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
1133 | * don't want to call it before we return, just in case. |
|
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
1134 | */ |
|
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
1135 | gaim_timeout_add(10, clean_connect, connect_info); |
|
1087
bc9c6b635358
[gaim-migrate @ 1097]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1057
diff
changeset
|
1136 | } |
|
bc9c6b635358
[gaim-migrate @ 1097]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1057
diff
changeset
|
1137 | |
|
14165
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
1138 | return connect_info->fd; |
|
1087
bc9c6b635358
[gaim-migrate @ 1097]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1057
diff
changeset
|
1139 | } |
|
bc9c6b635358
[gaim-migrate @ 1097]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1057
diff
changeset
|
1140 | |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1141 | static void |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1142 | proxy_do_write(gpointer data, gint source, GaimInputCondition cond) |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1143 | { |
|
14159
0fcdaa463a32
[gaim-migrate @ 16726]
Mark Doliner <markdoliner@pidgin.im>
parents:
14158
diff
changeset
|
1144 | GaimProxyConnectInfo *connect_info = data; |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1145 | const guchar *request = connect_info->write_buffer + connect_info->written_len; |
|
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1146 | gsize request_len = connect_info->write_buf_len - connect_info->written_len; |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1147 | |
|
14165
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
1148 | int ret = write(connect_info->fd, request, request_len); |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1149 | |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1150 | if(ret < 0 && errno == EAGAIN) |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1151 | return; |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1152 | else if(ret < 0) { |
|
14165
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
1153 | gaim_proxy_connect_info_disconnect(connect_info); |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1154 | try_connect(connect_info); |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1155 | return; |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1156 | } else if (ret < request_len) { |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1157 | connect_info->written_len += ret; |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1158 | return; |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1159 | } |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1160 | |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1161 | gaim_input_remove(connect_info->inpa); |
|
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1162 | g_free(connect_info->write_buffer); |
|
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1163 | connect_info->write_buffer = NULL; |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1164 | |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1165 | /* register the response handler for the response */ |
|
14165
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
1166 | connect_info->inpa = gaim_input_add(connect_info->fd, GAIM_INPUT_READ, connect_info->read_cb, connect_info); |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1167 | } |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1168 | |
| 3376 | 1169 | #define HTTP_GOODSTRING "HTTP/1.0 200" |
| 1170 | #define HTTP_GOODSTRING2 "HTTP/1.1 200" | |
|
1087
bc9c6b635358
[gaim-migrate @ 1097]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1057
diff
changeset
|
1171 | |
| 7834 | 1172 | /* 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
|
1173 | static void |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1174 | http_canread(gpointer data, gint source, GaimInputCondition cond) |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1175 | { |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1176 | int len, headers_len, status = 0; |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1177 | gboolean error; |
|
14159
0fcdaa463a32
[gaim-migrate @ 16726]
Mark Doliner <markdoliner@pidgin.im>
parents:
14158
diff
changeset
|
1178 | GaimProxyConnectInfo *connect_info = data; |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1179 | guchar *p; |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1180 | gsize max_read; |
|
14151
34427f138b1f
[gaim-migrate @ 16712]
Mark Doliner <markdoliner@pidgin.im>
parents:
14097
diff
changeset
|
1181 | gchar *msg; |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1182 | |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1183 | if(connect_info->read_buffer == NULL) { |
|
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1184 | connect_info->read_buf_len = 8192; |
|
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1185 | connect_info->read_buffer = g_malloc(connect_info->read_buf_len); |
|
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1186 | connect_info->read_len = 0; |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1187 | } |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1188 | |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1189 | p = connect_info->read_buffer + connect_info->read_len; |
|
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1190 | max_read = connect_info->read_buf_len - connect_info->read_len - 1; |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1191 | |
|
14165
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
1192 | len = read(connect_info->fd, p, max_read); |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1193 | if(len < 0 && errno == EAGAIN) |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1194 | return; |
|
13788
019bc2080927
[gaim-migrate @ 16198]
Daniel Atallah <datallah@pidgin.im>
parents:
13754
diff
changeset
|
1195 | else if(len <= 0) { |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1196 | gaim_proxy_connect_info_error(connect_info, _("Lost connection with server for an unknown reason.")); |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1197 | return; |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1198 | } else { |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1199 | connect_info->read_len += len; |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1200 | } |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1201 | p[len] = '\0'; |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1202 | |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1203 | if((p = (guchar *)g_strstr_len((const gchar *)connect_info->read_buffer, connect_info->read_len, "\r\n\r\n"))) { |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1204 | *p = '\0'; |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1205 | headers_len = (p - connect_info->read_buffer) + 4; |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1206 | } else if(len == max_read) |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1207 | headers_len = len; |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1208 | else |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1209 | return; |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1210 | |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1211 | error = strncmp((const char *)connect_info->read_buffer, "HTTP/", 5) != 0; |
|
14151
34427f138b1f
[gaim-migrate @ 16712]
Mark Doliner <markdoliner@pidgin.im>
parents:
14097
diff
changeset
|
1212 | if (!error) |
|
34427f138b1f
[gaim-migrate @ 16712]
Mark Doliner <markdoliner@pidgin.im>
parents:
14097
diff
changeset
|
1213 | { |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1214 | int major; |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1215 | p = connect_info->read_buffer + 5; |
|
13387
c6be7551b0a6
[gaim-migrate @ 15759]
Mark Doliner <markdoliner@pidgin.im>
parents:
13313
diff
changeset
|
1216 | major = strtol((const char *)p, (char **)&p, 10); |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1217 | error = (major == 0) || (*p != '.'); |
|
4366
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
1218 | if(!error) { |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1219 | int minor; |
|
4366
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
1220 | p++; |
|
13387
c6be7551b0a6
[gaim-migrate @ 15759]
Mark Doliner <markdoliner@pidgin.im>
parents:
13313
diff
changeset
|
1221 | minor = strtol((const char *)p, (char **)&p, 10); |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1222 | error = (*p != ' '); |
|
4366
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
1223 | if(!error) { |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
1224 | p++; |
|
13387
c6be7551b0a6
[gaim-migrate @ 15759]
Mark Doliner <markdoliner@pidgin.im>
parents:
13313
diff
changeset
|
1225 | status = strtol((const char *)p, (char **)&p, 10); |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1226 | error = (*p != ' '); |
|
4366
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
1227 | } |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
1228 | } |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
1229 | } |
| 9129 | 1230 | |
| 12391 | 1231 | /* Read the contents */ |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1232 | p = (guchar *)g_strrstr((const gchar *)connect_info->read_buffer, "Content-Length: "); |
|
14151
34427f138b1f
[gaim-migrate @ 16712]
Mark Doliner <markdoliner@pidgin.im>
parents:
14097
diff
changeset
|
1233 | if (p != NULL) |
|
34427f138b1f
[gaim-migrate @ 16712]
Mark Doliner <markdoliner@pidgin.im>
parents:
14097
diff
changeset
|
1234 | { |
| 12391 | 1235 | gchar *tmp; |
| 1236 | int len = 0; | |
| 1237 | char tmpc; | |
| 1238 | p += strlen("Content-Length: "); | |
|
13387
c6be7551b0a6
[gaim-migrate @ 15759]
Mark Doliner <markdoliner@pidgin.im>
parents:
13313
diff
changeset
|
1239 | tmp = strchr((const char *)p, '\r'); |
|
13405
9abc78d6db91
[gaim-migrate @ 15779]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
13387
diff
changeset
|
1240 | if(tmp) |
|
9abc78d6db91
[gaim-migrate @ 15779]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
13387
diff
changeset
|
1241 | *tmp = '\0'; |
|
13387
c6be7551b0a6
[gaim-migrate @ 15759]
Mark Doliner <markdoliner@pidgin.im>
parents:
13313
diff
changeset
|
1242 | len = atoi((const char *)p); |
|
13405
9abc78d6db91
[gaim-migrate @ 15779]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
13387
diff
changeset
|
1243 | if(tmp) |
|
9abc78d6db91
[gaim-migrate @ 15779]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
13387
diff
changeset
|
1244 | *tmp = '\r'; |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1245 | |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1246 | /* Compensate for what has already been read */ |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1247 | len -= connect_info->read_len - headers_len; |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1248 | /* I'm assuming that we're doing this to prevent the server from |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1249 | complaining / breaking since we don't read the whole page */ |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1250 | while(len--) { |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1251 | /* TODO: deal with EAGAIN (and other errors) better */ |
|
14165
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
1252 | if (read(connect_info->fd, &tmpc, 1) < 0 && errno != EAGAIN) |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1253 | break; |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1254 | } |
| 12391 | 1255 | } |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1256 | |
|
14151
34427f138b1f
[gaim-migrate @ 16712]
Mark Doliner <markdoliner@pidgin.im>
parents:
14097
diff
changeset
|
1257 | if (error) |
|
34427f138b1f
[gaim-migrate @ 16712]
Mark Doliner <markdoliner@pidgin.im>
parents:
14097
diff
changeset
|
1258 | { |
|
34427f138b1f
[gaim-migrate @ 16712]
Mark Doliner <markdoliner@pidgin.im>
parents:
14097
diff
changeset
|
1259 | msg = g_strdup_printf("Unable to parse response from HTTP proxy: %s\n", |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1260 | connect_info->read_buffer); |
|
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1261 | gaim_proxy_connect_info_error(connect_info, msg); |
|
14151
34427f138b1f
[gaim-migrate @ 16712]
Mark Doliner <markdoliner@pidgin.im>
parents:
14097
diff
changeset
|
1262 | g_free(msg); |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1263 | return; |
|
14151
34427f138b1f
[gaim-migrate @ 16712]
Mark Doliner <markdoliner@pidgin.im>
parents:
14097
diff
changeset
|
1264 | } |
|
34427f138b1f
[gaim-migrate @ 16712]
Mark Doliner <markdoliner@pidgin.im>
parents:
14097
diff
changeset
|
1265 | else if (status != 200) |
|
34427f138b1f
[gaim-migrate @ 16712]
Mark Doliner <markdoliner@pidgin.im>
parents:
14097
diff
changeset
|
1266 | { |
|
10309
073906008cb2
[gaim-migrate @ 11501]
Mark Doliner <markdoliner@pidgin.im>
parents:
10307
diff
changeset
|
1267 | gaim_debug_error("proxy", |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1268 | "Proxy server replied with:\n%s\n", |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1269 | connect_info->read_buffer); |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1270 | |
| 9129 | 1271 | |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1272 | if(status == 407 /* Proxy Auth */) { |
| 12391 | 1273 | gchar *ntlm; |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1274 | if((ntlm = g_strrstr((const gchar *)connect_info->read_buffer, "Proxy-Authenticate: NTLM "))) { /* Check for Type-2 */ |
|
13700
ad7bca3b4240
[gaim-migrate @ 16101]
Mark Doliner <markdoliner@pidgin.im>
parents:
13649
diff
changeset
|
1275 | gchar *tmp = ntlm; |
|
ad7bca3b4240
[gaim-migrate @ 16101]
Mark Doliner <markdoliner@pidgin.im>
parents:
13649
diff
changeset
|
1276 | guint8 *nonce; |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1277 | gchar *domain = (gchar*)gaim_proxy_info_get_username(connect_info->gpi); |
| 12391 | 1278 | gchar *username; |
| 1279 | gchar *request; | |
| 1280 | gchar *response; | |
|
14151
34427f138b1f
[gaim-migrate @ 16712]
Mark Doliner <markdoliner@pidgin.im>
parents:
14097
diff
changeset
|
1281 | username = strchr(domain, '\\'); |
|
34427f138b1f
[gaim-migrate @ 16712]
Mark Doliner <markdoliner@pidgin.im>
parents:
14097
diff
changeset
|
1282 | if (username == NULL) |
|
34427f138b1f
[gaim-migrate @ 16712]
Mark Doliner <markdoliner@pidgin.im>
parents:
14097
diff
changeset
|
1283 | { |
|
34427f138b1f
[gaim-migrate @ 16712]
Mark Doliner <markdoliner@pidgin.im>
parents:
14097
diff
changeset
|
1284 | msg = g_strdup_printf(_("HTTP proxy connection error %d"), status); |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1285 | gaim_proxy_connect_info_error(connect_info, msg); |
| 12391 | 1286 | g_free(msg); |
| 1287 | return; | |
| 1288 | } | |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1289 | *username = '\0'; |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1290 | username++; |
| 12391 | 1291 | ntlm += strlen("Proxy-Authenticate: NTLM "); |
|
13700
ad7bca3b4240
[gaim-migrate @ 16101]
Mark Doliner <markdoliner@pidgin.im>
parents:
13649
diff
changeset
|
1292 | while(*tmp != '\r' && *tmp != '\0') tmp++; |
|
ad7bca3b4240
[gaim-migrate @ 16101]
Mark Doliner <markdoliner@pidgin.im>
parents:
13649
diff
changeset
|
1293 | *tmp = '\0'; |
|
13085
c80913901342
[gaim-migrate @ 15446]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
13023
diff
changeset
|
1294 | nonce = gaim_ntlm_parse_type2(ntlm, NULL); |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1295 | response = gaim_ntlm_gen_type3(username, |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1296 | (gchar*) gaim_proxy_info_get_password(connect_info->gpi), |
|
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1297 | (gchar*) gaim_proxy_info_get_host(connect_info->gpi), |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1298 | domain, nonce, NULL); |
| 12391 | 1299 | username--; |
| 1300 | *username = '\\'; | |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1301 | request = g_strdup_printf( |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1302 | "CONNECT %s:%d HTTP/1.1\r\n" |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1303 | "Host: %s:%d\r\n" |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1304 | "Proxy-Authorization: NTLM %s\r\n" |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1305 | "Proxy-Connection: Keep-Alive\r\n\r\n", |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1306 | connect_info->host, connect_info->port, connect_info->host, |
|
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1307 | connect_info->port, response); |
| 12391 | 1308 | g_free(response); |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1309 | |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1310 | gaim_input_remove(connect_info->inpa); |
|
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1311 | g_free(connect_info->read_buffer); |
|
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1312 | connect_info->read_buffer = NULL; |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1313 | |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1314 | connect_info->write_buffer = (guchar *)request; |
|
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1315 | connect_info->write_buf_len = strlen(request); |
|
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1316 | connect_info->written_len = 0; |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1317 | |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1318 | connect_info->read_cb = http_canread; |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1319 | |
|
14165
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
1320 | connect_info->inpa = gaim_input_add(connect_info->fd, |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1321 | GAIM_INPUT_WRITE, proxy_do_write, connect_info); |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1322 | |
|
14165
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
1323 | proxy_do_write(connect_info, connect_info->fd, cond); |
| 12391 | 1324 | return; |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1325 | } else if((ntlm = g_strrstr((const char *)connect_info->read_buffer, "Proxy-Authenticate: NTLM"))) { /* Empty message */ |
| 12391 | 1326 | gchar request[2048]; |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1327 | gchar *domain = (gchar*) gaim_proxy_info_get_username(connect_info->gpi); |
| 12391 | 1328 | gchar *username; |
| 1329 | int request_len; | |
|
14151
34427f138b1f
[gaim-migrate @ 16712]
Mark Doliner <markdoliner@pidgin.im>
parents:
14097
diff
changeset
|
1330 | username = strchr(domain, '\\'); |
|
34427f138b1f
[gaim-migrate @ 16712]
Mark Doliner <markdoliner@pidgin.im>
parents:
14097
diff
changeset
|
1331 | if (username == NULL) |
|
34427f138b1f
[gaim-migrate @ 16712]
Mark Doliner <markdoliner@pidgin.im>
parents:
14097
diff
changeset
|
1332 | { |
|
34427f138b1f
[gaim-migrate @ 16712]
Mark Doliner <markdoliner@pidgin.im>
parents:
14097
diff
changeset
|
1333 | msg = g_strdup_printf(_("HTTP proxy connection error %d"), status); |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1334 | gaim_proxy_connect_info_error(connect_info, msg); |
| 12391 | 1335 | g_free(msg); |
| 1336 | return; | |
| 1337 | } | |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1338 | *username = '\0'; |
| 12391 | 1339 | |
| 1340 | request_len = g_snprintf(request, sizeof(request), | |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1341 | "CONNECT %s:%d HTTP/1.1\r\n" |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1342 | "Host: %s:%d\r\n", |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1343 | connect_info->host, connect_info->port, |
|
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1344 | connect_info->host, connect_info->port); |
| 12391 | 1345 | |
| 1346 | g_return_if_fail(request_len < sizeof(request)); | |
| 1347 | request_len += g_snprintf(request + request_len, | |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1348 | sizeof(request) - request_len, |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1349 | "Proxy-Authorization: NTLM %s\r\n" |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1350 | "Proxy-Connection: Keep-Alive\r\n\r\n", |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1351 | gaim_ntlm_gen_type1( |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1352 | (gchar*) gaim_proxy_info_get_host(connect_info->gpi), |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1353 | domain)); |
| 12391 | 1354 | *username = '\\'; |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1355 | |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1356 | gaim_input_remove(connect_info->inpa); |
|
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1357 | g_free(connect_info->read_buffer); |
|
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1358 | connect_info->read_buffer = NULL; |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1359 | |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1360 | connect_info->write_buffer = g_memdup(request, request_len); |
|
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1361 | connect_info->write_buf_len = request_len; |
|
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1362 | connect_info->written_len = 0; |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1363 | |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1364 | connect_info->read_cb = http_canread; |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1365 | |
|
14165
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
1366 | connect_info->inpa = gaim_input_add(connect_info->fd, |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1367 | GAIM_INPUT_WRITE, proxy_do_write, connect_info); |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1368 | |
|
14165
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
1369 | proxy_do_write(connect_info, connect_info->fd, cond); |
| 12391 | 1370 | return; |
| 1371 | } else { | |
|
14151
34427f138b1f
[gaim-migrate @ 16712]
Mark Doliner <markdoliner@pidgin.im>
parents:
14097
diff
changeset
|
1372 | msg = g_strdup_printf(_("HTTP proxy connection error %d"), status); |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1373 | gaim_proxy_connect_info_error(connect_info, msg); |
| 12391 | 1374 | g_free(msg); |
|
13209
439ad2dad2e1
[gaim-migrate @ 15572]
Daniel Atallah <datallah@pidgin.im>
parents:
13201
diff
changeset
|
1375 | return; |
| 12391 | 1376 | } |
| 1377 | } | |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1378 | if(status == 403 /* Forbidden */ ) { |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1379 | msg = g_strdup_printf(_("Access denied: HTTP proxy server forbids port %d tunnelling."), connect_info->port); |
|
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1380 | gaim_proxy_connect_info_error(connect_info, msg); |
|
8917
1301b17bc141
[gaim-migrate @ 9687]
Mark Doliner <markdoliner@pidgin.im>
parents:
8889
diff
changeset
|
1381 | g_free(msg); |
|
1301b17bc141
[gaim-migrate @ 9687]
Mark Doliner <markdoliner@pidgin.im>
parents:
8889
diff
changeset
|
1382 | } else { |
|
14151
34427f138b1f
[gaim-migrate @ 16712]
Mark Doliner <markdoliner@pidgin.im>
parents:
14097
diff
changeset
|
1383 | msg = g_strdup_printf(_("HTTP proxy connection error %d"), status); |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1384 | gaim_proxy_connect_info_error(connect_info, msg); |
| 7834 | 1385 | g_free(msg); |
| 1386 | } | |
| 1387 | } else { | |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1388 | gaim_input_remove(connect_info->inpa); |
|
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1389 | connect_info->inpa = 0; |
|
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1390 | g_free(connect_info->read_buffer); |
|
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1391 | connect_info->read_buffer = NULL; |
|
14151
34427f138b1f
[gaim-migrate @ 16712]
Mark Doliner <markdoliner@pidgin.im>
parents:
14097
diff
changeset
|
1392 | gaim_debug_info("proxy", "HTTP proxy connection established\n"); |
|
14165
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
1393 | gaim_proxy_connect_info_connected(connect_info); |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1394 | return; |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1395 | } |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1396 | } |
| 9129 | 1397 | |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1398 | |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1399 | |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1400 | static void |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1401 | http_canwrite(gpointer data, gint source, GaimInputCondition cond) |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1402 | { |
|
4366
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
1403 | char request[8192]; |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
1404 | int request_len = 0; |
|
14159
0fcdaa463a32
[gaim-migrate @ 16726]
Mark Doliner <markdoliner@pidgin.im>
parents:
14158
diff
changeset
|
1405 | GaimProxyConnectInfo *connect_info = data; |
| 12991 | 1406 | socklen_t len; |
|
2048
4ac8b9622c9e
[gaim-migrate @ 2058]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1881
diff
changeset
|
1407 | int error = ETIMEDOUT; |
|
3717
2fc0789e04e8
[gaim-migrate @ 3850]
Herman Bloggs <herman@bluedigits.com>
parents:
3630
diff
changeset
|
1408 | |
|
10309
073906008cb2
[gaim-migrate @ 11501]
Mark Doliner <markdoliner@pidgin.im>
parents:
10307
diff
changeset
|
1409 | gaim_debug_info("http proxy", "Connected.\n"); |
|
5211
94d9756c381f
[gaim-migrate @ 5581]
Christian Hammond <chipx86@chipx86.com>
parents:
4993
diff
changeset
|
1410 | |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1411 | if (connect_info->inpa > 0) |
|
14151
34427f138b1f
[gaim-migrate @ 16712]
Mark Doliner <markdoliner@pidgin.im>
parents:
14097
diff
changeset
|
1412 | { |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1413 | gaim_input_remove(connect_info->inpa); |
|
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1414 | connect_info->inpa = 0; |
|
14151
34427f138b1f
[gaim-migrate @ 16712]
Mark Doliner <markdoliner@pidgin.im>
parents:
14097
diff
changeset
|
1415 | } |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1416 | |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1417 | len = sizeof(error); |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1418 | |
|
14165
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
1419 | if (getsockopt(connect_info->fd, SOL_SOCKET, SO_ERROR, &error, &len) < 0) { |
|
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
1420 | gaim_proxy_connect_info_disconnect(connect_info); |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1421 | try_connect(connect_info); |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1422 | return; |
|
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1423 | } |
| 7834 | 1424 | |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1425 | gaim_debug_info("proxy", "using CONNECT tunnelling for %s:%d\n", |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1426 | connect_info->host, connect_info->port); |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1427 | request_len = g_snprintf(request, sizeof(request), |
| 7834 | 1428 | "CONNECT %s:%d HTTP/1.1\r\nHost: %s:%d\r\n", |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1429 | connect_info->host, connect_info->port, connect_info->host, connect_info->port); |
|
1843
aeeac3ee7ac5
[gaim-migrate @ 1853]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1840
diff
changeset
|
1430 | |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1431 | if (gaim_proxy_info_get_username(connect_info->gpi) != NULL) { |
|
1843
aeeac3ee7ac5
[gaim-migrate @ 1853]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1840
diff
changeset
|
1432 | char *t1, *t2; |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1433 | t1 = g_strdup_printf("%s:%s", |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1434 | gaim_proxy_info_get_username(connect_info->gpi), |
|
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1435 | gaim_proxy_info_get_password(connect_info->gpi) ? |
|
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1436 | gaim_proxy_info_get_password(connect_info->gpi) : ""); |
|
11143
f606fb334190
[gaim-migrate @ 13207]
Mark Doliner <markdoliner@pidgin.im>
parents:
11033
diff
changeset
|
1437 | t2 = gaim_base64_encode((const guchar *)t1, strlen(t1)); |
|
1843
aeeac3ee7ac5
[gaim-migrate @ 1853]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1840
diff
changeset
|
1438 | g_free(t1); |
|
4366
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
1439 | g_return_if_fail(request_len < sizeof(request)); |
|
13387
c6be7551b0a6
[gaim-migrate @ 15759]
Mark Doliner <markdoliner@pidgin.im>
parents:
13313
diff
changeset
|
1440 | |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1441 | request_len += g_snprintf(request + request_len, |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1442 | sizeof(request) - request_len, |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1443 | "Proxy-Authorization: Basic %s\r\n" |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1444 | "Proxy-Authorization: NTLM %s\r\n" |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1445 | "Proxy-Connection: Keep-Alive\r\n", t2, |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1446 | gaim_ntlm_gen_type1( |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1447 | (gchar*)gaim_proxy_info_get_host(connect_info->gpi),"")); |
|
1843
aeeac3ee7ac5
[gaim-migrate @ 1853]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1840
diff
changeset
|
1448 | g_free(t2); |
|
aeeac3ee7ac5
[gaim-migrate @ 1853]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1840
diff
changeset
|
1449 | } |
|
aeeac3ee7ac5
[gaim-migrate @ 1853]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1840
diff
changeset
|
1450 | |
|
4366
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
1451 | g_return_if_fail(request_len < sizeof(request)); |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
1452 | strcpy(request + request_len, "\r\n"); |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
1453 | request_len += 2; |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1454 | connect_info->write_buffer = g_memdup(request, request_len); |
|
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1455 | connect_info->write_buf_len = request_len; |
|
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1456 | connect_info->written_len = 0; |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1457 | |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1458 | connect_info->read_cb = http_canread; |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1459 | |
|
14165
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
1460 | connect_info->inpa = gaim_input_add(connect_info->fd, GAIM_INPUT_WRITE, proxy_do_write, |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1461 | connect_info); |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1462 | |
|
14165
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
1463 | proxy_do_write(connect_info, connect_info->fd, cond); |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1464 | } |
|
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1465 | |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1466 | static int |
|
14159
0fcdaa463a32
[gaim-migrate @ 16726]
Mark Doliner <markdoliner@pidgin.im>
parents:
14158
diff
changeset
|
1467 | proxy_connect_http(GaimProxyConnectInfo *connect_info, struct sockaddr *addr, socklen_t addrlen) |
|
1087
bc9c6b635358
[gaim-migrate @ 1097]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1057
diff
changeset
|
1468 | { |
|
10309
073906008cb2
[gaim-migrate @ 11501]
Mark Doliner <markdoliner@pidgin.im>
parents:
10307
diff
changeset
|
1469 | gaim_debug_info("http proxy", |
|
5211
94d9756c381f
[gaim-migrate @ 5581]
Christian Hammond <chipx86@chipx86.com>
parents:
4993
diff
changeset
|
1470 | "Connecting to %s:%d via %s:%d using HTTP\n", |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1471 | (connect_info->host ? connect_info->host : "(null)"), connect_info->port, |
|
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1472 | (gaim_proxy_info_get_host(connect_info->gpi) ? gaim_proxy_info_get_host(connect_info->gpi) : "(null)"), |
|
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1473 | gaim_proxy_info_get_port(connect_info->gpi)); |
|
1087
bc9c6b635358
[gaim-migrate @ 1097]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1057
diff
changeset
|
1474 | |
|
14165
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
1475 | connect_info->fd = socket(addr->sa_family, SOCK_STREAM, 0); |
|
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
1476 | if (connect_info->fd < 0) |
|
1087
bc9c6b635358
[gaim-migrate @ 1097]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1057
diff
changeset
|
1477 | return -1; |
|
bc9c6b635358
[gaim-migrate @ 1097]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1057
diff
changeset
|
1478 | |
|
14165
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
1479 | fcntl(connect_info->fd, F_SETFL, O_NONBLOCK); |
|
10172
8400788b226c
[gaim-migrate @ 11275]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10170
diff
changeset
|
1480 | #ifndef _WIN32 |
|
14165
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
1481 | fcntl(connect_info->fd, F_SETFD, FD_CLOEXEC); |
|
10172
8400788b226c
[gaim-migrate @ 11275]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10170
diff
changeset
|
1482 | #endif |
|
3717
2fc0789e04e8
[gaim-migrate @ 3850]
Herman Bloggs <herman@bluedigits.com>
parents:
3630
diff
changeset
|
1483 | |
|
14165
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
1484 | if (connect(connect_info->fd, addr, addrlen) != 0) |
|
14161
e959d0e476be
[gaim-migrate @ 16728]
Mark Doliner <markdoliner@pidgin.im>
parents:
14159
diff
changeset
|
1485 | { |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1486 | if ((errno == EINPROGRESS) || (errno == EINTR)) { |
|
14165
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
1487 | gaim_debug_info("http proxy", "Connection in progress\n"); |
| 9655 | 1488 | |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1489 | if (connect_info->port != 80) { |
| 7834 | 1490 | /* we need to do CONNECT first */ |
|
14165
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
1491 | connect_info->inpa = gaim_input_add(connect_info->fd, GAIM_INPUT_WRITE, |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1492 | http_canwrite, connect_info); |
| 7834 | 1493 | } else { |
|
14151
34427f138b1f
[gaim-migrate @ 16712]
Mark Doliner <markdoliner@pidgin.im>
parents:
14097
diff
changeset
|
1494 | gaim_debug_info("proxy", "HTTP proxy connection established\n"); |
|
14165
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
1495 | gaim_proxy_connect_info_connected(connect_info); |
| 7834 | 1496 | } |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1497 | } else { |
|
14165
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
1498 | close(connect_info->fd); |
|
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
1499 | connect_info->fd = -1; |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1500 | return -1; |
|
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1501 | } |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1502 | } |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1503 | else { |
| 12991 | 1504 | socklen_t len; |
|
2048
4ac8b9622c9e
[gaim-migrate @ 2058]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1881
diff
changeset
|
1505 | int error = ETIMEDOUT; |
|
3717
2fc0789e04e8
[gaim-migrate @ 3850]
Herman Bloggs <herman@bluedigits.com>
parents:
3630
diff
changeset
|
1506 | |
|
14165
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
1507 | gaim_debug_info("http proxy", "Connected immediately.\n"); |
|
5211
94d9756c381f
[gaim-migrate @ 5581]
Christian Hammond <chipx86@chipx86.com>
parents:
4993
diff
changeset
|
1508 | |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1509 | len = sizeof(error); |
|
14165
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
1510 | if (getsockopt(connect_info->fd, SOL_SOCKET, SO_ERROR, &error, &len) != 0) |
|
14161
e959d0e476be
[gaim-migrate @ 16728]
Mark Doliner <markdoliner@pidgin.im>
parents:
14159
diff
changeset
|
1511 | { |
|
14165
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
1512 | close(connect_info->fd); |
|
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
1513 | connect_info->fd = -1; |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1514 | return -1; |
|
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1515 | } |
|
14165
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
1516 | http_canwrite(connect_info, connect_info->fd, GAIM_INPUT_WRITE); |
|
1695
30db76d87de8
[gaim-migrate @ 1705]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1451
diff
changeset
|
1517 | } |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1518 | |
|
14165
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
1519 | return connect_info->fd; |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1520 | } |
|
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1521 | |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1522 | |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1523 | static void |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1524 | s4_canread(gpointer data, gint source, GaimInputCondition cond) |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1525 | { |
|
14159
0fcdaa463a32
[gaim-migrate @ 16726]
Mark Doliner <markdoliner@pidgin.im>
parents:
14158
diff
changeset
|
1526 | GaimProxyConnectInfo *connect_info = data; |
|
13387
c6be7551b0a6
[gaim-migrate @ 15759]
Mark Doliner <markdoliner@pidgin.im>
parents:
13313
diff
changeset
|
1527 | guchar *buf; |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1528 | int len, max_read; |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1529 | |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1530 | /* This is really not going to block under normal circumstances, but to |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1531 | * be correct, we deal with the unlikely scenario */ |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1532 | |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1533 | if (connect_info->read_buffer == NULL) { |
|
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1534 | connect_info->read_buf_len = 12; |
|
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1535 | connect_info->read_buffer = g_malloc(connect_info->read_buf_len); |
|
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1536 | connect_info->read_len = 0; |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1537 | } |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1538 | |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1539 | buf = connect_info->read_buffer + connect_info->read_len; |
|
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1540 | max_read = connect_info->read_buf_len - connect_info->read_len; |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1541 | |
|
14165
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
1542 | len = read(connect_info->fd, buf, max_read); |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1543 | |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1544 | if ((len < 0 && errno == EAGAIN) || (len > 0 && len + connect_info->read_len < 4)) |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1545 | return; |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1546 | else if (len + connect_info->read_len >= 4) { |
|
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1547 | if (connect_info->read_buffer[1] == 90) { |
|
14165
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
1548 | gaim_proxy_connect_info_connected(connect_info); |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1549 | return; |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1550 | } |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1551 | } |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1552 | |
|
14165
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
1553 | gaim_proxy_connect_info_disconnect(connect_info); |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1554 | try_connect(connect_info); |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1555 | } |
|
1705
cc63a8819c1c
[gaim-migrate @ 1715]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1695
diff
changeset
|
1556 | |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1557 | static void |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1558 | s4_canwrite(gpointer data, gint source, GaimInputCondition cond) |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1559 | { |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1560 | unsigned char packet[9]; |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1561 | struct hostent *hp; |
|
14159
0fcdaa463a32
[gaim-migrate @ 16726]
Mark Doliner <markdoliner@pidgin.im>
parents:
14158
diff
changeset
|
1562 | GaimProxyConnectInfo *connect_info = data; |
| 12991 | 1563 | socklen_t len; |
|
2048
4ac8b9622c9e
[gaim-migrate @ 2058]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1881
diff
changeset
|
1564 | int error = ETIMEDOUT; |
|
3717
2fc0789e04e8
[gaim-migrate @ 3850]
Herman Bloggs <herman@bluedigits.com>
parents:
3630
diff
changeset
|
1565 | |
| 11033 | 1566 | gaim_debug_info("socks4 proxy", "Connected.\n"); |
|
5211
94d9756c381f
[gaim-migrate @ 5581]
Christian Hammond <chipx86@chipx86.com>
parents:
4993
diff
changeset
|
1567 | |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1568 | if (connect_info->inpa > 0) |
|
14151
34427f138b1f
[gaim-migrate @ 16712]
Mark Doliner <markdoliner@pidgin.im>
parents:
14097
diff
changeset
|
1569 | { |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1570 | gaim_input_remove(connect_info->inpa); |
|
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1571 | connect_info->inpa = 0; |
|
14151
34427f138b1f
[gaim-migrate @ 16712]
Mark Doliner <markdoliner@pidgin.im>
parents:
14097
diff
changeset
|
1572 | } |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1573 | |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1574 | len = sizeof(error); |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1575 | |
|
14165
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
1576 | if (getsockopt(connect_info->fd, SOL_SOCKET, SO_ERROR, &error, &len) < 0) { |
|
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
1577 | gaim_proxy_connect_info_disconnect(connect_info); |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1578 | try_connect(connect_info); |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1579 | return; |
|
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1580 | } |
|
3717
2fc0789e04e8
[gaim-migrate @ 3850]
Herman Bloggs <herman@bluedigits.com>
parents:
3630
diff
changeset
|
1581 | |
| 10561 | 1582 | /* |
| 1583 | * The socks4 spec doesn't include support for doing host name | |
| 1584 | * lookups by the proxy. Some socks4 servers do this via | |
| 1585 | * extensions to the protocol. Since we don't know if a | |
| 1586 | * server supports this, it would need to be implemented | |
| 1587 | * with an option, or some detection mechanism - in the | |
| 1588 | * meantime, stick with plain old SOCKS4. | |
| 1589 | */ | |
|
14165
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
1590 | /* TODO: This needs to be non-blocking! */ |
|
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
1591 | hp = gethostbyname(connect_info->host); |
|
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
1592 | if (hp == NULL) { |
|
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
1593 | gaim_proxy_connect_info_disconnect(connect_info); |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1594 | try_connect(connect_info); |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1595 | return; |
|
1087
bc9c6b635358
[gaim-migrate @ 1097]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1057
diff
changeset
|
1596 | } |
|
bc9c6b635358
[gaim-migrate @ 1097]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1057
diff
changeset
|
1597 | |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1598 | packet[0] = 4; |
|
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1599 | packet[1] = 1; |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1600 | packet[2] = connect_info->port >> 8; |
|
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1601 | packet[3] = connect_info->port & 0xff; |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1602 | packet[4] = (unsigned char)(hp->h_addr_list[0])[0]; |
|
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1603 | packet[5] = (unsigned char)(hp->h_addr_list[0])[1]; |
|
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1604 | packet[6] = (unsigned char)(hp->h_addr_list[0])[2]; |
|
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1605 | packet[7] = (unsigned char)(hp->h_addr_list[0])[3]; |
|
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1606 | packet[8] = 0; |
|
3717
2fc0789e04e8
[gaim-migrate @ 3850]
Herman Bloggs <herman@bluedigits.com>
parents:
3630
diff
changeset
|
1607 | |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1608 | connect_info->write_buffer = g_memdup(packet, sizeof(packet)); |
|
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1609 | connect_info->write_buf_len = sizeof(packet); |
|
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1610 | connect_info->written_len = 0; |
|
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1611 | connect_info->read_cb = s4_canread; |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1612 | |
|
14165
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
1613 | connect_info->inpa = gaim_input_add(connect_info->fd, GAIM_INPUT_WRITE, proxy_do_write, connect_info); |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1614 | |
|
14165
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
1615 | proxy_do_write(connect_info, connect_info->fd, cond); |
| 1 | 1616 | } |
| 1617 | ||
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1618 | static int |
|
14159
0fcdaa463a32
[gaim-migrate @ 16726]
Mark Doliner <markdoliner@pidgin.im>
parents:
14158
diff
changeset
|
1619 | proxy_connect_socks4(GaimProxyConnectInfo *connect_info, struct sockaddr *addr, socklen_t addrlen) |
| 1 | 1620 | { |
|
10309
073906008cb2
[gaim-migrate @ 11501]
Mark Doliner <markdoliner@pidgin.im>
parents:
10307
diff
changeset
|
1621 | gaim_debug_info("socks4 proxy", |
|
5211
94d9756c381f
[gaim-migrate @ 5581]
Christian Hammond <chipx86@chipx86.com>
parents:
4993
diff
changeset
|
1622 | "Connecting to %s:%d via %s:%d using SOCKS4\n", |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1623 | connect_info->host, connect_info->port, |
|
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1624 | gaim_proxy_info_get_host(connect_info->gpi), |
|
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1625 | gaim_proxy_info_get_port(connect_info->gpi)); |
| 1 | 1626 | |
|
14165
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
1627 | connect_info->fd = socket(addr->sa_family, SOCK_STREAM, 0); |
|
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
1628 | if (connect_info->fd < 0) |
|
1087
bc9c6b635358
[gaim-migrate @ 1097]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1057
diff
changeset
|
1629 | return -1; |
| 1 | 1630 | |
|
14165
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
1631 | fcntl(connect_info->fd, F_SETFL, O_NONBLOCK); |
|
10172
8400788b226c
[gaim-migrate @ 11275]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10170
diff
changeset
|
1632 | #ifndef _WIN32 |
|
14165
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
1633 | fcntl(connect_info->fd, F_SETFD, FD_CLOEXEC); |
|
10172
8400788b226c
[gaim-migrate @ 11275]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10170
diff
changeset
|
1634 | #endif |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1635 | |
|
14165
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
1636 | if (connect(connect_info->fd, addr, addrlen) != 0) |
|
14161
e959d0e476be
[gaim-migrate @ 16728]
Mark Doliner <markdoliner@pidgin.im>
parents:
14159
diff
changeset
|
1637 | { |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1638 | if ((errno == EINPROGRESS) || (errno == EINTR)) { |
|
14165
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
1639 | gaim_debug_info("socks4 proxy", "Connection in progress.\n"); |
|
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
1640 | connect_info->inpa = gaim_input_add(connect_info->fd, GAIM_INPUT_WRITE, s4_canwrite, connect_info); |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1641 | } |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1642 | else { |
|
14165
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
1643 | close(connect_info->fd); |
|
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
1644 | connect_info->fd = -1; |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1645 | return -1; |
|
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1646 | } |
|
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1647 | } else { |
| 12991 | 1648 | socklen_t len; |
|
2048
4ac8b9622c9e
[gaim-migrate @ 2058]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1881
diff
changeset
|
1649 | int error = ETIMEDOUT; |
|
3717
2fc0789e04e8
[gaim-migrate @ 3850]
Herman Bloggs <herman@bluedigits.com>
parents:
3630
diff
changeset
|
1650 | |
|
14165
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
1651 | gaim_debug_info("socks4 proxy", "Connected immediately.\n"); |
|
5211
94d9756c381f
[gaim-migrate @ 5581]
Christian Hammond <chipx86@chipx86.com>
parents:
4993
diff
changeset
|
1652 | |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1653 | len = sizeof(error); |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1654 | |
|
14165
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
1655 | if (getsockopt(connect_info->fd, SOL_SOCKET, SO_ERROR, &error, &len) != 0) |
|
14161
e959d0e476be
[gaim-migrate @ 16728]
Mark Doliner <markdoliner@pidgin.im>
parents:
14159
diff
changeset
|
1656 | { |
|
14165
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
1657 | close(connect_info->fd); |
|
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
1658 | connect_info->fd = -1; |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1659 | return -1; |
|
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1660 | } |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1661 | |
|
14165
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
1662 | s4_canwrite(connect_info, connect_info->fd, GAIM_INPUT_WRITE); |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1663 | } |
|
670
1690e6b432ae
[gaim-migrate @ 680]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
664
diff
changeset
|
1664 | |
|
14165
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
1665 | return connect_info->fd; |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1666 | } |
|
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1667 | |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1668 | static void |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1669 | s5_canread_again(gpointer data, gint source, GaimInputCondition cond) |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1670 | { |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1671 | guchar *dest, *buf; |
|
14159
0fcdaa463a32
[gaim-migrate @ 16726]
Mark Doliner <markdoliner@pidgin.im>
parents:
14158
diff
changeset
|
1672 | GaimProxyConnectInfo *connect_info = data; |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1673 | int len; |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1674 | |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1675 | if (connect_info->read_buffer == NULL) { |
|
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1676 | connect_info->read_buf_len = 512; |
|
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1677 | connect_info->read_buffer = g_malloc(connect_info->read_buf_len); |
|
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1678 | connect_info->read_len = 0; |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1679 | } |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1680 | |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1681 | dest = connect_info->read_buffer + connect_info->read_len; |
|
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1682 | buf = connect_info->read_buffer; |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1683 | |
|
10309
073906008cb2
[gaim-migrate @ 11501]
Mark Doliner <markdoliner@pidgin.im>
parents:
10307
diff
changeset
|
1684 | gaim_debug_info("socks5 proxy", "Able to read again.\n"); |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1685 | |
|
14165
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
1686 | len = read(connect_info->fd, dest, (connect_info->read_buf_len - connect_info->read_len)); |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1687 | if(len < 0 && errno == EAGAIN) |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1688 | return; |
|
13788
019bc2080927
[gaim-migrate @ 16198]
Daniel Atallah <datallah@pidgin.im>
parents:
13754
diff
changeset
|
1689 | else if(len <= 0) { |
|
10309
073906008cb2
[gaim-migrate @ 11501]
Mark Doliner <markdoliner@pidgin.im>
parents:
10307
diff
changeset
|
1690 | gaim_debug_warning("socks5 proxy", "or not...\n"); |
|
14165
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
1691 | gaim_proxy_connect_info_disconnect(connect_info); |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1692 | try_connect(connect_info); |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1693 | return; |
|
1087
bc9c6b635358
[gaim-migrate @ 1097]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1057
diff
changeset
|
1694 | } |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1695 | connect_info->read_len += len; |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1696 | |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1697 | if(connect_info->read_len < 4) |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1698 | return; |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1699 | |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1700 | if ((buf[0] != 0x05) || (buf[1] != 0x00)) { |
|
7982
db8c1b6137eb
[gaim-migrate @ 8659]
Gavan Fantom <gavan@users.sourceforge.net>
parents:
7834
diff
changeset
|
1701 | if ((buf[0] == 0x05) && (buf[1] < 0x09)) |
|
10309
073906008cb2
[gaim-migrate @ 11501]
Mark Doliner <markdoliner@pidgin.im>
parents:
10307
diff
changeset
|
1702 | gaim_debug_error("socks5 proxy", socks5errors[buf[1]]); |
|
7982
db8c1b6137eb
[gaim-migrate @ 8659]
Gavan Fantom <gavan@users.sourceforge.net>
parents:
7834
diff
changeset
|
1703 | else |
|
10309
073906008cb2
[gaim-migrate @ 11501]
Mark Doliner <markdoliner@pidgin.im>
parents:
10307
diff
changeset
|
1704 | gaim_debug_error("socks5 proxy", "Bad data.\n"); |
|
14165
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
1705 | gaim_proxy_connect_info_disconnect(connect_info); |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1706 | try_connect(connect_info); |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1707 | return; |
|
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1708 | } |
|
670
1690e6b432ae
[gaim-migrate @ 680]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
664
diff
changeset
|
1709 | |
| 8262 | 1710 | /* Skip past BND.ADDR */ |
| 1711 | switch(buf[3]) { | |
| 1712 | case 0x01: /* the address is a version-4 IP address, with a length of 4 octets */ | |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1713 | if(connect_info->read_len < 4 + 4) |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1714 | return; |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1715 | buf += 4 + 4; |
| 8262 | 1716 | break; |
| 1717 | case 0x03: /* the address field contains a fully-qualified domain name. The first | |
| 1718 | octet of the address field contains the number of octets of name that | |
| 1719 | follow, there is no terminating NUL octet. */ | |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1720 | if(connect_info->read_len < 4 + 1) |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1721 | return; |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1722 | buf += 4 + 1; |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1723 | if(connect_info->read_len < 4 + 1 + buf[0]) |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1724 | return; |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1725 | buf += buf[0]; |
| 8262 | 1726 | break; |
| 1727 | case 0x04: /* the address is a version-6 IP address, with a length of 16 octets */ | |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1728 | if(connect_info->read_len < 4 + 16) |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1729 | return; |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1730 | buf += 4 + 16; |
| 8262 | 1731 | break; |
| 1732 | } | |
| 1733 | ||
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1734 | if(connect_info->read_len < (buf - connect_info->read_buffer) + 2) |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1735 | return; |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1736 | |
| 8262 | 1737 | /* Skip past BND.PORT */ |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1738 | buf += 2; |
| 8262 | 1739 | |
|
14165
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
1740 | gaim_proxy_connect_info_connected(connect_info); |
| 1 | 1741 | } |
| 1742 | ||
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1743 | static void |
|
14151
34427f138b1f
[gaim-migrate @ 16712]
Mark Doliner <markdoliner@pidgin.im>
parents:
14097
diff
changeset
|
1744 | s5_sendconnect(gpointer data, int source) |
|
1087
bc9c6b635358
[gaim-migrate @ 1097]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1057
diff
changeset
|
1745 | { |
|
14159
0fcdaa463a32
[gaim-migrate @ 16726]
Mark Doliner <markdoliner@pidgin.im>
parents:
14158
diff
changeset
|
1746 | GaimProxyConnectInfo *connect_info = data; |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1747 | int hlen = strlen(connect_info->host); |
|
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1748 | connect_info->write_buf_len = 5 + hlen + 2; |
|
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1749 | connect_info->write_buffer = g_malloc(connect_info->write_buf_len); |
|
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1750 | connect_info->written_len = 0; |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1751 | |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1752 | connect_info->write_buffer[0] = 0x05; |
|
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1753 | connect_info->write_buffer[1] = 0x01; /* CONNECT */ |
|
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1754 | connect_info->write_buffer[2] = 0x00; /* reserved */ |
|
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1755 | connect_info->write_buffer[3] = 0x03; /* address type -- host name */ |
|
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1756 | connect_info->write_buffer[4] = hlen; |
|
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1757 | memcpy(connect_info->write_buffer + 5, connect_info->host, hlen); |
|
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1758 | connect_info->write_buffer[5 + hlen] = connect_info->port >> 8; |
|
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1759 | connect_info->write_buffer[5 + hlen + 1] = connect_info->port & 0xff; |
|
1087
bc9c6b635358
[gaim-migrate @ 1097]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1057
diff
changeset
|
1760 | |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1761 | connect_info->read_cb = s5_canread_again; |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1762 | |
|
14165
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
1763 | connect_info->inpa = gaim_input_add(connect_info->fd, GAIM_INPUT_WRITE, proxy_do_write, connect_info); |
|
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
1764 | proxy_do_write(connect_info, connect_info->fd, GAIM_INPUT_WRITE); |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
1765 | } |
|
1087
bc9c6b635358
[gaim-migrate @ 1097]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1057
diff
changeset
|
1766 | |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1767 | static void |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1768 | s5_readauth(gpointer data, gint source, GaimInputCondition cond) |
|
1844
161c00c36474
[gaim-migrate @ 1854]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1843
diff
changeset
|
1769 | { |
|
14159
0fcdaa463a32
[gaim-migrate @ 16726]
Mark Doliner <markdoliner@pidgin.im>
parents:
14158
diff
changeset
|
1770 | GaimProxyConnectInfo *connect_info = data; |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1771 | int len; |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1772 | |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1773 | if (connect_info->read_buffer == NULL) { |
|
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1774 | connect_info->read_buf_len = 2; |
|
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1775 | connect_info->read_buffer = g_malloc(connect_info->read_buf_len); |
|
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1776 | connect_info->read_len = 0; |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1777 | } |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1778 | |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1779 | gaim_debug_info("socks5 proxy", "Got auth response.\n"); |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1780 | |
|
14165
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
1781 | len = read(connect_info->fd, connect_info->read_buffer + connect_info->read_len, |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1782 | connect_info->read_buf_len - connect_info->read_len); |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1783 | if(len < 0 && errno == EAGAIN) |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1784 | return; |
|
13788
019bc2080927
[gaim-migrate @ 16198]
Daniel Atallah <datallah@pidgin.im>
parents:
13754
diff
changeset
|
1785 | else if(len <= 0) { |
|
14165
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
1786 | gaim_proxy_connect_info_disconnect(connect_info); |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1787 | try_connect(connect_info); |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1788 | return; |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1789 | } |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1790 | connect_info->read_len += len; |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1791 | |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1792 | if (connect_info->read_len < 2) |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1793 | return; |
|
1844
161c00c36474
[gaim-migrate @ 1854]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1843
diff
changeset
|
1794 | |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1795 | gaim_input_remove(connect_info->inpa); |
|
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1796 | connect_info->inpa = 0; |
|
1844
161c00c36474
[gaim-migrate @ 1854]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1843
diff
changeset
|
1797 | |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1798 | if ((connect_info->read_buffer[0] != 0x01) || (connect_info->read_buffer[1] != 0x00)) { |
|
14165
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
1799 | gaim_proxy_connect_info_disconnect(connect_info); |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1800 | try_connect(connect_info); |
|
1844
161c00c36474
[gaim-migrate @ 1854]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1843
diff
changeset
|
1801 | return; |
|
161c00c36474
[gaim-migrate @ 1854]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1843
diff
changeset
|
1802 | } |
|
161c00c36474
[gaim-migrate @ 1854]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1843
diff
changeset
|
1803 | |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1804 | g_free(connect_info->read_buffer); |
|
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1805 | connect_info->read_buffer = NULL; |
|
1844
161c00c36474
[gaim-migrate @ 1854]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1843
diff
changeset
|
1806 | |
|
14165
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
1807 | s5_sendconnect(connect_info, connect_info->fd); |
|
1844
161c00c36474
[gaim-migrate @ 1854]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1843
diff
changeset
|
1808 | } |
|
161c00c36474
[gaim-migrate @ 1854]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1843
diff
changeset
|
1809 | |
|
14159
0fcdaa463a32
[gaim-migrate @ 16726]
Mark Doliner <markdoliner@pidgin.im>
parents:
14158
diff
changeset
|
1810 | static void |
|
0fcdaa463a32
[gaim-migrate @ 16726]
Mark Doliner <markdoliner@pidgin.im>
parents:
14158
diff
changeset
|
1811 | hmacmd5_chap(const unsigned char * challenge, int challen, const char * passwd, unsigned char * response) |
| 10561 | 1812 | { |
|
10684
0325b164a7eb
[gaim-migrate @ 12231]
Luke Schierer <lschiere@pidgin.im>
parents:
10626
diff
changeset
|
1813 | GaimCipher *cipher; |
|
0325b164a7eb
[gaim-migrate @ 12231]
Luke Schierer <lschiere@pidgin.im>
parents:
10626
diff
changeset
|
1814 | GaimCipherContext *ctx; |
| 10561 | 1815 | int i; |
| 1816 | unsigned char Kxoripad[65]; | |
| 1817 | unsigned char Kxoropad[65]; | |
| 1818 | int pwlen; | |
| 1819 | ||
|
10684
0325b164a7eb
[gaim-migrate @ 12231]
Luke Schierer <lschiere@pidgin.im>
parents:
10626
diff
changeset
|
1820 | cipher = gaim_ciphers_find_cipher("md5"); |
|
0325b164a7eb
[gaim-migrate @ 12231]
Luke Schierer <lschiere@pidgin.im>
parents:
10626
diff
changeset
|
1821 | ctx = gaim_cipher_context_new(cipher, NULL); |
|
0325b164a7eb
[gaim-migrate @ 12231]
Luke Schierer <lschiere@pidgin.im>
parents:
10626
diff
changeset
|
1822 | |
|
12765
0c1580860d16
[gaim-migrate @ 15112]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
12758
diff
changeset
|
1823 | memset(Kxoripad,0,sizeof(Kxoripad)); |
|
0c1580860d16
[gaim-migrate @ 15112]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
12758
diff
changeset
|
1824 | memset(Kxoropad,0,sizeof(Kxoropad)); |
|
0c1580860d16
[gaim-migrate @ 15112]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
12758
diff
changeset
|
1825 | |
| 10561 | 1826 | pwlen=strlen(passwd); |
| 1827 | if (pwlen>64) { | |
|
11183
be87fe695c93
[gaim-migrate @ 13295]
Mark Doliner <markdoliner@pidgin.im>
parents:
11143
diff
changeset
|
1828 | 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
|
1829 | gaim_cipher_context_digest(ctx, sizeof(Kxoripad), Kxoripad, NULL); |
| 10561 | 1830 | pwlen=16; |
|
12765
0c1580860d16
[gaim-migrate @ 15112]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
12758
diff
changeset
|
1831 | } else { |
|
0c1580860d16
[gaim-migrate @ 15112]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
12758
diff
changeset
|
1832 | memcpy(Kxoripad, passwd, pwlen); |
| 10561 | 1833 | } |
|
12765
0c1580860d16
[gaim-migrate @ 15112]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
12758
diff
changeset
|
1834 | memcpy(Kxoropad,Kxoripad,pwlen); |
| 10561 | 1835 | |
| 1836 | for (i=0;i<64;i++) { | |
| 1837 | Kxoripad[i]^=0x36; | |
| 1838 | Kxoropad[i]^=0x5c; | |
| 1839 | } | |
|
10684
0325b164a7eb
[gaim-migrate @ 12231]
Luke Schierer <lschiere@pidgin.im>
parents:
10626
diff
changeset
|
1840 | |
|
0325b164a7eb
[gaim-migrate @ 12231]
Luke Schierer <lschiere@pidgin.im>
parents:
10626
diff
changeset
|
1841 | gaim_cipher_context_reset(ctx, NULL); |
|
0325b164a7eb
[gaim-migrate @ 12231]
Luke Schierer <lschiere@pidgin.im>
parents:
10626
diff
changeset
|
1842 | gaim_cipher_context_append(ctx, Kxoripad, 64); |
|
0325b164a7eb
[gaim-migrate @ 12231]
Luke Schierer <lschiere@pidgin.im>
parents:
10626
diff
changeset
|
1843 | gaim_cipher_context_append(ctx, challenge, challen); |
| 10687 | 1844 | gaim_cipher_context_digest(ctx, sizeof(Kxoripad), Kxoripad, NULL); |
| 10561 | 1845 | |
|
10684
0325b164a7eb
[gaim-migrate @ 12231]
Luke Schierer <lschiere@pidgin.im>
parents:
10626
diff
changeset
|
1846 | gaim_cipher_context_reset(ctx, NULL); |
|
0325b164a7eb
[gaim-migrate @ 12231]
Luke Schierer <lschiere@pidgin.im>
parents:
10626
diff
changeset
|
1847 | gaim_cipher_context_append(ctx, Kxoropad, 64); |
|
0325b164a7eb
[gaim-migrate @ 12231]
Luke Schierer <lschiere@pidgin.im>
parents:
10626
diff
changeset
|
1848 | gaim_cipher_context_append(ctx, Kxoripad, 16); |
|
12765
0c1580860d16
[gaim-migrate @ 15112]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
12758
diff
changeset
|
1849 | gaim_cipher_context_digest(ctx, 16, response, NULL); |
|
10684
0325b164a7eb
[gaim-migrate @ 12231]
Luke Schierer <lschiere@pidgin.im>
parents:
10626
diff
changeset
|
1850 | |
|
0325b164a7eb
[gaim-migrate @ 12231]
Luke Schierer <lschiere@pidgin.im>
parents:
10626
diff
changeset
|
1851 | gaim_cipher_context_destroy(ctx); |
| 10561 | 1852 | } |
| 1853 | ||
| 1854 | static void | |
| 1855 | s5_readchap(gpointer data, gint source, GaimInputCondition cond) | |
| 1856 | { | |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1857 | guchar *cmdbuf, *buf; |
|
14159
0fcdaa463a32
[gaim-migrate @ 16726]
Mark Doliner <markdoliner@pidgin.im>
parents:
14158
diff
changeset
|
1858 | GaimProxyConnectInfo *connect_info = data; |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1859 | int len, navas, currentav; |
| 10561 | 1860 | |
| 1861 | gaim_debug(GAIM_DEBUG_INFO, "socks5 proxy", "Got CHAP response.\n"); | |
| 1862 | ||
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1863 | if (connect_info->read_buffer == NULL) { |
|
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1864 | connect_info->read_buf_len = 20; |
|
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1865 | connect_info->read_buffer = g_malloc(connect_info->read_buf_len); |
|
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1866 | connect_info->read_len = 0; |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1867 | } |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1868 | |
|
14165
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
1869 | len = read(connect_info->fd, connect_info->read_buffer + connect_info->read_len, |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1870 | connect_info->read_buf_len - connect_info->read_len); |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1871 | |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1872 | if(len < 0 && errno == EAGAIN) |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1873 | return; |
|
13788
019bc2080927
[gaim-migrate @ 16198]
Daniel Atallah <datallah@pidgin.im>
parents:
13754
diff
changeset
|
1874 | else if(len <= 0) { |
|
14165
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
1875 | gaim_proxy_connect_info_disconnect(connect_info); |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1876 | try_connect(connect_info); |
| 10561 | 1877 | return; |
| 1878 | } | |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1879 | connect_info->read_len += len; |
| 10561 | 1880 | |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1881 | if (connect_info->read_len < 2) |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1882 | return; |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1883 | |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1884 | cmdbuf = connect_info->read_buffer; |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1885 | |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1886 | if (*cmdbuf != 0x01) { |
|
14165
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
1887 | gaim_proxy_connect_info_disconnect(connect_info); |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1888 | try_connect(connect_info); |
| 10561 | 1889 | return; |
| 1890 | } | |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1891 | cmdbuf++; |
| 10561 | 1892 | |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1893 | navas = *cmdbuf; |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1894 | cmdbuf++; |
| 10561 | 1895 | |
| 1896 | for (currentav = 0; currentav < navas; currentav++) { | |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1897 | if (connect_info->read_len - (cmdbuf - connect_info->read_buffer) < 2) |
| 10561 | 1898 | return; |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1899 | if (connect_info->read_len - (cmdbuf - connect_info->read_buffer) < cmdbuf[1]) |
| 10561 | 1900 | return; |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1901 | buf = cmdbuf + 2; |
| 10561 | 1902 | switch (cmdbuf[0]) { |
| 1903 | case 0x00: | |
| 1904 | /* Did auth work? */ | |
| 1905 | if (buf[0] == 0x00) { | |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1906 | gaim_input_remove(connect_info->inpa); |
|
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1907 | connect_info->inpa = 0; |
|
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1908 | g_free(connect_info->read_buffer); |
|
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1909 | connect_info->read_buffer = NULL; |
| 10561 | 1910 | /* Success */ |
|
14165
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
1911 | s5_sendconnect(connect_info, connect_info->fd); |
|
10613
33c94d9a9e89
[gaim-migrate @ 12072]
Torrey McMahon <tmcmahon2@users.sourceforge.net>
parents:
10562
diff
changeset
|
1912 | return; |
| 10561 | 1913 | } else { |
| 1914 | /* Failure */ | |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1915 | gaim_debug_warning("proxy", |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1916 | "socks5 CHAP authentication " |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1917 | "failed. Disconnecting..."); |
|
14165
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
1918 | gaim_proxy_connect_info_disconnect(connect_info); |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1919 | try_connect(connect_info); |
| 10561 | 1920 | return; |
| 1921 | } | |
| 1922 | break; | |
| 1923 | case 0x03: | |
| 1924 | /* Server wants our credentials */ | |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1925 | |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1926 | connect_info->write_buf_len = 16 + 4; |
|
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1927 | connect_info->write_buffer = g_malloc(connect_info->write_buf_len); |
|
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1928 | connect_info->written_len = 0; |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1929 | |
| 10561 | 1930 | hmacmd5_chap(buf, cmdbuf[1], |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1931 | gaim_proxy_info_get_password(connect_info->gpi), |
|
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1932 | connect_info->write_buffer + 4); |
|
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1933 | connect_info->write_buffer[0] = 0x01; |
|
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1934 | connect_info->write_buffer[1] = 0x01; |
|
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1935 | connect_info->write_buffer[2] = 0x04; |
|
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1936 | connect_info->write_buffer[3] = 0x10; |
| 10561 | 1937 | |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1938 | gaim_input_remove(connect_info->inpa); |
|
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1939 | g_free(connect_info->read_buffer); |
|
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1940 | connect_info->read_buffer = NULL; |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1941 | |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1942 | connect_info->read_cb = s5_readchap; |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1943 | |
|
14165
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
1944 | connect_info->inpa = gaim_input_add(connect_info->fd, |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1945 | GAIM_INPUT_WRITE, proxy_do_write, connect_info); |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1946 | |
|
14165
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
1947 | proxy_do_write(connect_info, connect_info->fd, GAIM_INPUT_WRITE); |
| 10561 | 1948 | break; |
| 1949 | case 0x11: | |
| 1950 | /* Server wants to select an algorithm */ | |
| 1951 | if (buf[0] != 0x85) { | |
| 1952 | /* Only currently support HMAC-MD5 */ | |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1953 | gaim_debug_warning("proxy", |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1954 | "Server tried to select an " |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1955 | "algorithm that we did not advertise " |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1956 | "as supporting. This is a violation " |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1957 | "of the socks5 CHAP specification. " |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1958 | "Disconnecting..."); |
|
14165
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
1959 | gaim_proxy_connect_info_disconnect(connect_info); |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1960 | try_connect(connect_info); |
| 10561 | 1961 | return; |
| 1962 | } | |
| 1963 | break; | |
| 1964 | } | |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1965 | cmdbuf = buf + cmdbuf[1]; |
| 10561 | 1966 | } |
| 1967 | /* Fell through. We ran out of CHAP events to process, but haven't | |
| 1968 | * succeeded or failed authentication - there may be more to come. | |
| 1969 | * If this is the case, come straight back here. */ | |
| 1970 | } | |
| 1971 | ||
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1972 | static void |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1973 | s5_canread(gpointer data, gint source, GaimInputCondition cond) |
|
1844
161c00c36474
[gaim-migrate @ 1854]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1843
diff
changeset
|
1974 | { |
|
14159
0fcdaa463a32
[gaim-migrate @ 16726]
Mark Doliner <markdoliner@pidgin.im>
parents:
14158
diff
changeset
|
1975 | GaimProxyConnectInfo *connect_info = data; |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1976 | int len; |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1977 | |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1978 | if (connect_info->read_buffer == NULL) { |
|
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1979 | connect_info->read_buf_len = 2; |
|
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1980 | connect_info->read_buffer = g_malloc(connect_info->read_buf_len); |
|
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1981 | connect_info->read_len = 0; |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1982 | } |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1983 | |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1984 | gaim_debug_info("socks5 proxy", "Able to read.\n"); |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1985 | |
|
14165
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
1986 | len = read(connect_info->fd, connect_info->read_buffer + connect_info->read_len, |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1987 | connect_info->read_buf_len - connect_info->read_len); |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1988 | if(len < 0 && errno == EAGAIN) |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1989 | return; |
|
13788
019bc2080927
[gaim-migrate @ 16198]
Daniel Atallah <datallah@pidgin.im>
parents:
13754
diff
changeset
|
1990 | else if(len <= 0) { |
|
14165
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
1991 | gaim_proxy_connect_info_disconnect(connect_info); |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1992 | try_connect(connect_info); |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1993 | return; |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1994 | } |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1995 | connect_info->read_len += len; |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1996 | |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
1997 | if (connect_info->read_len < 2) |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1998 | return; |
|
1844
161c00c36474
[gaim-migrate @ 1854]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1843
diff
changeset
|
1999 | |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
2000 | gaim_input_remove(connect_info->inpa); |
|
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
2001 | connect_info->inpa = 0; |
|
1844
161c00c36474
[gaim-migrate @ 1854]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1843
diff
changeset
|
2002 | |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
2003 | if ((connect_info->read_buffer[0] != 0x05) || (connect_info->read_buffer[1] == 0xff)) { |
|
14165
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
2004 | gaim_proxy_connect_info_disconnect(connect_info); |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
2005 | try_connect(connect_info); |
|
1844
161c00c36474
[gaim-migrate @ 1854]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1843
diff
changeset
|
2006 | return; |
|
161c00c36474
[gaim-migrate @ 1854]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1843
diff
changeset
|
2007 | } |
|
161c00c36474
[gaim-migrate @ 1854]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1843
diff
changeset
|
2008 | |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
2009 | if (connect_info->read_buffer[1] == 0x02) { |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
2010 | gsize i, j; |
|
10912
ec7c127a435b
[gaim-migrate @ 12667]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10711
diff
changeset
|
2011 | const char *u, *p; |
| 9129 | 2012 | |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
2013 | u = gaim_proxy_info_get_username(connect_info->gpi); |
|
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
2014 | p = gaim_proxy_info_get_password(connect_info->gpi); |
|
10912
ec7c127a435b
[gaim-migrate @ 12667]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10711
diff
changeset
|
2015 | |
|
ec7c127a435b
[gaim-migrate @ 12667]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10711
diff
changeset
|
2016 | i = (u == NULL) ? 0 : strlen(u); |
|
ec7c127a435b
[gaim-migrate @ 12667]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10711
diff
changeset
|
2017 | j = (p == NULL) ? 0 : strlen(p); |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
2018 | |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
2019 | connect_info->write_buf_len = 1 + 1 + i + 1 + j; |
|
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
2020 | connect_info->write_buffer = g_malloc(connect_info->write_buf_len); |
|
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
2021 | connect_info->written_len = 0; |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
2022 | |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
2023 | connect_info->write_buffer[0] = 0x01; /* version 1 */ |
|
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
2024 | connect_info->write_buffer[1] = i; |
|
10917
f32ea2da503b
[gaim-migrate @ 12678]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10912
diff
changeset
|
2025 | if (u != NULL) |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
2026 | memcpy(connect_info->write_buffer + 2, u, i); |
|
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
2027 | connect_info->write_buffer[2 + i] = j; |
|
10917
f32ea2da503b
[gaim-migrate @ 12678]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10912
diff
changeset
|
2028 | if (p != NULL) |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
2029 | memcpy(connect_info->write_buffer + 2 + i + 1, p, j); |
|
3717
2fc0789e04e8
[gaim-migrate @ 3850]
Herman Bloggs <herman@bluedigits.com>
parents:
3630
diff
changeset
|
2030 | |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
2031 | g_free(connect_info->read_buffer); |
|
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
2032 | connect_info->read_buffer = NULL; |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
2033 | |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
2034 | connect_info->read_cb = s5_readauth; |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
2035 | |
|
14165
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
2036 | connect_info->inpa = gaim_input_add(connect_info->fd, GAIM_INPUT_WRITE, |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
2037 | proxy_do_write, connect_info); |
|
1844
161c00c36474
[gaim-migrate @ 1854]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1843
diff
changeset
|
2038 | |
|
14165
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
2039 | proxy_do_write(connect_info, connect_info->fd, GAIM_INPUT_WRITE); |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
2040 | |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
2041 | return; |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
2042 | } else if (connect_info->read_buffer[1] == 0x03) { |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
2043 | gsize userlen; |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
2044 | userlen = strlen(gaim_proxy_info_get_username(connect_info->gpi)); |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
2045 | |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
2046 | connect_info->write_buf_len = 7 + userlen; |
|
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
2047 | connect_info->write_buffer = g_malloc(connect_info->write_buf_len); |
|
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
2048 | connect_info->written_len = 0; |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
2049 | |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
2050 | connect_info->write_buffer[0] = 0x01; |
|
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
2051 | connect_info->write_buffer[1] = 0x02; |
|
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
2052 | connect_info->write_buffer[2] = 0x11; |
|
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
2053 | connect_info->write_buffer[3] = 0x01; |
|
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
2054 | connect_info->write_buffer[4] = 0x85; |
|
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
2055 | connect_info->write_buffer[5] = 0x02; |
|
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
2056 | connect_info->write_buffer[6] = userlen; |
|
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
2057 | memcpy(connect_info->write_buffer + 7, |
|
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
2058 | gaim_proxy_info_get_username(connect_info->gpi), userlen); |
| 10561 | 2059 | |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
2060 | g_free(connect_info->read_buffer); |
|
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
2061 | connect_info->read_buffer = NULL; |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
2062 | |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
2063 | connect_info->read_cb = s5_readchap; |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
2064 | |
|
14165
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
2065 | connect_info->inpa = gaim_input_add(connect_info->fd, GAIM_INPUT_WRITE, |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
2066 | proxy_do_write, connect_info); |
| 10561 | 2067 | |
|
14165
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
2068 | proxy_do_write(connect_info, connect_info->fd, GAIM_INPUT_WRITE); |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
2069 | |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
2070 | return; |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
2071 | } else { |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
2072 | g_free(connect_info->read_buffer); |
|
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
2073 | connect_info->read_buffer = NULL; |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
2074 | |
|
14165
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
2075 | s5_sendconnect(connect_info, connect_info->fd); |
|
1844
161c00c36474
[gaim-migrate @ 1854]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1843
diff
changeset
|
2076 | } |
|
161c00c36474
[gaim-migrate @ 1854]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1843
diff
changeset
|
2077 | } |
|
161c00c36474
[gaim-migrate @ 1854]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1843
diff
changeset
|
2078 | |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
2079 | static void |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
2080 | s5_canwrite(gpointer data, gint source, GaimInputCondition cond) |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
2081 | { |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
2082 | unsigned char buf[5]; |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
2083 | int i; |
|
14159
0fcdaa463a32
[gaim-migrate @ 16726]
Mark Doliner <markdoliner@pidgin.im>
parents:
14158
diff
changeset
|
2084 | GaimProxyConnectInfo *connect_info = data; |
| 12991 | 2085 | socklen_t len; |
|
2048
4ac8b9622c9e
[gaim-migrate @ 2058]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1881
diff
changeset
|
2086 | int error = ETIMEDOUT; |
|
3717
2fc0789e04e8
[gaim-migrate @ 3850]
Herman Bloggs <herman@bluedigits.com>
parents:
3630
diff
changeset
|
2087 | |
|
10309
073906008cb2
[gaim-migrate @ 11501]
Mark Doliner <markdoliner@pidgin.im>
parents:
10307
diff
changeset
|
2088 | gaim_debug_info("socks5 proxy", "Connected.\n"); |
|
5211
94d9756c381f
[gaim-migrate @ 5581]
Christian Hammond <chipx86@chipx86.com>
parents:
4993
diff
changeset
|
2089 | |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
2090 | if (connect_info->inpa > 0) |
|
14151
34427f138b1f
[gaim-migrate @ 16712]
Mark Doliner <markdoliner@pidgin.im>
parents:
14097
diff
changeset
|
2091 | { |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
2092 | gaim_input_remove(connect_info->inpa); |
|
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
2093 | connect_info->inpa = 0; |
|
14151
34427f138b1f
[gaim-migrate @ 16712]
Mark Doliner <markdoliner@pidgin.im>
parents:
14097
diff
changeset
|
2094 | } |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
2095 | |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
2096 | len = sizeof(error); |
|
14165
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
2097 | if (getsockopt(connect_info->fd, SOL_SOCKET, SO_ERROR, &error, &len) < 0) { |
|
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
2098 | gaim_proxy_connect_info_disconnect(connect_info); |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
2099 | try_connect(connect_info); |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
2100 | return; |
|
1087
bc9c6b635358
[gaim-migrate @ 1097]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1057
diff
changeset
|
2101 | } |
|
bc9c6b635358
[gaim-migrate @ 1097]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1057
diff
changeset
|
2102 | |
|
bc9c6b635358
[gaim-migrate @ 1097]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1057
diff
changeset
|
2103 | i = 0; |
|
1252
94fbface2d84
[gaim-migrate @ 1262]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1087
diff
changeset
|
2104 | buf[0] = 0x05; /* SOCKS version 5 */ |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
2105 | |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
2106 | if (gaim_proxy_info_get_username(connect_info->gpi) != NULL) { |
| 10561 | 2107 | buf[1] = 0x03; /* three methods */ |
|
1844
161c00c36474
[gaim-migrate @ 1854]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1843
diff
changeset
|
2108 | buf[2] = 0x00; /* no authentication */ |
| 10561 | 2109 | buf[3] = 0x03; /* CHAP authentication */ |
| 2110 | buf[4] = 0x02; /* username/password authentication */ | |
| 2111 | i = 5; | |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
2112 | } |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
2113 | else { |
|
1844
161c00c36474
[gaim-migrate @ 1854]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1843
diff
changeset
|
2114 | buf[1] = 0x01; |
|
161c00c36474
[gaim-migrate @ 1854]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1843
diff
changeset
|
2115 | buf[2] = 0x00; |
|
161c00c36474
[gaim-migrate @ 1854]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1843
diff
changeset
|
2116 | i = 3; |
|
161c00c36474
[gaim-migrate @ 1854]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1843
diff
changeset
|
2117 | } |
|
3717
2fc0789e04e8
[gaim-migrate @ 3850]
Herman Bloggs <herman@bluedigits.com>
parents:
3630
diff
changeset
|
2118 | |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
2119 | connect_info->write_buf_len = i; |
|
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
2120 | connect_info->write_buffer = g_malloc(connect_info->write_buf_len); |
|
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
2121 | memcpy(connect_info->write_buffer, buf, i); |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
2122 | |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
2123 | connect_info->read_cb = s5_canread; |
|
1087
bc9c6b635358
[gaim-migrate @ 1097]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1057
diff
changeset
|
2124 | |
|
14165
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
2125 | connect_info->inpa = gaim_input_add(connect_info->fd, GAIM_INPUT_WRITE, proxy_do_write, connect_info); |
|
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
2126 | proxy_do_write(connect_info, connect_info->fd, GAIM_INPUT_WRITE); |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
2127 | } |
|
1087
bc9c6b635358
[gaim-migrate @ 1097]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1057
diff
changeset
|
2128 | |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
2129 | static int |
|
14159
0fcdaa463a32
[gaim-migrate @ 16726]
Mark Doliner <markdoliner@pidgin.im>
parents:
14158
diff
changeset
|
2130 | proxy_connect_socks5(GaimProxyConnectInfo *connect_info, struct sockaddr *addr, socklen_t addrlen) |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
2131 | { |
|
10309
073906008cb2
[gaim-migrate @ 11501]
Mark Doliner <markdoliner@pidgin.im>
parents:
10307
diff
changeset
|
2132 | gaim_debug_info("socks5 proxy", |
|
5211
94d9756c381f
[gaim-migrate @ 5581]
Christian Hammond <chipx86@chipx86.com>
parents:
4993
diff
changeset
|
2133 | "Connecting to %s:%d via %s:%d using SOCKS5\n", |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
2134 | connect_info->host, connect_info->port, |
|
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
2135 | gaim_proxy_info_get_host(connect_info->gpi), |
|
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
2136 | gaim_proxy_info_get_port(connect_info->gpi)); |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
2137 | |
|
14165
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
2138 | connect_info->fd = socket(addr->sa_family, SOCK_STREAM, 0); |
|
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
2139 | if (connect_info->fd < 0) |
|
1087
bc9c6b635358
[gaim-migrate @ 1097]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1057
diff
changeset
|
2140 | return -1; |
|
bc9c6b635358
[gaim-migrate @ 1097]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1057
diff
changeset
|
2141 | |
|
14165
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
2142 | fcntl(connect_info->fd, F_SETFL, O_NONBLOCK); |
|
10172
8400788b226c
[gaim-migrate @ 11275]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10170
diff
changeset
|
2143 | #ifndef _WIN32 |
|
14165
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
2144 | fcntl(connect_info->fd, F_SETFD, FD_CLOEXEC); |
|
10172
8400788b226c
[gaim-migrate @ 11275]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10170
diff
changeset
|
2145 | #endif |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
2146 | |
|
14165
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
2147 | if (connect(connect_info->fd, addr, addrlen) != 0) |
|
14161
e959d0e476be
[gaim-migrate @ 16728]
Mark Doliner <markdoliner@pidgin.im>
parents:
14159
diff
changeset
|
2148 | { |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
2149 | if ((errno == EINPROGRESS) || (errno == EINTR)) { |
|
14165
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
2150 | gaim_debug_info("socks5 proxy", "Connection in progress\n"); |
|
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
2151 | connect_info->inpa = gaim_input_add(connect_info->fd, GAIM_INPUT_WRITE, s5_canwrite, connect_info); |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
2152 | } |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
2153 | else { |
|
14165
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
2154 | close(connect_info->fd); |
|
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
2155 | connect_info->fd = -1; |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
2156 | return -1; |
|
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
2157 | } |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
2158 | } |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
2159 | else { |
| 12991 | 2160 | socklen_t len; |
|
2048
4ac8b9622c9e
[gaim-migrate @ 2058]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1881
diff
changeset
|
2161 | int error = ETIMEDOUT; |
|
3717
2fc0789e04e8
[gaim-migrate @ 3850]
Herman Bloggs <herman@bluedigits.com>
parents:
3630
diff
changeset
|
2162 | |
|
14165
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
2163 | gaim_debug_info("socks5 proxy", "Connected immediately.\n"); |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
2164 | |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
2165 | len = sizeof(error); |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
2166 | |
|
14165
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
2167 | if (getsockopt(connect_info->fd, SOL_SOCKET, SO_ERROR, &error, &len) != 0) |
|
14161
e959d0e476be
[gaim-migrate @ 16728]
Mark Doliner <markdoliner@pidgin.im>
parents:
14159
diff
changeset
|
2168 | { |
|
14165
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
2169 | close(connect_info->fd); |
|
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
2170 | connect_info->fd = -1; |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
2171 | return -1; |
|
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
2172 | } |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
2173 | |
|
14165
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
2174 | s5_canwrite(connect_info, connect_info->fd, GAIM_INPUT_WRITE); |
|
1087
bc9c6b635358
[gaim-migrate @ 1097]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1057
diff
changeset
|
2175 | } |
|
bc9c6b635358
[gaim-migrate @ 1097]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1057
diff
changeset
|
2176 | |
|
14165
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
2177 | return connect_info->fd; |
|
1087
bc9c6b635358
[gaim-migrate @ 1097]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1057
diff
changeset
|
2178 | } |
|
bc9c6b635358
[gaim-migrate @ 1097]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1057
diff
changeset
|
2179 | |
|
14165
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
2180 | /** |
|
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
2181 | * This function iterates through a list of IP addresses and attempts |
|
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
2182 | * to connect to each one. This is called after the hostname is |
|
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
2183 | * resolved, and if a connection attempt fails. |
|
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
2184 | */ |
|
14159
0fcdaa463a32
[gaim-migrate @ 16726]
Mark Doliner <markdoliner@pidgin.im>
parents:
14158
diff
changeset
|
2185 | static void try_connect(GaimProxyConnectInfo *connect_info) |
|
4366
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
2186 | { |
| 4678 | 2187 | size_t addrlen; |
| 2188 | struct sockaddr *addr; | |
| 2189 | int ret = -1; | |
| 4634 | 2190 | |
|
14161
e959d0e476be
[gaim-migrate @ 16728]
Mark Doliner <markdoliner@pidgin.im>
parents:
14159
diff
changeset
|
2191 | if (connect_info->hosts == NULL) |
|
e959d0e476be
[gaim-migrate @ 16728]
Mark Doliner <markdoliner@pidgin.im>
parents:
14159
diff
changeset
|
2192 | { |
|
e959d0e476be
[gaim-migrate @ 16728]
Mark Doliner <markdoliner@pidgin.im>
parents:
14159
diff
changeset
|
2193 | gaim_proxy_connect_info_error(connect_info, _("Could not resolve host name")); |
|
e959d0e476be
[gaim-migrate @ 16728]
Mark Doliner <markdoliner@pidgin.im>
parents:
14159
diff
changeset
|
2194 | return; |
|
e959d0e476be
[gaim-migrate @ 16728]
Mark Doliner <markdoliner@pidgin.im>
parents:
14159
diff
changeset
|
2195 | } |
|
e959d0e476be
[gaim-migrate @ 16728]
Mark Doliner <markdoliner@pidgin.im>
parents:
14159
diff
changeset
|
2196 | |
|
e959d0e476be
[gaim-migrate @ 16728]
Mark Doliner <markdoliner@pidgin.im>
parents:
14159
diff
changeset
|
2197 | while (connect_info->hosts) |
|
e959d0e476be
[gaim-migrate @ 16728]
Mark Doliner <markdoliner@pidgin.im>
parents:
14159
diff
changeset
|
2198 | { |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
2199 | addrlen = GPOINTER_TO_INT(connect_info->hosts->data); |
|
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
2200 | connect_info->hosts = g_slist_remove(connect_info->hosts, connect_info->hosts->data); |
|
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
2201 | addr = connect_info->hosts->data; |
|
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
2202 | connect_info->hosts = g_slist_remove(connect_info->hosts, connect_info->hosts->data); |
|
4366
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
2203 | |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
2204 | switch (gaim_proxy_info_get_type(connect_info->gpi)) { |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
2205 | case GAIM_PROXY_NONE: |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
2206 | ret = proxy_connect_none(connect_info, addr, addrlen); |
| 4678 | 2207 | break; |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
2208 | |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
2209 | case GAIM_PROXY_HTTP: |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
2210 | ret = proxy_connect_http(connect_info, addr, addrlen); |
| 4678 | 2211 | break; |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
2212 | |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
2213 | case GAIM_PROXY_SOCKS4: |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
2214 | ret = proxy_connect_socks4(connect_info, addr, addrlen); |
| 4678 | 2215 | break; |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
2216 | |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
2217 | case GAIM_PROXY_SOCKS5: |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
2218 | ret = proxy_connect_socks5(connect_info, addr, addrlen); |
| 4678 | 2219 | break; |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
2220 | |
|
6621
2a18ef3e5224
[gaim-migrate @ 7145]
Robert McQueen <robot101@debian.org>
parents:
6320
diff
changeset
|
2221 | case GAIM_PROXY_USE_ENVVAR: |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
2222 | ret = proxy_connect_http(connect_info, addr, addrlen); |
|
6621
2a18ef3e5224
[gaim-migrate @ 7145]
Robert McQueen <robot101@debian.org>
parents:
6320
diff
changeset
|
2223 | break; |
|
2a18ef3e5224
[gaim-migrate @ 7145]
Robert McQueen <robot101@debian.org>
parents:
6320
diff
changeset
|
2224 | |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
2225 | default: |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
2226 | break; |
| 4678 | 2227 | } |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
2228 | |
| 9129 | 2229 | g_free(addr); |
| 2230 | ||
|
14161
e959d0e476be
[gaim-migrate @ 16728]
Mark Doliner <markdoliner@pidgin.im>
parents:
14159
diff
changeset
|
2231 | if (ret >= 0) |
|
4366
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
2232 | break; |
| 4678 | 2233 | } |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
2234 | |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
2235 | if (ret < 0) { |
|
14161
e959d0e476be
[gaim-migrate @ 16728]
Mark Doliner <markdoliner@pidgin.im>
parents:
14159
diff
changeset
|
2236 | gaim_proxy_connect_info_error(connect_info, _("Unable to establish a connection")); |
|
4366
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
2237 | } |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
2238 | } |
|
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
2239 | |
| 9129 | 2240 | static void |
| 2241 | connection_host_resolved(GSList *hosts, gpointer data, | |
| 2242 | const char *error_message) | |
| 2243 | { | |
|
14159
0fcdaa463a32
[gaim-migrate @ 16726]
Mark Doliner <markdoliner@pidgin.im>
parents:
14158
diff
changeset
|
2244 | GaimProxyConnectInfo *connect_info; |
| 9129 | 2245 | |
|
14161
e959d0e476be
[gaim-migrate @ 16728]
Mark Doliner <markdoliner@pidgin.im>
parents:
14159
diff
changeset
|
2246 | if (error_message != NULL) |
|
e959d0e476be
[gaim-migrate @ 16728]
Mark Doliner <markdoliner@pidgin.im>
parents:
14159
diff
changeset
|
2247 | { |
|
e959d0e476be
[gaim-migrate @ 16728]
Mark Doliner <markdoliner@pidgin.im>
parents:
14159
diff
changeset
|
2248 | gaim_debug_info("proxy", "Error while resolving hostname: %s\n", error_message); |
|
e959d0e476be
[gaim-migrate @ 16728]
Mark Doliner <markdoliner@pidgin.im>
parents:
14159
diff
changeset
|
2249 | /* TODO: Destroy connect_info and return? */ |
|
e959d0e476be
[gaim-migrate @ 16728]
Mark Doliner <markdoliner@pidgin.im>
parents:
14159
diff
changeset
|
2250 | } |
|
e959d0e476be
[gaim-migrate @ 16728]
Mark Doliner <markdoliner@pidgin.im>
parents:
14159
diff
changeset
|
2251 | |
|
14159
0fcdaa463a32
[gaim-migrate @ 16726]
Mark Doliner <markdoliner@pidgin.im>
parents:
14158
diff
changeset
|
2252 | connect_info = data; |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
2253 | connect_info->hosts = hosts; |
| 9129 | 2254 | |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
2255 | try_connect(connect_info); |
| 9129 | 2256 | } |
| 2257 | ||
| 13515 | 2258 | GaimProxyInfo * |
| 2259 | gaim_proxy_get_setup(GaimAccount *account) | |
|
1087
bc9c6b635358
[gaim-migrate @ 1097]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1057
diff
changeset
|
2260 | { |
| 13515 | 2261 | GaimProxyInfo *gpi; |
|
6621
2a18ef3e5224
[gaim-migrate @ 7145]
Robert McQueen <robot101@debian.org>
parents:
6320
diff
changeset
|
2262 | const gchar *tmp; |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
2263 | |
| 11878 | 2264 | if (account && gaim_account_get_proxy_info(account) != NULL) |
| 13515 | 2265 | gpi = gaim_account_get_proxy_info(account); |
| 11878 | 2266 | else if (gaim_running_gnome()) |
| 13515 | 2267 | gpi = gaim_gnome_proxy_get_info(); |
| 11878 | 2268 | else |
| 13515 | 2269 | gpi = gaim_global_proxy_get_info(); |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
2270 | |
| 13515 | 2271 | if (gaim_proxy_info_get_type(gpi) == GAIM_PROXY_USE_ENVVAR) { |
|
6621
2a18ef3e5224
[gaim-migrate @ 7145]
Robert McQueen <robot101@debian.org>
parents:
6320
diff
changeset
|
2272 | if ((tmp = g_getenv("HTTP_PROXY")) != NULL || |
|
2a18ef3e5224
[gaim-migrate @ 7145]
Robert McQueen <robot101@debian.org>
parents:
6320
diff
changeset
|
2273 | (tmp = g_getenv("http_proxy")) != NULL || |
|
10534
c28eef1b882a
[gaim-migrate @ 11866]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10320
diff
changeset
|
2274 | (tmp = g_getenv("HTTPPROXY")) != NULL) { |
| 9227 | 2275 | char *proxyhost,*proxypath,*proxyuser,*proxypasswd; |
|
7652
d60ba2565661
[gaim-migrate @ 8296]
Björn Voigt <bjoern@cs.tu-berlin.de>
parents:
7475
diff
changeset
|
2276 | int proxyport; |
|
6621
2a18ef3e5224
[gaim-migrate @ 7145]
Robert McQueen <robot101@debian.org>
parents:
6320
diff
changeset
|
2277 | |
| 9129 | 2278 | /* http_proxy-format: |
| 9227 | 2279 | * 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
|
2280 | */ |
| 9227 | 2281 | if(gaim_url_parse(tmp, &proxyhost, &proxyport, &proxypath, &proxyuser, &proxypasswd)) { |
| 13515 | 2282 | gaim_proxy_info_set_host(gpi, proxyhost); |
|
7652
d60ba2565661
[gaim-migrate @ 8296]
Björn Voigt <bjoern@cs.tu-berlin.de>
parents:
7475
diff
changeset
|
2283 | g_free(proxyhost); |
|
d60ba2565661
[gaim-migrate @ 8296]
Björn Voigt <bjoern@cs.tu-berlin.de>
parents:
7475
diff
changeset
|
2284 | g_free(proxypath); |
| 9227 | 2285 | if (proxyuser != NULL) { |
| 13515 | 2286 | gaim_proxy_info_set_username(gpi, proxyuser); |
| 9227 | 2287 | g_free(proxyuser); |
| 2288 | } | |
| 2289 | if (proxypasswd != NULL) { | |
| 13515 | 2290 | gaim_proxy_info_set_password(gpi, proxypasswd); |
| 9227 | 2291 | g_free(proxypasswd); |
| 2292 | } | |
|
7652
d60ba2565661
[gaim-migrate @ 8296]
Björn Voigt <bjoern@cs.tu-berlin.de>
parents:
7475
diff
changeset
|
2293 | |
|
d60ba2565661
[gaim-migrate @ 8296]
Björn Voigt <bjoern@cs.tu-berlin.de>
parents:
7475
diff
changeset
|
2294 | /* only for backward compatibility */ |
| 9129 | 2295 | if (proxyport == 80 && |
|
7652
d60ba2565661
[gaim-migrate @ 8296]
Björn Voigt <bjoern@cs.tu-berlin.de>
parents:
7475
diff
changeset
|
2296 | ((tmp = g_getenv("HTTP_PROXY_PORT")) != NULL || |
|
d60ba2565661
[gaim-migrate @ 8296]
Björn Voigt <bjoern@cs.tu-berlin.de>
parents:
7475
diff
changeset
|
2297 | (tmp = g_getenv("http_proxy_port")) != NULL || |
|
d60ba2565661
[gaim-migrate @ 8296]
Björn Voigt <bjoern@cs.tu-berlin.de>
parents:
7475
diff
changeset
|
2298 | (tmp = g_getenv("HTTPPROXYPORT")) != NULL)) |
|
d60ba2565661
[gaim-migrate @ 8296]
Björn Voigt <bjoern@cs.tu-berlin.de>
parents:
7475
diff
changeset
|
2299 | proxyport = atoi(tmp); |
| 9129 | 2300 | |
| 13515 | 2301 | gaim_proxy_info_set_port(gpi, proxyport); |
|
7652
d60ba2565661
[gaim-migrate @ 8296]
Björn Voigt <bjoern@cs.tu-berlin.de>
parents:
7475
diff
changeset
|
2302 | } |
|
10534
c28eef1b882a
[gaim-migrate @ 11866]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10320
diff
changeset
|
2303 | } else { |
|
c28eef1b882a
[gaim-migrate @ 11866]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10320
diff
changeset
|
2304 | /* no proxy environment variable found, don't use a proxy */ |
|
c28eef1b882a
[gaim-migrate @ 11866]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10320
diff
changeset
|
2305 | gaim_debug_info("proxy", "No environment settings found, not using a proxy\n"); |
| 13515 | 2306 | gaim_proxy_info_set_type(gpi, GAIM_PROXY_NONE); |
|
6621
2a18ef3e5224
[gaim-migrate @ 7145]
Robert McQueen <robot101@debian.org>
parents:
6320
diff
changeset
|
2307 | } |
|
2a18ef3e5224
[gaim-migrate @ 7145]
Robert McQueen <robot101@debian.org>
parents:
6320
diff
changeset
|
2308 | |
| 9227 | 2309 | /* 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
|
2310 | if ((tmp = g_getenv("HTTP_PROXY_USER")) != NULL || |
|
2a18ef3e5224
[gaim-migrate @ 7145]
Robert McQueen <robot101@debian.org>
parents:
6320
diff
changeset
|
2311 | (tmp = g_getenv("http_proxy_user")) != NULL || |
|
2a18ef3e5224
[gaim-migrate @ 7145]
Robert McQueen <robot101@debian.org>
parents:
6320
diff
changeset
|
2312 | (tmp = g_getenv("HTTPPROXYUSER")) != NULL) |
| 13515 | 2313 | gaim_proxy_info_set_username(gpi, tmp); |
|
6621
2a18ef3e5224
[gaim-migrate @ 7145]
Robert McQueen <robot101@debian.org>
parents:
6320
diff
changeset
|
2314 | |
|
2a18ef3e5224
[gaim-migrate @ 7145]
Robert McQueen <robot101@debian.org>
parents:
6320
diff
changeset
|
2315 | if ((tmp = g_getenv("HTTP_PROXY_PASS")) != NULL || |
|
2a18ef3e5224
[gaim-migrate @ 7145]
Robert McQueen <robot101@debian.org>
parents:
6320
diff
changeset
|
2316 | (tmp = g_getenv("http_proxy_pass")) != NULL || |
|
2a18ef3e5224
[gaim-migrate @ 7145]
Robert McQueen <robot101@debian.org>
parents:
6320
diff
changeset
|
2317 | (tmp = g_getenv("HTTPPROXYPASS")) != NULL) |
| 13515 | 2318 | gaim_proxy_info_set_password(gpi, tmp); |
|
6621
2a18ef3e5224
[gaim-migrate @ 7145]
Robert McQueen <robot101@debian.org>
parents:
6320
diff
changeset
|
2319 | } |
|
2a18ef3e5224
[gaim-migrate @ 7145]
Robert McQueen <robot101@debian.org>
parents:
6320
diff
changeset
|
2320 | |
| 13515 | 2321 | return gpi; |
| 2322 | } | |
| 2323 | ||
|
14151
34427f138b1f
[gaim-migrate @ 16712]
Mark Doliner <markdoliner@pidgin.im>
parents:
14097
diff
changeset
|
2324 | GaimProxyConnectInfo * |
| 13515 | 2325 | gaim_proxy_connect(GaimAccount *account, const char *host, int port, |
|
14170
f611621bc8a0
[gaim-migrate @ 16742]
Mark Doliner <markdoliner@pidgin.im>
parents:
14165
diff
changeset
|
2326 | GaimProxyConnectFunction connect_cb, gpointer data) |
| 13515 | 2327 | { |
| 2328 | const char *connecthost = host; | |
| 2329 | int connectport = port; | |
|
14159
0fcdaa463a32
[gaim-migrate @ 16726]
Mark Doliner <markdoliner@pidgin.im>
parents:
14158
diff
changeset
|
2330 | GaimProxyConnectInfo *connect_info; |
| 13515 | 2331 | |
|
14151
34427f138b1f
[gaim-migrate @ 16712]
Mark Doliner <markdoliner@pidgin.im>
parents:
14097
diff
changeset
|
2332 | g_return_val_if_fail(host != NULL, NULL); |
|
34427f138b1f
[gaim-migrate @ 16712]
Mark Doliner <markdoliner@pidgin.im>
parents:
14097
diff
changeset
|
2333 | g_return_val_if_fail(port > 0, NULL); |
|
34427f138b1f
[gaim-migrate @ 16712]
Mark Doliner <markdoliner@pidgin.im>
parents:
14097
diff
changeset
|
2334 | g_return_val_if_fail(connect_cb != NULL, NULL); |
| 13515 | 2335 | |
|
14159
0fcdaa463a32
[gaim-migrate @ 16726]
Mark Doliner <markdoliner@pidgin.im>
parents:
14158
diff
changeset
|
2336 | connect_info = g_new0(GaimProxyConnectInfo, 1); |
|
14165
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
2337 | connect_info->fd = -1; |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
2338 | connect_info->connect_cb = connect_cb; |
|
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
2339 | connect_info->data = data; |
|
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
2340 | connect_info->host = g_strdup(host); |
|
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
2341 | connect_info->port = port; |
|
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
2342 | connect_info->gpi = gaim_proxy_get_setup(account); |
| 13515 | 2343 | |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
2344 | if ((gaim_proxy_info_get_type(connect_info->gpi) != GAIM_PROXY_NONE) && |
|
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
2345 | (gaim_proxy_info_get_host(connect_info->gpi) == NULL || |
|
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
2346 | gaim_proxy_info_get_port(connect_info->gpi) <= 0)) { |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
2347 | |
|
6621
2a18ef3e5224
[gaim-migrate @ 7145]
Robert McQueen <robot101@debian.org>
parents:
6320
diff
changeset
|
2348 | gaim_notify_error(NULL, NULL, _("Invalid proxy settings"), _("Either the host name or port number specified for your given proxy type is invalid.")); |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
2349 | gaim_proxy_connect_info_destroy(connect_info); |
|
14151
34427f138b1f
[gaim-migrate @ 16712]
Mark Doliner <markdoliner@pidgin.im>
parents:
14097
diff
changeset
|
2350 | return NULL; |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
2351 | } |
|
4366
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
2352 | |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
2353 | switch (gaim_proxy_info_get_type(connect_info->gpi)) |
|
4366
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
2354 | { |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
2355 | case GAIM_PROXY_NONE: |
|
4366
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
2356 | break; |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
2357 | |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
2358 | case GAIM_PROXY_HTTP: |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
2359 | case GAIM_PROXY_SOCKS4: |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
2360 | case GAIM_PROXY_SOCKS5: |
|
6621
2a18ef3e5224
[gaim-migrate @ 7145]
Robert McQueen <robot101@debian.org>
parents:
6320
diff
changeset
|
2361 | case GAIM_PROXY_USE_ENVVAR: |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
2362 | connecthost = gaim_proxy_info_get_host(connect_info->gpi); |
|
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
2363 | connectport = gaim_proxy_info_get_port(connect_info->gpi); |
|
4366
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
2364 | break; |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
2365 | |
|
4366
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
2366 | default: |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
2367 | gaim_proxy_connect_info_destroy(connect_info); |
|
14151
34427f138b1f
[gaim-migrate @ 16712]
Mark Doliner <markdoliner@pidgin.im>
parents:
14097
diff
changeset
|
2368 | return NULL; |
|
34427f138b1f
[gaim-migrate @ 16712]
Mark Doliner <markdoliner@pidgin.im>
parents:
14097
diff
changeset
|
2369 | } |
|
34427f138b1f
[gaim-migrate @ 16712]
Mark Doliner <markdoliner@pidgin.im>
parents:
14097
diff
changeset
|
2370 | |
|
34427f138b1f
[gaim-migrate @ 16712]
Mark Doliner <markdoliner@pidgin.im>
parents:
14097
diff
changeset
|
2371 | if (gaim_gethostbyname_async(connecthost, |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
2372 | connectport, connection_host_resolved, connect_info) != 0) |
|
14151
34427f138b1f
[gaim-migrate @ 16712]
Mark Doliner <markdoliner@pidgin.im>
parents:
14097
diff
changeset
|
2373 | { |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
2374 | gaim_proxy_connect_info_destroy(connect_info); |
|
14151
34427f138b1f
[gaim-migrate @ 16712]
Mark Doliner <markdoliner@pidgin.im>
parents:
14097
diff
changeset
|
2375 | return NULL; |
|
4366
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
2376 | } |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
2377 | |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
2378 | connect_infos = g_slist_prepend(connect_infos, connect_info); |
|
14151
34427f138b1f
[gaim-migrate @ 16712]
Mark Doliner <markdoliner@pidgin.im>
parents:
14097
diff
changeset
|
2379 | |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
2380 | return connect_info; |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
2381 | } |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
2382 | |
|
14151
34427f138b1f
[gaim-migrate @ 16712]
Mark Doliner <markdoliner@pidgin.im>
parents:
14097
diff
changeset
|
2383 | /* |
|
34427f138b1f
[gaim-migrate @ 16712]
Mark Doliner <markdoliner@pidgin.im>
parents:
14097
diff
changeset
|
2384 | * Combine some of this code with gaim_proxy_connect() |
|
34427f138b1f
[gaim-migrate @ 16712]
Mark Doliner <markdoliner@pidgin.im>
parents:
14097
diff
changeset
|
2385 | */ |
|
34427f138b1f
[gaim-migrate @ 16712]
Mark Doliner <markdoliner@pidgin.im>
parents:
14097
diff
changeset
|
2386 | GaimProxyConnectInfo * |
| 8262 | 2387 | gaim_proxy_connect_socks5(GaimProxyInfo *gpi, const char *host, int port, |
|
14170
f611621bc8a0
[gaim-migrate @ 16742]
Mark Doliner <markdoliner@pidgin.im>
parents:
14165
diff
changeset
|
2388 | GaimProxyConnectFunction connect_cb, gpointer data) |
| 8262 | 2389 | { |
|
14159
0fcdaa463a32
[gaim-migrate @ 16726]
Mark Doliner <markdoliner@pidgin.im>
parents:
14158
diff
changeset
|
2390 | GaimProxyConnectInfo *connect_info; |
| 8262 | 2391 | |
|
14151
34427f138b1f
[gaim-migrate @ 16712]
Mark Doliner <markdoliner@pidgin.im>
parents:
14097
diff
changeset
|
2392 | g_return_val_if_fail(host != NULL, NULL); |
|
34427f138b1f
[gaim-migrate @ 16712]
Mark Doliner <markdoliner@pidgin.im>
parents:
14097
diff
changeset
|
2393 | g_return_val_if_fail(port > 0, NULL); |
|
34427f138b1f
[gaim-migrate @ 16712]
Mark Doliner <markdoliner@pidgin.im>
parents:
14097
diff
changeset
|
2394 | g_return_val_if_fail(connect_cb != NULL, NULL); |
|
34427f138b1f
[gaim-migrate @ 16712]
Mark Doliner <markdoliner@pidgin.im>
parents:
14097
diff
changeset
|
2395 | |
|
14159
0fcdaa463a32
[gaim-migrate @ 16726]
Mark Doliner <markdoliner@pidgin.im>
parents:
14158
diff
changeset
|
2396 | connect_info = g_new0(GaimProxyConnectInfo, 1); |
|
14165
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
2397 | connect_info->fd = -1; |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
2398 | connect_info->connect_cb = connect_cb; |
|
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
2399 | connect_info->data = data; |
|
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
2400 | connect_info->host = g_strdup(host); |
|
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
2401 | connect_info->port = port; |
|
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
2402 | connect_info->gpi = gpi; |
| 8262 | 2403 | |
|
14151
34427f138b1f
[gaim-migrate @ 16712]
Mark Doliner <markdoliner@pidgin.im>
parents:
14097
diff
changeset
|
2404 | if (gaim_gethostbyname_async(gaim_proxy_info_get_host(gpi), |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
2405 | gaim_proxy_info_get_port(gpi), connection_host_resolved, connect_info) != 0) |
|
14151
34427f138b1f
[gaim-migrate @ 16712]
Mark Doliner <markdoliner@pidgin.im>
parents:
14097
diff
changeset
|
2406 | { |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
2407 | gaim_proxy_connect_info_destroy(connect_info); |
|
14151
34427f138b1f
[gaim-migrate @ 16712]
Mark Doliner <markdoliner@pidgin.im>
parents:
14097
diff
changeset
|
2408 | return NULL; |
|
34427f138b1f
[gaim-migrate @ 16712]
Mark Doliner <markdoliner@pidgin.im>
parents:
14097
diff
changeset
|
2409 | } |
|
34427f138b1f
[gaim-migrate @ 16712]
Mark Doliner <markdoliner@pidgin.im>
parents:
14097
diff
changeset
|
2410 | |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
2411 | connect_infos = g_slist_prepend(connect_infos, connect_info); |
|
14151
34427f138b1f
[gaim-migrate @ 16712]
Mark Doliner <markdoliner@pidgin.im>
parents:
14097
diff
changeset
|
2412 | |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
2413 | return connect_info; |
| 8262 | 2414 | } |
| 2415 | ||
|
14165
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
2416 | void |
|
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
2417 | gaim_proxy_connect_cancel(GaimProxyConnectInfo *connect_info) |
|
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
2418 | { |
|
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
2419 | gaim_proxy_connect_info_destroy(connect_info); |
|
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
2420 | } |
| 8262 | 2421 | |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
2422 | static void |
|
12816
5f93e09fa9a6
[gaim-migrate @ 15164]
Mark Doliner <markdoliner@pidgin.im>
parents:
12811
diff
changeset
|
2423 | proxy_pref_cb(const char *name, GaimPrefType type, |
|
5f93e09fa9a6
[gaim-migrate @ 15164]
Mark Doliner <markdoliner@pidgin.im>
parents:
12811
diff
changeset
|
2424 | gconstpointer value, gpointer data) |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
2425 | { |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
2426 | GaimProxyInfo *info = gaim_global_proxy_get_info(); |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
2427 | |
|
6001
1abbeff6571c
[gaim-migrate @ 6449]
Mark Doliner <markdoliner@pidgin.im>
parents:
5970
diff
changeset
|
2428 | if (!strcmp(name, "/core/proxy/type")) { |
|
1abbeff6571c
[gaim-migrate @ 6449]
Mark Doliner <markdoliner@pidgin.im>
parents:
5970
diff
changeset
|
2429 | int proxytype; |
|
12816
5f93e09fa9a6
[gaim-migrate @ 15164]
Mark Doliner <markdoliner@pidgin.im>
parents:
12811
diff
changeset
|
2430 | const char *type = value; |
|
6001
1abbeff6571c
[gaim-migrate @ 6449]
Mark Doliner <markdoliner@pidgin.im>
parents:
5970
diff
changeset
|
2431 | |
|
1abbeff6571c
[gaim-migrate @ 6449]
Mark Doliner <markdoliner@pidgin.im>
parents:
5970
diff
changeset
|
2432 | if (!strcmp(type, "none")) |
|
1abbeff6571c
[gaim-migrate @ 6449]
Mark Doliner <markdoliner@pidgin.im>
parents:
5970
diff
changeset
|
2433 | proxytype = GAIM_PROXY_NONE; |
|
1abbeff6571c
[gaim-migrate @ 6449]
Mark Doliner <markdoliner@pidgin.im>
parents:
5970
diff
changeset
|
2434 | else if (!strcmp(type, "http")) |
|
1abbeff6571c
[gaim-migrate @ 6449]
Mark Doliner <markdoliner@pidgin.im>
parents:
5970
diff
changeset
|
2435 | proxytype = GAIM_PROXY_HTTP; |
|
1abbeff6571c
[gaim-migrate @ 6449]
Mark Doliner <markdoliner@pidgin.im>
parents:
5970
diff
changeset
|
2436 | else if (!strcmp(type, "socks4")) |
|
1abbeff6571c
[gaim-migrate @ 6449]
Mark Doliner <markdoliner@pidgin.im>
parents:
5970
diff
changeset
|
2437 | proxytype = GAIM_PROXY_SOCKS4; |
|
1abbeff6571c
[gaim-migrate @ 6449]
Mark Doliner <markdoliner@pidgin.im>
parents:
5970
diff
changeset
|
2438 | else if (!strcmp(type, "socks5")) |
|
1abbeff6571c
[gaim-migrate @ 6449]
Mark Doliner <markdoliner@pidgin.im>
parents:
5970
diff
changeset
|
2439 | proxytype = GAIM_PROXY_SOCKS5; |
|
6621
2a18ef3e5224
[gaim-migrate @ 7145]
Robert McQueen <robot101@debian.org>
parents:
6320
diff
changeset
|
2440 | else if (!strcmp(type, "envvar")) |
|
2a18ef3e5224
[gaim-migrate @ 7145]
Robert McQueen <robot101@debian.org>
parents:
6320
diff
changeset
|
2441 | proxytype = GAIM_PROXY_USE_ENVVAR; |
|
6001
1abbeff6571c
[gaim-migrate @ 6449]
Mark Doliner <markdoliner@pidgin.im>
parents:
5970
diff
changeset
|
2442 | else |
|
1abbeff6571c
[gaim-migrate @ 6449]
Mark Doliner <markdoliner@pidgin.im>
parents:
5970
diff
changeset
|
2443 | proxytype = -1; |
|
1abbeff6571c
[gaim-migrate @ 6449]
Mark Doliner <markdoliner@pidgin.im>
parents:
5970
diff
changeset
|
2444 | |
|
1abbeff6571c
[gaim-migrate @ 6449]
Mark Doliner <markdoliner@pidgin.im>
parents:
5970
diff
changeset
|
2445 | gaim_proxy_info_set_type(info, proxytype); |
|
1abbeff6571c
[gaim-migrate @ 6449]
Mark Doliner <markdoliner@pidgin.im>
parents:
5970
diff
changeset
|
2446 | } else if (!strcmp(name, "/core/proxy/host")) |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
2447 | gaim_proxy_info_set_host(info, value); |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
2448 | else if (!strcmp(name, "/core/proxy/port")) |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
2449 | gaim_proxy_info_set_port(info, GPOINTER_TO_INT(value)); |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
2450 | else if (!strcmp(name, "/core/proxy/username")) |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
2451 | gaim_proxy_info_set_username(info, value); |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
2452 | else if (!strcmp(name, "/core/proxy/password")) |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
2453 | gaim_proxy_info_set_password(info, value); |
|
1087
bc9c6b635358
[gaim-migrate @ 1097]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1057
diff
changeset
|
2454 | } |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
2455 | |
|
14151
34427f138b1f
[gaim-migrate @ 16712]
Mark Doliner <markdoliner@pidgin.im>
parents:
14097
diff
changeset
|
2456 | void * |
|
34427f138b1f
[gaim-migrate @ 16712]
Mark Doliner <markdoliner@pidgin.im>
parents:
14097
diff
changeset
|
2457 | gaim_proxy_get_handle() |
|
34427f138b1f
[gaim-migrate @ 16712]
Mark Doliner <markdoliner@pidgin.im>
parents:
14097
diff
changeset
|
2458 | { |
|
34427f138b1f
[gaim-migrate @ 16712]
Mark Doliner <markdoliner@pidgin.im>
parents:
14097
diff
changeset
|
2459 | static int handle; |
|
34427f138b1f
[gaim-migrate @ 16712]
Mark Doliner <markdoliner@pidgin.im>
parents:
14097
diff
changeset
|
2460 | |
|
34427f138b1f
[gaim-migrate @ 16712]
Mark Doliner <markdoliner@pidgin.im>
parents:
14097
diff
changeset
|
2461 | return &handle; |
|
34427f138b1f
[gaim-migrate @ 16712]
Mark Doliner <markdoliner@pidgin.im>
parents:
14097
diff
changeset
|
2462 | } |
|
34427f138b1f
[gaim-migrate @ 16712]
Mark Doliner <markdoliner@pidgin.im>
parents:
14097
diff
changeset
|
2463 | |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
2464 | void |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
2465 | gaim_proxy_init(void) |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
2466 | { |
|
10087
e5b80a38939d
[gaim-migrate @ 11098]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
9863
diff
changeset
|
2467 | void *handle; |
|
e5b80a38939d
[gaim-migrate @ 11098]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
9863
diff
changeset
|
2468 | |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
2469 | /* Initialize a default proxy info struct. */ |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
2470 | global_proxy_info = gaim_proxy_info_new(); |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
2471 | |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
2472 | /* Proxy */ |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
2473 | gaim_prefs_add_none("/core/proxy"); |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
2474 | gaim_prefs_add_string("/core/proxy/type", "none"); |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
2475 | gaim_prefs_add_string("/core/proxy/host", ""); |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
2476 | gaim_prefs_add_int("/core/proxy/port", 0); |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
2477 | gaim_prefs_add_string("/core/proxy/username", ""); |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
2478 | gaim_prefs_add_string("/core/proxy/password", ""); |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
2479 | |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
2480 | /* Setup callbacks for the preferences. */ |
|
10087
e5b80a38939d
[gaim-migrate @ 11098]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
9863
diff
changeset
|
2481 | handle = gaim_proxy_get_handle(); |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
2482 | gaim_prefs_connect_callback(handle, "/core/proxy/type", proxy_pref_cb, |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
2483 | NULL); |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
2484 | gaim_prefs_connect_callback(handle, "/core/proxy/host", proxy_pref_cb, |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
2485 | NULL); |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
2486 | gaim_prefs_connect_callback(handle, "/core/proxy/port", proxy_pref_cb, |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
2487 | NULL); |
|
10087
e5b80a38939d
[gaim-migrate @ 11098]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
9863
diff
changeset
|
2488 | gaim_prefs_connect_callback(handle, "/core/proxy/username", |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
2489 | proxy_pref_cb, NULL); |
|
10087
e5b80a38939d
[gaim-migrate @ 11098]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
9863
diff
changeset
|
2490 | gaim_prefs_connect_callback(handle, "/core/proxy/password", |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
2491 | proxy_pref_cb, NULL); |
|
10626
659572951067
[gaim-migrate @ 12101]
Daniel Atallah <datallah@pidgin.im>
parents:
10619
diff
changeset
|
2492 | #ifdef _WIN32 |
|
10237
93c682ab4b27
[gaim-migrate @ 11373]
Herman Bloggs <herman@bluedigits.com>
parents:
10172
diff
changeset
|
2493 | if(!g_thread_supported()) |
|
93c682ab4b27
[gaim-migrate @ 11373]
Herman Bloggs <herman@bluedigits.com>
parents:
10172
diff
changeset
|
2494 | g_thread_init(NULL); |
|
10626
659572951067
[gaim-migrate @ 12101]
Daniel Atallah <datallah@pidgin.im>
parents:
10619
diff
changeset
|
2495 | #endif |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
2496 | } |
|
10087
e5b80a38939d
[gaim-migrate @ 11098]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
9863
diff
changeset
|
2497 | |
|
14151
34427f138b1f
[gaim-migrate @ 16712]
Mark Doliner <markdoliner@pidgin.im>
parents:
14097
diff
changeset
|
2498 | void |
|
34427f138b1f
[gaim-migrate @ 16712]
Mark Doliner <markdoliner@pidgin.im>
parents:
14097
diff
changeset
|
2499 | gaim_proxy_uninit(void) |
|
10087
e5b80a38939d
[gaim-migrate @ 11098]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
9863
diff
changeset
|
2500 | { |
|
14158
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
2501 | while (connect_infos != NULL) |
|
4ae6de39878e
[gaim-migrate @ 16725]
Mark Doliner <markdoliner@pidgin.im>
parents:
14157
diff
changeset
|
2502 | gaim_proxy_connect_info_destroy(connect_infos->data); |
|
10087
e5b80a38939d
[gaim-migrate @ 11098]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
9863
diff
changeset
|
2503 | } |