Sun, 10 Jan 2016 03:23:46 -0600
Clear ununused functions from proxy.[ch] including purple_proxy_connect_udp()
Since porting libpurple's proxy API to internally use Gio, a lot of
functions remain unused. purple_proxy_connect_udp() was added for the
QQ prpl (ticket #6589), but no longer appears to be used. This patch
removes all of these functions in favor of the Gio versions.
| 37460 | 1 | /* purple |
| 1 | 2 | * |
| 15884 | 3 | * Purple is the legal property of its developers, whose names are too numerous |
| 8046 | 4 | * to list here. Please refer to the COPYRIGHT file distributed with this |
| 5 | * source distribution. | |
| 1 | 6 | * |
| 7 | * This program is free software; you can redistribute it and/or modify | |
| 8 | * it under the terms of the GNU General Public License as published by | |
| 9 | * the Free Software Foundation; either version 2 of the License, or | |
| 10 | * (at your option) any later version. | |
| 11 | * | |
| 12 | * This program is distributed in the hope that it will be useful, | |
| 13 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 14 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
| 15 | * GNU General Public License for more details. | |
| 16 | * | |
| 17 | * You should have received a copy of the GNU General Public License | |
| 18 | * along with this program; if not, write to the Free Software | |
|
19859
71d37b57eff2
The FSF changed its address a while ago; our files were out of date.
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
19840
diff
changeset
|
19 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA |
| 1 | 20 | * |
| 21 | */ | |
| 22 | ||
| 23 | /* this is a little piece of code to handle proxy connection */ | |
| 24 | /* 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
|
25 | , 2nd provide an easy way to add socks support |
|
5ed6b8356ebc
[gaim-migrate @ 7401]
Mark Doliner <markdoliner@pidgin.im>
parents:
6621
diff
changeset
|
26 | , 3rd draw women to it like flies to honey */ |
|
31738
c0a7971ce0d2
purple: Fix some compiler warnings related to new API and missing prototypes.
Paul Aurich <darkrain42@pidgin.im>
parents:
31678
diff
changeset
|
27 | #define _PURPLE_PROXY_C_ |
| 1 | 28 | |
|
5872
754c63f29b77
[gaim-migrate @ 6304]
Christian Hammond <chipx86@chipx86.com>
parents:
5681
diff
changeset
|
29 | #include "internal.h" |
|
34567
ea5103f66b0e
Refactor the codebase to use PurpleHash
Ankit Vani <a@nevitus.org>
parents:
34558
diff
changeset
|
30 | #include "ciphers/md5hash.h" |
|
5872
754c63f29b77
[gaim-migrate @ 6304]
Christian Hammond <chipx86@chipx86.com>
parents:
5681
diff
changeset
|
31 | #include "debug.h" |
|
34219
eee308def583
HTTP: get rid of purple_url_parse
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34218
diff
changeset
|
32 | #include "http.h" |
|
6621
2a18ef3e5224
[gaim-migrate @ 7145]
Robert McQueen <robot101@debian.org>
parents:
6320
diff
changeset
|
33 | #include "notify.h" |
| 12391 | 34 | #include "ntlm.h" |
|
5872
754c63f29b77
[gaim-migrate @ 6304]
Christian Hammond <chipx86@chipx86.com>
parents:
5681
diff
changeset
|
35 | #include "prefs.h" |
| 1 | 36 | #include "proxy.h" |
|
5872
754c63f29b77
[gaim-migrate @ 6304]
Christian Hammond <chipx86@chipx86.com>
parents:
5681
diff
changeset
|
37 | #include "util.h" |
| 3630 | 38 | |
|
37451
927a083a6c9f
This probably doesn't work, but it compiles (for now)
Gary Kramlich <grim@reaperworld.com>
parents:
37193
diff
changeset
|
39 | #include <gio/gio.h> |
|
927a083a6c9f
This probably doesn't work, but it compiles (for now)
Gary Kramlich <grim@reaperworld.com>
parents:
37193
diff
changeset
|
40 | |
|
32299
106311e19d3a
Hide PurpleProxyInfo struct.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32297
diff
changeset
|
41 | struct _PurpleProxyInfo |
|
106311e19d3a
Hide PurpleProxyInfo struct.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32297
diff
changeset
|
42 | { |
|
35462
901dfa763f15
Fix some gtk-doc warnings till proxy.c
Ankit Vani <a@nevitus.org>
parents:
35454
diff
changeset
|
43 | PurpleProxyType type; /* The proxy type. */ |
|
901dfa763f15
Fix some gtk-doc warnings till proxy.c
Ankit Vani <a@nevitus.org>
parents:
35454
diff
changeset
|
44 | |
|
901dfa763f15
Fix some gtk-doc warnings till proxy.c
Ankit Vani <a@nevitus.org>
parents:
35454
diff
changeset
|
45 | char *host; /* The host. */ |
|
901dfa763f15
Fix some gtk-doc warnings till proxy.c
Ankit Vani <a@nevitus.org>
parents:
35454
diff
changeset
|
46 | int port; /* The port number. */ |
|
901dfa763f15
Fix some gtk-doc warnings till proxy.c
Ankit Vani <a@nevitus.org>
parents:
35454
diff
changeset
|
47 | char *username; /* The username. */ |
|
901dfa763f15
Fix some gtk-doc warnings till proxy.c
Ankit Vani <a@nevitus.org>
parents:
35454
diff
changeset
|
48 | char *password; /* The password. */ |
|
32299
106311e19d3a
Hide PurpleProxyInfo struct.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32297
diff
changeset
|
49 | }; |
|
106311e19d3a
Hide PurpleProxyInfo struct.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32297
diff
changeset
|
50 | |
| 15884 | 51 | struct _PurpleProxyConnectData { |
|
14899
c65f0b4fb351
[gaim-migrate @ 17606]
Mark Doliner <markdoliner@pidgin.im>
parents:
14536
diff
changeset
|
52 | void *handle; |
| 15884 | 53 | PurpleProxyConnectFunction connect_cb; |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
54 | gpointer data; |
|
14513
fe63cd247350
[gaim-migrate @ 17165]
Mark Doliner <markdoliner@pidgin.im>
parents:
14454
diff
changeset
|
55 | gchar *host; |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
56 | int port; |
|
14165
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
57 | int fd; |
|
27249
3f5b531ae0b3
Add purple_proxy_connect_udp. Closes #6589.
Hu Yong <ccpaging@gmail.com>
parents:
25911
diff
changeset
|
58 | int socket_type; |
|
14151
34427f138b1f
[gaim-migrate @ 16712]
Mark Doliner <markdoliner@pidgin.im>
parents:
14097
diff
changeset
|
59 | guint inpa; |
| 15884 | 60 | PurpleProxyInfo *gpi; |
|
37451
927a083a6c9f
This probably doesn't work, but it compiles (for now)
Gary Kramlich <grim@reaperworld.com>
parents:
37193
diff
changeset
|
61 | |
|
927a083a6c9f
This probably doesn't work, but it compiles (for now)
Gary Kramlich <grim@reaperworld.com>
parents:
37193
diff
changeset
|
62 | GCancellable *cancellable; |
|
14159
0fcdaa463a32
[gaim-migrate @ 16726]
Mark Doliner <markdoliner@pidgin.im>
parents:
14158
diff
changeset
|
63 | |
|
35462
901dfa763f15
Fix some gtk-doc warnings till proxy.c
Ankit Vani <a@nevitus.org>
parents:
35454
diff
changeset
|
64 | /* |
|
37451
927a083a6c9f
This probably doesn't work, but it compiles (for now)
Gary Kramlich <grim@reaperworld.com>
parents:
37193
diff
changeset
|
65 | * This list contains GInetAddress and they should be freed with |
|
927a083a6c9f
This probably doesn't work, but it compiles (for now)
Gary Kramlich <grim@reaperworld.com>
parents:
37193
diff
changeset
|
66 | * g_resolver_free_addresses when done with. |
|
14159
0fcdaa463a32
[gaim-migrate @ 16726]
Mark Doliner <markdoliner@pidgin.im>
parents:
14158
diff
changeset
|
67 | */ |
|
37451
927a083a6c9f
This probably doesn't work, but it compiles (for now)
Gary Kramlich <grim@reaperworld.com>
parents:
37193
diff
changeset
|
68 | GList *hosts; |
|
14159
0fcdaa463a32
[gaim-migrate @ 16726]
Mark Doliner <markdoliner@pidgin.im>
parents:
14158
diff
changeset
|
69 | |
|
32129
5f9d676cefdb
Fix a possible XMPP remote crash
Mark Doliner <markdoliner@pidgin.im>
parents:
32070
diff
changeset
|
70 | PurpleProxyConnectData *child; |
|
5f9d676cefdb
Fix a possible XMPP remote crash
Mark Doliner <markdoliner@pidgin.im>
parents:
32070
diff
changeset
|
71 | |
|
14165
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
72 | /* |
|
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
73 | * All of the following variables are used when establishing a |
|
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
74 | * connection through a proxy. |
|
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
75 | */ |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
76 | guchar *write_buffer; |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
77 | gsize write_buf_len; |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
78 | gsize written_len; |
| 15884 | 79 | PurpleInputFunction read_cb; |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
80 | guchar *read_buffer; |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
81 | gsize read_buf_len; |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
82 | gsize read_len; |
|
31678
ad8a9a266b05
Add new DNS-related API to perform lookups in the context of an account.
Daniel Atallah <datallah@pidgin.im>
parents:
31677
diff
changeset
|
83 | PurpleAccount *account; |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
84 | }; |
|
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
85 | |
|
21091
07fe1a99c47b
Patch from Andrew Gaul to constify a bunch of static variables to reduce
Ka-Hing Cheung <khc@pidgin.im>
parents:
20251
diff
changeset
|
86 | static const char * const socks5errors[] = { |
|
7982
db8c1b6137eb
[gaim-migrate @ 8659]
Gavan Fantom <gavan@users.sourceforge.net>
parents:
7834
diff
changeset
|
87 | "succeeded\n", |
|
db8c1b6137eb
[gaim-migrate @ 8659]
Gavan Fantom <gavan@users.sourceforge.net>
parents:
7834
diff
changeset
|
88 | "general SOCKS server failure\n", |
|
db8c1b6137eb
[gaim-migrate @ 8659]
Gavan Fantom <gavan@users.sourceforge.net>
parents:
7834
diff
changeset
|
89 | "connection not allowed by ruleset\n", |
|
db8c1b6137eb
[gaim-migrate @ 8659]
Gavan Fantom <gavan@users.sourceforge.net>
parents:
7834
diff
changeset
|
90 | "Network unreachable\n", |
|
db8c1b6137eb
[gaim-migrate @ 8659]
Gavan Fantom <gavan@users.sourceforge.net>
parents:
7834
diff
changeset
|
91 | "Host unreachable\n", |
|
db8c1b6137eb
[gaim-migrate @ 8659]
Gavan Fantom <gavan@users.sourceforge.net>
parents:
7834
diff
changeset
|
92 | "Connection refused\n", |
|
db8c1b6137eb
[gaim-migrate @ 8659]
Gavan Fantom <gavan@users.sourceforge.net>
parents:
7834
diff
changeset
|
93 | "TTL expired\n", |
|
db8c1b6137eb
[gaim-migrate @ 8659]
Gavan Fantom <gavan@users.sourceforge.net>
parents:
7834
diff
changeset
|
94 | "Command not supported\n", |
|
db8c1b6137eb
[gaim-migrate @ 8659]
Gavan Fantom <gavan@users.sourceforge.net>
parents:
7834
diff
changeset
|
95 | "Address type not supported\n" |
|
db8c1b6137eb
[gaim-migrate @ 8659]
Gavan Fantom <gavan@users.sourceforge.net>
parents:
7834
diff
changeset
|
96 | }; |
|
db8c1b6137eb
[gaim-migrate @ 8659]
Gavan Fantom <gavan@users.sourceforge.net>
parents:
7834
diff
changeset
|
97 | |
| 15884 | 98 | static PurpleProxyInfo *global_proxy_info = NULL; |
|
14165
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
99 | |
|
14899
c65f0b4fb351
[gaim-migrate @ 17606]
Mark Doliner <markdoliner@pidgin.im>
parents:
14536
diff
changeset
|
100 | static GSList *handles = NULL; |
|
14151
34427f138b1f
[gaim-migrate @ 16712]
Mark Doliner <markdoliner@pidgin.im>
parents:
14097
diff
changeset
|
101 | |
|
16037
e00a903d17a2
I commonly see a crash in which socket_ready_cb(), shortly after a laptop wakes from sleep, is passed invalid (previously freed) connect_data. It looks like this:
Evan Schoenberg <evands@pidgin.im>
parents:
15884
diff
changeset
|
102 | /* |
|
e00a903d17a2
I commonly see a crash in which socket_ready_cb(), shortly after a laptop wakes from sleep, is passed invalid (previously freed) connect_data. It looks like this:
Evan Schoenberg <evands@pidgin.im>
parents:
15884
diff
changeset
|
103 | * TODO: Eventually (GObjectification) this bad boy will be removed, because it is |
|
e00a903d17a2
I commonly see a crash in which socket_ready_cb(), shortly after a laptop wakes from sleep, is passed invalid (previously freed) connect_data. It looks like this:
Evan Schoenberg <evands@pidgin.im>
parents:
15884
diff
changeset
|
104 | * a gross fix for a crashy problem. |
|
e00a903d17a2
I commonly see a crash in which socket_ready_cb(), shortly after a laptop wakes from sleep, is passed invalid (previously freed) connect_data. It looks like this:
Evan Schoenberg <evands@pidgin.im>
parents:
15884
diff
changeset
|
105 | */ |
|
e00a903d17a2
I commonly see a crash in which socket_ready_cb(), shortly after a laptop wakes from sleep, is passed invalid (previously freed) connect_data. It looks like this:
Evan Schoenberg <evands@pidgin.im>
parents:
15884
diff
changeset
|
106 | #define PURPLE_PROXY_CONNECT_DATA_IS_VALID(connect_data) g_slist_find(handles, connect_data) |
|
e00a903d17a2
I commonly see a crash in which socket_ready_cb(), shortly after a laptop wakes from sleep, is passed invalid (previously freed) connect_data. It looks like this:
Evan Schoenberg <evands@pidgin.im>
parents:
15884
diff
changeset
|
107 | |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
108 | /************************************************************************** |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
109 | * Proxy structure API |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
110 | **************************************************************************/ |
| 15884 | 111 | PurpleProxyInfo * |
| 112 | purple_proxy_info_new(void) | |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
113 | { |
| 15884 | 114 | return g_new0(PurpleProxyInfo, 1); |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
115 | } |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
116 | |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
117 | void |
| 15884 | 118 | purple_proxy_info_destroy(PurpleProxyInfo *info) |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
119 | { |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
120 | g_return_if_fail(info != NULL); |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
121 | |
|
14030
23144f1dc950
[gaim-migrate @ 16525]
Mark Doliner <markdoliner@pidgin.im>
parents:
13991
diff
changeset
|
122 | g_free(info->host); |
|
23144f1dc950
[gaim-migrate @ 16525]
Mark Doliner <markdoliner@pidgin.im>
parents:
13991
diff
changeset
|
123 | g_free(info->username); |
|
23144f1dc950
[gaim-migrate @ 16525]
Mark Doliner <markdoliner@pidgin.im>
parents:
13991
diff
changeset
|
124 | g_free(info->password); |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
125 | |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
126 | g_free(info); |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
127 | } |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
128 | |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
129 | void |
|
35378
5d9e2581005b
gtk-doc prep: *_get_type() functions are hidden as standard GType-returning funcs, so rename them.
Ankit Vani <a@nevitus.org>
parents:
35265
diff
changeset
|
130 | purple_proxy_info_set_proxy_type(PurpleProxyInfo *info, PurpleProxyType type) |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
131 | { |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
132 | g_return_if_fail(info != NULL); |
|
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 | info->type = type; |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
135 | } |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
136 | |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
137 | void |
| 15884 | 138 | purple_proxy_info_set_host(PurpleProxyInfo *info, const char *host) |
|
5681
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 | g_return_if_fail(info != NULL); |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
141 | |
|
14030
23144f1dc950
[gaim-migrate @ 16525]
Mark Doliner <markdoliner@pidgin.im>
parents:
13991
diff
changeset
|
142 | g_free(info->host); |
|
14097
0c340861ab79
[gaim-migrate @ 16638]
Mark Doliner <markdoliner@pidgin.im>
parents:
14030
diff
changeset
|
143 | info->host = g_strdup(host); |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
144 | } |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
145 | |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
146 | void |
| 15884 | 147 | purple_proxy_info_set_port(PurpleProxyInfo *info, int port) |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
148 | { |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
149 | g_return_if_fail(info != NULL); |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
150 | |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
151 | info->port = port; |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
152 | } |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
153 | |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
154 | void |
| 15884 | 155 | purple_proxy_info_set_username(PurpleProxyInfo *info, const char *username) |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
156 | { |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
157 | g_return_if_fail(info != NULL); |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
158 | |
|
14030
23144f1dc950
[gaim-migrate @ 16525]
Mark Doliner <markdoliner@pidgin.im>
parents:
13991
diff
changeset
|
159 | g_free(info->username); |
|
14097
0c340861ab79
[gaim-migrate @ 16638]
Mark Doliner <markdoliner@pidgin.im>
parents:
14030
diff
changeset
|
160 | info->username = g_strdup(username); |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
161 | } |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
162 | |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
163 | void |
| 15884 | 164 | purple_proxy_info_set_password(PurpleProxyInfo *info, const char *password) |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
165 | { |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
166 | g_return_if_fail(info != NULL); |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
167 | |
|
14030
23144f1dc950
[gaim-migrate @ 16525]
Mark Doliner <markdoliner@pidgin.im>
parents:
13991
diff
changeset
|
168 | g_free(info->password); |
|
14097
0c340861ab79
[gaim-migrate @ 16638]
Mark Doliner <markdoliner@pidgin.im>
parents:
14030
diff
changeset
|
169 | info->password = g_strdup(password); |
|
5681
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 | |
| 15884 | 172 | PurpleProxyType |
|
35378
5d9e2581005b
gtk-doc prep: *_get_type() functions are hidden as standard GType-returning funcs, so rename them.
Ankit Vani <a@nevitus.org>
parents:
35265
diff
changeset
|
173 | purple_proxy_info_get_proxy_type(const PurpleProxyInfo *info) |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
174 | { |
| 15884 | 175 | g_return_val_if_fail(info != NULL, PURPLE_PROXY_NONE); |
|
5681
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->type; |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
178 | } |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
179 | |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
180 | const char * |
| 15884 | 181 | purple_proxy_info_get_host(const PurpleProxyInfo *info) |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
182 | { |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
183 | g_return_val_if_fail(info != NULL, NULL); |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
184 | |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
185 | return info->host; |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
186 | } |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
187 | |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
188 | int |
| 15884 | 189 | purple_proxy_info_get_port(const PurpleProxyInfo *info) |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
190 | { |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
191 | g_return_val_if_fail(info != NULL, 0); |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
192 | |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
193 | return info->port; |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
194 | } |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
195 | |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
196 | const char * |
| 15884 | 197 | purple_proxy_info_get_username(const PurpleProxyInfo *info) |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
198 | { |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
199 | g_return_val_if_fail(info != NULL, NULL); |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
200 | |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
201 | return info->username; |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
202 | } |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
203 | |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
204 | const char * |
| 15884 | 205 | purple_proxy_info_get_password(const PurpleProxyInfo *info) |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
206 | { |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
207 | g_return_val_if_fail(info != NULL, NULL); |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
208 | |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
209 | return info->password; |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
210 | } |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
211 | |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
212 | /************************************************************************** |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
213 | * Global Proxy API |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
214 | **************************************************************************/ |
| 15884 | 215 | PurpleProxyInfo * |
| 216 | purple_global_proxy_get_info(void) | |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
217 | { |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
218 | return global_proxy_info; |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
219 | } |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
220 | |
|
25858
ec60fbe5a4ab
Patch from fqueze to add API for setting the global proxy settings. Fixes #7610.
Daniel Atallah <datallah@pidgin.im>
parents:
24866
diff
changeset
|
221 | void |
|
ec60fbe5a4ab
Patch from fqueze to add API for setting the global proxy settings. Fixes #7610.
Daniel Atallah <datallah@pidgin.im>
parents:
24866
diff
changeset
|
222 | purple_global_proxy_set_info(PurpleProxyInfo *info) |
|
ec60fbe5a4ab
Patch from fqueze to add API for setting the global proxy settings. Fixes #7610.
Daniel Atallah <datallah@pidgin.im>
parents:
24866
diff
changeset
|
223 | { |
|
ec60fbe5a4ab
Patch from fqueze to add API for setting the global proxy settings. Fixes #7610.
Daniel Atallah <datallah@pidgin.im>
parents:
24866
diff
changeset
|
224 | g_return_if_fail(info != NULL); |
|
ec60fbe5a4ab
Patch from fqueze to add API for setting the global proxy settings. Fixes #7610.
Daniel Atallah <datallah@pidgin.im>
parents:
24866
diff
changeset
|
225 | |
|
ec60fbe5a4ab
Patch from fqueze to add API for setting the global proxy settings. Fixes #7610.
Daniel Atallah <datallah@pidgin.im>
parents:
24866
diff
changeset
|
226 | purple_proxy_info_destroy(global_proxy_info); |
|
ec60fbe5a4ab
Patch from fqueze to add API for setting the global proxy settings. Fixes #7610.
Daniel Atallah <datallah@pidgin.im>
parents:
24866
diff
changeset
|
227 | |
|
ec60fbe5a4ab
Patch from fqueze to add API for setting the global proxy settings. Fixes #7610.
Daniel Atallah <datallah@pidgin.im>
parents:
24866
diff
changeset
|
228 | global_proxy_info = info; |
|
ec60fbe5a4ab
Patch from fqueze to add API for setting the global proxy settings. Fixes #7610.
Daniel Atallah <datallah@pidgin.im>
parents:
24866
diff
changeset
|
229 | } |
|
ec60fbe5a4ab
Patch from fqueze to add API for setting the global proxy settings. Fixes #7610.
Daniel Atallah <datallah@pidgin.im>
parents:
24866
diff
changeset
|
230 | |
|
32136
98a6cc751323
Add support for reading GNOME3 proxy settings.
Mihai Serban <mihai.serban@gmail.com>
parents:
32129
diff
changeset
|
231 | |
|
98a6cc751323
Add support for reading GNOME3 proxy settings.
Mihai Serban <mihai.serban@gmail.com>
parents:
32129
diff
changeset
|
232 | /* index in gproxycmds below, keep them in sync */ |
|
98a6cc751323
Add support for reading GNOME3 proxy settings.
Mihai Serban <mihai.serban@gmail.com>
parents:
32129
diff
changeset
|
233 | #define GNOME_PROXY_MODE 0 |
|
98a6cc751323
Add support for reading GNOME3 proxy settings.
Mihai Serban <mihai.serban@gmail.com>
parents:
32129
diff
changeset
|
234 | #define GNOME_PROXY_USE_SAME_PROXY 1 |
|
98a6cc751323
Add support for reading GNOME3 proxy settings.
Mihai Serban <mihai.serban@gmail.com>
parents:
32129
diff
changeset
|
235 | #define GNOME_PROXY_SOCKS_HOST 2 |
|
98a6cc751323
Add support for reading GNOME3 proxy settings.
Mihai Serban <mihai.serban@gmail.com>
parents:
32129
diff
changeset
|
236 | #define GNOME_PROXY_SOCKS_PORT 3 |
|
98a6cc751323
Add support for reading GNOME3 proxy settings.
Mihai Serban <mihai.serban@gmail.com>
parents:
32129
diff
changeset
|
237 | #define GNOME_PROXY_HTTP_HOST 4 |
|
98a6cc751323
Add support for reading GNOME3 proxy settings.
Mihai Serban <mihai.serban@gmail.com>
parents:
32129
diff
changeset
|
238 | #define GNOME_PROXY_HTTP_PORT 5 |
|
98a6cc751323
Add support for reading GNOME3 proxy settings.
Mihai Serban <mihai.serban@gmail.com>
parents:
32129
diff
changeset
|
239 | #define GNOME_PROXY_HTTP_USER 6 |
|
98a6cc751323
Add support for reading GNOME3 proxy settings.
Mihai Serban <mihai.serban@gmail.com>
parents:
32129
diff
changeset
|
240 | #define GNOME_PROXY_HTTP_PASS 7 |
|
98a6cc751323
Add support for reading GNOME3 proxy settings.
Mihai Serban <mihai.serban@gmail.com>
parents:
32129
diff
changeset
|
241 | #define GNOME2_CMDS 0 |
|
98a6cc751323
Add support for reading GNOME3 proxy settings.
Mihai Serban <mihai.serban@gmail.com>
parents:
32129
diff
changeset
|
242 | #define GNOME3_CMDS 1 |
|
98a6cc751323
Add support for reading GNOME3 proxy settings.
Mihai Serban <mihai.serban@gmail.com>
parents:
32129
diff
changeset
|
243 | |
|
98a6cc751323
Add support for reading GNOME3 proxy settings.
Mihai Serban <mihai.serban@gmail.com>
parents:
32129
diff
changeset
|
244 | /* detect proxy settings for gnome2/gnome3 */ |
|
98a6cc751323
Add support for reading GNOME3 proxy settings.
Mihai Serban <mihai.serban@gmail.com>
parents:
32129
diff
changeset
|
245 | static const char* gproxycmds[][2] = { |
|
98a6cc751323
Add support for reading GNOME3 proxy settings.
Mihai Serban <mihai.serban@gmail.com>
parents:
32129
diff
changeset
|
246 | { "gconftool-2 -g /system/proxy/mode" , "gsettings get org.gnome.system.proxy mode" }, |
|
98a6cc751323
Add support for reading GNOME3 proxy settings.
Mihai Serban <mihai.serban@gmail.com>
parents:
32129
diff
changeset
|
247 | { "gconftool-2 -g /system/http_proxy/use_same_proxy", "gsettings get org.gnome.system.proxy use-same-proxy" }, |
|
98a6cc751323
Add support for reading GNOME3 proxy settings.
Mihai Serban <mihai.serban@gmail.com>
parents:
32129
diff
changeset
|
248 | { "gconftool-2 -g /system/proxy/socks_host", "gsettings get org.gnome.system.proxy.socks host" }, |
|
98a6cc751323
Add support for reading GNOME3 proxy settings.
Mihai Serban <mihai.serban@gmail.com>
parents:
32129
diff
changeset
|
249 | { "gconftool-2 -g /system/proxy/socks_port", "gsettings get org.gnome.system.proxy.socks port" }, |
|
98a6cc751323
Add support for reading GNOME3 proxy settings.
Mihai Serban <mihai.serban@gmail.com>
parents:
32129
diff
changeset
|
250 | { "gconftool-2 -g /system/http_proxy/host", "gsettings get org.gnome.system.proxy.http host" }, |
|
98a6cc751323
Add support for reading GNOME3 proxy settings.
Mihai Serban <mihai.serban@gmail.com>
parents:
32129
diff
changeset
|
251 | { "gconftool-2 -g /system/http_proxy/port", "gsettings get org.gnome.system.proxy.http port"}, |
|
98a6cc751323
Add support for reading GNOME3 proxy settings.
Mihai Serban <mihai.serban@gmail.com>
parents:
32129
diff
changeset
|
252 | { "gconftool-2 -g /system/http_proxy/authentication_user", "gsettings get org.gnome.system.proxy.http authentication-user" }, |
|
98a6cc751323
Add support for reading GNOME3 proxy settings.
Mihai Serban <mihai.serban@gmail.com>
parents:
32129
diff
changeset
|
253 | { "gconftool-2 -g /system/http_proxy/authentication_password", "gsettings get org.gnome.system.proxy.http authentication-password" }, |
|
98a6cc751323
Add support for reading GNOME3 proxy settings.
Mihai Serban <mihai.serban@gmail.com>
parents:
32129
diff
changeset
|
254 | }; |
|
98a6cc751323
Add support for reading GNOME3 proxy settings.
Mihai Serban <mihai.serban@gmail.com>
parents:
32129
diff
changeset
|
255 | |
|
35462
901dfa763f15
Fix some gtk-doc warnings till proxy.c
Ankit Vani <a@nevitus.org>
parents:
35454
diff
changeset
|
256 | /* |
|
901dfa763f15
Fix some gtk-doc warnings till proxy.c
Ankit Vani <a@nevitus.org>
parents:
35454
diff
changeset
|
257 | * purple_gnome_proxy_get_parameter: |
|
901dfa763f15
Fix some gtk-doc warnings till proxy.c
Ankit Vani <a@nevitus.org>
parents:
35454
diff
changeset
|
258 | * @parameter: One of the GNOME_PROXY_x constants defined above |
|
901dfa763f15
Fix some gtk-doc warnings till proxy.c
Ankit Vani <a@nevitus.org>
parents:
35454
diff
changeset
|
259 | * @gnome_version: GNOME2_CMDS or GNOME3_CMDS |
|
901dfa763f15
Fix some gtk-doc warnings till proxy.c
Ankit Vani <a@nevitus.org>
parents:
35454
diff
changeset
|
260 | * |
|
32136
98a6cc751323
Add support for reading GNOME3 proxy settings.
Mihai Serban <mihai.serban@gmail.com>
parents:
32129
diff
changeset
|
261 | * This is a utility function used to retrieve proxy parameter values from |
|
98a6cc751323
Add support for reading GNOME3 proxy settings.
Mihai Serban <mihai.serban@gmail.com>
parents:
32129
diff
changeset
|
262 | * GNOME 2/3 environment. |
|
98a6cc751323
Add support for reading GNOME3 proxy settings.
Mihai Serban <mihai.serban@gmail.com>
parents:
32129
diff
changeset
|
263 | * |
|
35462
901dfa763f15
Fix some gtk-doc warnings till proxy.c
Ankit Vani <a@nevitus.org>
parents:
35454
diff
changeset
|
264 | * Returns: The value of requested proxy parameter |
|
32136
98a6cc751323
Add support for reading GNOME3 proxy settings.
Mihai Serban <mihai.serban@gmail.com>
parents:
32129
diff
changeset
|
265 | */ |
|
98a6cc751323
Add support for reading GNOME3 proxy settings.
Mihai Serban <mihai.serban@gmail.com>
parents:
32129
diff
changeset
|
266 | static char * |
|
98a6cc751323
Add support for reading GNOME3 proxy settings.
Mihai Serban <mihai.serban@gmail.com>
parents:
32129
diff
changeset
|
267 | purple_gnome_proxy_get_parameter(guint8 parameter, guint8 gnome_version) |
|
98a6cc751323
Add support for reading GNOME3 proxy settings.
Mihai Serban <mihai.serban@gmail.com>
parents:
32129
diff
changeset
|
268 | { |
|
98a6cc751323
Add support for reading GNOME3 proxy settings.
Mihai Serban <mihai.serban@gmail.com>
parents:
32129
diff
changeset
|
269 | gchar *param, *err; |
|
98a6cc751323
Add support for reading GNOME3 proxy settings.
Mihai Serban <mihai.serban@gmail.com>
parents:
32129
diff
changeset
|
270 | size_t param_len; |
|
98a6cc751323
Add support for reading GNOME3 proxy settings.
Mihai Serban <mihai.serban@gmail.com>
parents:
32129
diff
changeset
|
271 | |
|
98a6cc751323
Add support for reading GNOME3 proxy settings.
Mihai Serban <mihai.serban@gmail.com>
parents:
32129
diff
changeset
|
272 | if (parameter > GNOME_PROXY_HTTP_PASS) |
|
98a6cc751323
Add support for reading GNOME3 proxy settings.
Mihai Serban <mihai.serban@gmail.com>
parents:
32129
diff
changeset
|
273 | return NULL; |
|
98a6cc751323
Add support for reading GNOME3 proxy settings.
Mihai Serban <mihai.serban@gmail.com>
parents:
32129
diff
changeset
|
274 | if (gnome_version > GNOME3_CMDS) |
|
98a6cc751323
Add support for reading GNOME3 proxy settings.
Mihai Serban <mihai.serban@gmail.com>
parents:
32129
diff
changeset
|
275 | return NULL; |
|
98a6cc751323
Add support for reading GNOME3 proxy settings.
Mihai Serban <mihai.serban@gmail.com>
parents:
32129
diff
changeset
|
276 | |
|
98a6cc751323
Add support for reading GNOME3 proxy settings.
Mihai Serban <mihai.serban@gmail.com>
parents:
32129
diff
changeset
|
277 | if (!g_spawn_command_line_sync(gproxycmds[parameter][gnome_version], |
|
98a6cc751323
Add support for reading GNOME3 proxy settings.
Mihai Serban <mihai.serban@gmail.com>
parents:
32129
diff
changeset
|
278 | ¶m, &err, NULL, NULL)) |
|
98a6cc751323
Add support for reading GNOME3 proxy settings.
Mihai Serban <mihai.serban@gmail.com>
parents:
32129
diff
changeset
|
279 | return NULL; |
|
98a6cc751323
Add support for reading GNOME3 proxy settings.
Mihai Serban <mihai.serban@gmail.com>
parents:
32129
diff
changeset
|
280 | g_free(err); |
|
98a6cc751323
Add support for reading GNOME3 proxy settings.
Mihai Serban <mihai.serban@gmail.com>
parents:
32129
diff
changeset
|
281 | |
|
98a6cc751323
Add support for reading GNOME3 proxy settings.
Mihai Serban <mihai.serban@gmail.com>
parents:
32129
diff
changeset
|
282 | g_strstrip(param); |
|
98a6cc751323
Add support for reading GNOME3 proxy settings.
Mihai Serban <mihai.serban@gmail.com>
parents:
32129
diff
changeset
|
283 | if (param[0] == '\'' || param[0] == '\"') { |
|
98a6cc751323
Add support for reading GNOME3 proxy settings.
Mihai Serban <mihai.serban@gmail.com>
parents:
32129
diff
changeset
|
284 | param_len = strlen(param); |
|
98a6cc751323
Add support for reading GNOME3 proxy settings.
Mihai Serban <mihai.serban@gmail.com>
parents:
32129
diff
changeset
|
285 | memmove(param, param + 1, param_len); /* copy last \0 too */ |
|
98a6cc751323
Add support for reading GNOME3 proxy settings.
Mihai Serban <mihai.serban@gmail.com>
parents:
32129
diff
changeset
|
286 | --param_len; |
|
98a6cc751323
Add support for reading GNOME3 proxy settings.
Mihai Serban <mihai.serban@gmail.com>
parents:
32129
diff
changeset
|
287 | if (param_len > 0 && (param[param_len - 1] == '\'' || param[param_len - 1] == '\"')) |
|
98a6cc751323
Add support for reading GNOME3 proxy settings.
Mihai Serban <mihai.serban@gmail.com>
parents:
32129
diff
changeset
|
288 | param[param_len - 1] = '\0'; |
|
98a6cc751323
Add support for reading GNOME3 proxy settings.
Mihai Serban <mihai.serban@gmail.com>
parents:
32129
diff
changeset
|
289 | g_strstrip(param); |
|
98a6cc751323
Add support for reading GNOME3 proxy settings.
Mihai Serban <mihai.serban@gmail.com>
parents:
32129
diff
changeset
|
290 | } |
|
98a6cc751323
Add support for reading GNOME3 proxy settings.
Mihai Serban <mihai.serban@gmail.com>
parents:
32129
diff
changeset
|
291 | |
|
98a6cc751323
Add support for reading GNOME3 proxy settings.
Mihai Serban <mihai.serban@gmail.com>
parents:
32129
diff
changeset
|
292 | return param; |
|
98a6cc751323
Add support for reading GNOME3 proxy settings.
Mihai Serban <mihai.serban@gmail.com>
parents:
32129
diff
changeset
|
293 | } |
|
98a6cc751323
Add support for reading GNOME3 proxy settings.
Mihai Serban <mihai.serban@gmail.com>
parents:
32129
diff
changeset
|
294 | |
| 15884 | 295 | static PurpleProxyInfo * |
| 296 | purple_gnome_proxy_get_info(void) | |
| 11878 | 297 | { |
| 15884 | 298 | static PurpleProxyInfo info = {0, NULL, 0, NULL, NULL}; |
|
24156
6c7631ae7571
Use SOCKS proxy if specified when running in GNOME
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
23532
diff
changeset
|
299 | gboolean use_same_proxy = FALSE; |
|
32136
98a6cc751323
Add support for reading GNOME3 proxy settings.
Mihai Serban <mihai.serban@gmail.com>
parents:
32129
diff
changeset
|
300 | gchar *tmp; |
|
98a6cc751323
Add support for reading GNOME3 proxy settings.
Mihai Serban <mihai.serban@gmail.com>
parents:
32129
diff
changeset
|
301 | guint8 gnome_version = GNOME3_CMDS; |
|
98a6cc751323
Add support for reading GNOME3 proxy settings.
Mihai Serban <mihai.serban@gmail.com>
parents:
32129
diff
changeset
|
302 | |
|
98a6cc751323
Add support for reading GNOME3 proxy settings.
Mihai Serban <mihai.serban@gmail.com>
parents:
32129
diff
changeset
|
303 | tmp = g_find_program_in_path("gsettings"); |
|
98a6cc751323
Add support for reading GNOME3 proxy settings.
Mihai Serban <mihai.serban@gmail.com>
parents:
32129
diff
changeset
|
304 | if (tmp == NULL) { |
|
98a6cc751323
Add support for reading GNOME3 proxy settings.
Mihai Serban <mihai.serban@gmail.com>
parents:
32129
diff
changeset
|
305 | tmp = g_find_program_in_path("gconftool-2"); |
|
98a6cc751323
Add support for reading GNOME3 proxy settings.
Mihai Serban <mihai.serban@gmail.com>
parents:
32129
diff
changeset
|
306 | gnome_version = GNOME2_CMDS; |
|
98a6cc751323
Add support for reading GNOME3 proxy settings.
Mihai Serban <mihai.serban@gmail.com>
parents:
32129
diff
changeset
|
307 | } |
|
22554
dff2ca00b045
Short circuit and return out of the function early if gconftool-2
Mark Doliner <markdoliner@pidgin.im>
parents:
22553
diff
changeset
|
308 | if (tmp == NULL) |
|
dff2ca00b045
Short circuit and return out of the function early if gconftool-2
Mark Doliner <markdoliner@pidgin.im>
parents:
22553
diff
changeset
|
309 | return purple_global_proxy_get_info(); |
|
12156
58a027264d6c
[gaim-migrate @ 14457]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
11878
diff
changeset
|
310 | |
|
22554
dff2ca00b045
Short circuit and return out of the function early if gconftool-2
Mark Doliner <markdoliner@pidgin.im>
parents:
22553
diff
changeset
|
311 | g_free(tmp); |
|
12156
58a027264d6c
[gaim-migrate @ 14457]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
11878
diff
changeset
|
312 | |
|
22555
04cfb0cf0974
Improve our error handling of Gnome proxy settings.
Mark Doliner <markdoliner@pidgin.im>
parents:
22554
diff
changeset
|
313 | /* Check whether to use a proxy. */ |
|
32136
98a6cc751323
Add support for reading GNOME3 proxy settings.
Mihai Serban <mihai.serban@gmail.com>
parents:
32129
diff
changeset
|
314 | tmp = purple_gnome_proxy_get_parameter(GNOME_PROXY_MODE, gnome_version); |
|
98a6cc751323
Add support for reading GNOME3 proxy settings.
Mihai Serban <mihai.serban@gmail.com>
parents:
32129
diff
changeset
|
315 | if (!tmp) |
|
22554
dff2ca00b045
Short circuit and return out of the function early if gconftool-2
Mark Doliner <markdoliner@pidgin.im>
parents:
22553
diff
changeset
|
316 | return purple_global_proxy_get_info(); |
|
32136
98a6cc751323
Add support for reading GNOME3 proxy settings.
Mihai Serban <mihai.serban@gmail.com>
parents:
32129
diff
changeset
|
317 | |
|
98a6cc751323
Add support for reading GNOME3 proxy settings.
Mihai Serban <mihai.serban@gmail.com>
parents:
32129
diff
changeset
|
318 | if (purple_strequal(tmp, "none")) { |
|
22554
dff2ca00b045
Short circuit and return out of the function early if gconftool-2
Mark Doliner <markdoliner@pidgin.im>
parents:
22553
diff
changeset
|
319 | info.type = PURPLE_PROXY_NONE; |
|
12156
58a027264d6c
[gaim-migrate @ 14457]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
11878
diff
changeset
|
320 | g_free(tmp); |
| 11878 | 321 | return &info; |
| 322 | } | |
|
22555
04cfb0cf0974
Improve our error handling of Gnome proxy settings.
Mark Doliner <markdoliner@pidgin.im>
parents:
22554
diff
changeset
|
323 | |
|
32136
98a6cc751323
Add support for reading GNOME3 proxy settings.
Mihai Serban <mihai.serban@gmail.com>
parents:
32129
diff
changeset
|
324 | if (!purple_strequal(tmp, "manual")) { |
|
22555
04cfb0cf0974
Improve our error handling of Gnome proxy settings.
Mark Doliner <markdoliner@pidgin.im>
parents:
22554
diff
changeset
|
325 | /* Unknown setting. Fallback to using our global proxy settings. */ |
|
22554
dff2ca00b045
Short circuit and return out of the function early if gconftool-2
Mark Doliner <markdoliner@pidgin.im>
parents:
22553
diff
changeset
|
326 | g_free(tmp); |
|
dff2ca00b045
Short circuit and return out of the function early if gconftool-2
Mark Doliner <markdoliner@pidgin.im>
parents:
22553
diff
changeset
|
327 | return purple_global_proxy_get_info(); |
|
dff2ca00b045
Short circuit and return out of the function early if gconftool-2
Mark Doliner <markdoliner@pidgin.im>
parents:
22553
diff
changeset
|
328 | } |
|
12156
58a027264d6c
[gaim-migrate @ 14457]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
11878
diff
changeset
|
329 | |
|
22554
dff2ca00b045
Short circuit and return out of the function early if gconftool-2
Mark Doliner <markdoliner@pidgin.im>
parents:
22553
diff
changeset
|
330 | g_free(tmp); |
|
22555
04cfb0cf0974
Improve our error handling of Gnome proxy settings.
Mark Doliner <markdoliner@pidgin.im>
parents:
22554
diff
changeset
|
331 | |
|
22560
510c8edb3854
Bring back the lines that free info.whatever on subsequent calls to
Mark Doliner <markdoliner@pidgin.im>
parents:
22559
diff
changeset
|
332 | /* Free the old fields */ |
|
37426
6fd4989b77e4
The last of the NULL-checks before free()
Michael McConville <mmcco@mykolab.com>
parents:
37193
diff
changeset
|
333 | g_free(info.host); |
|
6fd4989b77e4
The last of the NULL-checks before free()
Michael McConville <mmcco@mykolab.com>
parents:
37193
diff
changeset
|
334 | info.host = NULL; |
|
6fd4989b77e4
The last of the NULL-checks before free()
Michael McConville <mmcco@mykolab.com>
parents:
37193
diff
changeset
|
335 | g_free(info.username); |
|
6fd4989b77e4
The last of the NULL-checks before free()
Michael McConville <mmcco@mykolab.com>
parents:
37193
diff
changeset
|
336 | info.username = NULL; |
|
6fd4989b77e4
The last of the NULL-checks before free()
Michael McConville <mmcco@mykolab.com>
parents:
37193
diff
changeset
|
337 | g_free(info.password); |
|
6fd4989b77e4
The last of the NULL-checks before free()
Michael McConville <mmcco@mykolab.com>
parents:
37193
diff
changeset
|
338 | info.password = NULL; |
|
22560
510c8edb3854
Bring back the lines that free info.whatever on subsequent calls to
Mark Doliner <markdoliner@pidgin.im>
parents:
22559
diff
changeset
|
339 | |
|
32136
98a6cc751323
Add support for reading GNOME3 proxy settings.
Mihai Serban <mihai.serban@gmail.com>
parents:
32129
diff
changeset
|
340 | tmp = purple_gnome_proxy_get_parameter(GNOME_PROXY_USE_SAME_PROXY, gnome_version); |
|
98a6cc751323
Add support for reading GNOME3 proxy settings.
Mihai Serban <mihai.serban@gmail.com>
parents:
32129
diff
changeset
|
341 | if (!tmp) |
|
22554
dff2ca00b045
Short circuit and return out of the function early if gconftool-2
Mark Doliner <markdoliner@pidgin.im>
parents:
22553
diff
changeset
|
342 | return purple_global_proxy_get_info(); |
|
32136
98a6cc751323
Add support for reading GNOME3 proxy settings.
Mihai Serban <mihai.serban@gmail.com>
parents:
32129
diff
changeset
|
343 | |
|
98a6cc751323
Add support for reading GNOME3 proxy settings.
Mihai Serban <mihai.serban@gmail.com>
parents:
32129
diff
changeset
|
344 | if (purple_strequal(tmp, "true")) |
|
24156
6c7631ae7571
Use SOCKS proxy if specified when running in GNOME
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
23532
diff
changeset
|
345 | use_same_proxy = TRUE; |
|
32136
98a6cc751323
Add support for reading GNOME3 proxy settings.
Mihai Serban <mihai.serban@gmail.com>
parents:
32129
diff
changeset
|
346 | |
|
24156
6c7631ae7571
Use SOCKS proxy if specified when running in GNOME
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
23532
diff
changeset
|
347 | g_free(tmp); |
|
6c7631ae7571
Use SOCKS proxy if specified when running in GNOME
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
23532
diff
changeset
|
348 | |
|
24315
98e4a5f1d662
Fix a double free. Fixes #7047
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
24298
diff
changeset
|
349 | if (!use_same_proxy) { |
|
32136
98a6cc751323
Add support for reading GNOME3 proxy settings.
Mihai Serban <mihai.serban@gmail.com>
parents:
32129
diff
changeset
|
350 | info.host = purple_gnome_proxy_get_parameter(GNOME_PROXY_SOCKS_HOST, gnome_version); |
|
98a6cc751323
Add support for reading GNOME3 proxy settings.
Mihai Serban <mihai.serban@gmail.com>
parents:
32129
diff
changeset
|
351 | if (!info.host) |
|
24315
98e4a5f1d662
Fix a double free. Fixes #7047
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
24298
diff
changeset
|
352 | return purple_global_proxy_get_info(); |
|
98e4a5f1d662
Fix a double free. Fixes #7047
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
24298
diff
changeset
|
353 | } |
|
24156
6c7631ae7571
Use SOCKS proxy if specified when running in GNOME
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
23532
diff
changeset
|
354 | |
|
24315
98e4a5f1d662
Fix a double free. Fixes #7047
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
24298
diff
changeset
|
355 | if (!use_same_proxy && (info.host != NULL) && (*info.host != '\0')) { |
|
24156
6c7631ae7571
Use SOCKS proxy if specified when running in GNOME
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
23532
diff
changeset
|
356 | info.type = PURPLE_PROXY_SOCKS5; |
|
32136
98a6cc751323
Add support for reading GNOME3 proxy settings.
Mihai Serban <mihai.serban@gmail.com>
parents:
32129
diff
changeset
|
357 | tmp = purple_gnome_proxy_get_parameter(GNOME_PROXY_SOCKS_PORT, gnome_version); |
|
98a6cc751323
Add support for reading GNOME3 proxy settings.
Mihai Serban <mihai.serban@gmail.com>
parents:
32129
diff
changeset
|
358 | if (!tmp) { |
|
24156
6c7631ae7571
Use SOCKS proxy if specified when running in GNOME
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
23532
diff
changeset
|
359 | g_free(info.host); |
|
6c7631ae7571
Use SOCKS proxy if specified when running in GNOME
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
23532
diff
changeset
|
360 | info.host = NULL; |
|
6c7631ae7571
Use SOCKS proxy if specified when running in GNOME
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
23532
diff
changeset
|
361 | return purple_global_proxy_get_info(); |
|
6c7631ae7571
Use SOCKS proxy if specified when running in GNOME
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
23532
diff
changeset
|
362 | } |
|
6c7631ae7571
Use SOCKS proxy if specified when running in GNOME
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
23532
diff
changeset
|
363 | info.port = atoi(tmp); |
|
6c7631ae7571
Use SOCKS proxy if specified when running in GNOME
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
23532
diff
changeset
|
364 | g_free(tmp); |
|
6c7631ae7571
Use SOCKS proxy if specified when running in GNOME
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
23532
diff
changeset
|
365 | } else { |
|
22555
04cfb0cf0974
Improve our error handling of Gnome proxy settings.
Mark Doliner <markdoliner@pidgin.im>
parents:
22554
diff
changeset
|
366 | g_free(info.host); |
|
32136
98a6cc751323
Add support for reading GNOME3 proxy settings.
Mihai Serban <mihai.serban@gmail.com>
parents:
32129
diff
changeset
|
367 | info.host = purple_gnome_proxy_get_parameter(GNOME_PROXY_HTTP_HOST, gnome_version); |
|
98a6cc751323
Add support for reading GNOME3 proxy settings.
Mihai Serban <mihai.serban@gmail.com>
parents:
32129
diff
changeset
|
368 | if (!info.host) |
|
24156
6c7631ae7571
Use SOCKS proxy if specified when running in GNOME
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
23532
diff
changeset
|
369 | return purple_global_proxy_get_info(); |
|
24316
88c65c05a21e
Some minor cleanup; removal of unnecessary frees and setting stuff to NULL
Daniel Atallah <datallah@pidgin.im>
parents:
24315
diff
changeset
|
370 | |
|
24156
6c7631ae7571
Use SOCKS proxy if specified when running in GNOME
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
23532
diff
changeset
|
371 | /* If we get this far then we know we're using an HTTP proxy */ |
|
6c7631ae7571
Use SOCKS proxy if specified when running in GNOME
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
23532
diff
changeset
|
372 | info.type = PURPLE_PROXY_HTTP; |
| 11878 | 373 | |
|
24156
6c7631ae7571
Use SOCKS proxy if specified when running in GNOME
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
23532
diff
changeset
|
374 | if (*info.host == '\0') |
|
6c7631ae7571
Use SOCKS proxy if specified when running in GNOME
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
23532
diff
changeset
|
375 | { |
|
6c7631ae7571
Use SOCKS proxy if specified when running in GNOME
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
23532
diff
changeset
|
376 | purple_debug_info("proxy", "Gnome proxy settings are set to " |
|
6c7631ae7571
Use SOCKS proxy if specified when running in GNOME
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
23532
diff
changeset
|
377 | "'manual' but no suitable proxy server is specified. Using " |
|
6c7631ae7571
Use SOCKS proxy if specified when running in GNOME
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
23532
diff
changeset
|
378 | "Pidgin's proxy settings instead.\n"); |
|
6c7631ae7571
Use SOCKS proxy if specified when running in GNOME
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
23532
diff
changeset
|
379 | g_free(info.host); |
|
6c7631ae7571
Use SOCKS proxy if specified when running in GNOME
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
23532
diff
changeset
|
380 | info.host = NULL; |
|
6c7631ae7571
Use SOCKS proxy if specified when running in GNOME
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
23532
diff
changeset
|
381 | return purple_global_proxy_get_info(); |
|
6c7631ae7571
Use SOCKS proxy if specified when running in GNOME
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
23532
diff
changeset
|
382 | } |
|
6c7631ae7571
Use SOCKS proxy if specified when running in GNOME
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
23532
diff
changeset
|
383 | |
|
32136
98a6cc751323
Add support for reading GNOME3 proxy settings.
Mihai Serban <mihai.serban@gmail.com>
parents:
32129
diff
changeset
|
384 | info.username = purple_gnome_proxy_get_parameter(GNOME_PROXY_HTTP_USER, gnome_version); |
|
98a6cc751323
Add support for reading GNOME3 proxy settings.
Mihai Serban <mihai.serban@gmail.com>
parents:
32129
diff
changeset
|
385 | if (!info.username) |
|
24156
6c7631ae7571
Use SOCKS proxy if specified when running in GNOME
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
23532
diff
changeset
|
386 | { |
|
6c7631ae7571
Use SOCKS proxy if specified when running in GNOME
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
23532
diff
changeset
|
387 | g_free(info.host); |
|
6c7631ae7571
Use SOCKS proxy if specified when running in GNOME
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
23532
diff
changeset
|
388 | info.host = NULL; |
|
6c7631ae7571
Use SOCKS proxy if specified when running in GNOME
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
23532
diff
changeset
|
389 | return purple_global_proxy_get_info(); |
|
6c7631ae7571
Use SOCKS proxy if specified when running in GNOME
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
23532
diff
changeset
|
390 | } |
|
32136
98a6cc751323
Add support for reading GNOME3 proxy settings.
Mihai Serban <mihai.serban@gmail.com>
parents:
32129
diff
changeset
|
391 | |
|
98a6cc751323
Add support for reading GNOME3 proxy settings.
Mihai Serban <mihai.serban@gmail.com>
parents:
32129
diff
changeset
|
392 | info.password = purple_gnome_proxy_get_parameter(GNOME_PROXY_HTTP_PASS, gnome_version); |
|
98a6cc751323
Add support for reading GNOME3 proxy settings.
Mihai Serban <mihai.serban@gmail.com>
parents:
32129
diff
changeset
|
393 | if (!info.password) |
|
24156
6c7631ae7571
Use SOCKS proxy if specified when running in GNOME
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
23532
diff
changeset
|
394 | { |
|
6c7631ae7571
Use SOCKS proxy if specified when running in GNOME
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
23532
diff
changeset
|
395 | g_free(info.host); |
|
6c7631ae7571
Use SOCKS proxy if specified when running in GNOME
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
23532
diff
changeset
|
396 | info.host = NULL; |
|
6c7631ae7571
Use SOCKS proxy if specified when running in GNOME
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
23532
diff
changeset
|
397 | g_free(info.username); |
|
6c7631ae7571
Use SOCKS proxy if specified when running in GNOME
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
23532
diff
changeset
|
398 | info.username = NULL; |
|
6c7631ae7571
Use SOCKS proxy if specified when running in GNOME
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
23532
diff
changeset
|
399 | return purple_global_proxy_get_info(); |
|
6c7631ae7571
Use SOCKS proxy if specified when running in GNOME
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
23532
diff
changeset
|
400 | } |
|
32136
98a6cc751323
Add support for reading GNOME3 proxy settings.
Mihai Serban <mihai.serban@gmail.com>
parents:
32129
diff
changeset
|
401 | |
|
98a6cc751323
Add support for reading GNOME3 proxy settings.
Mihai Serban <mihai.serban@gmail.com>
parents:
32129
diff
changeset
|
402 | tmp = purple_gnome_proxy_get_parameter(GNOME_PROXY_HTTP_PORT, gnome_version); |
|
98a6cc751323
Add support for reading GNOME3 proxy settings.
Mihai Serban <mihai.serban@gmail.com>
parents:
32129
diff
changeset
|
403 | if (!tmp) |
|
24156
6c7631ae7571
Use SOCKS proxy if specified when running in GNOME
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
23532
diff
changeset
|
404 | { |
|
6c7631ae7571
Use SOCKS proxy if specified when running in GNOME
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
23532
diff
changeset
|
405 | g_free(info.host); |
|
6c7631ae7571
Use SOCKS proxy if specified when running in GNOME
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
23532
diff
changeset
|
406 | info.host = NULL; |
|
6c7631ae7571
Use SOCKS proxy if specified when running in GNOME
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
23532
diff
changeset
|
407 | g_free(info.username); |
|
6c7631ae7571
Use SOCKS proxy if specified when running in GNOME
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
23532
diff
changeset
|
408 | info.username = NULL; |
|
6c7631ae7571
Use SOCKS proxy if specified when running in GNOME
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
23532
diff
changeset
|
409 | g_free(info.password); |
|
6c7631ae7571
Use SOCKS proxy if specified when running in GNOME
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
23532
diff
changeset
|
410 | info.password = NULL; |
|
6c7631ae7571
Use SOCKS proxy if specified when running in GNOME
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
23532
diff
changeset
|
411 | return purple_global_proxy_get_info(); |
|
6c7631ae7571
Use SOCKS proxy if specified when running in GNOME
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
23532
diff
changeset
|
412 | } |
|
6c7631ae7571
Use SOCKS proxy if specified when running in GNOME
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
23532
diff
changeset
|
413 | info.port = atoi(tmp); |
|
6c7631ae7571
Use SOCKS proxy if specified when running in GNOME
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
23532
diff
changeset
|
414 | g_free(tmp); |
|
22555
04cfb0cf0974
Improve our error handling of Gnome proxy settings.
Mark Doliner <markdoliner@pidgin.im>
parents:
22554
diff
changeset
|
415 | } |
| 11878 | 416 | |
|
22554
dff2ca00b045
Short circuit and return out of the function early if gconftool-2
Mark Doliner <markdoliner@pidgin.im>
parents:
22553
diff
changeset
|
417 | return &info; |
| 11878 | 418 | } |
|
24171
d976cc3db118
Add support for reading SOCKS proxy information from the Windows proxy settings.
Daniel Atallah <datallah@pidgin.im>
parents:
24156
diff
changeset
|
419 | |
|
d976cc3db118
Add support for reading SOCKS proxy information from the Windows proxy settings.
Daniel Atallah <datallah@pidgin.im>
parents:
24156
diff
changeset
|
420 | #ifdef _WIN32 |
|
d976cc3db118
Add support for reading SOCKS proxy information from the Windows proxy settings.
Daniel Atallah <datallah@pidgin.im>
parents:
24156
diff
changeset
|
421 | |
|
d976cc3db118
Add support for reading SOCKS proxy information from the Windows proxy settings.
Daniel Atallah <datallah@pidgin.im>
parents:
24156
diff
changeset
|
422 | typedef BOOL (CALLBACK* LPFNWINHTTPGETIEPROXYCONFIG)(/*IN OUT*/ WINHTTP_CURRENT_USER_IE_PROXY_CONFIG* pProxyConfig); |
|
d976cc3db118
Add support for reading SOCKS proxy information from the Windows proxy settings.
Daniel Atallah <datallah@pidgin.im>
parents:
24156
diff
changeset
|
423 | |
|
d976cc3db118
Add support for reading SOCKS proxy information from the Windows proxy settings.
Daniel Atallah <datallah@pidgin.im>
parents:
24156
diff
changeset
|
424 | /* This modifies "host" in-place evilly */ |
|
d976cc3db118
Add support for reading SOCKS proxy information from the Windows proxy settings.
Daniel Atallah <datallah@pidgin.im>
parents:
24156
diff
changeset
|
425 | static void |
|
d976cc3db118
Add support for reading SOCKS proxy information from the Windows proxy settings.
Daniel Atallah <datallah@pidgin.im>
parents:
24156
diff
changeset
|
426 | _proxy_fill_hostinfo(PurpleProxyInfo *info, char *host, int default_port) |
|
d976cc3db118
Add support for reading SOCKS proxy information from the Windows proxy settings.
Daniel Atallah <datallah@pidgin.im>
parents:
24156
diff
changeset
|
427 | { |
|
d976cc3db118
Add support for reading SOCKS proxy information from the Windows proxy settings.
Daniel Atallah <datallah@pidgin.im>
parents:
24156
diff
changeset
|
428 | int port = default_port; |
|
d976cc3db118
Add support for reading SOCKS proxy information from the Windows proxy settings.
Daniel Atallah <datallah@pidgin.im>
parents:
24156
diff
changeset
|
429 | char *d; |
|
d976cc3db118
Add support for reading SOCKS proxy information from the Windows proxy settings.
Daniel Atallah <datallah@pidgin.im>
parents:
24156
diff
changeset
|
430 | |
|
d976cc3db118
Add support for reading SOCKS proxy information from the Windows proxy settings.
Daniel Atallah <datallah@pidgin.im>
parents:
24156
diff
changeset
|
431 | d = g_strrstr(host, ":"); |
|
30057
ab9790d588f9
Fix an invalid memory deref with Windows proxy settings when there's no ":port"
Marten Klencke <mklencke@gmx.net>
parents:
29365
diff
changeset
|
432 | if (d) { |
|
24171
d976cc3db118
Add support for reading SOCKS proxy information from the Windows proxy settings.
Daniel Atallah <datallah@pidgin.im>
parents:
24156
diff
changeset
|
433 | *d = '\0'; |
|
30057
ab9790d588f9
Fix an invalid memory deref with Windows proxy settings when there's no ":port"
Marten Klencke <mklencke@gmx.net>
parents:
29365
diff
changeset
|
434 | |
|
ab9790d588f9
Fix an invalid memory deref with Windows proxy settings when there's no ":port"
Marten Klencke <mklencke@gmx.net>
parents:
29365
diff
changeset
|
435 | d++; |
|
ab9790d588f9
Fix an invalid memory deref with Windows proxy settings when there's no ":port"
Marten Klencke <mklencke@gmx.net>
parents:
29365
diff
changeset
|
436 | if (*d) |
|
ab9790d588f9
Fix an invalid memory deref with Windows proxy settings when there's no ":port"
Marten Klencke <mklencke@gmx.net>
parents:
29365
diff
changeset
|
437 | sscanf(d, "%d", &port); |
|
ab9790d588f9
Fix an invalid memory deref with Windows proxy settings when there's no ":port"
Marten Klencke <mklencke@gmx.net>
parents:
29365
diff
changeset
|
438 | |
|
ab9790d588f9
Fix an invalid memory deref with Windows proxy settings when there's no ":port"
Marten Klencke <mklencke@gmx.net>
parents:
29365
diff
changeset
|
439 | if (port == 0) |
|
ab9790d588f9
Fix an invalid memory deref with Windows proxy settings when there's no ":port"
Marten Klencke <mklencke@gmx.net>
parents:
29365
diff
changeset
|
440 | port = default_port; |
|
ab9790d588f9
Fix an invalid memory deref with Windows proxy settings when there's no ":port"
Marten Klencke <mklencke@gmx.net>
parents:
29365
diff
changeset
|
441 | } |
|
24171
d976cc3db118
Add support for reading SOCKS proxy information from the Windows proxy settings.
Daniel Atallah <datallah@pidgin.im>
parents:
24156
diff
changeset
|
442 | |
|
d976cc3db118
Add support for reading SOCKS proxy information from the Windows proxy settings.
Daniel Atallah <datallah@pidgin.im>
parents:
24156
diff
changeset
|
443 | purple_proxy_info_set_host(info, host); |
|
d976cc3db118
Add support for reading SOCKS proxy information from the Windows proxy settings.
Daniel Atallah <datallah@pidgin.im>
parents:
24156
diff
changeset
|
444 | purple_proxy_info_set_port(info, port); |
|
d976cc3db118
Add support for reading SOCKS proxy information from the Windows proxy settings.
Daniel Atallah <datallah@pidgin.im>
parents:
24156
diff
changeset
|
445 | } |
|
d976cc3db118
Add support for reading SOCKS proxy information from the Windows proxy settings.
Daniel Atallah <datallah@pidgin.im>
parents:
24156
diff
changeset
|
446 | |
|
d976cc3db118
Add support for reading SOCKS proxy information from the Windows proxy settings.
Daniel Atallah <datallah@pidgin.im>
parents:
24156
diff
changeset
|
447 | static PurpleProxyInfo * |
|
d976cc3db118
Add support for reading SOCKS proxy information from the Windows proxy settings.
Daniel Atallah <datallah@pidgin.im>
parents:
24156
diff
changeset
|
448 | purple_win32_proxy_get_info(void) |
|
d976cc3db118
Add support for reading SOCKS proxy information from the Windows proxy settings.
Daniel Atallah <datallah@pidgin.im>
parents:
24156
diff
changeset
|
449 | { |
|
d976cc3db118
Add support for reading SOCKS proxy information from the Windows proxy settings.
Daniel Atallah <datallah@pidgin.im>
parents:
24156
diff
changeset
|
450 | static LPFNWINHTTPGETIEPROXYCONFIG MyWinHttpGetIEProxyConfig = NULL; |
|
d976cc3db118
Add support for reading SOCKS proxy information from the Windows proxy settings.
Daniel Atallah <datallah@pidgin.im>
parents:
24156
diff
changeset
|
451 | static gboolean loaded = FALSE; |
|
d976cc3db118
Add support for reading SOCKS proxy information from the Windows proxy settings.
Daniel Atallah <datallah@pidgin.im>
parents:
24156
diff
changeset
|
452 | static PurpleProxyInfo info = {0, NULL, 0, NULL, NULL}; |
|
d976cc3db118
Add support for reading SOCKS proxy information from the Windows proxy settings.
Daniel Atallah <datallah@pidgin.im>
parents:
24156
diff
changeset
|
453 | |
|
d976cc3db118
Add support for reading SOCKS proxy information from the Windows proxy settings.
Daniel Atallah <datallah@pidgin.im>
parents:
24156
diff
changeset
|
454 | WINHTTP_CURRENT_USER_IE_PROXY_CONFIG ie_proxy_config; |
|
d976cc3db118
Add support for reading SOCKS proxy information from the Windows proxy settings.
Daniel Atallah <datallah@pidgin.im>
parents:
24156
diff
changeset
|
455 | |
|
d976cc3db118
Add support for reading SOCKS proxy information from the Windows proxy settings.
Daniel Atallah <datallah@pidgin.im>
parents:
24156
diff
changeset
|
456 | if (!loaded) { |
|
d976cc3db118
Add support for reading SOCKS proxy information from the Windows proxy settings.
Daniel Atallah <datallah@pidgin.im>
parents:
24156
diff
changeset
|
457 | loaded = TRUE; |
|
d976cc3db118
Add support for reading SOCKS proxy information from the Windows proxy settings.
Daniel Atallah <datallah@pidgin.im>
parents:
24156
diff
changeset
|
458 | MyWinHttpGetIEProxyConfig = (LPFNWINHTTPGETIEPROXYCONFIG) |
|
d976cc3db118
Add support for reading SOCKS proxy information from the Windows proxy settings.
Daniel Atallah <datallah@pidgin.im>
parents:
24156
diff
changeset
|
459 | wpurple_find_and_loadproc("winhttp.dll", "WinHttpGetIEProxyConfigForCurrentUser"); |
|
d976cc3db118
Add support for reading SOCKS proxy information from the Windows proxy settings.
Daniel Atallah <datallah@pidgin.im>
parents:
24156
diff
changeset
|
460 | if (!MyWinHttpGetIEProxyConfig) |
|
27497
2dc5a0e0c4c2
Increase the logging level of some debugging messages that seemed to be a
Mauro Brasil <mauro.brasil@tqi.com.br>
parents:
27249
diff
changeset
|
461 | purple_debug_warning("proxy", "Unable to read Windows Proxy Settings.\n"); |
|
24171
d976cc3db118
Add support for reading SOCKS proxy information from the Windows proxy settings.
Daniel Atallah <datallah@pidgin.im>
parents:
24156
diff
changeset
|
462 | } |
|
d976cc3db118
Add support for reading SOCKS proxy information from the Windows proxy settings.
Daniel Atallah <datallah@pidgin.im>
parents:
24156
diff
changeset
|
463 | |
|
d976cc3db118
Add support for reading SOCKS proxy information from the Windows proxy settings.
Daniel Atallah <datallah@pidgin.im>
parents:
24156
diff
changeset
|
464 | if (!MyWinHttpGetIEProxyConfig) |
|
d976cc3db118
Add support for reading SOCKS proxy information from the Windows proxy settings.
Daniel Atallah <datallah@pidgin.im>
parents:
24156
diff
changeset
|
465 | return NULL; |
|
d976cc3db118
Add support for reading SOCKS proxy information from the Windows proxy settings.
Daniel Atallah <datallah@pidgin.im>
parents:
24156
diff
changeset
|
466 | |
|
d976cc3db118
Add support for reading SOCKS proxy information from the Windows proxy settings.
Daniel Atallah <datallah@pidgin.im>
parents:
24156
diff
changeset
|
467 | ZeroMemory(&ie_proxy_config, sizeof(ie_proxy_config)); |
|
d976cc3db118
Add support for reading SOCKS proxy information from the Windows proxy settings.
Daniel Atallah <datallah@pidgin.im>
parents:
24156
diff
changeset
|
468 | if (!MyWinHttpGetIEProxyConfig(&ie_proxy_config)) { |
|
d976cc3db118
Add support for reading SOCKS proxy information from the Windows proxy settings.
Daniel Atallah <datallah@pidgin.im>
parents:
24156
diff
changeset
|
469 | purple_debug_error("proxy", "Error reading Windows Proxy Settings(%lu).\n", GetLastError()); |
|
d976cc3db118
Add support for reading SOCKS proxy information from the Windows proxy settings.
Daniel Atallah <datallah@pidgin.im>
parents:
24156
diff
changeset
|
470 | return NULL; |
|
d976cc3db118
Add support for reading SOCKS proxy information from the Windows proxy settings.
Daniel Atallah <datallah@pidgin.im>
parents:
24156
diff
changeset
|
471 | } |
|
d976cc3db118
Add support for reading SOCKS proxy information from the Windows proxy settings.
Daniel Atallah <datallah@pidgin.im>
parents:
24156
diff
changeset
|
472 | |
|
d976cc3db118
Add support for reading SOCKS proxy information from the Windows proxy settings.
Daniel Atallah <datallah@pidgin.im>
parents:
24156
diff
changeset
|
473 | /* We can't do much if it is autodetect*/ |
|
d976cc3db118
Add support for reading SOCKS proxy information from the Windows proxy settings.
Daniel Atallah <datallah@pidgin.im>
parents:
24156
diff
changeset
|
474 | if (ie_proxy_config.fAutoDetect) { |
|
d976cc3db118
Add support for reading SOCKS proxy information from the Windows proxy settings.
Daniel Atallah <datallah@pidgin.im>
parents:
24156
diff
changeset
|
475 | purple_debug_error("proxy", "Windows Proxy Settings set to autodetect (not supported).\n"); |
|
d976cc3db118
Add support for reading SOCKS proxy information from the Windows proxy settings.
Daniel Atallah <datallah@pidgin.im>
parents:
24156
diff
changeset
|
476 | |
|
d976cc3db118
Add support for reading SOCKS proxy information from the Windows proxy settings.
Daniel Atallah <datallah@pidgin.im>
parents:
24156
diff
changeset
|
477 | /* TODO: For 3.0.0 we'll revisit this (maybe)*/ |
|
d976cc3db118
Add support for reading SOCKS proxy information from the Windows proxy settings.
Daniel Atallah <datallah@pidgin.im>
parents:
24156
diff
changeset
|
478 | |
|
d976cc3db118
Add support for reading SOCKS proxy information from the Windows proxy settings.
Daniel Atallah <datallah@pidgin.im>
parents:
24156
diff
changeset
|
479 | return NULL; |
|
d976cc3db118
Add support for reading SOCKS proxy information from the Windows proxy settings.
Daniel Atallah <datallah@pidgin.im>
parents:
24156
diff
changeset
|
480 | |
|
d976cc3db118
Add support for reading SOCKS proxy information from the Windows proxy settings.
Daniel Atallah <datallah@pidgin.im>
parents:
24156
diff
changeset
|
481 | } else if (ie_proxy_config.lpszProxy) { |
|
d976cc3db118
Add support for reading SOCKS proxy information from the Windows proxy settings.
Daniel Atallah <datallah@pidgin.im>
parents:
24156
diff
changeset
|
482 | gchar *proxy_list = g_utf16_to_utf8(ie_proxy_config.lpszProxy, -1, |
|
d976cc3db118
Add support for reading SOCKS proxy information from the Windows proxy settings.
Daniel Atallah <datallah@pidgin.im>
parents:
24156
diff
changeset
|
483 | NULL, NULL, NULL); |
|
d976cc3db118
Add support for reading SOCKS proxy information from the Windows proxy settings.
Daniel Atallah <datallah@pidgin.im>
parents:
24156
diff
changeset
|
484 | |
|
d976cc3db118
Add support for reading SOCKS proxy information from the Windows proxy settings.
Daniel Atallah <datallah@pidgin.im>
parents:
24156
diff
changeset
|
485 | /* We can't do anything about the bypass list, as we don't have the url */ |
|
d976cc3db118
Add support for reading SOCKS proxy information from the Windows proxy settings.
Daniel Atallah <datallah@pidgin.im>
parents:
24156
diff
changeset
|
486 | /* TODO: For 3.0.0 we'll revisit this*/ |
|
d976cc3db118
Add support for reading SOCKS proxy information from the Windows proxy settings.
Daniel Atallah <datallah@pidgin.im>
parents:
24156
diff
changeset
|
487 | |
|
d976cc3db118
Add support for reading SOCKS proxy information from the Windows proxy settings.
Daniel Atallah <datallah@pidgin.im>
parents:
24156
diff
changeset
|
488 | /* There are proxy settings for several protocols */ |
|
d976cc3db118
Add support for reading SOCKS proxy information from the Windows proxy settings.
Daniel Atallah <datallah@pidgin.im>
parents:
24156
diff
changeset
|
489 | if (proxy_list && *proxy_list) { |
|
d976cc3db118
Add support for reading SOCKS proxy information from the Windows proxy settings.
Daniel Atallah <datallah@pidgin.im>
parents:
24156
diff
changeset
|
490 | char *specific = NULL, *tmp; |
|
d976cc3db118
Add support for reading SOCKS proxy information from the Windows proxy settings.
Daniel Atallah <datallah@pidgin.im>
parents:
24156
diff
changeset
|
491 | |
|
d976cc3db118
Add support for reading SOCKS proxy information from the Windows proxy settings.
Daniel Atallah <datallah@pidgin.im>
parents:
24156
diff
changeset
|
492 | /* If there is only a global proxy, which means "HTTP" */ |
|
d976cc3db118
Add support for reading SOCKS proxy information from the Windows proxy settings.
Daniel Atallah <datallah@pidgin.im>
parents:
24156
diff
changeset
|
493 | if (!strchr(proxy_list, ';') || (specific = g_strstr_len(proxy_list, -1, "http=")) != NULL) { |
|
d976cc3db118
Add support for reading SOCKS proxy information from the Windows proxy settings.
Daniel Atallah <datallah@pidgin.im>
parents:
24156
diff
changeset
|
494 | |
|
d976cc3db118
Add support for reading SOCKS proxy information from the Windows proxy settings.
Daniel Atallah <datallah@pidgin.im>
parents:
24156
diff
changeset
|
495 | if (specific) { |
|
d976cc3db118
Add support for reading SOCKS proxy information from the Windows proxy settings.
Daniel Atallah <datallah@pidgin.im>
parents:
24156
diff
changeset
|
496 | specific += strlen("http="); |
|
d976cc3db118
Add support for reading SOCKS proxy information from the Windows proxy settings.
Daniel Atallah <datallah@pidgin.im>
parents:
24156
diff
changeset
|
497 | tmp = strchr(specific, ';'); |
|
d976cc3db118
Add support for reading SOCKS proxy information from the Windows proxy settings.
Daniel Atallah <datallah@pidgin.im>
parents:
24156
diff
changeset
|
498 | if (tmp) |
|
d976cc3db118
Add support for reading SOCKS proxy information from the Windows proxy settings.
Daniel Atallah <datallah@pidgin.im>
parents:
24156
diff
changeset
|
499 | *tmp = '\0'; |
|
d976cc3db118
Add support for reading SOCKS proxy information from the Windows proxy settings.
Daniel Atallah <datallah@pidgin.im>
parents:
24156
diff
changeset
|
500 | /* specific now points the proxy server (and port) */ |
|
d976cc3db118
Add support for reading SOCKS proxy information from the Windows proxy settings.
Daniel Atallah <datallah@pidgin.im>
parents:
24156
diff
changeset
|
501 | } else |
|
d976cc3db118
Add support for reading SOCKS proxy information from the Windows proxy settings.
Daniel Atallah <datallah@pidgin.im>
parents:
24156
diff
changeset
|
502 | specific = proxy_list; |
|
d976cc3db118
Add support for reading SOCKS proxy information from the Windows proxy settings.
Daniel Atallah <datallah@pidgin.im>
parents:
24156
diff
changeset
|
503 | |
|
35378
5d9e2581005b
gtk-doc prep: *_get_type() functions are hidden as standard GType-returning funcs, so rename them.
Ankit Vani <a@nevitus.org>
parents:
35265
diff
changeset
|
504 | purple_proxy_info_set_proxy_type(&info, PURPLE_PROXY_HTTP); |
|
24171
d976cc3db118
Add support for reading SOCKS proxy information from the Windows proxy settings.
Daniel Atallah <datallah@pidgin.im>
parents:
24156
diff
changeset
|
505 | _proxy_fill_hostinfo(&info, specific, 80); |
|
d976cc3db118
Add support for reading SOCKS proxy information from the Windows proxy settings.
Daniel Atallah <datallah@pidgin.im>
parents:
24156
diff
changeset
|
506 | /* TODO: is there a way to set the username/password? */ |
|
d976cc3db118
Add support for reading SOCKS proxy information from the Windows proxy settings.
Daniel Atallah <datallah@pidgin.im>
parents:
24156
diff
changeset
|
507 | purple_proxy_info_set_username(&info, NULL); |
|
d976cc3db118
Add support for reading SOCKS proxy information from the Windows proxy settings.
Daniel Atallah <datallah@pidgin.im>
parents:
24156
diff
changeset
|
508 | purple_proxy_info_set_password(&info, NULL); |
|
d976cc3db118
Add support for reading SOCKS proxy information from the Windows proxy settings.
Daniel Atallah <datallah@pidgin.im>
parents:
24156
diff
changeset
|
509 | |
|
d976cc3db118
Add support for reading SOCKS proxy information from the Windows proxy settings.
Daniel Atallah <datallah@pidgin.im>
parents:
24156
diff
changeset
|
510 | purple_debug_info("proxy", "Windows Proxy Settings: HTTP proxy: '%s:%d'.\n", |
|
d976cc3db118
Add support for reading SOCKS proxy information from the Windows proxy settings.
Daniel Atallah <datallah@pidgin.im>
parents:
24156
diff
changeset
|
511 | purple_proxy_info_get_host(&info), |
|
d976cc3db118
Add support for reading SOCKS proxy information from the Windows proxy settings.
Daniel Atallah <datallah@pidgin.im>
parents:
24156
diff
changeset
|
512 | purple_proxy_info_get_port(&info)); |
|
d976cc3db118
Add support for reading SOCKS proxy information from the Windows proxy settings.
Daniel Atallah <datallah@pidgin.im>
parents:
24156
diff
changeset
|
513 | |
|
d976cc3db118
Add support for reading SOCKS proxy information from the Windows proxy settings.
Daniel Atallah <datallah@pidgin.im>
parents:
24156
diff
changeset
|
514 | } else if ((specific = g_strstr_len(proxy_list, -1, "socks=")) != NULL) { |
|
d976cc3db118
Add support for reading SOCKS proxy information from the Windows proxy settings.
Daniel Atallah <datallah@pidgin.im>
parents:
24156
diff
changeset
|
515 | |
|
d976cc3db118
Add support for reading SOCKS proxy information from the Windows proxy settings.
Daniel Atallah <datallah@pidgin.im>
parents:
24156
diff
changeset
|
516 | specific += strlen("socks="); |
|
d976cc3db118
Add support for reading SOCKS proxy information from the Windows proxy settings.
Daniel Atallah <datallah@pidgin.im>
parents:
24156
diff
changeset
|
517 | tmp = strchr(specific, ';'); |
|
d976cc3db118
Add support for reading SOCKS proxy information from the Windows proxy settings.
Daniel Atallah <datallah@pidgin.im>
parents:
24156
diff
changeset
|
518 | if (tmp) |
|
d976cc3db118
Add support for reading SOCKS proxy information from the Windows proxy settings.
Daniel Atallah <datallah@pidgin.im>
parents:
24156
diff
changeset
|
519 | *tmp = '\0'; |
|
d976cc3db118
Add support for reading SOCKS proxy information from the Windows proxy settings.
Daniel Atallah <datallah@pidgin.im>
parents:
24156
diff
changeset
|
520 | /* specific now points the proxy server (and port) */ |
|
d976cc3db118
Add support for reading SOCKS proxy information from the Windows proxy settings.
Daniel Atallah <datallah@pidgin.im>
parents:
24156
diff
changeset
|
521 | |
|
35378
5d9e2581005b
gtk-doc prep: *_get_type() functions are hidden as standard GType-returning funcs, so rename them.
Ankit Vani <a@nevitus.org>
parents:
35265
diff
changeset
|
522 | purple_proxy_info_set_proxy_type(&info, PURPLE_PROXY_SOCKS5); |
|
24171
d976cc3db118
Add support for reading SOCKS proxy information from the Windows proxy settings.
Daniel Atallah <datallah@pidgin.im>
parents:
24156
diff
changeset
|
523 | _proxy_fill_hostinfo(&info, specific, 1080); |
|
d976cc3db118
Add support for reading SOCKS proxy information from the Windows proxy settings.
Daniel Atallah <datallah@pidgin.im>
parents:
24156
diff
changeset
|
524 | /* TODO: is there a way to set the username/password? */ |
|
d976cc3db118
Add support for reading SOCKS proxy information from the Windows proxy settings.
Daniel Atallah <datallah@pidgin.im>
parents:
24156
diff
changeset
|
525 | purple_proxy_info_set_username(&info, NULL); |
|
d976cc3db118
Add support for reading SOCKS proxy information from the Windows proxy settings.
Daniel Atallah <datallah@pidgin.im>
parents:
24156
diff
changeset
|
526 | purple_proxy_info_set_password(&info, NULL); |
|
d976cc3db118
Add support for reading SOCKS proxy information from the Windows proxy settings.
Daniel Atallah <datallah@pidgin.im>
parents:
24156
diff
changeset
|
527 | |
|
d976cc3db118
Add support for reading SOCKS proxy information from the Windows proxy settings.
Daniel Atallah <datallah@pidgin.im>
parents:
24156
diff
changeset
|
528 | purple_debug_info("proxy", "Windows Proxy Settings: SOCKS5 proxy: '%s:%d'.\n", |
|
d976cc3db118
Add support for reading SOCKS proxy information from the Windows proxy settings.
Daniel Atallah <datallah@pidgin.im>
parents:
24156
diff
changeset
|
529 | purple_proxy_info_get_host(&info), |
|
d976cc3db118
Add support for reading SOCKS proxy information from the Windows proxy settings.
Daniel Atallah <datallah@pidgin.im>
parents:
24156
diff
changeset
|
530 | purple_proxy_info_get_port(&info)); |
|
d976cc3db118
Add support for reading SOCKS proxy information from the Windows proxy settings.
Daniel Atallah <datallah@pidgin.im>
parents:
24156
diff
changeset
|
531 | |
|
d976cc3db118
Add support for reading SOCKS proxy information from the Windows proxy settings.
Daniel Atallah <datallah@pidgin.im>
parents:
24156
diff
changeset
|
532 | } else { |
|
d976cc3db118
Add support for reading SOCKS proxy information from the Windows proxy settings.
Daniel Atallah <datallah@pidgin.im>
parents:
24156
diff
changeset
|
533 | |
|
d976cc3db118
Add support for reading SOCKS proxy information from the Windows proxy settings.
Daniel Atallah <datallah@pidgin.im>
parents:
24156
diff
changeset
|
534 | purple_debug_info("proxy", "Windows Proxy Settings: No supported proxy specified.\n"); |
|
d976cc3db118
Add support for reading SOCKS proxy information from the Windows proxy settings.
Daniel Atallah <datallah@pidgin.im>
parents:
24156
diff
changeset
|
535 | |
|
35378
5d9e2581005b
gtk-doc prep: *_get_type() functions are hidden as standard GType-returning funcs, so rename them.
Ankit Vani <a@nevitus.org>
parents:
35265
diff
changeset
|
536 | purple_proxy_info_set_proxy_type(&info, PURPLE_PROXY_NONE); |
|
24171
d976cc3db118
Add support for reading SOCKS proxy information from the Windows proxy settings.
Daniel Atallah <datallah@pidgin.im>
parents:
24156
diff
changeset
|
537 | |
|
d976cc3db118
Add support for reading SOCKS proxy information from the Windows proxy settings.
Daniel Atallah <datallah@pidgin.im>
parents:
24156
diff
changeset
|
538 | } |
|
d976cc3db118
Add support for reading SOCKS proxy information from the Windows proxy settings.
Daniel Atallah <datallah@pidgin.im>
parents:
24156
diff
changeset
|
539 | } |
|
d976cc3db118
Add support for reading SOCKS proxy information from the Windows proxy settings.
Daniel Atallah <datallah@pidgin.im>
parents:
24156
diff
changeset
|
540 | |
|
d976cc3db118
Add support for reading SOCKS proxy information from the Windows proxy settings.
Daniel Atallah <datallah@pidgin.im>
parents:
24156
diff
changeset
|
541 | /* TODO: Fix API to be able look at proxy bypass settings */ |
|
d976cc3db118
Add support for reading SOCKS proxy information from the Windows proxy settings.
Daniel Atallah <datallah@pidgin.im>
parents:
24156
diff
changeset
|
542 | |
|
d976cc3db118
Add support for reading SOCKS proxy information from the Windows proxy settings.
Daniel Atallah <datallah@pidgin.im>
parents:
24156
diff
changeset
|
543 | g_free(proxy_list); |
|
d976cc3db118
Add support for reading SOCKS proxy information from the Windows proxy settings.
Daniel Atallah <datallah@pidgin.im>
parents:
24156
diff
changeset
|
544 | } else { |
|
d976cc3db118
Add support for reading SOCKS proxy information from the Windows proxy settings.
Daniel Atallah <datallah@pidgin.im>
parents:
24156
diff
changeset
|
545 | purple_debug_info("proxy", "No Windows proxy set.\n"); |
|
35378
5d9e2581005b
gtk-doc prep: *_get_type() functions are hidden as standard GType-returning funcs, so rename them.
Ankit Vani <a@nevitus.org>
parents:
35265
diff
changeset
|
546 | purple_proxy_info_set_proxy_type(&info, PURPLE_PROXY_NONE); |
|
24171
d976cc3db118
Add support for reading SOCKS proxy information from the Windows proxy settings.
Daniel Atallah <datallah@pidgin.im>
parents:
24156
diff
changeset
|
547 | } |
|
d976cc3db118
Add support for reading SOCKS proxy information from the Windows proxy settings.
Daniel Atallah <datallah@pidgin.im>
parents:
24156
diff
changeset
|
548 | |
|
d976cc3db118
Add support for reading SOCKS proxy information from the Windows proxy settings.
Daniel Atallah <datallah@pidgin.im>
parents:
24156
diff
changeset
|
549 | if (ie_proxy_config.lpszAutoConfigUrl) |
|
d976cc3db118
Add support for reading SOCKS proxy information from the Windows proxy settings.
Daniel Atallah <datallah@pidgin.im>
parents:
24156
diff
changeset
|
550 | GlobalFree(ie_proxy_config.lpszAutoConfigUrl); |
|
d976cc3db118
Add support for reading SOCKS proxy information from the Windows proxy settings.
Daniel Atallah <datallah@pidgin.im>
parents:
24156
diff
changeset
|
551 | if (ie_proxy_config.lpszProxy) |
|
d976cc3db118
Add support for reading SOCKS proxy information from the Windows proxy settings.
Daniel Atallah <datallah@pidgin.im>
parents:
24156
diff
changeset
|
552 | GlobalFree(ie_proxy_config.lpszProxy); |
|
d976cc3db118
Add support for reading SOCKS proxy information from the Windows proxy settings.
Daniel Atallah <datallah@pidgin.im>
parents:
24156
diff
changeset
|
553 | if (ie_proxy_config.lpszProxyBypass) |
|
d976cc3db118
Add support for reading SOCKS proxy information from the Windows proxy settings.
Daniel Atallah <datallah@pidgin.im>
parents:
24156
diff
changeset
|
554 | GlobalFree(ie_proxy_config.lpszProxyBypass); |
|
d976cc3db118
Add support for reading SOCKS proxy information from the Windows proxy settings.
Daniel Atallah <datallah@pidgin.im>
parents:
24156
diff
changeset
|
555 | |
|
d976cc3db118
Add support for reading SOCKS proxy information from the Windows proxy settings.
Daniel Atallah <datallah@pidgin.im>
parents:
24156
diff
changeset
|
556 | return &info; |
|
d976cc3db118
Add support for reading SOCKS proxy information from the Windows proxy settings.
Daniel Atallah <datallah@pidgin.im>
parents:
24156
diff
changeset
|
557 | } |
|
d976cc3db118
Add support for reading SOCKS proxy information from the Windows proxy settings.
Daniel Atallah <datallah@pidgin.im>
parents:
24156
diff
changeset
|
558 | #endif |
|
d976cc3db118
Add support for reading SOCKS proxy information from the Windows proxy settings.
Daniel Atallah <datallah@pidgin.im>
parents:
24156
diff
changeset
|
559 | |
|
d976cc3db118
Add support for reading SOCKS proxy information from the Windows proxy settings.
Daniel Atallah <datallah@pidgin.im>
parents:
24156
diff
changeset
|
560 | |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
561 | /************************************************************************** |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
562 | * Proxy API |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
563 | **************************************************************************/ |
|
4366
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
564 | |
|
35462
901dfa763f15
Fix some gtk-doc warnings till proxy.c
Ankit Vani <a@nevitus.org>
parents:
35454
diff
changeset
|
565 | /* |
|
14513
fe63cd247350
[gaim-migrate @ 17165]
Mark Doliner <markdoliner@pidgin.im>
parents:
14454
diff
changeset
|
566 | * Whoever calls this needs to have called |
| 15884 | 567 | * purple_proxy_connect_data_disconnect() beforehand. |
|
14165
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
568 | */ |
|
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
569 | static void |
| 15884 | 570 | purple_proxy_connect_data_destroy(PurpleProxyConnectData *connect_data) |
|
14151
34427f138b1f
[gaim-migrate @ 16712]
Mark Doliner <markdoliner@pidgin.im>
parents:
14097
diff
changeset
|
571 | { |
|
37189
b61329019afe
Ad a check to make sure that connect_data is valid before freeing it to avoid double-frees
Daniel Atallah <datallah@pidgin.im>
parents:
36256
diff
changeset
|
572 | if (!PURPLE_PROXY_CONNECT_DATA_IS_VALID(connect_data)) |
|
b61329019afe
Ad a check to make sure that connect_data is valid before freeing it to avoid double-frees
Daniel Atallah <datallah@pidgin.im>
parents:
36256
diff
changeset
|
573 | return; |
|
b61329019afe
Ad a check to make sure that connect_data is valid before freeing it to avoid double-frees
Daniel Atallah <datallah@pidgin.im>
parents:
36256
diff
changeset
|
574 | |
|
14899
c65f0b4fb351
[gaim-migrate @ 17606]
Mark Doliner <markdoliner@pidgin.im>
parents:
14536
diff
changeset
|
575 | handles = g_slist_remove(handles, connect_data); |
|
14151
34427f138b1f
[gaim-migrate @ 16712]
Mark Doliner <markdoliner@pidgin.im>
parents:
14097
diff
changeset
|
576 | |
|
37451
927a083a6c9f
This probably doesn't work, but it compiles (for now)
Gary Kramlich <grim@reaperworld.com>
parents:
37193
diff
changeset
|
577 | if(G_IS_CANCELLABLE(connect_data->cancellable)) { |
|
927a083a6c9f
This probably doesn't work, but it compiles (for now)
Gary Kramlich <grim@reaperworld.com>
parents:
37193
diff
changeset
|
578 | g_cancellable_cancel(connect_data->cancellable); |
|
927a083a6c9f
This probably doesn't work, but it compiles (for now)
Gary Kramlich <grim@reaperworld.com>
parents:
37193
diff
changeset
|
579 | |
|
927a083a6c9f
This probably doesn't work, but it compiles (for now)
Gary Kramlich <grim@reaperworld.com>
parents:
37193
diff
changeset
|
580 | g_object_unref(G_OBJECT(connect_data->cancellable)); |
|
927a083a6c9f
This probably doesn't work, but it compiles (for now)
Gary Kramlich <grim@reaperworld.com>
parents:
37193
diff
changeset
|
581 | |
|
927a083a6c9f
This probably doesn't work, but it compiles (for now)
Gary Kramlich <grim@reaperworld.com>
parents:
37193
diff
changeset
|
582 | connect_data->cancellable = NULL; |
|
14151
34427f138b1f
[gaim-migrate @ 16712]
Mark Doliner <markdoliner@pidgin.im>
parents:
14097
diff
changeset
|
583 | } |
|
34427f138b1f
[gaim-migrate @ 16712]
Mark Doliner <markdoliner@pidgin.im>
parents:
14097
diff
changeset
|
584 | |
|
37451
927a083a6c9f
This probably doesn't work, but it compiles (for now)
Gary Kramlich <grim@reaperworld.com>
parents:
37193
diff
changeset
|
585 | g_resolver_free_addresses(connect_data->hosts); |
|
927a083a6c9f
This probably doesn't work, but it compiles (for now)
Gary Kramlich <grim@reaperworld.com>
parents:
37193
diff
changeset
|
586 | |
|
14324
8cbedd82b6ac
[gaim-migrate @ 16944]
Mark Doliner <markdoliner@pidgin.im>
parents:
14300
diff
changeset
|
587 | g_free(connect_data->host); |
|
8cbedd82b6ac
[gaim-migrate @ 16944]
Mark Doliner <markdoliner@pidgin.im>
parents:
14300
diff
changeset
|
588 | g_free(connect_data); |
|
14151
34427f138b1f
[gaim-migrate @ 16712]
Mark Doliner <markdoliner@pidgin.im>
parents:
14097
diff
changeset
|
589 | } |
|
34427f138b1f
[gaim-migrate @ 16712]
Mark Doliner <markdoliner@pidgin.im>
parents:
14097
diff
changeset
|
590 | |
|
35462
901dfa763f15
Fix some gtk-doc warnings till proxy.c
Ankit Vani <a@nevitus.org>
parents:
35454
diff
changeset
|
591 | /* |
|
901dfa763f15
Fix some gtk-doc warnings till proxy.c
Ankit Vani <a@nevitus.org>
parents:
35454
diff
changeset
|
592 | * purple_proxy_connect_data_disconnect: |
|
901dfa763f15
Fix some gtk-doc warnings till proxy.c
Ankit Vani <a@nevitus.org>
parents:
35454
diff
changeset
|
593 | * @error_message: An error message explaining why the connection |
|
901dfa763f15
Fix some gtk-doc warnings till proxy.c
Ankit Vani <a@nevitus.org>
parents:
35454
diff
changeset
|
594 | * failed. This will be passed to the callback function |
|
901dfa763f15
Fix some gtk-doc warnings till proxy.c
Ankit Vani <a@nevitus.org>
parents:
35454
diff
changeset
|
595 | * specified in the call to purple_proxy_connect(). If the |
|
901dfa763f15
Fix some gtk-doc warnings till proxy.c
Ankit Vani <a@nevitus.org>
parents:
35454
diff
changeset
|
596 | * connection was successful then pass in null. |
|
901dfa763f15
Fix some gtk-doc warnings till proxy.c
Ankit Vani <a@nevitus.org>
parents:
35454
diff
changeset
|
597 | * |
|
14513
fe63cd247350
[gaim-migrate @ 17165]
Mark Doliner <markdoliner@pidgin.im>
parents:
14454
diff
changeset
|
598 | * Free all information dealing with a connection attempt and |
|
fe63cd247350
[gaim-migrate @ 17165]
Mark Doliner <markdoliner@pidgin.im>
parents:
14454
diff
changeset
|
599 | * reset the connect_data to prepare for it to try to connect |
|
fe63cd247350
[gaim-migrate @ 17165]
Mark Doliner <markdoliner@pidgin.im>
parents:
14454
diff
changeset
|
600 | * to another IP address. |
|
fe63cd247350
[gaim-migrate @ 17165]
Mark Doliner <markdoliner@pidgin.im>
parents:
14454
diff
changeset
|
601 | * |
|
fe63cd247350
[gaim-migrate @ 17165]
Mark Doliner <markdoliner@pidgin.im>
parents:
14454
diff
changeset
|
602 | * If an error message is passed in, then we know the connection |
|
fe63cd247350
[gaim-migrate @ 17165]
Mark Doliner <markdoliner@pidgin.im>
parents:
14454
diff
changeset
|
603 | * attempt failed. If the connection attempt failed and |
|
fe63cd247350
[gaim-migrate @ 17165]
Mark Doliner <markdoliner@pidgin.im>
parents:
14454
diff
changeset
|
604 | * connect_data->hosts is not empty then we try the next IP address. |
|
fe63cd247350
[gaim-migrate @ 17165]
Mark Doliner <markdoliner@pidgin.im>
parents:
14454
diff
changeset
|
605 | * If the connection attempt failed and we have no more hosts |
|
fe63cd247350
[gaim-migrate @ 17165]
Mark Doliner <markdoliner@pidgin.im>
parents:
14454
diff
changeset
|
606 | * try try then we call the callback with the given error message, |
|
fe63cd247350
[gaim-migrate @ 17165]
Mark Doliner <markdoliner@pidgin.im>
parents:
14454
diff
changeset
|
607 | * then destroy the connect_data. |
|
fe63cd247350
[gaim-migrate @ 17165]
Mark Doliner <markdoliner@pidgin.im>
parents:
14454
diff
changeset
|
608 | */ |
|
fe63cd247350
[gaim-migrate @ 17165]
Mark Doliner <markdoliner@pidgin.im>
parents:
14454
diff
changeset
|
609 | static void |
| 15884 | 610 | purple_proxy_connect_data_disconnect(PurpleProxyConnectData *connect_data, const gchar *error_message) |
|
14513
fe63cd247350
[gaim-migrate @ 17165]
Mark Doliner <markdoliner@pidgin.im>
parents:
14454
diff
changeset
|
611 | { |
|
32129
5f9d676cefdb
Fix a possible XMPP remote crash
Mark Doliner <markdoliner@pidgin.im>
parents:
32070
diff
changeset
|
612 | if (connect_data->child != NULL) |
|
5f9d676cefdb
Fix a possible XMPP remote crash
Mark Doliner <markdoliner@pidgin.im>
parents:
32070
diff
changeset
|
613 | { |
|
5f9d676cefdb
Fix a possible XMPP remote crash
Mark Doliner <markdoliner@pidgin.im>
parents:
32070
diff
changeset
|
614 | purple_proxy_connect_cancel(connect_data->child); |
|
5f9d676cefdb
Fix a possible XMPP remote crash
Mark Doliner <markdoliner@pidgin.im>
parents:
32070
diff
changeset
|
615 | connect_data->child = NULL; |
|
5f9d676cefdb
Fix a possible XMPP remote crash
Mark Doliner <markdoliner@pidgin.im>
parents:
32070
diff
changeset
|
616 | } |
|
5f9d676cefdb
Fix a possible XMPP remote crash
Mark Doliner <markdoliner@pidgin.im>
parents:
32070
diff
changeset
|
617 | |
|
14513
fe63cd247350
[gaim-migrate @ 17165]
Mark Doliner <markdoliner@pidgin.im>
parents:
14454
diff
changeset
|
618 | if (connect_data->inpa > 0) |
|
fe63cd247350
[gaim-migrate @ 17165]
Mark Doliner <markdoliner@pidgin.im>
parents:
14454
diff
changeset
|
619 | { |
| 15884 | 620 | purple_input_remove(connect_data->inpa); |
|
14513
fe63cd247350
[gaim-migrate @ 17165]
Mark Doliner <markdoliner@pidgin.im>
parents:
14454
diff
changeset
|
621 | connect_data->inpa = 0; |
|
fe63cd247350
[gaim-migrate @ 17165]
Mark Doliner <markdoliner@pidgin.im>
parents:
14454
diff
changeset
|
622 | } |
|
fe63cd247350
[gaim-migrate @ 17165]
Mark Doliner <markdoliner@pidgin.im>
parents:
14454
diff
changeset
|
623 | |
|
fe63cd247350
[gaim-migrate @ 17165]
Mark Doliner <markdoliner@pidgin.im>
parents:
14454
diff
changeset
|
624 | if (connect_data->fd >= 0) |
|
fe63cd247350
[gaim-migrate @ 17165]
Mark Doliner <markdoliner@pidgin.im>
parents:
14454
diff
changeset
|
625 | { |
|
fe63cd247350
[gaim-migrate @ 17165]
Mark Doliner <markdoliner@pidgin.im>
parents:
14454
diff
changeset
|
626 | close(connect_data->fd); |
|
fe63cd247350
[gaim-migrate @ 17165]
Mark Doliner <markdoliner@pidgin.im>
parents:
14454
diff
changeset
|
627 | connect_data->fd = -1; |
|
fe63cd247350
[gaim-migrate @ 17165]
Mark Doliner <markdoliner@pidgin.im>
parents:
14454
diff
changeset
|
628 | } |
|
fe63cd247350
[gaim-migrate @ 17165]
Mark Doliner <markdoliner@pidgin.im>
parents:
14454
diff
changeset
|
629 | |
|
fe63cd247350
[gaim-migrate @ 17165]
Mark Doliner <markdoliner@pidgin.im>
parents:
14454
diff
changeset
|
630 | g_free(connect_data->write_buffer); |
|
fe63cd247350
[gaim-migrate @ 17165]
Mark Doliner <markdoliner@pidgin.im>
parents:
14454
diff
changeset
|
631 | connect_data->write_buffer = NULL; |
|
fe63cd247350
[gaim-migrate @ 17165]
Mark Doliner <markdoliner@pidgin.im>
parents:
14454
diff
changeset
|
632 | |
|
fe63cd247350
[gaim-migrate @ 17165]
Mark Doliner <markdoliner@pidgin.im>
parents:
14454
diff
changeset
|
633 | g_free(connect_data->read_buffer); |
|
fe63cd247350
[gaim-migrate @ 17165]
Mark Doliner <markdoliner@pidgin.im>
parents:
14454
diff
changeset
|
634 | connect_data->read_buffer = NULL; |
|
fe63cd247350
[gaim-migrate @ 17165]
Mark Doliner <markdoliner@pidgin.im>
parents:
14454
diff
changeset
|
635 | |
|
fe63cd247350
[gaim-migrate @ 17165]
Mark Doliner <markdoliner@pidgin.im>
parents:
14454
diff
changeset
|
636 | if (error_message != NULL) |
|
fe63cd247350
[gaim-migrate @ 17165]
Mark Doliner <markdoliner@pidgin.im>
parents:
14454
diff
changeset
|
637 | { |
|
27497
2dc5a0e0c4c2
Increase the logging level of some debugging messages that seemed to be a
Mauro Brasil <mauro.brasil@tqi.com.br>
parents:
27249
diff
changeset
|
638 | purple_debug_error("proxy", "Connection attempt failed: %s\n", |
|
14513
fe63cd247350
[gaim-migrate @ 17165]
Mark Doliner <markdoliner@pidgin.im>
parents:
14454
diff
changeset
|
639 | error_message); |
|
37536
7f1d2f3ba6ae
Clear ununused functions from proxy.[ch] including purple_proxy_connect_udp()
Mike Ruprecht <cmaiku@gmail.com>
parents:
37535
diff
changeset
|
640 | |
|
7f1d2f3ba6ae
Clear ununused functions from proxy.[ch] including purple_proxy_connect_udp()
Mike Ruprecht <cmaiku@gmail.com>
parents:
37535
diff
changeset
|
641 | /* Everything failed! Tell the originator of the request. */ |
|
7f1d2f3ba6ae
Clear ununused functions from proxy.[ch] including purple_proxy_connect_udp()
Mike Ruprecht <cmaiku@gmail.com>
parents:
37535
diff
changeset
|
642 | connect_data->connect_cb(connect_data->data, -1, error_message); |
|
7f1d2f3ba6ae
Clear ununused functions from proxy.[ch] including purple_proxy_connect_udp()
Mike Ruprecht <cmaiku@gmail.com>
parents:
37535
diff
changeset
|
643 | purple_proxy_connect_data_destroy(connect_data); |
|
14513
fe63cd247350
[gaim-migrate @ 17165]
Mark Doliner <markdoliner@pidgin.im>
parents:
14454
diff
changeset
|
644 | } |
|
fe63cd247350
[gaim-migrate @ 17165]
Mark Doliner <markdoliner@pidgin.im>
parents:
14454
diff
changeset
|
645 | } |
|
fe63cd247350
[gaim-migrate @ 17165]
Mark Doliner <markdoliner@pidgin.im>
parents:
14454
diff
changeset
|
646 | |
|
14151
34427f138b1f
[gaim-migrate @ 16712]
Mark Doliner <markdoliner@pidgin.im>
parents:
14097
diff
changeset
|
647 | static void |
| 15884 | 648 | purple_proxy_connect_data_connected(PurpleProxyConnectData *connect_data) |
|
14151
34427f138b1f
[gaim-migrate @ 16712]
Mark Doliner <markdoliner@pidgin.im>
parents:
14097
diff
changeset
|
649 | { |
|
27943
129a272c34f2
Add an explicit "Connected" message right before passing control from proxy subsystem to whomever called purple_proxy_connect.
Paul Aurich <darkrain42@pidgin.im>
parents:
27635
diff
changeset
|
650 | purple_debug_info("proxy", "Connected to %s:%d.\n", |
|
129a272c34f2
Add an explicit "Connected" message right before passing control from proxy subsystem to whomever called purple_proxy_connect.
Paul Aurich <darkrain42@pidgin.im>
parents:
27635
diff
changeset
|
651 | connect_data->host, connect_data->port); |
|
129a272c34f2
Add an explicit "Connected" message right before passing control from proxy subsystem to whomever called purple_proxy_connect.
Paul Aurich <darkrain42@pidgin.im>
parents:
27635
diff
changeset
|
652 | |
|
14324
8cbedd82b6ac
[gaim-migrate @ 16944]
Mark Doliner <markdoliner@pidgin.im>
parents:
14300
diff
changeset
|
653 | connect_data->connect_cb(connect_data->data, connect_data->fd, NULL); |
|
14165
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
654 | |
|
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
655 | /* |
|
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
656 | * We've passed the file descriptor to the protocol, so it's no longer |
|
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
657 | * our responsibility, and we should be careful not to free it when |
|
14324
8cbedd82b6ac
[gaim-migrate @ 16944]
Mark Doliner <markdoliner@pidgin.im>
parents:
14300
diff
changeset
|
658 | * we destroy the connect_data. |
|
14165
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
659 | */ |
|
14324
8cbedd82b6ac
[gaim-migrate @ 16944]
Mark Doliner <markdoliner@pidgin.im>
parents:
14300
diff
changeset
|
660 | connect_data->fd = -1; |
|
14165
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
661 | |
| 15884 | 662 | purple_proxy_connect_data_disconnect(connect_data, NULL); |
| 663 | purple_proxy_connect_data_destroy(connect_data); | |
|
14151
34427f138b1f
[gaim-migrate @ 16712]
Mark Doliner <markdoliner@pidgin.im>
parents:
14097
diff
changeset
|
664 | } |
|
34427f138b1f
[gaim-migrate @ 16712]
Mark Doliner <markdoliner@pidgin.im>
parents:
14097
diff
changeset
|
665 | |
| 15884 | 666 | PurpleProxyInfo * |
| 667 | purple_proxy_get_setup(PurpleAccount *account) | |
|
1087
bc9c6b635358
[gaim-migrate @ 1097]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1057
diff
changeset
|
668 | { |
| 15884 | 669 | PurpleProxyInfo *gpi = NULL; |
|
6621
2a18ef3e5224
[gaim-migrate @ 7145]
Robert McQueen <robot101@debian.org>
parents:
6320
diff
changeset
|
670 | const gchar *tmp; |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
671 | |
|
15032
65a111aba7a8
[gaim-migrate @ 17749]
Daniel Atallah <datallah@pidgin.im>
parents:
15015
diff
changeset
|
672 | /* This is used as a fallback so we don't overwrite the selected proxy type */ |
| 15884 | 673 | static PurpleProxyInfo *tmp_none_proxy_info = NULL; |
|
15032
65a111aba7a8
[gaim-migrate @ 17749]
Daniel Atallah <datallah@pidgin.im>
parents:
15015
diff
changeset
|
674 | if (!tmp_none_proxy_info) { |
| 15884 | 675 | tmp_none_proxy_info = purple_proxy_info_new(); |
|
35378
5d9e2581005b
gtk-doc prep: *_get_type() functions are hidden as standard GType-returning funcs, so rename them.
Ankit Vani <a@nevitus.org>
parents:
35265
diff
changeset
|
676 | purple_proxy_info_set_proxy_type(tmp_none_proxy_info, PURPLE_PROXY_NONE); |
|
15032
65a111aba7a8
[gaim-migrate @ 17749]
Daniel Atallah <datallah@pidgin.im>
parents:
15015
diff
changeset
|
677 | } |
|
65a111aba7a8
[gaim-migrate @ 17749]
Daniel Atallah <datallah@pidgin.im>
parents:
15015
diff
changeset
|
678 | |
| 15884 | 679 | if (account && purple_account_get_proxy_info(account) != NULL) { |
| 680 | gpi = purple_account_get_proxy_info(account); | |
|
35378
5d9e2581005b
gtk-doc prep: *_get_type() functions are hidden as standard GType-returning funcs, so rename them.
Ankit Vani <a@nevitus.org>
parents:
35265
diff
changeset
|
681 | if (purple_proxy_info_get_proxy_type(gpi) == PURPLE_PROXY_USE_GLOBAL) |
|
15041
18a6f6cdce33
[gaim-migrate @ 17758]
Daniel Atallah <datallah@pidgin.im>
parents:
15032
diff
changeset
|
682 | gpi = NULL; |
|
18a6f6cdce33
[gaim-migrate @ 17758]
Daniel Atallah <datallah@pidgin.im>
parents:
15032
diff
changeset
|
683 | } |
|
18a6f6cdce33
[gaim-migrate @ 17758]
Daniel Atallah <datallah@pidgin.im>
parents:
15032
diff
changeset
|
684 | if (gpi == NULL) { |
| 15884 | 685 | if (purple_running_gnome()) |
| 686 | gpi = purple_gnome_proxy_get_info(); | |
|
15041
18a6f6cdce33
[gaim-migrate @ 17758]
Daniel Atallah <datallah@pidgin.im>
parents:
15032
diff
changeset
|
687 | else |
| 15884 | 688 | gpi = purple_global_proxy_get_info(); |
|
15041
18a6f6cdce33
[gaim-migrate @ 17758]
Daniel Atallah <datallah@pidgin.im>
parents:
15032
diff
changeset
|
689 | } |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
690 | |
|
35378
5d9e2581005b
gtk-doc prep: *_get_type() functions are hidden as standard GType-returning funcs, so rename them.
Ankit Vani <a@nevitus.org>
parents:
35265
diff
changeset
|
691 | if (purple_proxy_info_get_proxy_type(gpi) == PURPLE_PROXY_USE_ENVVAR) { |
|
6621
2a18ef3e5224
[gaim-migrate @ 7145]
Robert McQueen <robot101@debian.org>
parents:
6320
diff
changeset
|
692 | if ((tmp = g_getenv("HTTP_PROXY")) != NULL || |
|
2a18ef3e5224
[gaim-migrate @ 7145]
Robert McQueen <robot101@debian.org>
parents:
6320
diff
changeset
|
693 | (tmp = g_getenv("http_proxy")) != NULL || |
|
34219
eee308def583
HTTP: get rid of purple_url_parse
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34218
diff
changeset
|
694 | (tmp = g_getenv("HTTPPROXY")) != NULL) |
|
eee308def583
HTTP: get rid of purple_url_parse
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34218
diff
changeset
|
695 | { |
|
eee308def583
HTTP: get rid of purple_url_parse
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34218
diff
changeset
|
696 | PurpleHttpURL *url; |
|
6621
2a18ef3e5224
[gaim-migrate @ 7145]
Robert McQueen <robot101@debian.org>
parents:
6320
diff
changeset
|
697 | |
| 9129 | 698 | /* http_proxy-format: |
| 9227 | 699 | * 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
|
700 | */ |
|
34219
eee308def583
HTTP: get rid of purple_url_parse
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34218
diff
changeset
|
701 | url = purple_http_url_parse(tmp); |
|
eee308def583
HTTP: get rid of purple_url_parse
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34218
diff
changeset
|
702 | if (!url) { |
|
eee308def583
HTTP: get rid of purple_url_parse
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34218
diff
changeset
|
703 | purple_debug_warning("proxy", "Couldn't parse URL\n"); |
|
eee308def583
HTTP: get rid of purple_url_parse
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34218
diff
changeset
|
704 | return gpi; |
|
7652
d60ba2565661
[gaim-migrate @ 8296]
Björn Voigt <bjoern@cs.tu-berlin.de>
parents:
7475
diff
changeset
|
705 | } |
|
34219
eee308def583
HTTP: get rid of purple_url_parse
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34218
diff
changeset
|
706 | |
|
eee308def583
HTTP: get rid of purple_url_parse
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34218
diff
changeset
|
707 | purple_proxy_info_set_host(gpi, purple_http_url_get_host(url)); |
|
eee308def583
HTTP: get rid of purple_url_parse
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34218
diff
changeset
|
708 | purple_proxy_info_set_username(gpi, purple_http_url_get_username(url)); |
|
eee308def583
HTTP: get rid of purple_url_parse
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34218
diff
changeset
|
709 | purple_proxy_info_set_password(gpi, purple_http_url_get_password(url)); |
|
eee308def583
HTTP: get rid of purple_url_parse
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34218
diff
changeset
|
710 | purple_proxy_info_set_port(gpi, purple_http_url_get_port(url)); |
|
eee308def583
HTTP: get rid of purple_url_parse
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34218
diff
changeset
|
711 | |
|
eee308def583
HTTP: get rid of purple_url_parse
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34218
diff
changeset
|
712 | /* XXX: Do we want to skip this step if user/password/port were part of url? */ |
|
eee308def583
HTTP: get rid of purple_url_parse
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34218
diff
changeset
|
713 | if ((tmp = g_getenv("HTTP_PROXY_USER")) != NULL || |
|
eee308def583
HTTP: get rid of purple_url_parse
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34218
diff
changeset
|
714 | (tmp = g_getenv("http_proxy_user")) != NULL || |
|
eee308def583
HTTP: get rid of purple_url_parse
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34218
diff
changeset
|
715 | (tmp = g_getenv("HTTPPROXYUSER")) != NULL) |
|
eee308def583
HTTP: get rid of purple_url_parse
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34218
diff
changeset
|
716 | purple_proxy_info_set_username(gpi, tmp); |
|
eee308def583
HTTP: get rid of purple_url_parse
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34218
diff
changeset
|
717 | |
|
eee308def583
HTTP: get rid of purple_url_parse
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34218
diff
changeset
|
718 | if ((tmp = g_getenv("HTTP_PROXY_PASS")) != NULL || |
|
eee308def583
HTTP: get rid of purple_url_parse
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34218
diff
changeset
|
719 | (tmp = g_getenv("http_proxy_pass")) != NULL || |
|
eee308def583
HTTP: get rid of purple_url_parse
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34218
diff
changeset
|
720 | (tmp = g_getenv("HTTPPROXYPASS")) != NULL) |
|
eee308def583
HTTP: get rid of purple_url_parse
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34218
diff
changeset
|
721 | purple_proxy_info_set_password(gpi, tmp); |
|
eee308def583
HTTP: get rid of purple_url_parse
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34218
diff
changeset
|
722 | |
|
eee308def583
HTTP: get rid of purple_url_parse
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34218
diff
changeset
|
723 | if ((tmp = g_getenv("HTTP_PROXY_PORT")) != NULL || |
|
eee308def583
HTTP: get rid of purple_url_parse
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34218
diff
changeset
|
724 | (tmp = g_getenv("http_proxy_port")) != NULL || |
|
eee308def583
HTTP: get rid of purple_url_parse
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34218
diff
changeset
|
725 | (tmp = g_getenv("HTTPPROXYPORT")) != NULL) |
|
eee308def583
HTTP: get rid of purple_url_parse
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34218
diff
changeset
|
726 | purple_proxy_info_set_port(gpi, atoi(tmp)); |
|
10534
c28eef1b882a
[gaim-migrate @ 11866]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10320
diff
changeset
|
727 | } else { |
|
24171
d976cc3db118
Add support for reading SOCKS proxy information from the Windows proxy settings.
Daniel Atallah <datallah@pidgin.im>
parents:
24156
diff
changeset
|
728 | #ifdef _WIN32 |
|
d976cc3db118
Add support for reading SOCKS proxy information from the Windows proxy settings.
Daniel Atallah <datallah@pidgin.im>
parents:
24156
diff
changeset
|
729 | PurpleProxyInfo *wgpi; |
|
d976cc3db118
Add support for reading SOCKS proxy information from the Windows proxy settings.
Daniel Atallah <datallah@pidgin.im>
parents:
24156
diff
changeset
|
730 | if ((wgpi = purple_win32_proxy_get_info()) != NULL) |
|
d976cc3db118
Add support for reading SOCKS proxy information from the Windows proxy settings.
Daniel Atallah <datallah@pidgin.im>
parents:
24156
diff
changeset
|
731 | return wgpi; |
|
d976cc3db118
Add support for reading SOCKS proxy information from the Windows proxy settings.
Daniel Atallah <datallah@pidgin.im>
parents:
24156
diff
changeset
|
732 | #endif |
|
10534
c28eef1b882a
[gaim-migrate @ 11866]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10320
diff
changeset
|
733 | /* no proxy environment variable found, don't use a proxy */ |
| 15884 | 734 | purple_debug_info("proxy", "No environment settings found, not using a proxy\n"); |
|
15032
65a111aba7a8
[gaim-migrate @ 17749]
Daniel Atallah <datallah@pidgin.im>
parents:
15015
diff
changeset
|
735 | gpi = tmp_none_proxy_info; |
|
6621
2a18ef3e5224
[gaim-migrate @ 7145]
Robert McQueen <robot101@debian.org>
parents:
6320
diff
changeset
|
736 | } |
|
2a18ef3e5224
[gaim-migrate @ 7145]
Robert McQueen <robot101@debian.org>
parents:
6320
diff
changeset
|
737 | |
|
2a18ef3e5224
[gaim-migrate @ 7145]
Robert McQueen <robot101@debian.org>
parents:
6320
diff
changeset
|
738 | } |
|
2a18ef3e5224
[gaim-migrate @ 7145]
Robert McQueen <robot101@debian.org>
parents:
6320
diff
changeset
|
739 | |
| 13515 | 740 | return gpi; |
| 741 | } | |
| 742 | ||
|
37533
5749c9ff9c82
Add cross-platform duplicate_fd() function to support Gio-ifying proxy.c
Mike Ruprecht <cmaiku@gmail.com>
parents:
37532
diff
changeset
|
743 | /* Grabbed duplicate_fd() from GLib's testcases (gio/tests/socket.c). |
|
5749c9ff9c82
Add cross-platform duplicate_fd() function to support Gio-ifying proxy.c
Mike Ruprecht <cmaiku@gmail.com>
parents:
37532
diff
changeset
|
744 | * Can be dropped once this API has been converted to Gio. |
|
5749c9ff9c82
Add cross-platform duplicate_fd() function to support Gio-ifying proxy.c
Mike Ruprecht <cmaiku@gmail.com>
parents:
37532
diff
changeset
|
745 | */ |
|
5749c9ff9c82
Add cross-platform duplicate_fd() function to support Gio-ifying proxy.c
Mike Ruprecht <cmaiku@gmail.com>
parents:
37532
diff
changeset
|
746 | static int |
|
5749c9ff9c82
Add cross-platform duplicate_fd() function to support Gio-ifying proxy.c
Mike Ruprecht <cmaiku@gmail.com>
parents:
37532
diff
changeset
|
747 | duplicate_fd (int fd) |
|
5749c9ff9c82
Add cross-platform duplicate_fd() function to support Gio-ifying proxy.c
Mike Ruprecht <cmaiku@gmail.com>
parents:
37532
diff
changeset
|
748 | { |
|
5749c9ff9c82
Add cross-platform duplicate_fd() function to support Gio-ifying proxy.c
Mike Ruprecht <cmaiku@gmail.com>
parents:
37532
diff
changeset
|
749 | #ifdef G_OS_WIN32 |
|
5749c9ff9c82
Add cross-platform duplicate_fd() function to support Gio-ifying proxy.c
Mike Ruprecht <cmaiku@gmail.com>
parents:
37532
diff
changeset
|
750 | HANDLE newfd; |
|
5749c9ff9c82
Add cross-platform duplicate_fd() function to support Gio-ifying proxy.c
Mike Ruprecht <cmaiku@gmail.com>
parents:
37532
diff
changeset
|
751 | |
|
5749c9ff9c82
Add cross-platform duplicate_fd() function to support Gio-ifying proxy.c
Mike Ruprecht <cmaiku@gmail.com>
parents:
37532
diff
changeset
|
752 | if (!DuplicateHandle (GetCurrentProcess (), |
|
5749c9ff9c82
Add cross-platform duplicate_fd() function to support Gio-ifying proxy.c
Mike Ruprecht <cmaiku@gmail.com>
parents:
37532
diff
changeset
|
753 | (HANDLE)fd, |
|
5749c9ff9c82
Add cross-platform duplicate_fd() function to support Gio-ifying proxy.c
Mike Ruprecht <cmaiku@gmail.com>
parents:
37532
diff
changeset
|
754 | GetCurrentProcess (), |
|
5749c9ff9c82
Add cross-platform duplicate_fd() function to support Gio-ifying proxy.c
Mike Ruprecht <cmaiku@gmail.com>
parents:
37532
diff
changeset
|
755 | &newfd, |
|
5749c9ff9c82
Add cross-platform duplicate_fd() function to support Gio-ifying proxy.c
Mike Ruprecht <cmaiku@gmail.com>
parents:
37532
diff
changeset
|
756 | 0, |
|
5749c9ff9c82
Add cross-platform duplicate_fd() function to support Gio-ifying proxy.c
Mike Ruprecht <cmaiku@gmail.com>
parents:
37532
diff
changeset
|
757 | FALSE, |
|
5749c9ff9c82
Add cross-platform duplicate_fd() function to support Gio-ifying proxy.c
Mike Ruprecht <cmaiku@gmail.com>
parents:
37532
diff
changeset
|
758 | DUPLICATE_SAME_ACCESS)) |
|
5749c9ff9c82
Add cross-platform duplicate_fd() function to support Gio-ifying proxy.c
Mike Ruprecht <cmaiku@gmail.com>
parents:
37532
diff
changeset
|
759 | { |
|
5749c9ff9c82
Add cross-platform duplicate_fd() function to support Gio-ifying proxy.c
Mike Ruprecht <cmaiku@gmail.com>
parents:
37532
diff
changeset
|
760 | return -1; |
|
5749c9ff9c82
Add cross-platform duplicate_fd() function to support Gio-ifying proxy.c
Mike Ruprecht <cmaiku@gmail.com>
parents:
37532
diff
changeset
|
761 | } |
|
5749c9ff9c82
Add cross-platform duplicate_fd() function to support Gio-ifying proxy.c
Mike Ruprecht <cmaiku@gmail.com>
parents:
37532
diff
changeset
|
762 | |
|
5749c9ff9c82
Add cross-platform duplicate_fd() function to support Gio-ifying proxy.c
Mike Ruprecht <cmaiku@gmail.com>
parents:
37532
diff
changeset
|
763 | return (int)newfd; |
|
5749c9ff9c82
Add cross-platform duplicate_fd() function to support Gio-ifying proxy.c
Mike Ruprecht <cmaiku@gmail.com>
parents:
37532
diff
changeset
|
764 | #else |
|
5749c9ff9c82
Add cross-platform duplicate_fd() function to support Gio-ifying proxy.c
Mike Ruprecht <cmaiku@gmail.com>
parents:
37532
diff
changeset
|
765 | return dup (fd); |
|
5749c9ff9c82
Add cross-platform duplicate_fd() function to support Gio-ifying proxy.c
Mike Ruprecht <cmaiku@gmail.com>
parents:
37532
diff
changeset
|
766 | #endif |
|
5749c9ff9c82
Add cross-platform duplicate_fd() function to support Gio-ifying proxy.c
Mike Ruprecht <cmaiku@gmail.com>
parents:
37532
diff
changeset
|
767 | } |
|
5749c9ff9c82
Add cross-platform duplicate_fd() function to support Gio-ifying proxy.c
Mike Ruprecht <cmaiku@gmail.com>
parents:
37532
diff
changeset
|
768 | /* End function grabbed from GLib */ |
|
5749c9ff9c82
Add cross-platform duplicate_fd() function to support Gio-ifying proxy.c
Mike Ruprecht <cmaiku@gmail.com>
parents:
37532
diff
changeset
|
769 | |
|
37535
447036b8779a
Port purple_proxy_connect() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37534
diff
changeset
|
770 | static void |
|
447036b8779a
Port purple_proxy_connect() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37534
diff
changeset
|
771 | connect_to_host_cb(GObject *source, GAsyncResult *res, gpointer user_data) |
|
447036b8779a
Port purple_proxy_connect() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37534
diff
changeset
|
772 | { |
|
447036b8779a
Port purple_proxy_connect() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37534
diff
changeset
|
773 | PurpleProxyConnectData *connect_data = user_data; |
|
447036b8779a
Port purple_proxy_connect() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37534
diff
changeset
|
774 | GSocketConnection *conn; |
|
447036b8779a
Port purple_proxy_connect() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37534
diff
changeset
|
775 | GError *error = NULL; |
|
447036b8779a
Port purple_proxy_connect() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37534
diff
changeset
|
776 | GSocket *socket; |
|
447036b8779a
Port purple_proxy_connect() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37534
diff
changeset
|
777 | |
|
447036b8779a
Port purple_proxy_connect() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37534
diff
changeset
|
778 | conn = g_socket_client_connect_to_host_finish(G_SOCKET_CLIENT(source), |
|
447036b8779a
Port purple_proxy_connect() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37534
diff
changeset
|
779 | res, &error); |
|
447036b8779a
Port purple_proxy_connect() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37534
diff
changeset
|
780 | if (conn == NULL) { |
|
447036b8779a
Port purple_proxy_connect() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37534
diff
changeset
|
781 | purple_debug_error("proxy", |
|
447036b8779a
Port purple_proxy_connect() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37534
diff
changeset
|
782 | "Unable to connect to destination host: %s\n", |
|
447036b8779a
Port purple_proxy_connect() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37534
diff
changeset
|
783 | error->message); |
|
447036b8779a
Port purple_proxy_connect() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37534
diff
changeset
|
784 | purple_proxy_connect_data_disconnect(connect_data, |
|
447036b8779a
Port purple_proxy_connect() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37534
diff
changeset
|
785 | "Unable to connect to destination host.\n"); |
|
447036b8779a
Port purple_proxy_connect() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37534
diff
changeset
|
786 | g_clear_error(&error); |
|
447036b8779a
Port purple_proxy_connect() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37534
diff
changeset
|
787 | return; |
|
447036b8779a
Port purple_proxy_connect() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37534
diff
changeset
|
788 | } |
|
447036b8779a
Port purple_proxy_connect() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37534
diff
changeset
|
789 | |
|
447036b8779a
Port purple_proxy_connect() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37534
diff
changeset
|
790 | socket = g_socket_connection_get_socket(conn); |
|
447036b8779a
Port purple_proxy_connect() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37534
diff
changeset
|
791 | g_assert(socket != NULL); |
|
447036b8779a
Port purple_proxy_connect() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37534
diff
changeset
|
792 | |
|
447036b8779a
Port purple_proxy_connect() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37534
diff
changeset
|
793 | /* Duplicate the file descriptor, and then free the connection. |
|
447036b8779a
Port purple_proxy_connect() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37534
diff
changeset
|
794 | * libpurple's proxy code doesn't keep an object around for the |
|
447036b8779a
Port purple_proxy_connect() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37534
diff
changeset
|
795 | * lifetime of the connection. Therefore, in order to not leak |
|
447036b8779a
Port purple_proxy_connect() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37534
diff
changeset
|
796 | * memory, the GSocketConnection must be freed here. In order |
|
447036b8779a
Port purple_proxy_connect() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37534
diff
changeset
|
797 | * to avoid the double close/free of the file descriptor, the |
|
447036b8779a
Port purple_proxy_connect() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37534
diff
changeset
|
798 | * file descriptor is duplicated. |
|
447036b8779a
Port purple_proxy_connect() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37534
diff
changeset
|
799 | */ |
|
447036b8779a
Port purple_proxy_connect() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37534
diff
changeset
|
800 | connect_data->fd = duplicate_fd(g_socket_get_fd(socket)); |
|
447036b8779a
Port purple_proxy_connect() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37534
diff
changeset
|
801 | g_object_unref(conn); |
|
447036b8779a
Port purple_proxy_connect() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37534
diff
changeset
|
802 | |
|
447036b8779a
Port purple_proxy_connect() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37534
diff
changeset
|
803 | purple_proxy_connect_data_connected(connect_data); |
|
447036b8779a
Port purple_proxy_connect() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37534
diff
changeset
|
804 | } |
|
447036b8779a
Port purple_proxy_connect() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37534
diff
changeset
|
805 | |
| 15884 | 806 | PurpleProxyConnectData * |
| 807 | purple_proxy_connect(void *handle, PurpleAccount *account, | |
|
14899
c65f0b4fb351
[gaim-migrate @ 17606]
Mark Doliner <markdoliner@pidgin.im>
parents:
14536
diff
changeset
|
808 | const char *host, int port, |
| 15884 | 809 | PurpleProxyConnectFunction connect_cb, gpointer data) |
| 13515 | 810 | { |
| 15884 | 811 | PurpleProxyConnectData *connect_data; |
|
37535
447036b8779a
Port purple_proxy_connect() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37534
diff
changeset
|
812 | GProxyResolver *resolver; |
|
447036b8779a
Port purple_proxy_connect() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37534
diff
changeset
|
813 | GSocketClient *client; |
| 13515 | 814 | |
|
14151
34427f138b1f
[gaim-migrate @ 16712]
Mark Doliner <markdoliner@pidgin.im>
parents:
14097
diff
changeset
|
815 | g_return_val_if_fail(host != NULL, NULL); |
|
34427f138b1f
[gaim-migrate @ 16712]
Mark Doliner <markdoliner@pidgin.im>
parents:
14097
diff
changeset
|
816 | g_return_val_if_fail(port > 0, NULL); |
|
34427f138b1f
[gaim-migrate @ 16712]
Mark Doliner <markdoliner@pidgin.im>
parents:
14097
diff
changeset
|
817 | g_return_val_if_fail(connect_cb != NULL, NULL); |
| 13515 | 818 | |
| 15884 | 819 | connect_data = g_new0(PurpleProxyConnectData, 1); |
|
14324
8cbedd82b6ac
[gaim-migrate @ 16944]
Mark Doliner <markdoliner@pidgin.im>
parents:
14300
diff
changeset
|
820 | connect_data->fd = -1; |
|
27249
3f5b531ae0b3
Add purple_proxy_connect_udp. Closes #6589.
Hu Yong <ccpaging@gmail.com>
parents:
25911
diff
changeset
|
821 | connect_data->socket_type = SOCK_STREAM; |
|
14899
c65f0b4fb351
[gaim-migrate @ 17606]
Mark Doliner <markdoliner@pidgin.im>
parents:
14536
diff
changeset
|
822 | connect_data->handle = handle; |
|
14324
8cbedd82b6ac
[gaim-migrate @ 16944]
Mark Doliner <markdoliner@pidgin.im>
parents:
14300
diff
changeset
|
823 | connect_data->connect_cb = connect_cb; |
|
8cbedd82b6ac
[gaim-migrate @ 16944]
Mark Doliner <markdoliner@pidgin.im>
parents:
14300
diff
changeset
|
824 | connect_data->data = data; |
|
8cbedd82b6ac
[gaim-migrate @ 16944]
Mark Doliner <markdoliner@pidgin.im>
parents:
14300
diff
changeset
|
825 | connect_data->host = g_strdup(host); |
|
8cbedd82b6ac
[gaim-migrate @ 16944]
Mark Doliner <markdoliner@pidgin.im>
parents:
14300
diff
changeset
|
826 | connect_data->port = port; |
| 15884 | 827 | connect_data->gpi = purple_proxy_get_setup(account); |
|
31678
ad8a9a266b05
Add new DNS-related API to perform lookups in the context of an account.
Daniel Atallah <datallah@pidgin.im>
parents:
31677
diff
changeset
|
828 | connect_data->account = account; |
| 13515 | 829 | |
|
37535
447036b8779a
Port purple_proxy_connect() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37534
diff
changeset
|
830 | resolver = purple_proxy_get_proxy_resolver(account); |
|
447036b8779a
Port purple_proxy_connect() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37534
diff
changeset
|
831 | |
|
447036b8779a
Port purple_proxy_connect() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37534
diff
changeset
|
832 | if (resolver == NULL) { |
|
447036b8779a
Port purple_proxy_connect() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37534
diff
changeset
|
833 | /* purple_proxy_get_proxy_resolver already has debug output */ |
| 15884 | 834 | purple_proxy_connect_data_destroy(connect_data); |
|
14151
34427f138b1f
[gaim-migrate @ 16712]
Mark Doliner <markdoliner@pidgin.im>
parents:
14097
diff
changeset
|
835 | return NULL; |
|
1840
770bc15f419c
[gaim-migrate @ 1850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1705
diff
changeset
|
836 | } |
|
4366
d2b52a5ff6fc
[gaim-migrate @ 4632]
Nicolás Lichtmaier <nico@lichtmaier.com.ar>
parents:
3867
diff
changeset
|
837 | |
|
37451
927a083a6c9f
This probably doesn't work, but it compiles (for now)
Gary Kramlich <grim@reaperworld.com>
parents:
37193
diff
changeset
|
838 | connect_data->cancellable = g_cancellable_new(); |
|
927a083a6c9f
This probably doesn't work, but it compiles (for now)
Gary Kramlich <grim@reaperworld.com>
parents:
37193
diff
changeset
|
839 | |
|
37535
447036b8779a
Port purple_proxy_connect() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37534
diff
changeset
|
840 | client = g_socket_client_new(); |
|
447036b8779a
Port purple_proxy_connect() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37534
diff
changeset
|
841 | g_socket_client_set_proxy_resolver(client, resolver); |
|
37518
53c9ebedf2b7
Plug g_resolver_get_default() leaks
Mike Ruprecht <cmaiku@gmail.com>
parents:
37517
diff
changeset
|
842 | g_object_unref(resolver); |
|
37451
927a083a6c9f
This probably doesn't work, but it compiles (for now)
Gary Kramlich <grim@reaperworld.com>
parents:
37193
diff
changeset
|
843 | |
|
37535
447036b8779a
Port purple_proxy_connect() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37534
diff
changeset
|
844 | purple_debug_info("proxy", "Attempting connection to %s:%u\n", |
|
447036b8779a
Port purple_proxy_connect() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37534
diff
changeset
|
845 | host, port); |
|
447036b8779a
Port purple_proxy_connect() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37534
diff
changeset
|
846 | |
|
447036b8779a
Port purple_proxy_connect() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37534
diff
changeset
|
847 | g_socket_client_connect_to_host_async(client, host, port, |
|
447036b8779a
Port purple_proxy_connect() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37534
diff
changeset
|
848 | connect_data->cancellable, connect_to_host_cb, |
|
447036b8779a
Port purple_proxy_connect() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37534
diff
changeset
|
849 | connect_data); |
|
447036b8779a
Port purple_proxy_connect() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37534
diff
changeset
|
850 | g_object_unref(client); |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
851 | |
|
14899
c65f0b4fb351
[gaim-migrate @ 17606]
Mark Doliner <markdoliner@pidgin.im>
parents:
14536
diff
changeset
|
852 | handles = g_slist_prepend(handles, connect_data); |
|
14151
34427f138b1f
[gaim-migrate @ 16712]
Mark Doliner <markdoliner@pidgin.im>
parents:
14097
diff
changeset
|
853 | |
|
14324
8cbedd82b6ac
[gaim-migrate @ 16944]
Mark Doliner <markdoliner@pidgin.im>
parents:
14300
diff
changeset
|
854 | return connect_data; |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
855 | } |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
856 | |
|
37534
355492f1084d
Port purple_proxy_connect_socks5_account() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37533
diff
changeset
|
857 | static void |
|
355492f1084d
Port purple_proxy_connect_socks5_account() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37533
diff
changeset
|
858 | socks5_proxy_connect_cb(GObject *source, GAsyncResult *res, gpointer user_data) |
|
355492f1084d
Port purple_proxy_connect_socks5_account() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37533
diff
changeset
|
859 | { |
|
355492f1084d
Port purple_proxy_connect_socks5_account() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37533
diff
changeset
|
860 | PurpleProxyConnectData *connect_data = user_data; |
|
355492f1084d
Port purple_proxy_connect_socks5_account() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37533
diff
changeset
|
861 | GIOStream *stream; |
|
355492f1084d
Port purple_proxy_connect_socks5_account() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37533
diff
changeset
|
862 | GError *error = NULL; |
|
355492f1084d
Port purple_proxy_connect_socks5_account() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37533
diff
changeset
|
863 | GSocket *socket; |
|
355492f1084d
Port purple_proxy_connect_socks5_account() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37533
diff
changeset
|
864 | |
|
355492f1084d
Port purple_proxy_connect_socks5_account() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37533
diff
changeset
|
865 | stream = g_proxy_connect_finish(G_PROXY(source), res, &error); |
|
355492f1084d
Port purple_proxy_connect_socks5_account() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37533
diff
changeset
|
866 | |
|
355492f1084d
Port purple_proxy_connect_socks5_account() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37533
diff
changeset
|
867 | if (stream == NULL) { |
|
355492f1084d
Port purple_proxy_connect_socks5_account() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37533
diff
changeset
|
868 | purple_debug_error("proxy", |
|
355492f1084d
Port purple_proxy_connect_socks5_account() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37533
diff
changeset
|
869 | "Unable to connect to destination host: %s\n", |
|
355492f1084d
Port purple_proxy_connect_socks5_account() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37533
diff
changeset
|
870 | error->message); |
|
355492f1084d
Port purple_proxy_connect_socks5_account() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37533
diff
changeset
|
871 | purple_proxy_connect_data_disconnect(connect_data, |
|
355492f1084d
Port purple_proxy_connect_socks5_account() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37533
diff
changeset
|
872 | "Unable to connecto to destination host.\n"); |
|
355492f1084d
Port purple_proxy_connect_socks5_account() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37533
diff
changeset
|
873 | g_clear_error(&error); |
|
355492f1084d
Port purple_proxy_connect_socks5_account() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37533
diff
changeset
|
874 | return; |
|
355492f1084d
Port purple_proxy_connect_socks5_account() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37533
diff
changeset
|
875 | } |
|
355492f1084d
Port purple_proxy_connect_socks5_account() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37533
diff
changeset
|
876 | |
|
355492f1084d
Port purple_proxy_connect_socks5_account() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37533
diff
changeset
|
877 | if (!G_IS_SOCKET_CONNECTION(stream)) { |
|
355492f1084d
Port purple_proxy_connect_socks5_account() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37533
diff
changeset
|
878 | purple_debug_error("proxy", |
|
355492f1084d
Port purple_proxy_connect_socks5_account() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37533
diff
changeset
|
879 | "GProxy didn't return a GSocketConnection.\n"); |
|
355492f1084d
Port purple_proxy_connect_socks5_account() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37533
diff
changeset
|
880 | purple_proxy_connect_data_disconnect(connect_data, |
|
355492f1084d
Port purple_proxy_connect_socks5_account() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37533
diff
changeset
|
881 | "GProxy didn't return a GSocketConnection.\n"); |
|
355492f1084d
Port purple_proxy_connect_socks5_account() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37533
diff
changeset
|
882 | g_object_unref(stream); |
|
355492f1084d
Port purple_proxy_connect_socks5_account() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37533
diff
changeset
|
883 | return; |
|
355492f1084d
Port purple_proxy_connect_socks5_account() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37533
diff
changeset
|
884 | } |
|
355492f1084d
Port purple_proxy_connect_socks5_account() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37533
diff
changeset
|
885 | |
|
355492f1084d
Port purple_proxy_connect_socks5_account() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37533
diff
changeset
|
886 | socket = g_socket_connection_get_socket(G_SOCKET_CONNECTION(stream)); |
|
355492f1084d
Port purple_proxy_connect_socks5_account() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37533
diff
changeset
|
887 | |
|
355492f1084d
Port purple_proxy_connect_socks5_account() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37533
diff
changeset
|
888 | /* Duplicate the file descriptor, and then free the connection. |
|
355492f1084d
Port purple_proxy_connect_socks5_account() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37533
diff
changeset
|
889 | * libpurple's proxy code doesn't keep an object around for the |
|
355492f1084d
Port purple_proxy_connect_socks5_account() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37533
diff
changeset
|
890 | * lifetime of the connection. Therefore, in order to not leak |
|
355492f1084d
Port purple_proxy_connect_socks5_account() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37533
diff
changeset
|
891 | * memory, the GSocketConnection (aka GIOStream here) must be |
|
355492f1084d
Port purple_proxy_connect_socks5_account() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37533
diff
changeset
|
892 | * freed here. In order to avoid the double close/free of the |
|
355492f1084d
Port purple_proxy_connect_socks5_account() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37533
diff
changeset
|
893 | * file descriptor, the file descriptor is duplicated. |
|
355492f1084d
Port purple_proxy_connect_socks5_account() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37533
diff
changeset
|
894 | */ |
|
355492f1084d
Port purple_proxy_connect_socks5_account() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37533
diff
changeset
|
895 | connect_data->fd = duplicate_fd(g_socket_get_fd(socket)); |
|
355492f1084d
Port purple_proxy_connect_socks5_account() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37533
diff
changeset
|
896 | g_object_unref(stream); |
|
355492f1084d
Port purple_proxy_connect_socks5_account() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37533
diff
changeset
|
897 | |
|
355492f1084d
Port purple_proxy_connect_socks5_account() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37533
diff
changeset
|
898 | purple_proxy_connect_data_connected(connect_data); |
|
355492f1084d
Port purple_proxy_connect_socks5_account() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37533
diff
changeset
|
899 | } |
|
355492f1084d
Port purple_proxy_connect_socks5_account() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37533
diff
changeset
|
900 | |
|
31742
e6eb15f2734b
proxy: Use account proxy when making standalone SOCKS5 connections.
Daniel Atallah <datallah@pidgin.im>
parents:
31678
diff
changeset
|
901 | /* This is called when we connect to the SOCKS5 proxy server (through any |
|
e6eb15f2734b
proxy: Use account proxy when making standalone SOCKS5 connections.
Daniel Atallah <datallah@pidgin.im>
parents:
31678
diff
changeset
|
902 | * relevant account proxy) |
|
e6eb15f2734b
proxy: Use account proxy when making standalone SOCKS5 connections.
Daniel Atallah <datallah@pidgin.im>
parents:
31678
diff
changeset
|
903 | */ |
|
37534
355492f1084d
Port purple_proxy_connect_socks5_account() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37533
diff
changeset
|
904 | static void |
|
355492f1084d
Port purple_proxy_connect_socks5_account() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37533
diff
changeset
|
905 | socks5_connect_to_host_cb(GObject *source, GAsyncResult *res, |
|
355492f1084d
Port purple_proxy_connect_socks5_account() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37533
diff
changeset
|
906 | gpointer user_data) |
|
355492f1084d
Port purple_proxy_connect_socks5_account() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37533
diff
changeset
|
907 | { |
|
355492f1084d
Port purple_proxy_connect_socks5_account() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37533
diff
changeset
|
908 | PurpleProxyConnectData *connect_data = user_data; |
|
355492f1084d
Port purple_proxy_connect_socks5_account() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37533
diff
changeset
|
909 | GSocketConnection *conn; |
|
355492f1084d
Port purple_proxy_connect_socks5_account() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37533
diff
changeset
|
910 | GError *error = NULL; |
|
355492f1084d
Port purple_proxy_connect_socks5_account() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37533
diff
changeset
|
911 | GProxy *proxy; |
|
355492f1084d
Port purple_proxy_connect_socks5_account() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37533
diff
changeset
|
912 | PurpleProxyInfo *info; |
|
355492f1084d
Port purple_proxy_connect_socks5_account() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37533
diff
changeset
|
913 | GSocketAddress *addr; |
|
355492f1084d
Port purple_proxy_connect_socks5_account() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37533
diff
changeset
|
914 | GInetSocketAddress *inet_addr; |
|
355492f1084d
Port purple_proxy_connect_socks5_account() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37533
diff
changeset
|
915 | GSocketAddress *proxy_addr; |
|
355492f1084d
Port purple_proxy_connect_socks5_account() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37533
diff
changeset
|
916 | |
|
355492f1084d
Port purple_proxy_connect_socks5_account() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37533
diff
changeset
|
917 | conn = g_socket_client_connect_to_host_finish(G_SOCKET_CLIENT(source), |
|
355492f1084d
Port purple_proxy_connect_socks5_account() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37533
diff
changeset
|
918 | res, &error); |
|
355492f1084d
Port purple_proxy_connect_socks5_account() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37533
diff
changeset
|
919 | if (conn == NULL) { |
|
355492f1084d
Port purple_proxy_connect_socks5_account() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37533
diff
changeset
|
920 | purple_debug_error("proxy", |
|
355492f1084d
Port purple_proxy_connect_socks5_account() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37533
diff
changeset
|
921 | "Unable to connect to SOCKS5 host: %s\n", |
|
355492f1084d
Port purple_proxy_connect_socks5_account() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37533
diff
changeset
|
922 | error->message); |
|
355492f1084d
Port purple_proxy_connect_socks5_account() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37533
diff
changeset
|
923 | purple_proxy_connect_data_disconnect(connect_data, |
|
355492f1084d
Port purple_proxy_connect_socks5_account() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37533
diff
changeset
|
924 | "Unable to connect to SOCKS5 host.\n"); |
|
355492f1084d
Port purple_proxy_connect_socks5_account() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37533
diff
changeset
|
925 | g_clear_error(&error); |
|
31742
e6eb15f2734b
proxy: Use account proxy when making standalone SOCKS5 connections.
Daniel Atallah <datallah@pidgin.im>
parents:
31678
diff
changeset
|
926 | return; |
|
32129
5f9d676cefdb
Fix a possible XMPP remote crash
Mark Doliner <markdoliner@pidgin.im>
parents:
32070
diff
changeset
|
927 | } |
|
5f9d676cefdb
Fix a possible XMPP remote crash
Mark Doliner <markdoliner@pidgin.im>
parents:
32070
diff
changeset
|
928 | |
|
37534
355492f1084d
Port purple_proxy_connect_socks5_account() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37533
diff
changeset
|
929 | proxy = g_proxy_get_default_for_protocol("socks5"); |
|
355492f1084d
Port purple_proxy_connect_socks5_account() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37533
diff
changeset
|
930 | if (proxy == NULL) { |
|
355492f1084d
Port purple_proxy_connect_socks5_account() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37533
diff
changeset
|
931 | purple_debug_error("proxy", "SOCKS5 proxy backend missing.\n"); |
|
355492f1084d
Port purple_proxy_connect_socks5_account() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37533
diff
changeset
|
932 | purple_proxy_connect_data_disconnect(connect_data, |
|
355492f1084d
Port purple_proxy_connect_socks5_account() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37533
diff
changeset
|
933 | "SOCKS5 proxy backend missing.\n"); |
|
355492f1084d
Port purple_proxy_connect_socks5_account() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37533
diff
changeset
|
934 | g_object_unref(conn); |
|
31742
e6eb15f2734b
proxy: Use account proxy when making standalone SOCKS5 connections.
Daniel Atallah <datallah@pidgin.im>
parents:
31678
diff
changeset
|
935 | return; |
|
e6eb15f2734b
proxy: Use account proxy when making standalone SOCKS5 connections.
Daniel Atallah <datallah@pidgin.im>
parents:
31678
diff
changeset
|
936 | } |
|
e6eb15f2734b
proxy: Use account proxy when making standalone SOCKS5 connections.
Daniel Atallah <datallah@pidgin.im>
parents:
31678
diff
changeset
|
937 | |
|
37534
355492f1084d
Port purple_proxy_connect_socks5_account() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37533
diff
changeset
|
938 | info = connect_data->gpi; |
|
355492f1084d
Port purple_proxy_connect_socks5_account() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37533
diff
changeset
|
939 | |
|
355492f1084d
Port purple_proxy_connect_socks5_account() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37533
diff
changeset
|
940 | addr = g_socket_connection_get_remote_address(conn, &error); |
|
355492f1084d
Port purple_proxy_connect_socks5_account() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37533
diff
changeset
|
941 | if (addr == NULL) { |
|
355492f1084d
Port purple_proxy_connect_socks5_account() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37533
diff
changeset
|
942 | purple_debug_error("proxy", "Unable to retrieve SOCKS5 host " |
|
355492f1084d
Port purple_proxy_connect_socks5_account() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37533
diff
changeset
|
943 | "address from connection: %s\n", |
|
355492f1084d
Port purple_proxy_connect_socks5_account() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37533
diff
changeset
|
944 | error->message); |
|
355492f1084d
Port purple_proxy_connect_socks5_account() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37533
diff
changeset
|
945 | purple_proxy_connect_data_disconnect(connect_data, |
|
355492f1084d
Port purple_proxy_connect_socks5_account() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37533
diff
changeset
|
946 | "Unable to retrieve SOCKS5 host address from " |
|
355492f1084d
Port purple_proxy_connect_socks5_account() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37533
diff
changeset
|
947 | "connection"); |
|
355492f1084d
Port purple_proxy_connect_socks5_account() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37533
diff
changeset
|
948 | g_object_unref(conn); |
|
355492f1084d
Port purple_proxy_connect_socks5_account() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37533
diff
changeset
|
949 | g_object_unref(proxy); |
|
355492f1084d
Port purple_proxy_connect_socks5_account() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37533
diff
changeset
|
950 | g_clear_error(&error); |
|
355492f1084d
Port purple_proxy_connect_socks5_account() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37533
diff
changeset
|
951 | return; |
|
355492f1084d
Port purple_proxy_connect_socks5_account() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37533
diff
changeset
|
952 | } |
|
355492f1084d
Port purple_proxy_connect_socks5_account() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37533
diff
changeset
|
953 | |
|
355492f1084d
Port purple_proxy_connect_socks5_account() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37533
diff
changeset
|
954 | inet_addr = G_INET_SOCKET_ADDRESS(addr); |
|
355492f1084d
Port purple_proxy_connect_socks5_account() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37533
diff
changeset
|
955 | |
|
355492f1084d
Port purple_proxy_connect_socks5_account() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37533
diff
changeset
|
956 | proxy_addr = g_proxy_address_new( |
|
355492f1084d
Port purple_proxy_connect_socks5_account() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37533
diff
changeset
|
957 | g_inet_socket_address_get_address(inet_addr), |
|
355492f1084d
Port purple_proxy_connect_socks5_account() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37533
diff
changeset
|
958 | g_inet_socket_address_get_port(inet_addr), |
|
355492f1084d
Port purple_proxy_connect_socks5_account() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37533
diff
changeset
|
959 | "socks5", connect_data->host, connect_data->port, |
|
355492f1084d
Port purple_proxy_connect_socks5_account() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37533
diff
changeset
|
960 | purple_proxy_info_get_username(info), |
|
355492f1084d
Port purple_proxy_connect_socks5_account() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37533
diff
changeset
|
961 | purple_proxy_info_get_password(info)); |
|
355492f1084d
Port purple_proxy_connect_socks5_account() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37533
diff
changeset
|
962 | g_object_unref(inet_addr); |
|
355492f1084d
Port purple_proxy_connect_socks5_account() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37533
diff
changeset
|
963 | |
|
31742
e6eb15f2734b
proxy: Use account proxy when making standalone SOCKS5 connections.
Daniel Atallah <datallah@pidgin.im>
parents:
31678
diff
changeset
|
964 | purple_debug_info("proxy", "Initiating SOCKS5 negotiation.\n"); |
|
e6eb15f2734b
proxy: Use account proxy when making standalone SOCKS5 connections.
Daniel Atallah <datallah@pidgin.im>
parents:
31678
diff
changeset
|
965 | |
|
e6eb15f2734b
proxy: Use account proxy when making standalone SOCKS5 connections.
Daniel Atallah <datallah@pidgin.im>
parents:
31678
diff
changeset
|
966 | purple_debug_info("proxy", |
|
e6eb15f2734b
proxy: Use account proxy when making standalone SOCKS5 connections.
Daniel Atallah <datallah@pidgin.im>
parents:
31678
diff
changeset
|
967 | "Connecting to %s:%d via %s:%d using SOCKS5\n", |
|
e6eb15f2734b
proxy: Use account proxy when making standalone SOCKS5 connections.
Daniel Atallah <datallah@pidgin.im>
parents:
31678
diff
changeset
|
968 | connect_data->host, connect_data->port, |
|
e6eb15f2734b
proxy: Use account proxy when making standalone SOCKS5 connections.
Daniel Atallah <datallah@pidgin.im>
parents:
31678
diff
changeset
|
969 | purple_proxy_info_get_host(connect_data->gpi), |
|
e6eb15f2734b
proxy: Use account proxy when making standalone SOCKS5 connections.
Daniel Atallah <datallah@pidgin.im>
parents:
31678
diff
changeset
|
970 | purple_proxy_info_get_port(connect_data->gpi)); |
|
e6eb15f2734b
proxy: Use account proxy when making standalone SOCKS5 connections.
Daniel Atallah <datallah@pidgin.im>
parents:
31678
diff
changeset
|
971 | |
|
37534
355492f1084d
Port purple_proxy_connect_socks5_account() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37533
diff
changeset
|
972 | g_proxy_connect_async(proxy, G_IO_STREAM(conn), |
|
355492f1084d
Port purple_proxy_connect_socks5_account() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37533
diff
changeset
|
973 | G_PROXY_ADDRESS(proxy_addr), |
|
355492f1084d
Port purple_proxy_connect_socks5_account() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37533
diff
changeset
|
974 | connect_data->cancellable, |
|
355492f1084d
Port purple_proxy_connect_socks5_account() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37533
diff
changeset
|
975 | socks5_proxy_connect_cb, connect_data); |
|
355492f1084d
Port purple_proxy_connect_socks5_account() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37533
diff
changeset
|
976 | g_object_unref(proxy_addr); |
|
355492f1084d
Port purple_proxy_connect_socks5_account() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37533
diff
changeset
|
977 | g_object_unref(conn); |
|
355492f1084d
Port purple_proxy_connect_socks5_account() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37533
diff
changeset
|
978 | g_object_unref(proxy); |
|
31742
e6eb15f2734b
proxy: Use account proxy when making standalone SOCKS5 connections.
Daniel Atallah <datallah@pidgin.im>
parents:
31678
diff
changeset
|
979 | } |
|
e6eb15f2734b
proxy: Use account proxy when making standalone SOCKS5 connections.
Daniel Atallah <datallah@pidgin.im>
parents:
31678
diff
changeset
|
980 | |
|
31678
ad8a9a266b05
Add new DNS-related API to perform lookups in the context of an account.
Daniel Atallah <datallah@pidgin.im>
parents:
31677
diff
changeset
|
981 | /* |
|
ad8a9a266b05
Add new DNS-related API to perform lookups in the context of an account.
Daniel Atallah <datallah@pidgin.im>
parents:
31677
diff
changeset
|
982 | * Combine some of this code with purple_proxy_connect() |
|
ad8a9a266b05
Add new DNS-related API to perform lookups in the context of an account.
Daniel Atallah <datallah@pidgin.im>
parents:
31677
diff
changeset
|
983 | */ |
|
ad8a9a266b05
Add new DNS-related API to perform lookups in the context of an account.
Daniel Atallah <datallah@pidgin.im>
parents:
31677
diff
changeset
|
984 | PurpleProxyConnectData * |
|
ad8a9a266b05
Add new DNS-related API to perform lookups in the context of an account.
Daniel Atallah <datallah@pidgin.im>
parents:
31677
diff
changeset
|
985 | purple_proxy_connect_socks5_account(void *handle, PurpleAccount *account, |
|
ad8a9a266b05
Add new DNS-related API to perform lookups in the context of an account.
Daniel Atallah <datallah@pidgin.im>
parents:
31677
diff
changeset
|
986 | PurpleProxyInfo *gpi, |
|
ad8a9a266b05
Add new DNS-related API to perform lookups in the context of an account.
Daniel Atallah <datallah@pidgin.im>
parents:
31677
diff
changeset
|
987 | const char *host, int port, |
|
ad8a9a266b05
Add new DNS-related API to perform lookups in the context of an account.
Daniel Atallah <datallah@pidgin.im>
parents:
31677
diff
changeset
|
988 | PurpleProxyConnectFunction connect_cb, |
|
ad8a9a266b05
Add new DNS-related API to perform lookups in the context of an account.
Daniel Atallah <datallah@pidgin.im>
parents:
31677
diff
changeset
|
989 | gpointer data) |
|
ad8a9a266b05
Add new DNS-related API to perform lookups in the context of an account.
Daniel Atallah <datallah@pidgin.im>
parents:
31677
diff
changeset
|
990 | { |
| 15884 | 991 | PurpleProxyConnectData *connect_data; |
|
37534
355492f1084d
Port purple_proxy_connect_socks5_account() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37533
diff
changeset
|
992 | GProxyResolver *resolver; |
|
355492f1084d
Port purple_proxy_connect_socks5_account() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37533
diff
changeset
|
993 | GSocketClient *client; |
| 8262 | 994 | |
|
14151
34427f138b1f
[gaim-migrate @ 16712]
Mark Doliner <markdoliner@pidgin.im>
parents:
14097
diff
changeset
|
995 | g_return_val_if_fail(host != NULL, NULL); |
| 15015 | 996 | g_return_val_if_fail(port >= 0, NULL); |
|
14151
34427f138b1f
[gaim-migrate @ 16712]
Mark Doliner <markdoliner@pidgin.im>
parents:
14097
diff
changeset
|
997 | g_return_val_if_fail(connect_cb != NULL, NULL); |
|
34427f138b1f
[gaim-migrate @ 16712]
Mark Doliner <markdoliner@pidgin.im>
parents:
14097
diff
changeset
|
998 | |
| 15884 | 999 | connect_data = g_new0(PurpleProxyConnectData, 1); |
|
14324
8cbedd82b6ac
[gaim-migrate @ 16944]
Mark Doliner <markdoliner@pidgin.im>
parents:
14300
diff
changeset
|
1000 | connect_data->fd = -1; |
|
27249
3f5b531ae0b3
Add purple_proxy_connect_udp. Closes #6589.
Hu Yong <ccpaging@gmail.com>
parents:
25911
diff
changeset
|
1001 | connect_data->socket_type = SOCK_STREAM; |
|
14899
c65f0b4fb351
[gaim-migrate @ 17606]
Mark Doliner <markdoliner@pidgin.im>
parents:
14536
diff
changeset
|
1002 | connect_data->handle = handle; |
|
14324
8cbedd82b6ac
[gaim-migrate @ 16944]
Mark Doliner <markdoliner@pidgin.im>
parents:
14300
diff
changeset
|
1003 | connect_data->connect_cb = connect_cb; |
|
8cbedd82b6ac
[gaim-migrate @ 16944]
Mark Doliner <markdoliner@pidgin.im>
parents:
14300
diff
changeset
|
1004 | connect_data->data = data; |
|
8cbedd82b6ac
[gaim-migrate @ 16944]
Mark Doliner <markdoliner@pidgin.im>
parents:
14300
diff
changeset
|
1005 | connect_data->host = g_strdup(host); |
|
8cbedd82b6ac
[gaim-migrate @ 16944]
Mark Doliner <markdoliner@pidgin.im>
parents:
14300
diff
changeset
|
1006 | connect_data->port = port; |
|
8cbedd82b6ac
[gaim-migrate @ 16944]
Mark Doliner <markdoliner@pidgin.im>
parents:
14300
diff
changeset
|
1007 | connect_data->gpi = gpi; |
|
31678
ad8a9a266b05
Add new DNS-related API to perform lookups in the context of an account.
Daniel Atallah <datallah@pidgin.im>
parents:
31677
diff
changeset
|
1008 | connect_data->account = account; |
| 8262 | 1009 | |
|
31742
e6eb15f2734b
proxy: Use account proxy when making standalone SOCKS5 connections.
Daniel Atallah <datallah@pidgin.im>
parents:
31678
diff
changeset
|
1010 | /* If there is an account proxy, use it to connect to the desired SOCKS5 |
|
e6eb15f2734b
proxy: Use account proxy when making standalone SOCKS5 connections.
Daniel Atallah <datallah@pidgin.im>
parents:
31678
diff
changeset
|
1011 | * proxy. |
|
e6eb15f2734b
proxy: Use account proxy when making standalone SOCKS5 connections.
Daniel Atallah <datallah@pidgin.im>
parents:
31678
diff
changeset
|
1012 | */ |
|
37534
355492f1084d
Port purple_proxy_connect_socks5_account() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37533
diff
changeset
|
1013 | resolver = purple_proxy_get_proxy_resolver(account); |
|
355492f1084d
Port purple_proxy_connect_socks5_account() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37533
diff
changeset
|
1014 | |
|
355492f1084d
Port purple_proxy_connect_socks5_account() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37533
diff
changeset
|
1015 | if (resolver == NULL) { |
|
355492f1084d
Port purple_proxy_connect_socks5_account() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37533
diff
changeset
|
1016 | /* purple_proxy_get_proxy_resolver already has debug output */ |
| 15884 | 1017 | purple_proxy_connect_data_destroy(connect_data); |
|
14151
34427f138b1f
[gaim-migrate @ 16712]
Mark Doliner <markdoliner@pidgin.im>
parents:
14097
diff
changeset
|
1018 | return NULL; |
|
34427f138b1f
[gaim-migrate @ 16712]
Mark Doliner <markdoliner@pidgin.im>
parents:
14097
diff
changeset
|
1019 | } |
|
34427f138b1f
[gaim-migrate @ 16712]
Mark Doliner <markdoliner@pidgin.im>
parents:
14097
diff
changeset
|
1020 | |
|
37534
355492f1084d
Port purple_proxy_connect_socks5_account() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37533
diff
changeset
|
1021 | connect_data->cancellable = g_cancellable_new(); |
|
355492f1084d
Port purple_proxy_connect_socks5_account() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37533
diff
changeset
|
1022 | |
|
355492f1084d
Port purple_proxy_connect_socks5_account() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37533
diff
changeset
|
1023 | client = g_socket_client_new(); |
|
355492f1084d
Port purple_proxy_connect_socks5_account() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37533
diff
changeset
|
1024 | g_socket_client_set_proxy_resolver(client, resolver); |
|
355492f1084d
Port purple_proxy_connect_socks5_account() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37533
diff
changeset
|
1025 | g_object_unref(resolver); |
|
355492f1084d
Port purple_proxy_connect_socks5_account() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37533
diff
changeset
|
1026 | |
|
355492f1084d
Port purple_proxy_connect_socks5_account() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37533
diff
changeset
|
1027 | purple_debug_info("proxy", |
|
355492f1084d
Port purple_proxy_connect_socks5_account() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37533
diff
changeset
|
1028 | "Connecting to %s:%d via %s:%d using SOCKS5\n", |
|
355492f1084d
Port purple_proxy_connect_socks5_account() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37533
diff
changeset
|
1029 | connect_data->host, connect_data->port, |
|
355492f1084d
Port purple_proxy_connect_socks5_account() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37533
diff
changeset
|
1030 | purple_proxy_info_get_host(connect_data->gpi), |
|
355492f1084d
Port purple_proxy_connect_socks5_account() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37533
diff
changeset
|
1031 | purple_proxy_info_get_port(connect_data->gpi)); |
|
355492f1084d
Port purple_proxy_connect_socks5_account() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37533
diff
changeset
|
1032 | |
|
355492f1084d
Port purple_proxy_connect_socks5_account() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37533
diff
changeset
|
1033 | g_socket_client_connect_to_host_async(client, |
|
355492f1084d
Port purple_proxy_connect_socks5_account() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37533
diff
changeset
|
1034 | purple_proxy_info_get_host(connect_data->gpi), |
|
355492f1084d
Port purple_proxy_connect_socks5_account() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37533
diff
changeset
|
1035 | purple_proxy_info_get_port(connect_data->gpi), |
|
355492f1084d
Port purple_proxy_connect_socks5_account() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37533
diff
changeset
|
1036 | connect_data->cancellable, socks5_connect_to_host_cb, |
|
355492f1084d
Port purple_proxy_connect_socks5_account() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37533
diff
changeset
|
1037 | connect_data); |
|
355492f1084d
Port purple_proxy_connect_socks5_account() to use Gio internally
Mike Ruprecht <cmaiku@gmail.com>
parents:
37533
diff
changeset
|
1038 | g_object_unref(client); |
|
31742
e6eb15f2734b
proxy: Use account proxy when making standalone SOCKS5 connections.
Daniel Atallah <datallah@pidgin.im>
parents:
31678
diff
changeset
|
1039 | |
|
14899
c65f0b4fb351
[gaim-migrate @ 17606]
Mark Doliner <markdoliner@pidgin.im>
parents:
14536
diff
changeset
|
1040 | handles = g_slist_prepend(handles, connect_data); |
|
14151
34427f138b1f
[gaim-migrate @ 16712]
Mark Doliner <markdoliner@pidgin.im>
parents:
14097
diff
changeset
|
1041 | |
|
14324
8cbedd82b6ac
[gaim-migrate @ 16944]
Mark Doliner <markdoliner@pidgin.im>
parents:
14300
diff
changeset
|
1042 | return connect_data; |
| 8262 | 1043 | } |
| 1044 | ||
|
14165
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
1045 | void |
| 15884 | 1046 | purple_proxy_connect_cancel(PurpleProxyConnectData *connect_data) |
|
14165
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
1047 | { |
|
32129
5f9d676cefdb
Fix a possible XMPP remote crash
Mark Doliner <markdoliner@pidgin.im>
parents:
32070
diff
changeset
|
1048 | g_return_if_fail(connect_data != NULL); |
|
5f9d676cefdb
Fix a possible XMPP remote crash
Mark Doliner <markdoliner@pidgin.im>
parents:
32070
diff
changeset
|
1049 | |
| 15884 | 1050 | purple_proxy_connect_data_disconnect(connect_data, NULL); |
| 1051 | purple_proxy_connect_data_destroy(connect_data); | |
|
14165
0f09ac2220f4
[gaim-migrate @ 16734]
Mark Doliner <markdoliner@pidgin.im>
parents:
14161
diff
changeset
|
1052 | } |
| 8262 | 1053 | |
|
14899
c65f0b4fb351
[gaim-migrate @ 17606]
Mark Doliner <markdoliner@pidgin.im>
parents:
14536
diff
changeset
|
1054 | void |
| 15884 | 1055 | purple_proxy_connect_cancel_with_handle(void *handle) |
|
14899
c65f0b4fb351
[gaim-migrate @ 17606]
Mark Doliner <markdoliner@pidgin.im>
parents:
14536
diff
changeset
|
1056 | { |
|
c65f0b4fb351
[gaim-migrate @ 17606]
Mark Doliner <markdoliner@pidgin.im>
parents:
14536
diff
changeset
|
1057 | GSList *l, *l_next; |
|
c65f0b4fb351
[gaim-migrate @ 17606]
Mark Doliner <markdoliner@pidgin.im>
parents:
14536
diff
changeset
|
1058 | |
|
c65f0b4fb351
[gaim-migrate @ 17606]
Mark Doliner <markdoliner@pidgin.im>
parents:
14536
diff
changeset
|
1059 | for (l = handles; l != NULL; l = l_next) { |
| 15884 | 1060 | PurpleProxyConnectData *connect_data = l->data; |
|
14899
c65f0b4fb351
[gaim-migrate @ 17606]
Mark Doliner <markdoliner@pidgin.im>
parents:
14536
diff
changeset
|
1061 | |
|
c65f0b4fb351
[gaim-migrate @ 17606]
Mark Doliner <markdoliner@pidgin.im>
parents:
14536
diff
changeset
|
1062 | l_next = l->next; |
|
c65f0b4fb351
[gaim-migrate @ 17606]
Mark Doliner <markdoliner@pidgin.im>
parents:
14536
diff
changeset
|
1063 | |
|
c65f0b4fb351
[gaim-migrate @ 17606]
Mark Doliner <markdoliner@pidgin.im>
parents:
14536
diff
changeset
|
1064 | if (connect_data->handle == handle) |
| 15884 | 1065 | purple_proxy_connect_cancel(connect_data); |
|
14899
c65f0b4fb351
[gaim-migrate @ 17606]
Mark Doliner <markdoliner@pidgin.im>
parents:
14536
diff
changeset
|
1066 | } |
|
c65f0b4fb351
[gaim-migrate @ 17606]
Mark Doliner <markdoliner@pidgin.im>
parents:
14536
diff
changeset
|
1067 | } |
|
c65f0b4fb351
[gaim-migrate @ 17606]
Mark Doliner <markdoliner@pidgin.im>
parents:
14536
diff
changeset
|
1068 | |
|
37532
5aaf2d93e7e3
Implement function to get a GProxyResolver with an account's settings
Mike Ruprecht <cmaiku@gmail.com>
parents:
37518
diff
changeset
|
1069 | GProxyResolver * |
|
5aaf2d93e7e3
Implement function to get a GProxyResolver with an account's settings
Mike Ruprecht <cmaiku@gmail.com>
parents:
37518
diff
changeset
|
1070 | purple_proxy_get_proxy_resolver(PurpleAccount *account) |
|
5aaf2d93e7e3
Implement function to get a GProxyResolver with an account's settings
Mike Ruprecht <cmaiku@gmail.com>
parents:
37518
diff
changeset
|
1071 | { |
|
5aaf2d93e7e3
Implement function to get a GProxyResolver with an account's settings
Mike Ruprecht <cmaiku@gmail.com>
parents:
37518
diff
changeset
|
1072 | PurpleProxyInfo *info = purple_proxy_get_setup(account); |
|
5aaf2d93e7e3
Implement function to get a GProxyResolver with an account's settings
Mike Ruprecht <cmaiku@gmail.com>
parents:
37518
diff
changeset
|
1073 | const gchar *protocol; |
|
5aaf2d93e7e3
Implement function to get a GProxyResolver with an account's settings
Mike Ruprecht <cmaiku@gmail.com>
parents:
37518
diff
changeset
|
1074 | const gchar *username; |
|
5aaf2d93e7e3
Implement function to get a GProxyResolver with an account's settings
Mike Ruprecht <cmaiku@gmail.com>
parents:
37518
diff
changeset
|
1075 | const gchar *password; |
|
5aaf2d93e7e3
Implement function to get a GProxyResolver with an account's settings
Mike Ruprecht <cmaiku@gmail.com>
parents:
37518
diff
changeset
|
1076 | gchar *auth; |
|
5aaf2d93e7e3
Implement function to get a GProxyResolver with an account's settings
Mike Ruprecht <cmaiku@gmail.com>
parents:
37518
diff
changeset
|
1077 | gchar *proxy; |
|
5aaf2d93e7e3
Implement function to get a GProxyResolver with an account's settings
Mike Ruprecht <cmaiku@gmail.com>
parents:
37518
diff
changeset
|
1078 | GProxyResolver *resolver; |
|
5aaf2d93e7e3
Implement function to get a GProxyResolver with an account's settings
Mike Ruprecht <cmaiku@gmail.com>
parents:
37518
diff
changeset
|
1079 | |
|
5aaf2d93e7e3
Implement function to get a GProxyResolver with an account's settings
Mike Ruprecht <cmaiku@gmail.com>
parents:
37518
diff
changeset
|
1080 | if (purple_proxy_info_get_proxy_type(info) == PURPLE_PROXY_NONE) { |
|
5aaf2d93e7e3
Implement function to get a GProxyResolver with an account's settings
Mike Ruprecht <cmaiku@gmail.com>
parents:
37518
diff
changeset
|
1081 | /* Return the default proxy which, if it doesn't support any |
|
5aaf2d93e7e3
Implement function to get a GProxyResolver with an account's settings
Mike Ruprecht <cmaiku@gmail.com>
parents:
37518
diff
changeset
|
1082 | * further system proxy settings than purple_proxy_get_setup() |
|
5aaf2d93e7e3
Implement function to get a GProxyResolver with an account's settings
Mike Ruprecht <cmaiku@gmail.com>
parents:
37518
diff
changeset
|
1083 | * detects, will end up as direct connections as intended. |
|
5aaf2d93e7e3
Implement function to get a GProxyResolver with an account's settings
Mike Ruprecht <cmaiku@gmail.com>
parents:
37518
diff
changeset
|
1084 | */ |
|
5aaf2d93e7e3
Implement function to get a GProxyResolver with an account's settings
Mike Ruprecht <cmaiku@gmail.com>
parents:
37518
diff
changeset
|
1085 | return g_object_ref(g_proxy_resolver_get_default()); |
|
5aaf2d93e7e3
Implement function to get a GProxyResolver with an account's settings
Mike Ruprecht <cmaiku@gmail.com>
parents:
37518
diff
changeset
|
1086 | } |
|
5aaf2d93e7e3
Implement function to get a GProxyResolver with an account's settings
Mike Ruprecht <cmaiku@gmail.com>
parents:
37518
diff
changeset
|
1087 | |
|
5aaf2d93e7e3
Implement function to get a GProxyResolver with an account's settings
Mike Ruprecht <cmaiku@gmail.com>
parents:
37518
diff
changeset
|
1088 | switch (purple_proxy_info_get_proxy_type(info)) |
|
5aaf2d93e7e3
Implement function to get a GProxyResolver with an account's settings
Mike Ruprecht <cmaiku@gmail.com>
parents:
37518
diff
changeset
|
1089 | { |
|
5aaf2d93e7e3
Implement function to get a GProxyResolver with an account's settings
Mike Ruprecht <cmaiku@gmail.com>
parents:
37518
diff
changeset
|
1090 | /* PURPLE_PROXY_NONE already handled above */ |
|
5aaf2d93e7e3
Implement function to get a GProxyResolver with an account's settings
Mike Ruprecht <cmaiku@gmail.com>
parents:
37518
diff
changeset
|
1091 | |
|
5aaf2d93e7e3
Implement function to get a GProxyResolver with an account's settings
Mike Ruprecht <cmaiku@gmail.com>
parents:
37518
diff
changeset
|
1092 | case PURPLE_PROXY_USE_ENVVAR: |
|
5aaf2d93e7e3
Implement function to get a GProxyResolver with an account's settings
Mike Ruprecht <cmaiku@gmail.com>
parents:
37518
diff
changeset
|
1093 | /* Intentional passthrough */ |
|
5aaf2d93e7e3
Implement function to get a GProxyResolver with an account's settings
Mike Ruprecht <cmaiku@gmail.com>
parents:
37518
diff
changeset
|
1094 | case PURPLE_PROXY_HTTP: |
|
5aaf2d93e7e3
Implement function to get a GProxyResolver with an account's settings
Mike Ruprecht <cmaiku@gmail.com>
parents:
37518
diff
changeset
|
1095 | protocol = "http"; |
|
5aaf2d93e7e3
Implement function to get a GProxyResolver with an account's settings
Mike Ruprecht <cmaiku@gmail.com>
parents:
37518
diff
changeset
|
1096 | break; |
|
5aaf2d93e7e3
Implement function to get a GProxyResolver with an account's settings
Mike Ruprecht <cmaiku@gmail.com>
parents:
37518
diff
changeset
|
1097 | case PURPLE_PROXY_SOCKS4: |
|
5aaf2d93e7e3
Implement function to get a GProxyResolver with an account's settings
Mike Ruprecht <cmaiku@gmail.com>
parents:
37518
diff
changeset
|
1098 | protocol = "socks4"; |
|
5aaf2d93e7e3
Implement function to get a GProxyResolver with an account's settings
Mike Ruprecht <cmaiku@gmail.com>
parents:
37518
diff
changeset
|
1099 | break; |
|
5aaf2d93e7e3
Implement function to get a GProxyResolver with an account's settings
Mike Ruprecht <cmaiku@gmail.com>
parents:
37518
diff
changeset
|
1100 | case PURPLE_PROXY_SOCKS5: |
|
5aaf2d93e7e3
Implement function to get a GProxyResolver with an account's settings
Mike Ruprecht <cmaiku@gmail.com>
parents:
37518
diff
changeset
|
1101 | /* Intentional passthrough */ |
|
5aaf2d93e7e3
Implement function to get a GProxyResolver with an account's settings
Mike Ruprecht <cmaiku@gmail.com>
parents:
37518
diff
changeset
|
1102 | case PURPLE_PROXY_TOR: |
|
5aaf2d93e7e3
Implement function to get a GProxyResolver with an account's settings
Mike Ruprecht <cmaiku@gmail.com>
parents:
37518
diff
changeset
|
1103 | protocol = "socks5"; |
|
5aaf2d93e7e3
Implement function to get a GProxyResolver with an account's settings
Mike Ruprecht <cmaiku@gmail.com>
parents:
37518
diff
changeset
|
1104 | break; |
|
5aaf2d93e7e3
Implement function to get a GProxyResolver with an account's settings
Mike Ruprecht <cmaiku@gmail.com>
parents:
37518
diff
changeset
|
1105 | |
|
5aaf2d93e7e3
Implement function to get a GProxyResolver with an account's settings
Mike Ruprecht <cmaiku@gmail.com>
parents:
37518
diff
changeset
|
1106 | default: |
|
5aaf2d93e7e3
Implement function to get a GProxyResolver with an account's settings
Mike Ruprecht <cmaiku@gmail.com>
parents:
37518
diff
changeset
|
1107 | purple_debug_error("proxy", |
|
5aaf2d93e7e3
Implement function to get a GProxyResolver with an account's settings
Mike Ruprecht <cmaiku@gmail.com>
parents:
37518
diff
changeset
|
1108 | "Invalid Proxy type (%d) specified.\n", |
|
5aaf2d93e7e3
Implement function to get a GProxyResolver with an account's settings
Mike Ruprecht <cmaiku@gmail.com>
parents:
37518
diff
changeset
|
1109 | purple_proxy_info_get_proxy_type(info)); |
|
5aaf2d93e7e3
Implement function to get a GProxyResolver with an account's settings
Mike Ruprecht <cmaiku@gmail.com>
parents:
37518
diff
changeset
|
1110 | return NULL; |
|
5aaf2d93e7e3
Implement function to get a GProxyResolver with an account's settings
Mike Ruprecht <cmaiku@gmail.com>
parents:
37518
diff
changeset
|
1111 | } |
|
5aaf2d93e7e3
Implement function to get a GProxyResolver with an account's settings
Mike Ruprecht <cmaiku@gmail.com>
parents:
37518
diff
changeset
|
1112 | |
|
5aaf2d93e7e3
Implement function to get a GProxyResolver with an account's settings
Mike Ruprecht <cmaiku@gmail.com>
parents:
37518
diff
changeset
|
1113 | |
|
5aaf2d93e7e3
Implement function to get a GProxyResolver with an account's settings
Mike Ruprecht <cmaiku@gmail.com>
parents:
37518
diff
changeset
|
1114 | if (purple_proxy_info_get_host(info) == NULL || |
|
5aaf2d93e7e3
Implement function to get a GProxyResolver with an account's settings
Mike Ruprecht <cmaiku@gmail.com>
parents:
37518
diff
changeset
|
1115 | purple_proxy_info_get_port(info) <= 0) { |
|
5aaf2d93e7e3
Implement function to get a GProxyResolver with an account's settings
Mike Ruprecht <cmaiku@gmail.com>
parents:
37518
diff
changeset
|
1116 | purple_notify_error(NULL, NULL, |
|
5aaf2d93e7e3
Implement function to get a GProxyResolver with an account's settings
Mike Ruprecht <cmaiku@gmail.com>
parents:
37518
diff
changeset
|
1117 | _("Invalid proxy settings"), |
|
5aaf2d93e7e3
Implement function to get a GProxyResolver with an account's settings
Mike Ruprecht <cmaiku@gmail.com>
parents:
37518
diff
changeset
|
1118 | _("Either the host name or port number " |
|
5aaf2d93e7e3
Implement function to get a GProxyResolver with an account's settings
Mike Ruprecht <cmaiku@gmail.com>
parents:
37518
diff
changeset
|
1119 | "specified for your given proxy type is " |
|
5aaf2d93e7e3
Implement function to get a GProxyResolver with an account's settings
Mike Ruprecht <cmaiku@gmail.com>
parents:
37518
diff
changeset
|
1120 | "invalid."), |
|
5aaf2d93e7e3
Implement function to get a GProxyResolver with an account's settings
Mike Ruprecht <cmaiku@gmail.com>
parents:
37518
diff
changeset
|
1121 | purple_request_cpar_from_account( account)); |
|
5aaf2d93e7e3
Implement function to get a GProxyResolver with an account's settings
Mike Ruprecht <cmaiku@gmail.com>
parents:
37518
diff
changeset
|
1122 | return NULL; |
|
5aaf2d93e7e3
Implement function to get a GProxyResolver with an account's settings
Mike Ruprecht <cmaiku@gmail.com>
parents:
37518
diff
changeset
|
1123 | } |
|
5aaf2d93e7e3
Implement function to get a GProxyResolver with an account's settings
Mike Ruprecht <cmaiku@gmail.com>
parents:
37518
diff
changeset
|
1124 | |
|
5aaf2d93e7e3
Implement function to get a GProxyResolver with an account's settings
Mike Ruprecht <cmaiku@gmail.com>
parents:
37518
diff
changeset
|
1125 | /* Everything checks out. Create and return the GProxyResolver */ |
|
5aaf2d93e7e3
Implement function to get a GProxyResolver with an account's settings
Mike Ruprecht <cmaiku@gmail.com>
parents:
37518
diff
changeset
|
1126 | |
|
5aaf2d93e7e3
Implement function to get a GProxyResolver with an account's settings
Mike Ruprecht <cmaiku@gmail.com>
parents:
37518
diff
changeset
|
1127 | username = purple_proxy_info_get_username(info); |
|
5aaf2d93e7e3
Implement function to get a GProxyResolver with an account's settings
Mike Ruprecht <cmaiku@gmail.com>
parents:
37518
diff
changeset
|
1128 | password = purple_proxy_info_get_password(info); |
|
5aaf2d93e7e3
Implement function to get a GProxyResolver with an account's settings
Mike Ruprecht <cmaiku@gmail.com>
parents:
37518
diff
changeset
|
1129 | |
|
5aaf2d93e7e3
Implement function to get a GProxyResolver with an account's settings
Mike Ruprecht <cmaiku@gmail.com>
parents:
37518
diff
changeset
|
1130 | /* Username and password are optional */ |
|
5aaf2d93e7e3
Implement function to get a GProxyResolver with an account's settings
Mike Ruprecht <cmaiku@gmail.com>
parents:
37518
diff
changeset
|
1131 | if (username != NULL && password != NULL) { |
|
5aaf2d93e7e3
Implement function to get a GProxyResolver with an account's settings
Mike Ruprecht <cmaiku@gmail.com>
parents:
37518
diff
changeset
|
1132 | auth = g_strdup_printf("%s:%s@", username, password); |
|
5aaf2d93e7e3
Implement function to get a GProxyResolver with an account's settings
Mike Ruprecht <cmaiku@gmail.com>
parents:
37518
diff
changeset
|
1133 | } else if (username != NULL) { |
|
5aaf2d93e7e3
Implement function to get a GProxyResolver with an account's settings
Mike Ruprecht <cmaiku@gmail.com>
parents:
37518
diff
changeset
|
1134 | auth = g_strdup_printf("%s@", username); |
|
5aaf2d93e7e3
Implement function to get a GProxyResolver with an account's settings
Mike Ruprecht <cmaiku@gmail.com>
parents:
37518
diff
changeset
|
1135 | } else { |
|
5aaf2d93e7e3
Implement function to get a GProxyResolver with an account's settings
Mike Ruprecht <cmaiku@gmail.com>
parents:
37518
diff
changeset
|
1136 | auth = NULL; |
|
5aaf2d93e7e3
Implement function to get a GProxyResolver with an account's settings
Mike Ruprecht <cmaiku@gmail.com>
parents:
37518
diff
changeset
|
1137 | } |
|
5aaf2d93e7e3
Implement function to get a GProxyResolver with an account's settings
Mike Ruprecht <cmaiku@gmail.com>
parents:
37518
diff
changeset
|
1138 | |
|
5aaf2d93e7e3
Implement function to get a GProxyResolver with an account's settings
Mike Ruprecht <cmaiku@gmail.com>
parents:
37518
diff
changeset
|
1139 | proxy = g_strdup_printf("%s://%s%s:%i", protocol, |
|
5aaf2d93e7e3
Implement function to get a GProxyResolver with an account's settings
Mike Ruprecht <cmaiku@gmail.com>
parents:
37518
diff
changeset
|
1140 | auth != NULL ? auth : "", |
|
5aaf2d93e7e3
Implement function to get a GProxyResolver with an account's settings
Mike Ruprecht <cmaiku@gmail.com>
parents:
37518
diff
changeset
|
1141 | purple_proxy_info_get_host(info), |
|
5aaf2d93e7e3
Implement function to get a GProxyResolver with an account's settings
Mike Ruprecht <cmaiku@gmail.com>
parents:
37518
diff
changeset
|
1142 | purple_proxy_info_get_port(info)); |
|
5aaf2d93e7e3
Implement function to get a GProxyResolver with an account's settings
Mike Ruprecht <cmaiku@gmail.com>
parents:
37518
diff
changeset
|
1143 | g_free(auth); |
|
5aaf2d93e7e3
Implement function to get a GProxyResolver with an account's settings
Mike Ruprecht <cmaiku@gmail.com>
parents:
37518
diff
changeset
|
1144 | |
|
5aaf2d93e7e3
Implement function to get a GProxyResolver with an account's settings
Mike Ruprecht <cmaiku@gmail.com>
parents:
37518
diff
changeset
|
1145 | resolver = g_simple_proxy_resolver_new(proxy, NULL); |
|
5aaf2d93e7e3
Implement function to get a GProxyResolver with an account's settings
Mike Ruprecht <cmaiku@gmail.com>
parents:
37518
diff
changeset
|
1146 | g_free(proxy); |
|
5aaf2d93e7e3
Implement function to get a GProxyResolver with an account's settings
Mike Ruprecht <cmaiku@gmail.com>
parents:
37518
diff
changeset
|
1147 | |
|
5aaf2d93e7e3
Implement function to get a GProxyResolver with an account's settings
Mike Ruprecht <cmaiku@gmail.com>
parents:
37518
diff
changeset
|
1148 | return resolver; |
|
5aaf2d93e7e3
Implement function to get a GProxyResolver with an account's settings
Mike Ruprecht <cmaiku@gmail.com>
parents:
37518
diff
changeset
|
1149 | } |
|
5aaf2d93e7e3
Implement function to get a GProxyResolver with an account's settings
Mike Ruprecht <cmaiku@gmail.com>
parents:
37518
diff
changeset
|
1150 | |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1151 | static void |
| 15884 | 1152 | proxy_pref_cb(const char *name, PurplePrefType type, |
|
12816
5f93e09fa9a6
[gaim-migrate @ 15164]
Mark Doliner <markdoliner@pidgin.im>
parents:
12811
diff
changeset
|
1153 | gconstpointer value, gpointer data) |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1154 | { |
| 15884 | 1155 | PurpleProxyInfo *info = purple_global_proxy_get_info(); |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1156 | |
|
25859
b42be7bb9dac
Patch from Paul Aurich to add purple_strequal to help readability and simplicity of code. Ie, don't need to negate the value of strcmp, since this does a strcmp and does the negation for us
Paul Aurich <darkrain42@pidgin.im>
parents:
24866
diff
changeset
|
1157 | if (purple_strequal(name, "/purple/proxy/type")) { |
|
6001
1abbeff6571c
[gaim-migrate @ 6449]
Mark Doliner <markdoliner@pidgin.im>
parents:
5970
diff
changeset
|
1158 | int proxytype; |
|
12816
5f93e09fa9a6
[gaim-migrate @ 15164]
Mark Doliner <markdoliner@pidgin.im>
parents:
12811
diff
changeset
|
1159 | const char *type = value; |
|
6001
1abbeff6571c
[gaim-migrate @ 6449]
Mark Doliner <markdoliner@pidgin.im>
parents:
5970
diff
changeset
|
1160 | |
|
25859
b42be7bb9dac
Patch from Paul Aurich to add purple_strequal to help readability and simplicity of code. Ie, don't need to negate the value of strcmp, since this does a strcmp and does the negation for us
Paul Aurich <darkrain42@pidgin.im>
parents:
24866
diff
changeset
|
1161 | if (purple_strequal(type, "none")) |
| 15884 | 1162 | proxytype = PURPLE_PROXY_NONE; |
|
25859
b42be7bb9dac
Patch from Paul Aurich to add purple_strequal to help readability and simplicity of code. Ie, don't need to negate the value of strcmp, since this does a strcmp and does the negation for us
Paul Aurich <darkrain42@pidgin.im>
parents:
24866
diff
changeset
|
1163 | else if (purple_strequal(type, "http")) |
| 15884 | 1164 | proxytype = PURPLE_PROXY_HTTP; |
|
25859
b42be7bb9dac
Patch from Paul Aurich to add purple_strequal to help readability and simplicity of code. Ie, don't need to negate the value of strcmp, since this does a strcmp and does the negation for us
Paul Aurich <darkrain42@pidgin.im>
parents:
24866
diff
changeset
|
1165 | else if (purple_strequal(type, "socks4")) |
| 15884 | 1166 | proxytype = PURPLE_PROXY_SOCKS4; |
|
25859
b42be7bb9dac
Patch from Paul Aurich to add purple_strequal to help readability and simplicity of code. Ie, don't need to negate the value of strcmp, since this does a strcmp and does the negation for us
Paul Aurich <darkrain42@pidgin.im>
parents:
24866
diff
changeset
|
1167 | else if (purple_strequal(type, "socks5")) |
| 15884 | 1168 | proxytype = PURPLE_PROXY_SOCKS5; |
|
31677
042eaab1468c
Add a new proxy type of "Tor". This is really just a SOCKS5 proxy, but can be
Daniel Atallah <datallah@pidgin.im>
parents:
30626
diff
changeset
|
1169 | else if (purple_strequal(type, "tor")) |
|
042eaab1468c
Add a new proxy type of "Tor". This is really just a SOCKS5 proxy, but can be
Daniel Atallah <datallah@pidgin.im>
parents:
30626
diff
changeset
|
1170 | proxytype = PURPLE_PROXY_TOR; |
|
25859
b42be7bb9dac
Patch from Paul Aurich to add purple_strequal to help readability and simplicity of code. Ie, don't need to negate the value of strcmp, since this does a strcmp and does the negation for us
Paul Aurich <darkrain42@pidgin.im>
parents:
24866
diff
changeset
|
1171 | else if (purple_strequal(type, "envvar")) |
| 15884 | 1172 | proxytype = PURPLE_PROXY_USE_ENVVAR; |
|
6001
1abbeff6571c
[gaim-migrate @ 6449]
Mark Doliner <markdoliner@pidgin.im>
parents:
5970
diff
changeset
|
1173 | else |
|
1abbeff6571c
[gaim-migrate @ 6449]
Mark Doliner <markdoliner@pidgin.im>
parents:
5970
diff
changeset
|
1174 | proxytype = -1; |
|
1abbeff6571c
[gaim-migrate @ 6449]
Mark Doliner <markdoliner@pidgin.im>
parents:
5970
diff
changeset
|
1175 | |
|
35378
5d9e2581005b
gtk-doc prep: *_get_type() functions are hidden as standard GType-returning funcs, so rename them.
Ankit Vani <a@nevitus.org>
parents:
35265
diff
changeset
|
1176 | purple_proxy_info_set_proxy_type(info, proxytype); |
|
25859
b42be7bb9dac
Patch from Paul Aurich to add purple_strequal to help readability and simplicity of code. Ie, don't need to negate the value of strcmp, since this does a strcmp and does the negation for us
Paul Aurich <darkrain42@pidgin.im>
parents:
24866
diff
changeset
|
1177 | } else if (purple_strequal(name, "/purple/proxy/host")) |
| 15884 | 1178 | purple_proxy_info_set_host(info, value); |
|
25859
b42be7bb9dac
Patch from Paul Aurich to add purple_strequal to help readability and simplicity of code. Ie, don't need to negate the value of strcmp, since this does a strcmp and does the negation for us
Paul Aurich <darkrain42@pidgin.im>
parents:
24866
diff
changeset
|
1179 | else if (purple_strequal(name, "/purple/proxy/port")) |
| 15884 | 1180 | purple_proxy_info_set_port(info, GPOINTER_TO_INT(value)); |
|
25859
b42be7bb9dac
Patch from Paul Aurich to add purple_strequal to help readability and simplicity of code. Ie, don't need to negate the value of strcmp, since this does a strcmp and does the negation for us
Paul Aurich <darkrain42@pidgin.im>
parents:
24866
diff
changeset
|
1181 | else if (purple_strequal(name, "/purple/proxy/username")) |
| 15884 | 1182 | purple_proxy_info_set_username(info, value); |
|
25859
b42be7bb9dac
Patch from Paul Aurich to add purple_strequal to help readability and simplicity of code. Ie, don't need to negate the value of strcmp, since this does a strcmp and does the negation for us
Paul Aurich <darkrain42@pidgin.im>
parents:
24866
diff
changeset
|
1183 | else if (purple_strequal(name, "/purple/proxy/password")) |
| 15884 | 1184 | purple_proxy_info_set_password(info, value); |
|
1087
bc9c6b635358
[gaim-migrate @ 1097]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
1057
diff
changeset
|
1185 | } |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1186 | |
|
14151
34427f138b1f
[gaim-migrate @ 16712]
Mark Doliner <markdoliner@pidgin.im>
parents:
14097
diff
changeset
|
1187 | void * |
| 15884 | 1188 | purple_proxy_get_handle() |
|
14151
34427f138b1f
[gaim-migrate @ 16712]
Mark Doliner <markdoliner@pidgin.im>
parents:
14097
diff
changeset
|
1189 | { |
|
34427f138b1f
[gaim-migrate @ 16712]
Mark Doliner <markdoliner@pidgin.im>
parents:
14097
diff
changeset
|
1190 | static int handle; |
|
34427f138b1f
[gaim-migrate @ 16712]
Mark Doliner <markdoliner@pidgin.im>
parents:
14097
diff
changeset
|
1191 | |
|
34427f138b1f
[gaim-migrate @ 16712]
Mark Doliner <markdoliner@pidgin.im>
parents:
14097
diff
changeset
|
1192 | return &handle; |
|
34427f138b1f
[gaim-migrate @ 16712]
Mark Doliner <markdoliner@pidgin.im>
parents:
14097
diff
changeset
|
1193 | } |
|
34427f138b1f
[gaim-migrate @ 16712]
Mark Doliner <markdoliner@pidgin.im>
parents:
14097
diff
changeset
|
1194 | |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1195 | void |
| 15884 | 1196 | purple_proxy_init(void) |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1197 | { |
|
10087
e5b80a38939d
[gaim-migrate @ 11098]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
9863
diff
changeset
|
1198 | void *handle; |
|
e5b80a38939d
[gaim-migrate @ 11098]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
9863
diff
changeset
|
1199 | |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1200 | /* Initialize a default proxy info struct. */ |
| 15884 | 1201 | global_proxy_info = purple_proxy_info_new(); |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1202 | |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1203 | /* Proxy */ |
|
16478
19107605c565
Works for me! Renames prefs: /core to /purple, /gaim/gtk to /pidgin, /gaim/gnt to /finch
Sean Egan <seanegan@pidgin.im>
parents:
16037
diff
changeset
|
1204 | purple_prefs_add_none("/purple/proxy"); |
|
19107605c565
Works for me! Renames prefs: /core to /purple, /gaim/gtk to /pidgin, /gaim/gnt to /finch
Sean Egan <seanegan@pidgin.im>
parents:
16037
diff
changeset
|
1205 | purple_prefs_add_string("/purple/proxy/type", "none"); |
|
19107605c565
Works for me! Renames prefs: /core to /purple, /gaim/gtk to /pidgin, /gaim/gnt to /finch
Sean Egan <seanegan@pidgin.im>
parents:
16037
diff
changeset
|
1206 | purple_prefs_add_string("/purple/proxy/host", ""); |
|
19107605c565
Works for me! Renames prefs: /core to /purple, /gaim/gtk to /pidgin, /gaim/gnt to /finch
Sean Egan <seanegan@pidgin.im>
parents:
16037
diff
changeset
|
1207 | purple_prefs_add_int("/purple/proxy/port", 0); |
|
19107605c565
Works for me! Renames prefs: /core to /purple, /gaim/gtk to /pidgin, /gaim/gnt to /finch
Sean Egan <seanegan@pidgin.im>
parents:
16037
diff
changeset
|
1208 | purple_prefs_add_string("/purple/proxy/username", ""); |
|
19107605c565
Works for me! Renames prefs: /core to /purple, /gaim/gtk to /pidgin, /gaim/gnt to /finch
Sean Egan <seanegan@pidgin.im>
parents:
16037
diff
changeset
|
1209 | purple_prefs_add_string("/purple/proxy/password", ""); |
|
25624
62b56bc39896
Implement support for resolving DNS via the SOCKS4 proxy in use.
Daniel Atallah <datallah@pidgin.im>
parents:
25623
diff
changeset
|
1210 | purple_prefs_add_bool("/purple/proxy/socks4_remotedns", FALSE); |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1211 | |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1212 | /* Setup callbacks for the preferences. */ |
| 15884 | 1213 | handle = purple_proxy_get_handle(); |
|
16478
19107605c565
Works for me! Renames prefs: /core to /purple, /gaim/gtk to /pidgin, /gaim/gnt to /finch
Sean Egan <seanegan@pidgin.im>
parents:
16037
diff
changeset
|
1214 | purple_prefs_connect_callback(handle, "/purple/proxy/type", proxy_pref_cb, |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1215 | NULL); |
|
16478
19107605c565
Works for me! Renames prefs: /core to /purple, /gaim/gtk to /pidgin, /gaim/gnt to /finch
Sean Egan <seanegan@pidgin.im>
parents:
16037
diff
changeset
|
1216 | purple_prefs_connect_callback(handle, "/purple/proxy/host", proxy_pref_cb, |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1217 | NULL); |
|
16478
19107605c565
Works for me! Renames prefs: /core to /purple, /gaim/gtk to /pidgin, /gaim/gnt to /finch
Sean Egan <seanegan@pidgin.im>
parents:
16037
diff
changeset
|
1218 | purple_prefs_connect_callback(handle, "/purple/proxy/port", proxy_pref_cb, |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1219 | NULL); |
|
16478
19107605c565
Works for me! Renames prefs: /core to /purple, /gaim/gtk to /pidgin, /gaim/gnt to /finch
Sean Egan <seanegan@pidgin.im>
parents:
16037
diff
changeset
|
1220 | purple_prefs_connect_callback(handle, "/purple/proxy/username", |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1221 | proxy_pref_cb, NULL); |
|
16478
19107605c565
Works for me! Renames prefs: /core to /purple, /gaim/gtk to /pidgin, /gaim/gnt to /finch
Sean Egan <seanegan@pidgin.im>
parents:
16037
diff
changeset
|
1222 | purple_prefs_connect_callback(handle, "/purple/proxy/password", |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13085
diff
changeset
|
1223 | proxy_pref_cb, NULL); |
|
20053
68ce40196f8a
grab revision 6be36979d022284283217c2a32f2b812740cbbf3
Luke Schierer <lschiere@pidgin.im>
parents:
19985
diff
changeset
|
1224 | |
|
68ce40196f8a
grab revision 6be36979d022284283217c2a32f2b812740cbbf3
Luke Schierer <lschiere@pidgin.im>
parents:
19985
diff
changeset
|
1225 | /* Load the initial proxy settings */ |
|
20055
ca7144d5605f
grab revision 240d37f3b465527200f862ff3c0da77618ae32ae
Luke Schierer <lschiere@pidgin.im>
parents:
20053
diff
changeset
|
1226 | purple_prefs_trigger_callback("/purple/proxy/type"); |
|
ca7144d5605f
grab revision 240d37f3b465527200f862ff3c0da77618ae32ae
Luke Schierer <lschiere@pidgin.im>
parents:
20053
diff
changeset
|
1227 | purple_prefs_trigger_callback("/purple/proxy/host"); |
|
ca7144d5605f
grab revision 240d37f3b465527200f862ff3c0da77618ae32ae
Luke Schierer <lschiere@pidgin.im>
parents:
20053
diff
changeset
|
1228 | purple_prefs_trigger_callback("/purple/proxy/port"); |
|
ca7144d5605f
grab revision 240d37f3b465527200f862ff3c0da77618ae32ae
Luke Schierer <lschiere@pidgin.im>
parents:
20053
diff
changeset
|
1229 | purple_prefs_trigger_callback("/purple/proxy/username"); |
|
ca7144d5605f
grab revision 240d37f3b465527200f862ff3c0da77618ae32ae
Luke Schierer <lschiere@pidgin.im>
parents:
20053
diff
changeset
|
1230 | purple_prefs_trigger_callback("/purple/proxy/password"); |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5580
diff
changeset
|
1231 | } |
|
10087
e5b80a38939d
[gaim-migrate @ 11098]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
9863
diff
changeset
|
1232 | |
|
14151
34427f138b1f
[gaim-migrate @ 16712]
Mark Doliner <markdoliner@pidgin.im>
parents:
14097
diff
changeset
|
1233 | void |
| 15884 | 1234 | purple_proxy_uninit(void) |
|
10087
e5b80a38939d
[gaim-migrate @ 11098]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
9863
diff
changeset
|
1235 | { |
|
14899
c65f0b4fb351
[gaim-migrate @ 17606]
Mark Doliner <markdoliner@pidgin.im>
parents:
14536
diff
changeset
|
1236 | while (handles != NULL) |
|
14513
fe63cd247350
[gaim-migrate @ 17165]
Mark Doliner <markdoliner@pidgin.im>
parents:
14454
diff
changeset
|
1237 | { |
| 15884 | 1238 | purple_proxy_connect_data_disconnect(handles->data, NULL); |
| 1239 | purple_proxy_connect_data_destroy(handles->data); | |
|
14513
fe63cd247350
[gaim-migrate @ 17165]
Mark Doliner <markdoliner@pidgin.im>
parents:
14454
diff
changeset
|
1240 | } |
|
28177
e62fe687ca6c
Clean up various file-scoped globals at uninit.
Paul Aurich <darkrain42@pidgin.im>
parents:
27943
diff
changeset
|
1241 | |
|
e62fe687ca6c
Clean up various file-scoped globals at uninit.
Paul Aurich <darkrain42@pidgin.im>
parents:
27943
diff
changeset
|
1242 | purple_prefs_disconnect_by_handle(purple_proxy_get_handle()); |
|
e62fe687ca6c
Clean up various file-scoped globals at uninit.
Paul Aurich <darkrain42@pidgin.im>
parents:
27943
diff
changeset
|
1243 | |
|
e62fe687ca6c
Clean up various file-scoped globals at uninit.
Paul Aurich <darkrain42@pidgin.im>
parents:
27943
diff
changeset
|
1244 | purple_proxy_info_destroy(global_proxy_info); |
|
e62fe687ca6c
Clean up various file-scoped globals at uninit.
Paul Aurich <darkrain42@pidgin.im>
parents:
27943
diff
changeset
|
1245 | global_proxy_info = NULL; |
|
10087
e5b80a38939d
[gaim-migrate @ 11098]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
9863
diff
changeset
|
1246 | } |