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