Mercurial > pidgin
annotate libpurple/network.c @ 28104:f628e98e6dff
Add some extra error strings just in case.
author | maiku@pidgin.im |
---|---|
date | Fri, 28 Aug 2009 07:25:43 +0000 |
parents | 7fbf964c6c6c |
children | 02f6f49da454 |
rev | line source |
---|---|
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
1 /** |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
2 * @file network.c Network Implementation |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
3 * @ingroup core |
20074
6bf32c9e15a7
remove gpl boilerplate from doxygen docs
Sean Egan <seanegan@gmail.com>
parents:
19681
diff
changeset
|
4 */ |
6bf32c9e15a7
remove gpl boilerplate from doxygen docs
Sean Egan <seanegan@gmail.com>
parents:
19681
diff
changeset
|
5 |
6bf32c9e15a7
remove gpl boilerplate from doxygen docs
Sean Egan <seanegan@gmail.com>
parents:
19681
diff
changeset
|
6 /* purple |
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
7 * |
15822 | 8 * Purple is the legal property of its developers, whose names are too numerous |
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
9 * to list here. Please refer to the COPYRIGHT file distributed with this |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
10 * source distribution. |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
11 * |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
12 * This program is free software; you can redistribute it and/or modify |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
13 * it under the terms of the GNU General Public License as published by |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
14 * the Free Software Foundation; either version 2 of the License, or |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
15 * (at your option) any later version. |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
16 * |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
17 * This program is distributed in the hope that it will be useful, |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
18 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
19 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
20 * GNU General Public License for more details. |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
21 * |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
22 * You should have received a copy of the GNU General Public License |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
23 * along with this program; if not, write to the Free Software |
19681
44b4e8bd759b
The FSF changed its address a while ago; our files were out of date.
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
19654
diff
changeset
|
24 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA |
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
25 */ |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
26 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
27 #include "internal.h" |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
28 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
29 #ifndef _WIN32 |
23201
313b87adb730
A patch from Peter O'Gorman at The Written Word, Inc. to fix various
Peter O'Gorman <pogma@thewrittenword.com>
parents:
23043
diff
changeset
|
30 #include <arpa/nameser.h> |
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
31 #include <resolv.h> |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
32 #include <netinet/in.h> |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
33 #include <net/if.h> |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
34 #include <sys/ioctl.h> |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
35 #else |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
36 #include <nspapi.h> |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
37 #endif |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
38 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
39 /* Solaris */ |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
40 #if defined (__SVR4) && defined (__sun) |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
41 #include <sys/sockio.h> |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
42 #endif |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
43 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
44 #include "debug.h" |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
45 #include "account.h" |
15974
1a12ce76c4f4
The network module now registers the signal 'network-configuration-changed' and emits it when a network change is detected via libnm or the win32 network monitor. The UI could also emit this signal if it knows something network.c doesn't. UPnP and NAT-PMP respond to the signal by clearing their IP address caches; changing networks without quitting/relaunching will now lead to the new IP address being (lazily) determined. This commit also enables nat-pmp and adds nat-pmp.[h|c] to the build process; please let me know if there are any problems building, as I only have OS X test machines.
Evan Schoenberg <evan.s@dreskin.net>
parents:
15949
diff
changeset
|
46 #include "nat-pmp.h" |
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
47 #include "network.h" |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
48 #include "prefs.h" |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
49 #include "stun.h" |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
50 #include "upnp.h" |
26050
ae3d25465d0f
Run an asynchronous DNS lookup for the STUN server IP (to set as a property
Marcus Lundblad <ml@update.uu.se>
parents:
24888
diff
changeset
|
51 #include "dnsquery.h" |
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
52 |
27635
7fbf964c6c6c
Move the IDN support into the DNS routines.
Paul Aurich <paul@darkrain42.org>
parents:
27231
diff
changeset
|
53 #ifdef USE_IDN |
7fbf964c6c6c
Move the IDN support into the DNS routines.
Paul Aurich <paul@darkrain42.org>
parents:
27231
diff
changeset
|
54 #include <idna.h> |
7fbf964c6c6c
Move the IDN support into the DNS routines.
Paul Aurich <paul@darkrain42.org>
parents:
27231
diff
changeset
|
55 #endif |
7fbf964c6c6c
Move the IDN support into the DNS routines.
Paul Aurich <paul@darkrain42.org>
parents:
27231
diff
changeset
|
56 |
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
57 /* |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
58 * Calling sizeof(struct ifreq) isn't always correct on |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
59 * Mac OS X (and maybe others). |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
60 */ |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
61 #ifdef _SIZEOF_ADDR_IFREQ |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
62 # define HX_SIZE_OF_IFREQ(a) _SIZEOF_ADDR_IFREQ(a) |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
63 #else |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
64 # define HX_SIZE_OF_IFREQ(a) sizeof(a) |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
65 #endif |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
66 |
22895
0bd86dae2734
Use pkg-config to detect NetworkManager. Also, fail if it isn't present,
Richard Laager <rlaager@wiktel.com>
parents:
22889
diff
changeset
|
67 #ifdef HAVE_NETWORKMANAGER |
22874
790c606ff8a9
A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@wiktel.com>
parents:
22594
diff
changeset
|
68 #include <dbus/dbus-glib.h> |
22895
0bd86dae2734
Use pkg-config to detect NetworkManager. Also, fail if it isn't present,
Richard Laager <rlaager@wiktel.com>
parents:
22889
diff
changeset
|
69 #include <NetworkManager.h> |
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
70 |
22874
790c606ff8a9
A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@wiktel.com>
parents:
22594
diff
changeset
|
71 static DBusGConnection *nm_conn = NULL; |
790c606ff8a9
A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@wiktel.com>
parents:
22594
diff
changeset
|
72 static DBusGProxy *nm_proxy = NULL; |
790c606ff8a9
A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@wiktel.com>
parents:
22594
diff
changeset
|
73 static DBusGProxy *dbus_proxy = NULL; |
24301
785db7300ef2
Improve our NetworkManager support in a couple of ways:
Richard Laager <rlaager@wiktel.com>
parents:
23712
diff
changeset
|
74 static NMState nm_state = NM_STATE_UNKNOWN; |
785db7300ef2
Improve our NetworkManager support in a couple of ways:
Richard Laager <rlaager@wiktel.com>
parents:
23712
diff
changeset
|
75 static gboolean have_nm_state = FALSE; |
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
76 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
77 #elif defined _WIN32 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
78 static int current_network_count; |
24888
a6742d9eadf3
Adjust the NLA code to prevent hang on exit for Windows XP and Windows Vista.
Paul Aurich <paul@darkrain42.org>
parents:
24301
diff
changeset
|
79 |
a6742d9eadf3
Adjust the NLA code to prevent hang on exit for Windows XP and Windows Vista.
Paul Aurich <paul@darkrain42.org>
parents:
24301
diff
changeset
|
80 /* Mutex for the other global vars */ |
a6742d9eadf3
Adjust the NLA code to prevent hang on exit for Windows XP and Windows Vista.
Paul Aurich <paul@darkrain42.org>
parents:
24301
diff
changeset
|
81 static GStaticMutex mutex = G_STATIC_MUTEX_INIT; |
25401
75f72178e361
Fix 3 different race conditions in the win32 network management functionality.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
24888
diff
changeset
|
82 static gboolean network_initialized = FALSE; |
75f72178e361
Fix 3 different race conditions in the win32 network management functionality.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
24888
diff
changeset
|
83 static HANDLE network_change_handle = NULL; |
75f72178e361
Fix 3 different race conditions in the win32 network management functionality.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
24888
diff
changeset
|
84 static int (WSAAPI *MyWSANSPIoctl) ( |
75f72178e361
Fix 3 different race conditions in the win32 network management functionality.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
24888
diff
changeset
|
85 HANDLE hLookup, DWORD dwControlCode, LPVOID lpvInBuffer, |
75f72178e361
Fix 3 different race conditions in the win32 network management functionality.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
24888
diff
changeset
|
86 DWORD cbInBuffer, LPVOID lpvOutBuffer, DWORD cbOutBuffer, |
75f72178e361
Fix 3 different race conditions in the win32 network management functionality.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
24888
diff
changeset
|
87 LPDWORD lpcbBytesReturned, LPWSACOMPLETION lpCompletion) = NULL; |
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
88 #endif |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
89 |
15822 | 90 struct _PurpleNetworkListenData { |
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
91 int listenfd; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
92 int socket_type; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
93 gboolean retry; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
94 gboolean adding; |
15822 | 95 PurpleNetworkListenCallback cb; |
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
96 gpointer cb_data; |
15440
56a2a0bb290a
Fix a crash when a network_listen_range process is canceled before its UPnP port mapping completes, which occurs regularly on certain routers when file transfers are initiated and then quickly finished. Much thanks to Elliott Harris and Eric Richie for their hard work with me hunting this down and fixing it.
Evan Schoenberg <evan.s@dreskin.net>
parents:
15373
diff
changeset
|
97 UPnPMappingAddRemove *mapping_data; |
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
98 }; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
99 |
22895
0bd86dae2734
Use pkg-config to detect NetworkManager. Also, fail if it isn't present,
Richard Laager <rlaager@wiktel.com>
parents:
22889
diff
changeset
|
100 #ifdef HAVE_NETWORKMANAGER |
22874
790c606ff8a9
A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@wiktel.com>
parents:
22594
diff
changeset
|
101 static NMState nm_get_network_state(void); |
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
102 #endif |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
103 |
25852
b38cbefca6ad
Add a -f/--force-online option to Pidgin which tells libpurple to claim the
Richard Laager <rlaager@wiktel.com>
parents:
24301
diff
changeset
|
104 #if defined(HAVE_NETWORKMANAGER) || defined(_WIN32) |
b38cbefca6ad
Add a -f/--force-online option to Pidgin which tells libpurple to claim the
Richard Laager <rlaager@wiktel.com>
parents:
24301
diff
changeset
|
105 static gboolean force_online; |
b38cbefca6ad
Add a -f/--force-online option to Pidgin which tells libpurple to claim the
Richard Laager <rlaager@wiktel.com>
parents:
24301
diff
changeset
|
106 #endif |
b38cbefca6ad
Add a -f/--force-online option to Pidgin which tells libpurple to claim the
Richard Laager <rlaager@wiktel.com>
parents:
24301
diff
changeset
|
107 |
26055
c56e8826fed0
Added support to generate relayed candidates (TURN).
Marcus Lundblad <ml@update.uu.se>
parents:
26050
diff
changeset
|
108 /* Cached IP addresses for STUN and TURN servers (set globally in prefs) */ |
26050
ae3d25465d0f
Run an asynchronous DNS lookup for the STUN server IP (to set as a property
Marcus Lundblad <ml@update.uu.se>
parents:
24888
diff
changeset
|
109 static gchar *stun_ip = NULL; |
26055
c56e8826fed0
Added support to generate relayed candidates (TURN).
Marcus Lundblad <ml@update.uu.se>
parents:
26050
diff
changeset
|
110 static gchar *turn_ip = NULL; |
26050
ae3d25465d0f
Run an asynchronous DNS lookup for the STUN server IP (to set as a property
Marcus Lundblad <ml@update.uu.se>
parents:
24888
diff
changeset
|
111 |
27108
38c4973b5222
Add a function to remove a port mapping (UPnP or NAT-PMP) given a file
Marcus Lundblad <ml@update.uu.se>
parents:
26885
diff
changeset
|
112 /* Keep track of port mappings done with UPnP and NAT-PMP */ |
38c4973b5222
Add a function to remove a port mapping (UPnP or NAT-PMP) given a file
Marcus Lundblad <ml@update.uu.se>
parents:
26885
diff
changeset
|
113 static GHashTable *upnp_port_mappings = NULL; |
38c4973b5222
Add a function to remove a port mapping (UPnP or NAT-PMP) given a file
Marcus Lundblad <ml@update.uu.se>
parents:
26885
diff
changeset
|
114 static GHashTable *nat_pmp_port_mappings = NULL; |
38c4973b5222
Add a function to remove a port mapping (UPnP or NAT-PMP) given a file
Marcus Lundblad <ml@update.uu.se>
parents:
26885
diff
changeset
|
115 |
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
116 const unsigned char * |
15822 | 117 purple_network_ip_atoi(const char *ip) |
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
118 { |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
119 static unsigned char ret[4]; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
120 gchar *delimiter = "."; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
121 gchar **split; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
122 int i; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
123 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
124 g_return_val_if_fail(ip != NULL, NULL); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
125 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
126 split = g_strsplit(ip, delimiter, 4); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
127 for (i = 0; split[i] != NULL; i++) |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
128 ret[i] = atoi(split[i]); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
129 g_strfreev(split); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
130 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
131 /* i should always be 4 */ |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
132 if (i != 4) |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
133 return NULL; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
134 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
135 return ret; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
136 } |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
137 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
138 void |
15822 | 139 purple_network_set_public_ip(const char *ip) |
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
140 { |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
141 g_return_if_fail(ip != NULL); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
142 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
143 /* XXX - Ensure the IP address is valid */ |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
144 |
16424
4999bbc52881
Works for me! Renames prefs: /core to /purple, /gaim/gtk to /pidgin, /gaim/gnt to /finch
Sean Egan <seanegan@gmail.com>
parents:
15974
diff
changeset
|
145 purple_prefs_set_string("/purple/network/public_ip", ip); |
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
146 } |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
147 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
148 const char * |
15822 | 149 purple_network_get_public_ip(void) |
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
150 { |
16424
4999bbc52881
Works for me! Renames prefs: /core to /purple, /gaim/gtk to /pidgin, /gaim/gnt to /finch
Sean Egan <seanegan@gmail.com>
parents:
15974
diff
changeset
|
151 return purple_prefs_get_string("/purple/network/public_ip"); |
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
152 } |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
153 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
154 const char * |
15822 | 155 purple_network_get_local_system_ip(int fd) |
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
156 { |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
157 char buffer[1024]; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
158 static char ip[16]; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
159 char *tmp; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
160 struct ifconf ifc; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
161 struct ifreq *ifr; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
162 struct sockaddr_in *sinptr; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
163 guint32 lhost = htonl(127 * 256 * 256 * 256 + 1); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
164 long unsigned int add; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
165 int source = fd; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
166 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
167 if (fd < 0) |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
168 source = socket(PF_INET,SOCK_STREAM, 0); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
169 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
170 ifc.ifc_len = sizeof(buffer); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
171 ifc.ifc_req = (struct ifreq *)buffer; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
172 ioctl(source, SIOCGIFCONF, &ifc); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
173 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
174 if (fd < 0) |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
175 close(source); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
176 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
177 tmp = buffer; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
178 while (tmp < buffer + ifc.ifc_len) |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
179 { |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
180 ifr = (struct ifreq *)tmp; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
181 tmp += HX_SIZE_OF_IFREQ(*ifr); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
182 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
183 if (ifr->ifr_addr.sa_family == AF_INET) |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
184 { |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
185 sinptr = (struct sockaddr_in *)&ifr->ifr_addr; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
186 if (sinptr->sin_addr.s_addr != lhost) |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
187 { |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
188 add = ntohl(sinptr->sin_addr.s_addr); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
189 g_snprintf(ip, 16, "%lu.%lu.%lu.%lu", |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
190 ((add >> 24) & 255), |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
191 ((add >> 16) & 255), |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
192 ((add >> 8) & 255), |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
193 add & 255); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
194 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
195 return ip; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
196 } |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
197 } |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
198 } |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
199 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
200 return "0.0.0.0"; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
201 } |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
202 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
203 const char * |
15822 | 204 purple_network_get_my_ip(int fd) |
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
205 { |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
206 const char *ip = NULL; |
15822 | 207 PurpleStunNatDiscovery *stun; |
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
208 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
209 /* Check if the user specified an IP manually */ |
16424
4999bbc52881
Works for me! Renames prefs: /core to /purple, /gaim/gtk to /pidgin, /gaim/gnt to /finch
Sean Egan <seanegan@gmail.com>
parents:
15974
diff
changeset
|
210 if (!purple_prefs_get_bool("/purple/network/auto_ip")) { |
15822 | 211 ip = purple_network_get_public_ip(); |
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
212 /* Make sure the IP address entered by the user is valid */ |
15822 | 213 if ((ip != NULL) && (purple_network_ip_atoi(ip) != NULL)) |
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
214 return ip; |
21697
65ef019c000b
Allow UPnP and NAT-PMP port mapping to be disabled via a pref. This means that UPnP discovery will not occur if this new pref and the "Autodetect IP Address" pref are both unchecked. Fixes #4157.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
21466
diff
changeset
|
215 } else { |
65ef019c000b
Allow UPnP and NAT-PMP port mapping to be disabled via a pref. This means that UPnP discovery will not occur if this new pref and the "Autodetect IP Address" pref are both unchecked. Fixes #4157.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
21466
diff
changeset
|
216 /* Check if STUN discovery was already done */ |
65ef019c000b
Allow UPnP and NAT-PMP port mapping to be disabled via a pref. This means that UPnP discovery will not occur if this new pref and the "Autodetect IP Address" pref are both unchecked. Fixes #4157.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
21466
diff
changeset
|
217 stun = purple_stun_discover(NULL); |
65ef019c000b
Allow UPnP and NAT-PMP port mapping to be disabled via a pref. This means that UPnP discovery will not occur if this new pref and the "Autodetect IP Address" pref are both unchecked. Fixes #4157.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
21466
diff
changeset
|
218 if ((stun != NULL) && (stun->status == PURPLE_STUN_STATUS_DISCOVERED)) |
65ef019c000b
Allow UPnP and NAT-PMP port mapping to be disabled via a pref. This means that UPnP discovery will not occur if this new pref and the "Autodetect IP Address" pref are both unchecked. Fixes #4157.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
21466
diff
changeset
|
219 return stun->publicip; |
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
220 |
21697
65ef019c000b
Allow UPnP and NAT-PMP port mapping to be disabled via a pref. This means that UPnP discovery will not occur if this new pref and the "Autodetect IP Address" pref are both unchecked. Fixes #4157.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
21466
diff
changeset
|
221 /* Attempt to get the IP from a NAT device using UPnP */ |
65ef019c000b
Allow UPnP and NAT-PMP port mapping to be disabled via a pref. This means that UPnP discovery will not occur if this new pref and the "Autodetect IP Address" pref are both unchecked. Fixes #4157.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
21466
diff
changeset
|
222 ip = purple_upnp_get_public_ip(); |
65ef019c000b
Allow UPnP and NAT-PMP port mapping to be disabled via a pref. This means that UPnP discovery will not occur if this new pref and the "Autodetect IP Address" pref are both unchecked. Fixes #4157.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
21466
diff
changeset
|
223 if (ip != NULL) |
65ef019c000b
Allow UPnP and NAT-PMP port mapping to be disabled via a pref. This means that UPnP discovery will not occur if this new pref and the "Autodetect IP Address" pref are both unchecked. Fixes #4157.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
21466
diff
changeset
|
224 return ip; |
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
225 |
21697
65ef019c000b
Allow UPnP and NAT-PMP port mapping to be disabled via a pref. This means that UPnP discovery will not occur if this new pref and the "Autodetect IP Address" pref are both unchecked. Fixes #4157.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
21466
diff
changeset
|
226 /* Attempt to get the IP from a NAT device using NAT-PMP */ |
65ef019c000b
Allow UPnP and NAT-PMP port mapping to be disabled via a pref. This means that UPnP discovery will not occur if this new pref and the "Autodetect IP Address" pref are both unchecked. Fixes #4157.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
21466
diff
changeset
|
227 ip = purple_pmp_get_public_ip(); |
65ef019c000b
Allow UPnP and NAT-PMP port mapping to be disabled via a pref. This means that UPnP discovery will not occur if this new pref and the "Autodetect IP Address" pref are both unchecked. Fixes #4157.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
21466
diff
changeset
|
228 if (ip != NULL) |
65ef019c000b
Allow UPnP and NAT-PMP port mapping to be disabled via a pref. This means that UPnP discovery will not occur if this new pref and the "Autodetect IP Address" pref are both unchecked. Fixes #4157.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
21466
diff
changeset
|
229 return ip; |
65ef019c000b
Allow UPnP and NAT-PMP port mapping to be disabled via a pref. This means that UPnP discovery will not occur if this new pref and the "Autodetect IP Address" pref are both unchecked. Fixes #4157.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
21466
diff
changeset
|
230 } |
15646
552be3958d6a
Added nat-pmp implementation and #ifdef'd out changes to network.c which would utilize it.
Evan Schoenberg <evan.s@dreskin.net>
parents:
15440
diff
changeset
|
231 |
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
232 /* Just fetch the IP of the local system */ |
15822 | 233 return purple_network_get_local_system_ip(fd); |
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
234 } |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
235 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
236 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
237 static void |
15822 | 238 purple_network_set_upnp_port_mapping_cb(gboolean success, gpointer data) |
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
239 { |
15822 | 240 PurpleNetworkListenData *listen_data; |
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
241 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
242 listen_data = data; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
243 /* TODO: Once we're keeping track of upnp requests... */ |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
244 /* listen_data->pnp_data = NULL; */ |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
245 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
246 if (!success) { |
27231
627d23bfdb05
Increase the logging level of some debugging messages that seemed to be a
mauro.brasil@tqi.com.br
parents:
27110
diff
changeset
|
247 purple_debug_warning("network", "Couldn't create UPnP mapping\n"); |
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
248 if (listen_data->retry) { |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
249 listen_data->retry = FALSE; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
250 listen_data->adding = FALSE; |
15822 | 251 listen_data->mapping_data = purple_upnp_remove_port_mapping( |
252 purple_network_get_port_from_fd(listen_data->listenfd), | |
15440
56a2a0bb290a
Fix a crash when a network_listen_range process is canceled before its UPnP port mapping completes, which occurs regularly on certain routers when file transfers are initiated and then quickly finished. Much thanks to Elliott Harris and Eric Richie for their hard work with me hunting this down and fixing it.
Evan Schoenberg <evan.s@dreskin.net>
parents:
15373
diff
changeset
|
253 (listen_data->socket_type == SOCK_STREAM) ? "TCP" : "UDP", |
15822 | 254 purple_network_set_upnp_port_mapping_cb, listen_data); |
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
255 return; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
256 } |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
257 } else if (!listen_data->adding) { |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
258 /* We've tried successfully to remove the port mapping. |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
259 * Try to add it again */ |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
260 listen_data->adding = TRUE; |
15822 | 261 listen_data->mapping_data = purple_upnp_set_port_mapping( |
262 purple_network_get_port_from_fd(listen_data->listenfd), | |
15440
56a2a0bb290a
Fix a crash when a network_listen_range process is canceled before its UPnP port mapping completes, which occurs regularly on certain routers when file transfers are initiated and then quickly finished. Much thanks to Elliott Harris and Eric Richie for their hard work with me hunting this down and fixing it.
Evan Schoenberg <evan.s@dreskin.net>
parents:
15373
diff
changeset
|
263 (listen_data->socket_type == SOCK_STREAM) ? "TCP" : "UDP", |
15822 | 264 purple_network_set_upnp_port_mapping_cb, listen_data); |
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
265 return; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
266 } |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
267 |
27108
38c4973b5222
Add a function to remove a port mapping (UPnP or NAT-PMP) given a file
Marcus Lundblad <ml@update.uu.se>
parents:
26885
diff
changeset
|
268 if (success) { |
38c4973b5222
Add a function to remove a port mapping (UPnP or NAT-PMP) given a file
Marcus Lundblad <ml@update.uu.se>
parents:
26885
diff
changeset
|
269 /* add port mapping to hash table */ |
38c4973b5222
Add a function to remove a port mapping (UPnP or NAT-PMP) given a file
Marcus Lundblad <ml@update.uu.se>
parents:
26885
diff
changeset
|
270 gint *key = g_new(gint, 1); |
38c4973b5222
Add a function to remove a port mapping (UPnP or NAT-PMP) given a file
Marcus Lundblad <ml@update.uu.se>
parents:
26885
diff
changeset
|
271 gint *value = g_new(gint, 1); |
38c4973b5222
Add a function to remove a port mapping (UPnP or NAT-PMP) given a file
Marcus Lundblad <ml@update.uu.se>
parents:
26885
diff
changeset
|
272 *key = purple_network_get_port_from_fd(listen_data->listenfd); |
38c4973b5222
Add a function to remove a port mapping (UPnP or NAT-PMP) given a file
Marcus Lundblad <ml@update.uu.se>
parents:
26885
diff
changeset
|
273 *value = listen_data->socket_type; |
38c4973b5222
Add a function to remove a port mapping (UPnP or NAT-PMP) given a file
Marcus Lundblad <ml@update.uu.se>
parents:
26885
diff
changeset
|
274 g_hash_table_insert(upnp_port_mappings, key, value); |
38c4973b5222
Add a function to remove a port mapping (UPnP or NAT-PMP) given a file
Marcus Lundblad <ml@update.uu.se>
parents:
26885
diff
changeset
|
275 } |
38c4973b5222
Add a function to remove a port mapping (UPnP or NAT-PMP) given a file
Marcus Lundblad <ml@update.uu.se>
parents:
26885
diff
changeset
|
276 |
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
277 if (listen_data->cb) |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
278 listen_data->cb(listen_data->listenfd, listen_data->cb_data); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
279 |
15822 | 280 /* Clear the UPnP mapping data, since it's complete and purple_netweork_listen_cancel() will try to cancel |
15440
56a2a0bb290a
Fix a crash when a network_listen_range process is canceled before its UPnP port mapping completes, which occurs regularly on certain routers when file transfers are initiated and then quickly finished. Much thanks to Elliott Harris and Eric Richie for their hard work with me hunting this down and fixing it.
Evan Schoenberg <evan.s@dreskin.net>
parents:
15373
diff
changeset
|
281 * it otherwise. */ |
56a2a0bb290a
Fix a crash when a network_listen_range process is canceled before its UPnP port mapping completes, which occurs regularly on certain routers when file transfers are initiated and then quickly finished. Much thanks to Elliott Harris and Eric Richie for their hard work with me hunting this down and fixing it.
Evan Schoenberg <evan.s@dreskin.net>
parents:
15373
diff
changeset
|
282 listen_data->mapping_data = NULL; |
15822 | 283 purple_network_listen_cancel(listen_data); |
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
284 } |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
285 |
15855
9b875f0ecb86
nat-pmp is now functional with a compatible router. I'm not enabling this code yet because it hasn't been tested with a router which doesn't support nat-pmp.
Evan Schoenberg <evan.s@dreskin.net>
parents:
15822
diff
changeset
|
286 static gboolean |
9b875f0ecb86
nat-pmp is now functional with a compatible router. I'm not enabling this code yet because it hasn't been tested with a router which doesn't support nat-pmp.
Evan Schoenberg <evan.s@dreskin.net>
parents:
15822
diff
changeset
|
287 purple_network_finish_pmp_map_cb(gpointer data) |
9b875f0ecb86
nat-pmp is now functional with a compatible router. I'm not enabling this code yet because it hasn't been tested with a router which doesn't support nat-pmp.
Evan Schoenberg <evan.s@dreskin.net>
parents:
15822
diff
changeset
|
288 { |
9b875f0ecb86
nat-pmp is now functional with a compatible router. I'm not enabling this code yet because it hasn't been tested with a router which doesn't support nat-pmp.
Evan Schoenberg <evan.s@dreskin.net>
parents:
15822
diff
changeset
|
289 PurpleNetworkListenData *listen_data; |
27110
455e679ea0db
Remove port mappings from the hash tables when removing them.
Marcus Lundblad <ml@update.uu.se>
parents:
27108
diff
changeset
|
290 gint *key = g_new(gint, 1); |
455e679ea0db
Remove port mappings from the hash tables when removing them.
Marcus Lundblad <ml@update.uu.se>
parents:
27108
diff
changeset
|
291 gint *value = g_new(gint, 1); |
15900
3a45be1c3281
Whitespace and make sure stuff is #defined to an actual value.
Mark Doliner <mark@kingant.net>
parents:
15893
diff
changeset
|
292 |
15855
9b875f0ecb86
nat-pmp is now functional with a compatible router. I'm not enabling this code yet because it hasn't been tested with a router which doesn't support nat-pmp.
Evan Schoenberg <evan.s@dreskin.net>
parents:
15822
diff
changeset
|
293 listen_data = data; |
15900
3a45be1c3281
Whitespace and make sure stuff is #defined to an actual value.
Mark Doliner <mark@kingant.net>
parents:
15893
diff
changeset
|
294 |
27110
455e679ea0db
Remove port mappings from the hash tables when removing them.
Marcus Lundblad <ml@update.uu.se>
parents:
27108
diff
changeset
|
295 /* add port mapping to hash table */ |
455e679ea0db
Remove port mappings from the hash tables when removing them.
Marcus Lundblad <ml@update.uu.se>
parents:
27108
diff
changeset
|
296 *key = purple_network_get_port_from_fd(listen_data->listenfd); |
455e679ea0db
Remove port mappings from the hash tables when removing them.
Marcus Lundblad <ml@update.uu.se>
parents:
27108
diff
changeset
|
297 *value = listen_data->socket_type; |
455e679ea0db
Remove port mappings from the hash tables when removing them.
Marcus Lundblad <ml@update.uu.se>
parents:
27108
diff
changeset
|
298 g_hash_table_insert(nat_pmp_port_mappings, key, value); |
455e679ea0db
Remove port mappings from the hash tables when removing them.
Marcus Lundblad <ml@update.uu.se>
parents:
27108
diff
changeset
|
299 |
15855
9b875f0ecb86
nat-pmp is now functional with a compatible router. I'm not enabling this code yet because it hasn't been tested with a router which doesn't support nat-pmp.
Evan Schoenberg <evan.s@dreskin.net>
parents:
15822
diff
changeset
|
300 if (listen_data->cb) |
9b875f0ecb86
nat-pmp is now functional with a compatible router. I'm not enabling this code yet because it hasn't been tested with a router which doesn't support nat-pmp.
Evan Schoenberg <evan.s@dreskin.net>
parents:
15822
diff
changeset
|
301 listen_data->cb(listen_data->listenfd, listen_data->cb_data); |
9b875f0ecb86
nat-pmp is now functional with a compatible router. I'm not enabling this code yet because it hasn't been tested with a router which doesn't support nat-pmp.
Evan Schoenberg <evan.s@dreskin.net>
parents:
15822
diff
changeset
|
302 |
9b875f0ecb86
nat-pmp is now functional with a compatible router. I'm not enabling this code yet because it hasn't been tested with a router which doesn't support nat-pmp.
Evan Schoenberg <evan.s@dreskin.net>
parents:
15822
diff
changeset
|
303 purple_network_listen_cancel(listen_data); |
9b875f0ecb86
nat-pmp is now functional with a compatible router. I'm not enabling this code yet because it hasn't been tested with a router which doesn't support nat-pmp.
Evan Schoenberg <evan.s@dreskin.net>
parents:
15822
diff
changeset
|
304 |
9b875f0ecb86
nat-pmp is now functional with a compatible router. I'm not enabling this code yet because it hasn't been tested with a router which doesn't support nat-pmp.
Evan Schoenberg <evan.s@dreskin.net>
parents:
15822
diff
changeset
|
305 return FALSE; |
9b875f0ecb86
nat-pmp is now functional with a compatible router. I'm not enabling this code yet because it hasn't been tested with a router which doesn't support nat-pmp.
Evan Schoenberg <evan.s@dreskin.net>
parents:
15822
diff
changeset
|
306 } |
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
307 |
21466
7a05b6f84545
Don't map the port used for bonjour file transfers externally. This adds a new function that will go away in 3.0.0 when we can modify purple_network_do_listen to take an additional parameter.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
21121
diff
changeset
|
308 static gboolean listen_map_external = TRUE; |
7a05b6f84545
Don't map the port used for bonjour file transfers externally. This adds a new function that will go away in 3.0.0 when we can modify purple_network_do_listen to take an additional parameter.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
21121
diff
changeset
|
309 void purple_network_listen_map_external(gboolean map_external) |
7a05b6f84545
Don't map the port used for bonjour file transfers externally. This adds a new function that will go away in 3.0.0 when we can modify purple_network_do_listen to take an additional parameter.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
21121
diff
changeset
|
310 { |
7a05b6f84545
Don't map the port used for bonjour file transfers externally. This adds a new function that will go away in 3.0.0 when we can modify purple_network_do_listen to take an additional parameter.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
21121
diff
changeset
|
311 listen_map_external = map_external; |
7a05b6f84545
Don't map the port used for bonjour file transfers externally. This adds a new function that will go away in 3.0.0 when we can modify purple_network_do_listen to take an additional parameter.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
21121
diff
changeset
|
312 } |
7a05b6f84545
Don't map the port used for bonjour file transfers externally. This adds a new function that will go away in 3.0.0 when we can modify purple_network_do_listen to take an additional parameter.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
21121
diff
changeset
|
313 |
15822 | 314 static PurpleNetworkListenData * |
315 purple_network_do_listen(unsigned short port, int socket_type, PurpleNetworkListenCallback cb, gpointer cb_data) | |
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
316 { |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
317 int listenfd = -1; |
20347
04fe5601fedb
applied changes from 2762c6075c0dc52a96098c5478c5bf68cfd890a3
Luke Schierer <lschiere@pidgin.im>
parents:
20074
diff
changeset
|
318 int flags; |
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
319 const int on = 1; |
15822 | 320 PurpleNetworkListenData *listen_data; |
15646
552be3958d6a
Added nat-pmp implementation and #ifdef'd out changes to network.c which would utilize it.
Evan Schoenberg <evan.s@dreskin.net>
parents:
15440
diff
changeset
|
321 unsigned short actual_port; |
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
322 #ifdef HAVE_GETADDRINFO |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
323 int errnum; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
324 struct addrinfo hints, *res, *next; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
325 char serv[6]; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
326 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
327 /* |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
328 * Get a list of addresses on this machine. |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
329 */ |
26885
8290e36a5a73
A patch from Scott Wolchok to replace snprintf() with g_snprintf() and
Richard Laager <rlaager@wiktel.com>
parents:
26551
diff
changeset
|
330 g_snprintf(serv, sizeof(serv), "%hu", port); |
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
331 memset(&hints, 0, sizeof(struct addrinfo)); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
332 hints.ai_flags = AI_PASSIVE; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
333 hints.ai_family = AF_UNSPEC; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
334 hints.ai_socktype = socket_type; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
335 errnum = getaddrinfo(NULL /* any IP */, serv, &hints, &res); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
336 if (errnum != 0) { |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
337 #ifndef _WIN32 |
21862
ae58ffd5e929
Create a purple_gai_strerror() function similar to g_str_error() which
Mark Doliner <mark@kingant.net>
parents:
21774
diff
changeset
|
338 purple_debug_warning("network", "getaddrinfo: %s\n", purple_gai_strerror(errnum)); |
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
339 if (errnum == EAI_SYSTEM) |
21121
35b4f1dc4c8d
replace most calls to strerror with calls to g_strerror. strerror will return
Nathan Walp <nwalp@pidgin.im>
parents:
20347
diff
changeset
|
340 purple_debug_warning("network", "getaddrinfo: system error: %s\n", g_strerror(errno)); |
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
341 #else |
15822 | 342 purple_debug_warning("network", "getaddrinfo: Error Code = %d\n", errnum); |
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
343 #endif |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
344 return NULL; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
345 } |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
346 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
347 /* |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
348 * Go through the list of addresses and attempt to listen on |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
349 * one of them. |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
350 * XXX - Try IPv6 addresses first? |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
351 */ |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
352 for (next = res; next != NULL; next = next->ai_next) { |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
353 listenfd = socket(next->ai_family, next->ai_socktype, next->ai_protocol); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
354 if (listenfd < 0) |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
355 continue; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
356 if (setsockopt(listenfd, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on)) != 0) |
21121
35b4f1dc4c8d
replace most calls to strerror with calls to g_strerror. strerror will return
Nathan Walp <nwalp@pidgin.im>
parents:
20347
diff
changeset
|
357 purple_debug_warning("network", "setsockopt: %s\n", g_strerror(errno)); |
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
358 if (bind(listenfd, next->ai_addr, next->ai_addrlen) == 0) |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
359 break; /* success */ |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
360 /* XXX - It is unclear to me (datallah) whether we need to be |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
361 using a new socket each time */ |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
362 close(listenfd); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
363 } |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
364 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
365 freeaddrinfo(res); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
366 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
367 if (next == NULL) |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
368 return NULL; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
369 #else |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
370 struct sockaddr_in sockin; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
371 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
372 if ((listenfd = socket(AF_INET, socket_type, 0)) < 0) { |
21121
35b4f1dc4c8d
replace most calls to strerror with calls to g_strerror. strerror will return
Nathan Walp <nwalp@pidgin.im>
parents:
20347
diff
changeset
|
373 purple_debug_warning("network", "socket: %s\n", g_strerror(errno)); |
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
374 return NULL; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
375 } |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
376 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
377 if (setsockopt(listenfd, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on)) != 0) |
21121
35b4f1dc4c8d
replace most calls to strerror with calls to g_strerror. strerror will return
Nathan Walp <nwalp@pidgin.im>
parents:
20347
diff
changeset
|
378 purple_debug_warning("network", "setsockopt: %s\n", g_strerror(errno)); |
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
379 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
380 memset(&sockin, 0, sizeof(struct sockaddr_in)); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
381 sockin.sin_family = PF_INET; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
382 sockin.sin_port = htons(port); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
383 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
384 if (bind(listenfd, (struct sockaddr *)&sockin, sizeof(struct sockaddr_in)) != 0) { |
21121
35b4f1dc4c8d
replace most calls to strerror with calls to g_strerror. strerror will return
Nathan Walp <nwalp@pidgin.im>
parents:
20347
diff
changeset
|
385 purple_debug_warning("network", "bind: %s\n", g_strerror(errno)); |
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
386 close(listenfd); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
387 return NULL; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
388 } |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
389 #endif |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
390 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
391 if (socket_type == SOCK_STREAM && listen(listenfd, 4) != 0) { |
21121
35b4f1dc4c8d
replace most calls to strerror with calls to g_strerror. strerror will return
Nathan Walp <nwalp@pidgin.im>
parents:
20347
diff
changeset
|
392 purple_debug_warning("network", "listen: %s\n", g_strerror(errno)); |
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
393 close(listenfd); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
394 return NULL; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
395 } |
20347
04fe5601fedb
applied changes from 2762c6075c0dc52a96098c5478c5bf68cfd890a3
Luke Schierer <lschiere@pidgin.im>
parents:
20074
diff
changeset
|
396 flags = fcntl(listenfd, F_GETFL); |
04fe5601fedb
applied changes from 2762c6075c0dc52a96098c5478c5bf68cfd890a3
Luke Schierer <lschiere@pidgin.im>
parents:
20074
diff
changeset
|
397 fcntl(listenfd, F_SETFL, flags | O_NONBLOCK); |
23712
91169093449d
More leaks of fds to client processes.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
23201
diff
changeset
|
398 #ifndef _WIN32 |
91169093449d
More leaks of fds to client processes.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
23201
diff
changeset
|
399 fcntl(listenfd, F_SETFD, FD_CLOEXEC); |
91169093449d
More leaks of fds to client processes.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
23201
diff
changeset
|
400 #endif |
15822 | 401 actual_port = purple_network_get_port_from_fd(listenfd); |
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
402 |
15822 | 403 purple_debug_info("network", "Listening on port: %hu\n", actual_port); |
15900
3a45be1c3281
Whitespace and make sure stuff is #defined to an actual value.
Mark Doliner <mark@kingant.net>
parents:
15893
diff
changeset
|
404 |
15822 | 405 listen_data = g_new0(PurpleNetworkListenData, 1); |
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
406 listen_data->listenfd = listenfd; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
407 listen_data->adding = TRUE; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
408 listen_data->retry = TRUE; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
409 listen_data->cb = cb; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
410 listen_data->cb_data = cb_data; |
19644
ec7b92cbf49f
Store the socket_type in the PurpleNetworkListenData correctly so that callback functions can use it correctly. Fixes #2933.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
19408
diff
changeset
|
411 listen_data->socket_type = socket_type; |
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
412 |
21697
65ef019c000b
Allow UPnP and NAT-PMP port mapping to be disabled via a pref. This means that UPnP discovery will not occur if this new pref and the "Autodetect IP Address" pref are both unchecked. Fixes #4157.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
21466
diff
changeset
|
413 if (!listen_map_external || !purple_prefs_get_bool("/purple/network/map_ports")) |
21466
7a05b6f84545
Don't map the port used for bonjour file transfers externally. This adds a new function that will go away in 3.0.0 when we can modify purple_network_do_listen to take an additional parameter.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
21121
diff
changeset
|
414 { |
7a05b6f84545
Don't map the port used for bonjour file transfers externally. This adds a new function that will go away in 3.0.0 when we can modify purple_network_do_listen to take an additional parameter.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
21121
diff
changeset
|
415 purple_debug_info("network", "Skipping external port mapping.\n"); |
7a05b6f84545
Don't map the port used for bonjour file transfers externally. This adds a new function that will go away in 3.0.0 when we can modify purple_network_do_listen to take an additional parameter.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
21121
diff
changeset
|
416 /* The pmp_map_cb does what we want to do */ |
7a05b6f84545
Don't map the port used for bonjour file transfers externally. This adds a new function that will go away in 3.0.0 when we can modify purple_network_do_listen to take an additional parameter.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
21121
diff
changeset
|
417 purple_timeout_add(0, purple_network_finish_pmp_map_cb, listen_data); |
7a05b6f84545
Don't map the port used for bonjour file transfers externally. This adds a new function that will go away in 3.0.0 when we can modify purple_network_do_listen to take an additional parameter.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
21121
diff
changeset
|
418 } |
15646
552be3958d6a
Added nat-pmp implementation and #ifdef'd out changes to network.c which would utilize it.
Evan Schoenberg <evan.s@dreskin.net>
parents:
15440
diff
changeset
|
419 /* Attempt a NAT-PMP Mapping, which will return immediately */ |
21466
7a05b6f84545
Don't map the port used for bonjour file transfers externally. This adds a new function that will go away in 3.0.0 when we can modify purple_network_do_listen to take an additional parameter.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
21121
diff
changeset
|
420 else if (purple_pmp_create_map(((socket_type == SOCK_STREAM) ? PURPLE_PMP_TYPE_TCP : PURPLE_PMP_TYPE_UDP), |
15949
b4ab4812838a
purple_pmp_create_map() returns a gboolean now, not a pointer
Evan Schoenberg <evan.s@dreskin.net>
parents:
15900
diff
changeset
|
421 actual_port, actual_port, PURPLE_PMP_LIFETIME)) |
15855
9b875f0ecb86
nat-pmp is now functional with a compatible router. I'm not enabling this code yet because it hasn't been tested with a router which doesn't support nat-pmp.
Evan Schoenberg <evan.s@dreskin.net>
parents:
15822
diff
changeset
|
422 { |
21466
7a05b6f84545
Don't map the port used for bonjour file transfers externally. This adds a new function that will go away in 3.0.0 when we can modify purple_network_do_listen to take an additional parameter.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
21121
diff
changeset
|
423 purple_debug_info("network", "Created NAT-PMP mapping on port %i\n", actual_port); |
15855
9b875f0ecb86
nat-pmp is now functional with a compatible router. I'm not enabling this code yet because it hasn't been tested with a router which doesn't support nat-pmp.
Evan Schoenberg <evan.s@dreskin.net>
parents:
15822
diff
changeset
|
424 /* We want to return listen_data now, and on the next run loop trigger the cb and destroy listen_data */ |
9b875f0ecb86
nat-pmp is now functional with a compatible router. I'm not enabling this code yet because it hasn't been tested with a router which doesn't support nat-pmp.
Evan Schoenberg <evan.s@dreskin.net>
parents:
15822
diff
changeset
|
425 purple_timeout_add(0, purple_network_finish_pmp_map_cb, listen_data); |
9b875f0ecb86
nat-pmp is now functional with a compatible router. I'm not enabling this code yet because it hasn't been tested with a router which doesn't support nat-pmp.
Evan Schoenberg <evan.s@dreskin.net>
parents:
15822
diff
changeset
|
426 } |
9b875f0ecb86
nat-pmp is now functional with a compatible router. I'm not enabling this code yet because it hasn't been tested with a router which doesn't support nat-pmp.
Evan Schoenberg <evan.s@dreskin.net>
parents:
15822
diff
changeset
|
427 else |
9b875f0ecb86
nat-pmp is now functional with a compatible router. I'm not enabling this code yet because it hasn't been tested with a router which doesn't support nat-pmp.
Evan Schoenberg <evan.s@dreskin.net>
parents:
15822
diff
changeset
|
428 { |
9b875f0ecb86
nat-pmp is now functional with a compatible router. I'm not enabling this code yet because it hasn't been tested with a router which doesn't support nat-pmp.
Evan Schoenberg <evan.s@dreskin.net>
parents:
15822
diff
changeset
|
429 /* Attempt a UPnP Mapping */ |
9b875f0ecb86
nat-pmp is now functional with a compatible router. I'm not enabling this code yet because it hasn't been tested with a router which doesn't support nat-pmp.
Evan Schoenberg <evan.s@dreskin.net>
parents:
15822
diff
changeset
|
430 listen_data->mapping_data = purple_upnp_set_port_mapping( |
9b875f0ecb86
nat-pmp is now functional with a compatible router. I'm not enabling this code yet because it hasn't been tested with a router which doesn't support nat-pmp.
Evan Schoenberg <evan.s@dreskin.net>
parents:
15822
diff
changeset
|
431 actual_port, |
9b875f0ecb86
nat-pmp is now functional with a compatible router. I'm not enabling this code yet because it hasn't been tested with a router which doesn't support nat-pmp.
Evan Schoenberg <evan.s@dreskin.net>
parents:
15822
diff
changeset
|
432 (socket_type == SOCK_STREAM) ? "TCP" : "UDP", |
9b875f0ecb86
nat-pmp is now functional with a compatible router. I'm not enabling this code yet because it hasn't been tested with a router which doesn't support nat-pmp.
Evan Schoenberg <evan.s@dreskin.net>
parents:
15822
diff
changeset
|
433 purple_network_set_upnp_port_mapping_cb, listen_data); |
9b875f0ecb86
nat-pmp is now functional with a compatible router. I'm not enabling this code yet because it hasn't been tested with a router which doesn't support nat-pmp.
Evan Schoenberg <evan.s@dreskin.net>
parents:
15822
diff
changeset
|
434 } |
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
435 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
436 return listen_data; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
437 } |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
438 |
15822 | 439 PurpleNetworkListenData * |
440 purple_network_listen(unsigned short port, int socket_type, | |
441 PurpleNetworkListenCallback cb, gpointer cb_data) | |
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
442 { |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
443 g_return_val_if_fail(port != 0, NULL); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
444 |
15822 | 445 return purple_network_do_listen(port, socket_type, cb, cb_data); |
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
446 } |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
447 |
15822 | 448 PurpleNetworkListenData * |
449 purple_network_listen_range(unsigned short start, unsigned short end, | |
450 int socket_type, PurpleNetworkListenCallback cb, gpointer cb_data) | |
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
451 { |
15822 | 452 PurpleNetworkListenData *ret = NULL; |
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
453 |
16424
4999bbc52881
Works for me! Renames prefs: /core to /purple, /gaim/gtk to /pidgin, /gaim/gnt to /finch
Sean Egan <seanegan@gmail.com>
parents:
15974
diff
changeset
|
454 if (purple_prefs_get_bool("/purple/network/ports_range_use")) { |
4999bbc52881
Works for me! Renames prefs: /core to /purple, /gaim/gtk to /pidgin, /gaim/gnt to /finch
Sean Egan <seanegan@gmail.com>
parents:
15974
diff
changeset
|
455 start = purple_prefs_get_int("/purple/network/ports_range_start"); |
4999bbc52881
Works for me! Renames prefs: /core to /purple, /gaim/gtk to /pidgin, /gaim/gnt to /finch
Sean Egan <seanegan@gmail.com>
parents:
15974
diff
changeset
|
456 end = purple_prefs_get_int("/purple/network/ports_range_end"); |
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
457 } else { |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
458 if (end < start) |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
459 end = start; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
460 } |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
461 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
462 for (; start <= end; start++) { |
15822 | 463 ret = purple_network_do_listen(start, socket_type, cb, cb_data); |
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
464 if (ret != NULL) |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
465 break; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
466 } |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
467 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
468 return ret; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
469 } |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
470 |
15822 | 471 void purple_network_listen_cancel(PurpleNetworkListenData *listen_data) |
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
472 { |
15440
56a2a0bb290a
Fix a crash when a network_listen_range process is canceled before its UPnP port mapping completes, which occurs regularly on certain routers when file transfers are initiated and then quickly finished. Much thanks to Elliott Harris and Eric Richie for their hard work with me hunting this down and fixing it.
Evan Schoenberg <evan.s@dreskin.net>
parents:
15373
diff
changeset
|
473 if (listen_data->mapping_data != NULL) |
15822 | 474 purple_upnp_cancel_port_mapping(listen_data->mapping_data); |
15440
56a2a0bb290a
Fix a crash when a network_listen_range process is canceled before its UPnP port mapping completes, which occurs regularly on certain routers when file transfers are initiated and then quickly finished. Much thanks to Elliott Harris and Eric Richie for their hard work with me hunting this down and fixing it.
Evan Schoenberg <evan.s@dreskin.net>
parents:
15373
diff
changeset
|
475 |
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
476 g_free(listen_data); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
477 } |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
478 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
479 unsigned short |
15822 | 480 purple_network_get_port_from_fd(int fd) |
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
481 { |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
482 struct sockaddr_in addr; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
483 socklen_t len; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
484 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
485 g_return_val_if_fail(fd >= 0, 0); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
486 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
487 len = sizeof(addr); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
488 if (getsockname(fd, (struct sockaddr *) &addr, &len) == -1) { |
21121
35b4f1dc4c8d
replace most calls to strerror with calls to g_strerror. strerror will return
Nathan Walp <nwalp@pidgin.im>
parents:
20347
diff
changeset
|
489 purple_debug_warning("network", "getsockname: %s\n", g_strerror(errno)); |
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
490 return 0; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
491 } |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
492 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
493 return ntohs(addr.sin_port); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
494 } |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
495 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
496 #ifdef _WIN32 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
497 #ifndef NS_NLA |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
498 #define NS_NLA 15 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
499 #endif |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
500 static gint |
15822 | 501 wpurple_get_connected_network_count(void) |
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
502 { |
19408
cc36a5aac908
Fix some conversion warnings about using negative values with unsigned types. There are more, but these were easy fixes. You may think that I'm changing the API, but I'm really not - it was just wrong.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
18401
diff
changeset
|
503 gint net_cnt = 0; |
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
504 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
505 WSAQUERYSET qs; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
506 HANDLE h; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
507 gint retval; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
508 int errorid; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
509 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
510 memset(&qs, 0, sizeof(WSAQUERYSET)); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
511 qs.dwSize = sizeof(WSAQUERYSET); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
512 qs.dwNameSpace = NS_NLA; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
513 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
514 retval = WSALookupServiceBegin(&qs, LUP_RETURN_ALL, &h); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
515 if (retval != ERROR_SUCCESS) { |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
516 gchar *msg; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
517 errorid = WSAGetLastError(); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
518 msg = g_win32_error_message(errorid); |
15822 | 519 purple_debug_warning("network", "Couldn't retrieve NLA SP lookup handle. " |
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
520 "NLA service is probably not running. Message: %s (%d).\n", |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
521 msg, errorid); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
522 g_free(msg); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
523 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
524 return -1; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
525 } else { |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
526 char buf[4096]; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
527 WSAQUERYSET *res = (LPWSAQUERYSET) buf; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
528 DWORD size = sizeof(buf); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
529 while ((retval = WSALookupServiceNext(h, 0, &size, res)) == ERROR_SUCCESS) { |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
530 net_cnt++; |
15822 | 531 purple_debug_info("network", "found network '%s'\n", |
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
532 res->lpszServiceInstanceName ? res->lpszServiceInstanceName : "(NULL)"); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
533 size = sizeof(buf); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
534 } |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
535 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
536 errorid = WSAGetLastError(); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
537 if (!(errorid == WSA_E_NO_MORE || errorid == WSAENOMORE)) { |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
538 gchar *msg = g_win32_error_message(errorid); |
15822 | 539 purple_debug_error("network", "got unexpected NLA response %s (%d)\n", msg, errorid); |
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
540 g_free(msg); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
541 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
542 net_cnt = -1; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
543 } |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
544 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
545 retval = WSALookupServiceEnd(h); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
546 } |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
547 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
548 return net_cnt; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
549 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
550 } |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
551 |
15822 | 552 static gboolean wpurple_network_change_thread_cb(gpointer data) |
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
553 { |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
554 gint new_count; |
15822 | 555 PurpleConnectionUiOps *ui_ops = purple_connections_get_ui_ops(); |
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
556 |
15822 | 557 new_count = wpurple_get_connected_network_count(); |
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
558 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
559 if (new_count < 0) |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
560 return FALSE; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
561 |
15822 | 562 purple_debug_info("network", "Received Network Change Notification. Current network count is %d, previous count was %d.\n", new_count, current_network_count); |
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
563 |
15974
1a12ce76c4f4
The network module now registers the signal 'network-configuration-changed' and emits it when a network change is detected via libnm or the win32 network monitor. The UI could also emit this signal if it knows something network.c doesn't. UPnP and NAT-PMP respond to the signal by clearing their IP address caches; changing networks without quitting/relaunching will now lead to the new IP address being (lazily) determined. This commit also enables nat-pmp and adds nat-pmp.[h|c] to the build process; please let me know if there are any problems building, as I only have OS X test machines.
Evan Schoenberg <evan.s@dreskin.net>
parents:
15949
diff
changeset
|
564 purple_signal_emit(purple_network_get_handle(), "network-configuration-changed", NULL); |
1a12ce76c4f4
The network module now registers the signal 'network-configuration-changed' and emits it when a network change is detected via libnm or the win32 network monitor. The UI could also emit this signal if it knows something network.c doesn't. UPnP and NAT-PMP respond to the signal by clearing their IP address caches; changing networks without quitting/relaunching will now lead to the new IP address being (lazily) determined. This commit also enables nat-pmp and adds nat-pmp.[h|c] to the build process; please let me know if there are any problems building, as I only have OS X test machines.
Evan Schoenberg <evan.s@dreskin.net>
parents:
15949
diff
changeset
|
565 |
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
566 if (new_count > 0 && ui_ops != NULL && ui_ops->network_connected != NULL) { |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
567 ui_ops->network_connected(); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
568 } else if (new_count == 0 && current_network_count > 0 && |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
569 ui_ops != NULL && ui_ops->network_disconnected != NULL) { |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
570 ui_ops->network_disconnected(); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
571 } |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
572 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
573 current_network_count = new_count; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
574 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
575 return FALSE; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
576 } |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
577 |
25401
75f72178e361
Fix 3 different race conditions in the win32 network management functionality.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
24888
diff
changeset
|
578 static gboolean _print_debug_msg(gpointer data) { |
75f72178e361
Fix 3 different race conditions in the win32 network management functionality.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
24888
diff
changeset
|
579 gchar *msg = data; |
75f72178e361
Fix 3 different race conditions in the win32 network management functionality.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
24888
diff
changeset
|
580 purple_debug_warning("network", msg); |
75f72178e361
Fix 3 different race conditions in the win32 network management functionality.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
24888
diff
changeset
|
581 g_free(msg); |
75f72178e361
Fix 3 different race conditions in the win32 network management functionality.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
24888
diff
changeset
|
582 return FALSE; |
75f72178e361
Fix 3 different race conditions in the win32 network management functionality.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
24888
diff
changeset
|
583 } |
75f72178e361
Fix 3 different race conditions in the win32 network management functionality.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
24888
diff
changeset
|
584 |
15822 | 585 static gpointer wpurple_network_change_thread(gpointer data) |
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
586 { |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
587 WSAQUERYSET qs; |
24888
a6742d9eadf3
Adjust the NLA code to prevent hang on exit for Windows XP and Windows Vista.
Paul Aurich <paul@darkrain42.org>
parents:
24301
diff
changeset
|
588 WSAEVENT *nla_event; |
25401
75f72178e361
Fix 3 different race conditions in the win32 network management functionality.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
24888
diff
changeset
|
589 time_t last_trigger = time(NULL) - 31; |
75f72178e361
Fix 3 different race conditions in the win32 network management functionality.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
24888
diff
changeset
|
590 char buf[4096]; |
75f72178e361
Fix 3 different race conditions in the win32 network management functionality.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
24888
diff
changeset
|
591 WSAQUERYSET *res = (LPWSAQUERYSET) buf; |
75f72178e361
Fix 3 different race conditions in the win32 network management functionality.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
24888
diff
changeset
|
592 DWORD size; |
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
593 |
24888
a6742d9eadf3
Adjust the NLA code to prevent hang on exit for Windows XP and Windows Vista.
Paul Aurich <paul@darkrain42.org>
parents:
24301
diff
changeset
|
594 if ((nla_event = WSACreateEvent()) == WSA_INVALID_EVENT) { |
a6742d9eadf3
Adjust the NLA code to prevent hang on exit for Windows XP and Windows Vista.
Paul Aurich <paul@darkrain42.org>
parents:
24301
diff
changeset
|
595 int errorid = WSAGetLastError(); |
a6742d9eadf3
Adjust the NLA code to prevent hang on exit for Windows XP and Windows Vista.
Paul Aurich <paul@darkrain42.org>
parents:
24301
diff
changeset
|
596 gchar *msg = g_win32_error_message(errorid); |
25401
75f72178e361
Fix 3 different race conditions in the win32 network management functionality.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
24888
diff
changeset
|
597 purple_timeout_add(0, _print_debug_msg, |
75f72178e361
Fix 3 different race conditions in the win32 network management functionality.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
24888
diff
changeset
|
598 g_strdup_printf("Couldn't create WSA event. " |
75f72178e361
Fix 3 different race conditions in the win32 network management functionality.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
24888
diff
changeset
|
599 "Message: %s (%d).\n", msg, errorid)); |
24888
a6742d9eadf3
Adjust the NLA code to prevent hang on exit for Windows XP and Windows Vista.
Paul Aurich <paul@darkrain42.org>
parents:
24301
diff
changeset
|
600 g_free(msg); |
a6742d9eadf3
Adjust the NLA code to prevent hang on exit for Windows XP and Windows Vista.
Paul Aurich <paul@darkrain42.org>
parents:
24301
diff
changeset
|
601 g_thread_exit(NULL); |
a6742d9eadf3
Adjust the NLA code to prevent hang on exit for Windows XP and Windows Vista.
Paul Aurich <paul@darkrain42.org>
parents:
24301
diff
changeset
|
602 return NULL; |
a6742d9eadf3
Adjust the NLA code to prevent hang on exit for Windows XP and Windows Vista.
Paul Aurich <paul@darkrain42.org>
parents:
24301
diff
changeset
|
603 } |
a6742d9eadf3
Adjust the NLA code to prevent hang on exit for Windows XP and Windows Vista.
Paul Aurich <paul@darkrain42.org>
parents:
24301
diff
changeset
|
604 |
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
605 while (TRUE) { |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
606 int retval; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
607 DWORD retLen = 0; |
24888
a6742d9eadf3
Adjust the NLA code to prevent hang on exit for Windows XP and Windows Vista.
Paul Aurich <paul@darkrain42.org>
parents:
24301
diff
changeset
|
608 WSACOMPLETION completion; |
a6742d9eadf3
Adjust the NLA code to prevent hang on exit for Windows XP and Windows Vista.
Paul Aurich <paul@darkrain42.org>
parents:
24301
diff
changeset
|
609 WSAOVERLAPPED overlapped; |
a6742d9eadf3
Adjust the NLA code to prevent hang on exit for Windows XP and Windows Vista.
Paul Aurich <paul@darkrain42.org>
parents:
24301
diff
changeset
|
610 |
a6742d9eadf3
Adjust the NLA code to prevent hang on exit for Windows XP and Windows Vista.
Paul Aurich <paul@darkrain42.org>
parents:
24301
diff
changeset
|
611 g_static_mutex_lock(&mutex); |
a6742d9eadf3
Adjust the NLA code to prevent hang on exit for Windows XP and Windows Vista.
Paul Aurich <paul@darkrain42.org>
parents:
24301
diff
changeset
|
612 if (network_initialized == FALSE) { |
a6742d9eadf3
Adjust the NLA code to prevent hang on exit for Windows XP and Windows Vista.
Paul Aurich <paul@darkrain42.org>
parents:
24301
diff
changeset
|
613 /* purple_network_uninit has been called */ |
a6742d9eadf3
Adjust the NLA code to prevent hang on exit for Windows XP and Windows Vista.
Paul Aurich <paul@darkrain42.org>
parents:
24301
diff
changeset
|
614 WSACloseEvent(nla_event); |
a6742d9eadf3
Adjust the NLA code to prevent hang on exit for Windows XP and Windows Vista.
Paul Aurich <paul@darkrain42.org>
parents:
24301
diff
changeset
|
615 g_static_mutex_unlock(&mutex); |
a6742d9eadf3
Adjust the NLA code to prevent hang on exit for Windows XP and Windows Vista.
Paul Aurich <paul@darkrain42.org>
parents:
24301
diff
changeset
|
616 g_thread_exit(NULL); |
a6742d9eadf3
Adjust the NLA code to prevent hang on exit for Windows XP and Windows Vista.
Paul Aurich <paul@darkrain42.org>
parents:
24301
diff
changeset
|
617 return NULL; |
a6742d9eadf3
Adjust the NLA code to prevent hang on exit for Windows XP and Windows Vista.
Paul Aurich <paul@darkrain42.org>
parents:
24301
diff
changeset
|
618 } |
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
619 |
25401
75f72178e361
Fix 3 different race conditions in the win32 network management functionality.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
24888
diff
changeset
|
620 if (network_change_handle == NULL) { |
75f72178e361
Fix 3 different race conditions in the win32 network management functionality.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
24888
diff
changeset
|
621 memset(&qs, 0, sizeof(WSAQUERYSET)); |
75f72178e361
Fix 3 different race conditions in the win32 network management functionality.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
24888
diff
changeset
|
622 qs.dwSize = sizeof(WSAQUERYSET); |
75f72178e361
Fix 3 different race conditions in the win32 network management functionality.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
24888
diff
changeset
|
623 qs.dwNameSpace = NS_NLA; |
75f72178e361
Fix 3 different race conditions in the win32 network management functionality.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
24888
diff
changeset
|
624 if (WSALookupServiceBegin(&qs, 0, &network_change_handle) == SOCKET_ERROR) { |
75f72178e361
Fix 3 different race conditions in the win32 network management functionality.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
24888
diff
changeset
|
625 int errorid = WSAGetLastError(); |
75f72178e361
Fix 3 different race conditions in the win32 network management functionality.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
24888
diff
changeset
|
626 gchar *msg = g_win32_error_message(errorid); |
75f72178e361
Fix 3 different race conditions in the win32 network management functionality.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
24888
diff
changeset
|
627 purple_timeout_add(0, _print_debug_msg, |
75f72178e361
Fix 3 different race conditions in the win32 network management functionality.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
24888
diff
changeset
|
628 g_strdup_printf("Couldn't retrieve NLA SP lookup handle. " |
75f72178e361
Fix 3 different race conditions in the win32 network management functionality.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
24888
diff
changeset
|
629 "NLA service is probably not running. Message: %s (%d).\n", |
75f72178e361
Fix 3 different race conditions in the win32 network management functionality.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
24888
diff
changeset
|
630 msg, errorid)); |
75f72178e361
Fix 3 different race conditions in the win32 network management functionality.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
24888
diff
changeset
|
631 g_free(msg); |
75f72178e361
Fix 3 different race conditions in the win32 network management functionality.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
24888
diff
changeset
|
632 WSACloseEvent(nla_event); |
75f72178e361
Fix 3 different race conditions in the win32 network management functionality.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
24888
diff
changeset
|
633 g_static_mutex_unlock(&mutex); |
75f72178e361
Fix 3 different race conditions in the win32 network management functionality.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
24888
diff
changeset
|
634 g_thread_exit(NULL); |
75f72178e361
Fix 3 different race conditions in the win32 network management functionality.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
24888
diff
changeset
|
635 return NULL; |
75f72178e361
Fix 3 different race conditions in the win32 network management functionality.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
24888
diff
changeset
|
636 } |
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
637 } |
24888
a6742d9eadf3
Adjust the NLA code to prevent hang on exit for Windows XP and Windows Vista.
Paul Aurich <paul@darkrain42.org>
parents:
24301
diff
changeset
|
638 g_static_mutex_unlock(&mutex); |
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
639 |
24888
a6742d9eadf3
Adjust the NLA code to prevent hang on exit for Windows XP and Windows Vista.
Paul Aurich <paul@darkrain42.org>
parents:
24301
diff
changeset
|
640 memset(&completion, 0, sizeof(WSACOMPLETION)); |
a6742d9eadf3
Adjust the NLA code to prevent hang on exit for Windows XP and Windows Vista.
Paul Aurich <paul@darkrain42.org>
parents:
24301
diff
changeset
|
641 completion.Type = NSP_NOTIFY_EVENT; |
a6742d9eadf3
Adjust the NLA code to prevent hang on exit for Windows XP and Windows Vista.
Paul Aurich <paul@darkrain42.org>
parents:
24301
diff
changeset
|
642 overlapped.hEvent = nla_event; |
a6742d9eadf3
Adjust the NLA code to prevent hang on exit for Windows XP and Windows Vista.
Paul Aurich <paul@darkrain42.org>
parents:
24301
diff
changeset
|
643 completion.Parameters.Event.lpOverlapped = &overlapped; |
a6742d9eadf3
Adjust the NLA code to prevent hang on exit for Windows XP and Windows Vista.
Paul Aurich <paul@darkrain42.org>
parents:
24301
diff
changeset
|
644 |
a6742d9eadf3
Adjust the NLA code to prevent hang on exit for Windows XP and Windows Vista.
Paul Aurich <paul@darkrain42.org>
parents:
24301
diff
changeset
|
645 if (MyWSANSPIoctl(network_change_handle, SIO_NSP_NOTIFY_CHANGE, NULL, 0, NULL, 0, &retLen, &completion) == SOCKET_ERROR) { |
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
646 int errorid = WSAGetLastError(); |
25401
75f72178e361
Fix 3 different race conditions in the win32 network management functionality.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
24888
diff
changeset
|
647 if (errorid == WSA_INVALID_HANDLE) { |
75f72178e361
Fix 3 different race conditions in the win32 network management functionality.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
24888
diff
changeset
|
648 purple_timeout_add(0, _print_debug_msg, |
75f72178e361
Fix 3 different race conditions in the win32 network management functionality.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
24888
diff
changeset
|
649 g_strdup("Invalid NLA handle; resetting.\n")); |
75f72178e361
Fix 3 different race conditions in the win32 network management functionality.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
24888
diff
changeset
|
650 g_static_mutex_lock(&mutex); |
75f72178e361
Fix 3 different race conditions in the win32 network management functionality.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
24888
diff
changeset
|
651 retval = WSALookupServiceEnd(network_change_handle); |
75f72178e361
Fix 3 different race conditions in the win32 network management functionality.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
24888
diff
changeset
|
652 network_change_handle = NULL; |
75f72178e361
Fix 3 different race conditions in the win32 network management functionality.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
24888
diff
changeset
|
653 g_static_mutex_unlock(&mutex); |
75f72178e361
Fix 3 different race conditions in the win32 network management functionality.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
24888
diff
changeset
|
654 continue; |
24888
a6742d9eadf3
Adjust the NLA code to prevent hang on exit for Windows XP and Windows Vista.
Paul Aurich <paul@darkrain42.org>
parents:
24301
diff
changeset
|
655 /* WSA_IO_PENDING indicates successful async notification will happen */ |
25401
75f72178e361
Fix 3 different race conditions in the win32 network management functionality.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
24888
diff
changeset
|
656 } else if (errorid != WSA_IO_PENDING) { |
24888
a6742d9eadf3
Adjust the NLA code to prevent hang on exit for Windows XP and Windows Vista.
Paul Aurich <paul@darkrain42.org>
parents:
24301
diff
changeset
|
657 gchar *msg = g_win32_error_message(errorid); |
25401
75f72178e361
Fix 3 different race conditions in the win32 network management functionality.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
24888
diff
changeset
|
658 purple_timeout_add(0, _print_debug_msg, |
75f72178e361
Fix 3 different race conditions in the win32 network management functionality.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
24888
diff
changeset
|
659 g_strdup_printf("Unable to wait for changes. Message: %s (%d).\n", |
75f72178e361
Fix 3 different race conditions in the win32 network management functionality.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
24888
diff
changeset
|
660 msg, errorid)); |
24888
a6742d9eadf3
Adjust the NLA code to prevent hang on exit for Windows XP and Windows Vista.
Paul Aurich <paul@darkrain42.org>
parents:
24301
diff
changeset
|
661 g_free(msg); |
a6742d9eadf3
Adjust the NLA code to prevent hang on exit for Windows XP and Windows Vista.
Paul Aurich <paul@darkrain42.org>
parents:
24301
diff
changeset
|
662 } |
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
663 } |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
664 |
25401
75f72178e361
Fix 3 different race conditions in the win32 network management functionality.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
24888
diff
changeset
|
665 /* Make sure at least 30 seconds have elapsed since the last |
75f72178e361
Fix 3 different race conditions in the win32 network management functionality.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
24888
diff
changeset
|
666 * notification so we don't peg the cpu if this keeps changing. */ |
75f72178e361
Fix 3 different race conditions in the win32 network management functionality.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
24888
diff
changeset
|
667 if ((time(NULL) - last_trigger) < 30) |
75f72178e361
Fix 3 different race conditions in the win32 network management functionality.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
24888
diff
changeset
|
668 Sleep(30000); |
75f72178e361
Fix 3 different race conditions in the win32 network management functionality.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
24888
diff
changeset
|
669 |
24888
a6742d9eadf3
Adjust the NLA code to prevent hang on exit for Windows XP and Windows Vista.
Paul Aurich <paul@darkrain42.org>
parents:
24301
diff
changeset
|
670 /* This will block until NLA notifies us */ |
a6742d9eadf3
Adjust the NLA code to prevent hang on exit for Windows XP and Windows Vista.
Paul Aurich <paul@darkrain42.org>
parents:
24301
diff
changeset
|
671 retval = WaitForSingleObjectEx(nla_event, WSA_INFINITE, TRUE); |
a6742d9eadf3
Adjust the NLA code to prevent hang on exit for Windows XP and Windows Vista.
Paul Aurich <paul@darkrain42.org>
parents:
24301
diff
changeset
|
672 |
25401
75f72178e361
Fix 3 different race conditions in the win32 network management functionality.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
24888
diff
changeset
|
673 last_trigger = time(NULL); |
75f72178e361
Fix 3 different race conditions in the win32 network management functionality.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
24888
diff
changeset
|
674 |
24888
a6742d9eadf3
Adjust the NLA code to prevent hang on exit for Windows XP and Windows Vista.
Paul Aurich <paul@darkrain42.org>
parents:
24301
diff
changeset
|
675 g_static_mutex_lock(&mutex); |
a6742d9eadf3
Adjust the NLA code to prevent hang on exit for Windows XP and Windows Vista.
Paul Aurich <paul@darkrain42.org>
parents:
24301
diff
changeset
|
676 if (network_initialized == FALSE) { |
a6742d9eadf3
Adjust the NLA code to prevent hang on exit for Windows XP and Windows Vista.
Paul Aurich <paul@darkrain42.org>
parents:
24301
diff
changeset
|
677 /* Time to die */ |
a6742d9eadf3
Adjust the NLA code to prevent hang on exit for Windows XP and Windows Vista.
Paul Aurich <paul@darkrain42.org>
parents:
24301
diff
changeset
|
678 WSACloseEvent(nla_event); |
a6742d9eadf3
Adjust the NLA code to prevent hang on exit for Windows XP and Windows Vista.
Paul Aurich <paul@darkrain42.org>
parents:
24301
diff
changeset
|
679 g_static_mutex_unlock(&mutex); |
a6742d9eadf3
Adjust the NLA code to prevent hang on exit for Windows XP and Windows Vista.
Paul Aurich <paul@darkrain42.org>
parents:
24301
diff
changeset
|
680 g_thread_exit(NULL); |
a6742d9eadf3
Adjust the NLA code to prevent hang on exit for Windows XP and Windows Vista.
Paul Aurich <paul@darkrain42.org>
parents:
24301
diff
changeset
|
681 return NULL; |
a6742d9eadf3
Adjust the NLA code to prevent hang on exit for Windows XP and Windows Vista.
Paul Aurich <paul@darkrain42.org>
parents:
24301
diff
changeset
|
682 } |
a6742d9eadf3
Adjust the NLA code to prevent hang on exit for Windows XP and Windows Vista.
Paul Aurich <paul@darkrain42.org>
parents:
24301
diff
changeset
|
683 |
25401
75f72178e361
Fix 3 different race conditions in the win32 network management functionality.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
24888
diff
changeset
|
684 size = sizeof(buf); |
75f72178e361
Fix 3 different race conditions in the win32 network management functionality.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
24888
diff
changeset
|
685 while ((retval = WSALookupServiceNext(network_change_handle, 0, &size, res)) == ERROR_SUCCESS) { |
75f72178e361
Fix 3 different race conditions in the win32 network management functionality.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
24888
diff
changeset
|
686 /*purple_timeout_add(0, _print_debug_msg, |
75f72178e361
Fix 3 different race conditions in the win32 network management functionality.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
24888
diff
changeset
|
687 g_strdup_printf("thread found network '%s'\n", |
75f72178e361
Fix 3 different race conditions in the win32 network management functionality.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
24888
diff
changeset
|
688 res->lpszServiceInstanceName ? res->lpszServiceInstanceName : "(NULL)"));*/ |
75f72178e361
Fix 3 different race conditions in the win32 network management functionality.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
24888
diff
changeset
|
689 size = sizeof(buf); |
75f72178e361
Fix 3 different race conditions in the win32 network management functionality.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
24888
diff
changeset
|
690 } |
75f72178e361
Fix 3 different race conditions in the win32 network management functionality.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
24888
diff
changeset
|
691 |
24888
a6742d9eadf3
Adjust the NLA code to prevent hang on exit for Windows XP and Windows Vista.
Paul Aurich <paul@darkrain42.org>
parents:
24301
diff
changeset
|
692 WSAResetEvent(nla_event); |
a6742d9eadf3
Adjust the NLA code to prevent hang on exit for Windows XP and Windows Vista.
Paul Aurich <paul@darkrain42.org>
parents:
24301
diff
changeset
|
693 g_static_mutex_unlock(&mutex); |
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
694 |
21466
7a05b6f84545
Don't map the port used for bonjour file transfers externally. This adds a new function that will go away in 3.0.0 when we can modify purple_network_do_listen to take an additional parameter.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
21121
diff
changeset
|
695 purple_timeout_add(0, wpurple_network_change_thread_cb, NULL); |
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
696 } |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
697 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
698 g_thread_exit(NULL); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
699 return NULL; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
700 } |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
701 #endif |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
702 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
703 gboolean |
15822 | 704 purple_network_is_available(void) |
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
705 { |
22895
0bd86dae2734
Use pkg-config to detect NetworkManager. Also, fail if it isn't present,
Richard Laager <rlaager@wiktel.com>
parents:
22889
diff
changeset
|
706 #ifdef HAVE_NETWORKMANAGER |
25852
b38cbefca6ad
Add a -f/--force-online option to Pidgin which tells libpurple to claim the
Richard Laager <rlaager@wiktel.com>
parents:
24301
diff
changeset
|
707 if (force_online) |
b38cbefca6ad
Add a -f/--force-online option to Pidgin which tells libpurple to claim the
Richard Laager <rlaager@wiktel.com>
parents:
24301
diff
changeset
|
708 return TRUE; |
b38cbefca6ad
Add a -f/--force-online option to Pidgin which tells libpurple to claim the
Richard Laager <rlaager@wiktel.com>
parents:
24301
diff
changeset
|
709 |
24301
785db7300ef2
Improve our NetworkManager support in a couple of ways:
Richard Laager <rlaager@wiktel.com>
parents:
23712
diff
changeset
|
710 if (!have_nm_state) |
22882
6421d275c85e
Fix some whitespace as noticed by QuLogic.
Richard Laager <rlaager@wiktel.com>
parents:
22876
diff
changeset
|
711 { |
24301
785db7300ef2
Improve our NetworkManager support in a couple of ways:
Richard Laager <rlaager@wiktel.com>
parents:
23712
diff
changeset
|
712 have_nm_state = TRUE; |
785db7300ef2
Improve our NetworkManager support in a couple of ways:
Richard Laager <rlaager@wiktel.com>
parents:
23712
diff
changeset
|
713 nm_state = nm_get_network_state(); |
785db7300ef2
Improve our NetworkManager support in a couple of ways:
Richard Laager <rlaager@wiktel.com>
parents:
23712
diff
changeset
|
714 if (nm_state == NM_STATE_UNKNOWN) |
785db7300ef2
Improve our NetworkManager support in a couple of ways:
Richard Laager <rlaager@wiktel.com>
parents:
23712
diff
changeset
|
715 purple_debug_warning("network", "NetworkManager not active. Assuming connection exists.\n"); |
22876
e6674df4cbf1
Changes suggested by QuLogic to fix my broken changes to the NetworkManager
Richard Laager <rlaager@wiktel.com>
parents:
22875
diff
changeset
|
716 } |
24301
785db7300ef2
Improve our NetworkManager support in a couple of ways:
Richard Laager <rlaager@wiktel.com>
parents:
23712
diff
changeset
|
717 |
785db7300ef2
Improve our NetworkManager support in a couple of ways:
Richard Laager <rlaager@wiktel.com>
parents:
23712
diff
changeset
|
718 if (nm_state == NM_STATE_UNKNOWN || nm_state == NM_STATE_CONNECTED) |
22875
4f6040bb6f7a
Update configure.ac to properly detect Network Manager (via NetworkManager.h instead of libnm_glib). Also, change the code so that if NetworkManager is dead, we'll assume we're connected to the network and try anyway.
Richard Laager <rlaager@wiktel.com>
parents:
22874
diff
changeset
|
719 return TRUE; |
22876
e6674df4cbf1
Changes suggested by QuLogic to fix my broken changes to the NetworkManager
Richard Laager <rlaager@wiktel.com>
parents:
22875
diff
changeset
|
720 |
e6674df4cbf1
Changes suggested by QuLogic to fix my broken changes to the NetworkManager
Richard Laager <rlaager@wiktel.com>
parents:
22875
diff
changeset
|
721 return FALSE; |
e6674df4cbf1
Changes suggested by QuLogic to fix my broken changes to the NetworkManager
Richard Laager <rlaager@wiktel.com>
parents:
22875
diff
changeset
|
722 |
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
723 #elif defined _WIN32 |
25852
b38cbefca6ad
Add a -f/--force-online option to Pidgin which tells libpurple to claim the
Richard Laager <rlaager@wiktel.com>
parents:
24301
diff
changeset
|
724 return (current_network_count > 0 || force_online); |
22876
e6674df4cbf1
Changes suggested by QuLogic to fix my broken changes to the NetworkManager
Richard Laager <rlaager@wiktel.com>
parents:
22875
diff
changeset
|
725 #else |
e6674df4cbf1
Changes suggested by QuLogic to fix my broken changes to the NetworkManager
Richard Laager <rlaager@wiktel.com>
parents:
22875
diff
changeset
|
726 return TRUE; |
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
727 #endif |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
728 } |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
729 |
25852
b38cbefca6ad
Add a -f/--force-online option to Pidgin which tells libpurple to claim the
Richard Laager <rlaager@wiktel.com>
parents:
24301
diff
changeset
|
730 void |
b38cbefca6ad
Add a -f/--force-online option to Pidgin which tells libpurple to claim the
Richard Laager <rlaager@wiktel.com>
parents:
24301
diff
changeset
|
731 purple_network_force_online() |
b38cbefca6ad
Add a -f/--force-online option to Pidgin which tells libpurple to claim the
Richard Laager <rlaager@wiktel.com>
parents:
24301
diff
changeset
|
732 { |
b38cbefca6ad
Add a -f/--force-online option to Pidgin which tells libpurple to claim the
Richard Laager <rlaager@wiktel.com>
parents:
24301
diff
changeset
|
733 #if defined(HAVE_NETWORKMANAGER) || defined(_WIN32) |
b38cbefca6ad
Add a -f/--force-online option to Pidgin which tells libpurple to claim the
Richard Laager <rlaager@wiktel.com>
parents:
24301
diff
changeset
|
734 force_online = TRUE; |
b38cbefca6ad
Add a -f/--force-online option to Pidgin which tells libpurple to claim the
Richard Laager <rlaager@wiktel.com>
parents:
24301
diff
changeset
|
735 #endif |
b38cbefca6ad
Add a -f/--force-online option to Pidgin which tells libpurple to claim the
Richard Laager <rlaager@wiktel.com>
parents:
24301
diff
changeset
|
736 } |
b38cbefca6ad
Add a -f/--force-online option to Pidgin which tells libpurple to claim the
Richard Laager <rlaager@wiktel.com>
parents:
24301
diff
changeset
|
737 |
22895
0bd86dae2734
Use pkg-config to detect NetworkManager. Also, fail if it isn't present,
Richard Laager <rlaager@wiktel.com>
parents:
22889
diff
changeset
|
738 #ifdef HAVE_NETWORKMANAGER |
22594
0e426ad6cc87
Make some more things static
Stu Tomlinson <stu@nosnilmot.com>
parents:
21862
diff
changeset
|
739 static void |
22874
790c606ff8a9
A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@wiktel.com>
parents:
22594
diff
changeset
|
740 nm_update_state(NMState state) |
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
741 { |
24301
785db7300ef2
Improve our NetworkManager support in a couple of ways:
Richard Laager <rlaager@wiktel.com>
parents:
23712
diff
changeset
|
742 NMState prev = nm_state; |
15822 | 743 PurpleConnectionUiOps *ui_ops = purple_connections_get_ui_ops(); |
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
744 |
24301
785db7300ef2
Improve our NetworkManager support in a couple of ways:
Richard Laager <rlaager@wiktel.com>
parents:
23712
diff
changeset
|
745 have_nm_state = TRUE; |
785db7300ef2
Improve our NetworkManager support in a couple of ways:
Richard Laager <rlaager@wiktel.com>
parents:
23712
diff
changeset
|
746 nm_state = state; |
785db7300ef2
Improve our NetworkManager support in a couple of ways:
Richard Laager <rlaager@wiktel.com>
parents:
23712
diff
changeset
|
747 |
15974
1a12ce76c4f4
The network module now registers the signal 'network-configuration-changed' and emits it when a network change is detected via libnm or the win32 network monitor. The UI could also emit this signal if it knows something network.c doesn't. UPnP and NAT-PMP respond to the signal by clearing their IP address caches; changing networks without quitting/relaunching will now lead to the new IP address being (lazily) determined. This commit also enables nat-pmp and adds nat-pmp.[h|c] to the build process; please let me know if there are any problems building, as I only have OS X test machines.
Evan Schoenberg <evan.s@dreskin.net>
parents:
15949
diff
changeset
|
748 purple_signal_emit(purple_network_get_handle(), "network-configuration-changed", NULL); |
1a12ce76c4f4
The network module now registers the signal 'network-configuration-changed' and emits it when a network change is detected via libnm or the win32 network monitor. The UI could also emit this signal if it knows something network.c doesn't. UPnP and NAT-PMP respond to the signal by clearing their IP address caches; changing networks without quitting/relaunching will now lead to the new IP address being (lazily) determined. This commit also enables nat-pmp and adds nat-pmp.[h|c] to the build process; please let me know if there are any problems building, as I only have OS X test machines.
Evan Schoenberg <evan.s@dreskin.net>
parents:
15949
diff
changeset
|
749 |
22874
790c606ff8a9
A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@wiktel.com>
parents:
22594
diff
changeset
|
750 switch(state) |
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
751 { |
22874
790c606ff8a9
A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@wiktel.com>
parents:
22594
diff
changeset
|
752 case NM_STATE_CONNECTED: |
790c606ff8a9
A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@wiktel.com>
parents:
22594
diff
changeset
|
753 /* Call res_init in case DNS servers have changed */ |
790c606ff8a9
A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@wiktel.com>
parents:
22594
diff
changeset
|
754 res_init(); |
26050
ae3d25465d0f
Run an asynchronous DNS lookup for the STUN server IP (to set as a property
Marcus Lundblad <ml@update.uu.se>
parents:
24888
diff
changeset
|
755 /* update STUN IP in case we it changed (theoretically we could |
ae3d25465d0f
Run an asynchronous DNS lookup for the STUN server IP (to set as a property
Marcus Lundblad <ml@update.uu.se>
parents:
24888
diff
changeset
|
756 have gone from IPv4 to IPv6, f.ex. or we were previously |
ae3d25465d0f
Run an asynchronous DNS lookup for the STUN server IP (to set as a property
Marcus Lundblad <ml@update.uu.se>
parents:
24888
diff
changeset
|
757 offline */ |
ae3d25465d0f
Run an asynchronous DNS lookup for the STUN server IP (to set as a property
Marcus Lundblad <ml@update.uu.se>
parents:
24888
diff
changeset
|
758 purple_network_set_stun_server( |
ae3d25465d0f
Run an asynchronous DNS lookup for the STUN server IP (to set as a property
Marcus Lundblad <ml@update.uu.se>
parents:
24888
diff
changeset
|
759 purple_prefs_get_string("/purple/network/stun_server")); |
26055
c56e8826fed0
Added support to generate relayed candidates (TURN).
Marcus Lundblad <ml@update.uu.se>
parents:
26050
diff
changeset
|
760 purple_network_set_turn_server( |
c56e8826fed0
Added support to generate relayed candidates (TURN).
Marcus Lundblad <ml@update.uu.se>
parents:
26050
diff
changeset
|
761 purple_prefs_get_string("/purple/network/turn_server")); |
26050
ae3d25465d0f
Run an asynchronous DNS lookup for the STUN server IP (to set as a property
Marcus Lundblad <ml@update.uu.se>
parents:
24888
diff
changeset
|
762 |
22874
790c606ff8a9
A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@wiktel.com>
parents:
22594
diff
changeset
|
763 if (ui_ops != NULL && ui_ops->network_connected != NULL) |
790c606ff8a9
A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@wiktel.com>
parents:
22594
diff
changeset
|
764 ui_ops->network_connected(); |
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
765 break; |
22874
790c606ff8a9
A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@wiktel.com>
parents:
22594
diff
changeset
|
766 case NM_STATE_ASLEEP: |
790c606ff8a9
A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@wiktel.com>
parents:
22594
diff
changeset
|
767 case NM_STATE_CONNECTING: |
790c606ff8a9
A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@wiktel.com>
parents:
22594
diff
changeset
|
768 case NM_STATE_DISCONNECTED: |
24301
785db7300ef2
Improve our NetworkManager support in a couple of ways:
Richard Laager <rlaager@wiktel.com>
parents:
23712
diff
changeset
|
769 if (prev != NM_STATE_CONNECTED && prev != NM_STATE_UNKNOWN) |
22874
790c606ff8a9
A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@wiktel.com>
parents:
22594
diff
changeset
|
770 break; |
790c606ff8a9
A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@wiktel.com>
parents:
22594
diff
changeset
|
771 if (ui_ops != NULL && ui_ops->network_disconnected != NULL) |
790c606ff8a9
A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@wiktel.com>
parents:
22594
diff
changeset
|
772 ui_ops->network_disconnected(); |
790c606ff8a9
A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@wiktel.com>
parents:
22594
diff
changeset
|
773 break; |
790c606ff8a9
A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@wiktel.com>
parents:
22594
diff
changeset
|
774 case NM_STATE_UNKNOWN: |
790c606ff8a9
A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@wiktel.com>
parents:
22594
diff
changeset
|
775 default: |
790c606ff8a9
A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@wiktel.com>
parents:
22594
diff
changeset
|
776 break; |
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
777 } |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
778 } |
22874
790c606ff8a9
A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@wiktel.com>
parents:
22594
diff
changeset
|
779 |
790c606ff8a9
A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@wiktel.com>
parents:
22594
diff
changeset
|
780 static void |
790c606ff8a9
A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@wiktel.com>
parents:
22594
diff
changeset
|
781 nm_state_change_cb(DBusGProxy *proxy, NMState state, gpointer user_data) |
790c606ff8a9
A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@wiktel.com>
parents:
22594
diff
changeset
|
782 { |
790c606ff8a9
A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@wiktel.com>
parents:
22594
diff
changeset
|
783 purple_debug_info("network", "Got StateChange from NetworkManager: %d.\n", state); |
790c606ff8a9
A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@wiktel.com>
parents:
22594
diff
changeset
|
784 nm_update_state(state); |
790c606ff8a9
A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@wiktel.com>
parents:
22594
diff
changeset
|
785 } |
790c606ff8a9
A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@wiktel.com>
parents:
22594
diff
changeset
|
786 |
790c606ff8a9
A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@wiktel.com>
parents:
22594
diff
changeset
|
787 static NMState |
790c606ff8a9
A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@wiktel.com>
parents:
22594
diff
changeset
|
788 nm_get_network_state(void) |
790c606ff8a9
A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@wiktel.com>
parents:
22594
diff
changeset
|
789 { |
790c606ff8a9
A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@wiktel.com>
parents:
22594
diff
changeset
|
790 GError *err = NULL; |
790c606ff8a9
A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@wiktel.com>
parents:
22594
diff
changeset
|
791 NMState state = NM_STATE_UNKNOWN; |
790c606ff8a9
A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@wiktel.com>
parents:
22594
diff
changeset
|
792 |
790c606ff8a9
A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@wiktel.com>
parents:
22594
diff
changeset
|
793 if (!nm_proxy) |
790c606ff8a9
A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@wiktel.com>
parents:
22594
diff
changeset
|
794 return NM_STATE_UNKNOWN; |
790c606ff8a9
A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@wiktel.com>
parents:
22594
diff
changeset
|
795 |
790c606ff8a9
A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@wiktel.com>
parents:
22594
diff
changeset
|
796 if (!dbus_g_proxy_call(nm_proxy, "state", &err, G_TYPE_INVALID, G_TYPE_UINT, &state, G_TYPE_INVALID)) { |
23043 | 797 g_error_free(err); |
22874
790c606ff8a9
A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@wiktel.com>
parents:
22594
diff
changeset
|
798 return NM_STATE_UNKNOWN; |
790c606ff8a9
A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@wiktel.com>
parents:
22594
diff
changeset
|
799 } |
790c606ff8a9
A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@wiktel.com>
parents:
22594
diff
changeset
|
800 |
790c606ff8a9
A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@wiktel.com>
parents:
22594
diff
changeset
|
801 return state; |
790c606ff8a9
A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@wiktel.com>
parents:
22594
diff
changeset
|
802 } |
790c606ff8a9
A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@wiktel.com>
parents:
22594
diff
changeset
|
803 |
790c606ff8a9
A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@wiktel.com>
parents:
22594
diff
changeset
|
804 static void |
790c606ff8a9
A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@wiktel.com>
parents:
22594
diff
changeset
|
805 nm_dbus_name_owner_changed_cb(DBusGProxy *proxy, char *service, char *old_owner, char *new_owner, gpointer user_data) |
790c606ff8a9
A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@wiktel.com>
parents:
22594
diff
changeset
|
806 { |
790c606ff8a9
A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@wiktel.com>
parents:
22594
diff
changeset
|
807 if (g_str_equal(service, NM_DBUS_SERVICE)) { |
790c606ff8a9
A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@wiktel.com>
parents:
22594
diff
changeset
|
808 gboolean old_owner_good = old_owner && (old_owner[0] != '\0'); |
790c606ff8a9
A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@wiktel.com>
parents:
22594
diff
changeset
|
809 gboolean new_owner_good = new_owner && (new_owner[0] != '\0'); |
790c606ff8a9
A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@wiktel.com>
parents:
22594
diff
changeset
|
810 |
790c606ff8a9
A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@wiktel.com>
parents:
22594
diff
changeset
|
811 purple_debug_info("network", "Got NameOwnerChanged signal, service = '%s', old_owner = '%s', new_owner = '%s'\n", service, old_owner, new_owner); |
790c606ff8a9
A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@wiktel.com>
parents:
22594
diff
changeset
|
812 if (!old_owner_good && new_owner_good) { /* Equivalent to old ServiceCreated signal */ |
790c606ff8a9
A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@wiktel.com>
parents:
22594
diff
changeset
|
813 purple_debug_info("network", "NetworkManager has started.\n"); |
790c606ff8a9
A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@wiktel.com>
parents:
22594
diff
changeset
|
814 nm_update_state(nm_get_network_state()); |
790c606ff8a9
A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@wiktel.com>
parents:
22594
diff
changeset
|
815 } else if (old_owner_good && !new_owner_good) { /* Equivalent to old ServiceDeleted signal */ |
790c606ff8a9
A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@wiktel.com>
parents:
22594
diff
changeset
|
816 purple_debug_info("network", "NetworkManager has gone away.\n"); |
790c606ff8a9
A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@wiktel.com>
parents:
22594
diff
changeset
|
817 nm_update_state(NM_STATE_UNKNOWN); |
790c606ff8a9
A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@wiktel.com>
parents:
22594
diff
changeset
|
818 } |
790c606ff8a9
A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@wiktel.com>
parents:
22594
diff
changeset
|
819 } |
790c606ff8a9
A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@wiktel.com>
parents:
22594
diff
changeset
|
820 } |
790c606ff8a9
A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@wiktel.com>
parents:
22594
diff
changeset
|
821 |
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
822 #endif |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
823 |
26050
ae3d25465d0f
Run an asynchronous DNS lookup for the STUN server IP (to set as a property
Marcus Lundblad <ml@update.uu.se>
parents:
24888
diff
changeset
|
824 static void |
26055
c56e8826fed0
Added support to generate relayed candidates (TURN).
Marcus Lundblad <ml@update.uu.se>
parents:
26050
diff
changeset
|
825 purple_network_ip_lookup_cb(GSList *hosts, gpointer data, |
26050
ae3d25465d0f
Run an asynchronous DNS lookup for the STUN server IP (to set as a property
Marcus Lundblad <ml@update.uu.se>
parents:
24888
diff
changeset
|
826 const char *error_message) |
ae3d25465d0f
Run an asynchronous DNS lookup for the STUN server IP (to set as a property
Marcus Lundblad <ml@update.uu.se>
parents:
24888
diff
changeset
|
827 { |
26055
c56e8826fed0
Added support to generate relayed candidates (TURN).
Marcus Lundblad <ml@update.uu.se>
parents:
26050
diff
changeset
|
828 const gchar **ip = (const gchar **) data; |
26056
4f0aec6d4ad7
Removed some extra tabs on blank lines
Marcus Lundblad <ml@update.uu.se>
parents:
26055
diff
changeset
|
829 |
26050
ae3d25465d0f
Run an asynchronous DNS lookup for the STUN server IP (to set as a property
Marcus Lundblad <ml@update.uu.se>
parents:
24888
diff
changeset
|
830 if (error_message) { |
26055
c56e8826fed0
Added support to generate relayed candidates (TURN).
Marcus Lundblad <ml@update.uu.se>
parents:
26050
diff
changeset
|
831 purple_debug_error("network", "lookup of IP address failed: %s\n", |
26050
ae3d25465d0f
Run an asynchronous DNS lookup for the STUN server IP (to set as a property
Marcus Lundblad <ml@update.uu.se>
parents:
24888
diff
changeset
|
832 error_message); |
ae3d25465d0f
Run an asynchronous DNS lookup for the STUN server IP (to set as a property
Marcus Lundblad <ml@update.uu.se>
parents:
24888
diff
changeset
|
833 g_slist_free(hosts); |
ae3d25465d0f
Run an asynchronous DNS lookup for the STUN server IP (to set as a property
Marcus Lundblad <ml@update.uu.se>
parents:
24888
diff
changeset
|
834 return; |
ae3d25465d0f
Run an asynchronous DNS lookup for the STUN server IP (to set as a property
Marcus Lundblad <ml@update.uu.se>
parents:
24888
diff
changeset
|
835 } |
26056
4f0aec6d4ad7
Removed some extra tabs on blank lines
Marcus Lundblad <ml@update.uu.se>
parents:
26055
diff
changeset
|
836 |
26050
ae3d25465d0f
Run an asynchronous DNS lookup for the STUN server IP (to set as a property
Marcus Lundblad <ml@update.uu.se>
parents:
24888
diff
changeset
|
837 if (hosts && g_slist_next(hosts)) { |
ae3d25465d0f
Run an asynchronous DNS lookup for the STUN server IP (to set as a property
Marcus Lundblad <ml@update.uu.se>
parents:
24888
diff
changeset
|
838 struct sockaddr *addr = g_slist_next(hosts)->data; |
ae3d25465d0f
Run an asynchronous DNS lookup for the STUN server IP (to set as a property
Marcus Lundblad <ml@update.uu.se>
parents:
24888
diff
changeset
|
839 char dst[INET6_ADDRSTRLEN]; |
ae3d25465d0f
Run an asynchronous DNS lookup for the STUN server IP (to set as a property
Marcus Lundblad <ml@update.uu.se>
parents:
24888
diff
changeset
|
840 |
ae3d25465d0f
Run an asynchronous DNS lookup for the STUN server IP (to set as a property
Marcus Lundblad <ml@update.uu.se>
parents:
24888
diff
changeset
|
841 if (addr->sa_family == AF_INET6) { |
ae3d25465d0f
Run an asynchronous DNS lookup for the STUN server IP (to set as a property
Marcus Lundblad <ml@update.uu.se>
parents:
24888
diff
changeset
|
842 inet_ntop(addr->sa_family, &((struct sockaddr_in6 *) addr)->sin6_addr, |
ae3d25465d0f
Run an asynchronous DNS lookup for the STUN server IP (to set as a property
Marcus Lundblad <ml@update.uu.se>
parents:
24888
diff
changeset
|
843 dst, sizeof(dst)); |
ae3d25465d0f
Run an asynchronous DNS lookup for the STUN server IP (to set as a property
Marcus Lundblad <ml@update.uu.se>
parents:
24888
diff
changeset
|
844 } else { |
ae3d25465d0f
Run an asynchronous DNS lookup for the STUN server IP (to set as a property
Marcus Lundblad <ml@update.uu.se>
parents:
24888
diff
changeset
|
845 inet_ntop(addr->sa_family, &((struct sockaddr_in *) addr)->sin_addr, |
ae3d25465d0f
Run an asynchronous DNS lookup for the STUN server IP (to set as a property
Marcus Lundblad <ml@update.uu.se>
parents:
24888
diff
changeset
|
846 dst, sizeof(dst)); |
ae3d25465d0f
Run an asynchronous DNS lookup for the STUN server IP (to set as a property
Marcus Lundblad <ml@update.uu.se>
parents:
24888
diff
changeset
|
847 } |
26056
4f0aec6d4ad7
Removed some extra tabs on blank lines
Marcus Lundblad <ml@update.uu.se>
parents:
26055
diff
changeset
|
848 |
26055
c56e8826fed0
Added support to generate relayed candidates (TURN).
Marcus Lundblad <ml@update.uu.se>
parents:
26050
diff
changeset
|
849 *ip = g_strdup(dst); |
c56e8826fed0
Added support to generate relayed candidates (TURN).
Marcus Lundblad <ml@update.uu.se>
parents:
26050
diff
changeset
|
850 purple_debug_info("network", "set IP address: %s\n", *ip); |
26050
ae3d25465d0f
Run an asynchronous DNS lookup for the STUN server IP (to set as a property
Marcus Lundblad <ml@update.uu.se>
parents:
24888
diff
changeset
|
851 } |
26551
5d1140b0b10a
Don't leak the struct sockaddr* from purple_dnsquery_a.
Paul Aurich <paul@darkrain42.org>
parents:
26131
diff
changeset
|
852 |
5d1140b0b10a
Don't leak the struct sockaddr* from purple_dnsquery_a.
Paul Aurich <paul@darkrain42.org>
parents:
26131
diff
changeset
|
853 while (hosts != NULL) { |
5d1140b0b10a
Don't leak the struct sockaddr* from purple_dnsquery_a.
Paul Aurich <paul@darkrain42.org>
parents:
26131
diff
changeset
|
854 hosts = g_slist_delete_link(hosts, hosts); |
5d1140b0b10a
Don't leak the struct sockaddr* from purple_dnsquery_a.
Paul Aurich <paul@darkrain42.org>
parents:
26131
diff
changeset
|
855 /* Free the address */ |
5d1140b0b10a
Don't leak the struct sockaddr* from purple_dnsquery_a.
Paul Aurich <paul@darkrain42.org>
parents:
26131
diff
changeset
|
856 g_free(hosts->data); |
5d1140b0b10a
Don't leak the struct sockaddr* from purple_dnsquery_a.
Paul Aurich <paul@darkrain42.org>
parents:
26131
diff
changeset
|
857 hosts = g_slist_delete_link(hosts, hosts); |
5d1140b0b10a
Don't leak the struct sockaddr* from purple_dnsquery_a.
Paul Aurich <paul@darkrain42.org>
parents:
26131
diff
changeset
|
858 } |
26050
ae3d25465d0f
Run an asynchronous DNS lookup for the STUN server IP (to set as a property
Marcus Lundblad <ml@update.uu.se>
parents:
24888
diff
changeset
|
859 } |
ae3d25465d0f
Run an asynchronous DNS lookup for the STUN server IP (to set as a property
Marcus Lundblad <ml@update.uu.se>
parents:
24888
diff
changeset
|
860 |
ae3d25465d0f
Run an asynchronous DNS lookup for the STUN server IP (to set as a property
Marcus Lundblad <ml@update.uu.se>
parents:
24888
diff
changeset
|
861 void |
ae3d25465d0f
Run an asynchronous DNS lookup for the STUN server IP (to set as a property
Marcus Lundblad <ml@update.uu.se>
parents:
24888
diff
changeset
|
862 purple_network_set_stun_server(const gchar *stun_server) |
ae3d25465d0f
Run an asynchronous DNS lookup for the STUN server IP (to set as a property
Marcus Lundblad <ml@update.uu.se>
parents:
24888
diff
changeset
|
863 { |
ae3d25465d0f
Run an asynchronous DNS lookup for the STUN server IP (to set as a property
Marcus Lundblad <ml@update.uu.se>
parents:
24888
diff
changeset
|
864 if (stun_server && stun_server[0] != '\0') { |
ae3d25465d0f
Run an asynchronous DNS lookup for the STUN server IP (to set as a property
Marcus Lundblad <ml@update.uu.se>
parents:
24888
diff
changeset
|
865 if (purple_network_is_available()) { |
ae3d25465d0f
Run an asynchronous DNS lookup for the STUN server IP (to set as a property
Marcus Lundblad <ml@update.uu.se>
parents:
24888
diff
changeset
|
866 purple_debug_info("network", "running DNS query for STUN server\n"); |
26055
c56e8826fed0
Added support to generate relayed candidates (TURN).
Marcus Lundblad <ml@update.uu.se>
parents:
26050
diff
changeset
|
867 purple_dnsquery_a(stun_server, 3478, purple_network_ip_lookup_cb, |
c56e8826fed0
Added support to generate relayed candidates (TURN).
Marcus Lundblad <ml@update.uu.se>
parents:
26050
diff
changeset
|
868 &stun_ip); |
26050
ae3d25465d0f
Run an asynchronous DNS lookup for the STUN server IP (to set as a property
Marcus Lundblad <ml@update.uu.se>
parents:
24888
diff
changeset
|
869 } else { |
ae3d25465d0f
Run an asynchronous DNS lookup for the STUN server IP (to set as a property
Marcus Lundblad <ml@update.uu.se>
parents:
24888
diff
changeset
|
870 purple_debug_info("network", |
ae3d25465d0f
Run an asynchronous DNS lookup for the STUN server IP (to set as a property
Marcus Lundblad <ml@update.uu.se>
parents:
24888
diff
changeset
|
871 "network is unavailable, don't try to update STUN IP"); |
ae3d25465d0f
Run an asynchronous DNS lookup for the STUN server IP (to set as a property
Marcus Lundblad <ml@update.uu.se>
parents:
24888
diff
changeset
|
872 } |
ae3d25465d0f
Run an asynchronous DNS lookup for the STUN server IP (to set as a property
Marcus Lundblad <ml@update.uu.se>
parents:
24888
diff
changeset
|
873 } else if (stun_ip) { |
ae3d25465d0f
Run an asynchronous DNS lookup for the STUN server IP (to set as a property
Marcus Lundblad <ml@update.uu.se>
parents:
24888
diff
changeset
|
874 g_free(stun_ip); |
ae3d25465d0f
Run an asynchronous DNS lookup for the STUN server IP (to set as a property
Marcus Lundblad <ml@update.uu.se>
parents:
24888
diff
changeset
|
875 stun_ip = NULL; |
ae3d25465d0f
Run an asynchronous DNS lookup for the STUN server IP (to set as a property
Marcus Lundblad <ml@update.uu.se>
parents:
24888
diff
changeset
|
876 } |
ae3d25465d0f
Run an asynchronous DNS lookup for the STUN server IP (to set as a property
Marcus Lundblad <ml@update.uu.se>
parents:
24888
diff
changeset
|
877 } |
ae3d25465d0f
Run an asynchronous DNS lookup for the STUN server IP (to set as a property
Marcus Lundblad <ml@update.uu.se>
parents:
24888
diff
changeset
|
878 |
26055
c56e8826fed0
Added support to generate relayed candidates (TURN).
Marcus Lundblad <ml@update.uu.se>
parents:
26050
diff
changeset
|
879 void |
c56e8826fed0
Added support to generate relayed candidates (TURN).
Marcus Lundblad <ml@update.uu.se>
parents:
26050
diff
changeset
|
880 purple_network_set_turn_server(const gchar *turn_server) |
c56e8826fed0
Added support to generate relayed candidates (TURN).
Marcus Lundblad <ml@update.uu.se>
parents:
26050
diff
changeset
|
881 { |
c56e8826fed0
Added support to generate relayed candidates (TURN).
Marcus Lundblad <ml@update.uu.se>
parents:
26050
diff
changeset
|
882 if (turn_server && turn_server[0] != '\0') { |
c56e8826fed0
Added support to generate relayed candidates (TURN).
Marcus Lundblad <ml@update.uu.se>
parents:
26050
diff
changeset
|
883 if (purple_network_is_available()) { |
c56e8826fed0
Added support to generate relayed candidates (TURN).
Marcus Lundblad <ml@update.uu.se>
parents:
26050
diff
changeset
|
884 purple_debug_info("network", "running DNS query for TURN server\n"); |
c56e8826fed0
Added support to generate relayed candidates (TURN).
Marcus Lundblad <ml@update.uu.se>
parents:
26050
diff
changeset
|
885 purple_dnsquery_a(turn_server, |
c56e8826fed0
Added support to generate relayed candidates (TURN).
Marcus Lundblad <ml@update.uu.se>
parents:
26050
diff
changeset
|
886 purple_prefs_get_int("/purple/network/turn_port"), |
c56e8826fed0
Added support to generate relayed candidates (TURN).
Marcus Lundblad <ml@update.uu.se>
parents:
26050
diff
changeset
|
887 purple_network_ip_lookup_cb, &turn_ip); |
c56e8826fed0
Added support to generate relayed candidates (TURN).
Marcus Lundblad <ml@update.uu.se>
parents:
26050
diff
changeset
|
888 } else { |
c56e8826fed0
Added support to generate relayed candidates (TURN).
Marcus Lundblad <ml@update.uu.se>
parents:
26050
diff
changeset
|
889 purple_debug_info("network", |
c56e8826fed0
Added support to generate relayed candidates (TURN).
Marcus Lundblad <ml@update.uu.se>
parents:
26050
diff
changeset
|
890 "network is unavailable, don't try to update TURN IP"); |
c56e8826fed0
Added support to generate relayed candidates (TURN).
Marcus Lundblad <ml@update.uu.se>
parents:
26050
diff
changeset
|
891 } |
c56e8826fed0
Added support to generate relayed candidates (TURN).
Marcus Lundblad <ml@update.uu.se>
parents:
26050
diff
changeset
|
892 } else if (turn_ip) { |
c56e8826fed0
Added support to generate relayed candidates (TURN).
Marcus Lundblad <ml@update.uu.se>
parents:
26050
diff
changeset
|
893 g_free(turn_ip); |
c56e8826fed0
Added support to generate relayed candidates (TURN).
Marcus Lundblad <ml@update.uu.se>
parents:
26050
diff
changeset
|
894 turn_ip = NULL; |
c56e8826fed0
Added support to generate relayed candidates (TURN).
Marcus Lundblad <ml@update.uu.se>
parents:
26050
diff
changeset
|
895 } |
c56e8826fed0
Added support to generate relayed candidates (TURN).
Marcus Lundblad <ml@update.uu.se>
parents:
26050
diff
changeset
|
896 } |
c56e8826fed0
Added support to generate relayed candidates (TURN).
Marcus Lundblad <ml@update.uu.se>
parents:
26050
diff
changeset
|
897 |
c56e8826fed0
Added support to generate relayed candidates (TURN).
Marcus Lundblad <ml@update.uu.se>
parents:
26050
diff
changeset
|
898 |
26050
ae3d25465d0f
Run an asynchronous DNS lookup for the STUN server IP (to set as a property
Marcus Lundblad <ml@update.uu.se>
parents:
24888
diff
changeset
|
899 const gchar * |
ae3d25465d0f
Run an asynchronous DNS lookup for the STUN server IP (to set as a property
Marcus Lundblad <ml@update.uu.se>
parents:
24888
diff
changeset
|
900 purple_network_get_stun_ip(void) |
ae3d25465d0f
Run an asynchronous DNS lookup for the STUN server IP (to set as a property
Marcus Lundblad <ml@update.uu.se>
parents:
24888
diff
changeset
|
901 { |
ae3d25465d0f
Run an asynchronous DNS lookup for the STUN server IP (to set as a property
Marcus Lundblad <ml@update.uu.se>
parents:
24888
diff
changeset
|
902 return stun_ip; |
ae3d25465d0f
Run an asynchronous DNS lookup for the STUN server IP (to set as a property
Marcus Lundblad <ml@update.uu.se>
parents:
24888
diff
changeset
|
903 } |
ae3d25465d0f
Run an asynchronous DNS lookup for the STUN server IP (to set as a property
Marcus Lundblad <ml@update.uu.se>
parents:
24888
diff
changeset
|
904 |
26055
c56e8826fed0
Added support to generate relayed candidates (TURN).
Marcus Lundblad <ml@update.uu.se>
parents:
26050
diff
changeset
|
905 const gchar * |
c56e8826fed0
Added support to generate relayed candidates (TURN).
Marcus Lundblad <ml@update.uu.se>
parents:
26050
diff
changeset
|
906 purple_network_get_turn_ip(void) |
c56e8826fed0
Added support to generate relayed candidates (TURN).
Marcus Lundblad <ml@update.uu.se>
parents:
26050
diff
changeset
|
907 { |
c56e8826fed0
Added support to generate relayed candidates (TURN).
Marcus Lundblad <ml@update.uu.se>
parents:
26050
diff
changeset
|
908 return turn_ip; |
c56e8826fed0
Added support to generate relayed candidates (TURN).
Marcus Lundblad <ml@update.uu.se>
parents:
26050
diff
changeset
|
909 } |
c56e8826fed0
Added support to generate relayed candidates (TURN).
Marcus Lundblad <ml@update.uu.se>
parents:
26050
diff
changeset
|
910 |
15974
1a12ce76c4f4
The network module now registers the signal 'network-configuration-changed' and emits it when a network change is detected via libnm or the win32 network monitor. The UI could also emit this signal if it knows something network.c doesn't. UPnP and NAT-PMP respond to the signal by clearing their IP address caches; changing networks without quitting/relaunching will now lead to the new IP address being (lazily) determined. This commit also enables nat-pmp and adds nat-pmp.[h|c] to the build process; please let me know if there are any problems building, as I only have OS X test machines.
Evan Schoenberg <evan.s@dreskin.net>
parents:
15949
diff
changeset
|
911 void * |
1a12ce76c4f4
The network module now registers the signal 'network-configuration-changed' and emits it when a network change is detected via libnm or the win32 network monitor. The UI could also emit this signal if it knows something network.c doesn't. UPnP and NAT-PMP respond to the signal by clearing their IP address caches; changing networks without quitting/relaunching will now lead to the new IP address being (lazily) determined. This commit also enables nat-pmp and adds nat-pmp.[h|c] to the build process; please let me know if there are any problems building, as I only have OS X test machines.
Evan Schoenberg <evan.s@dreskin.net>
parents:
15949
diff
changeset
|
912 purple_network_get_handle(void) |
1a12ce76c4f4
The network module now registers the signal 'network-configuration-changed' and emits it when a network change is detected via libnm or the win32 network monitor. The UI could also emit this signal if it knows something network.c doesn't. UPnP and NAT-PMP respond to the signal by clearing their IP address caches; changing networks without quitting/relaunching will now lead to the new IP address being (lazily) determined. This commit also enables nat-pmp and adds nat-pmp.[h|c] to the build process; please let me know if there are any problems building, as I only have OS X test machines.
Evan Schoenberg <evan.s@dreskin.net>
parents:
15949
diff
changeset
|
913 { |
1a12ce76c4f4
The network module now registers the signal 'network-configuration-changed' and emits it when a network change is detected via libnm or the win32 network monitor. The UI could also emit this signal if it knows something network.c doesn't. UPnP and NAT-PMP respond to the signal by clearing their IP address caches; changing networks without quitting/relaunching will now lead to the new IP address being (lazily) determined. This commit also enables nat-pmp and adds nat-pmp.[h|c] to the build process; please let me know if there are any problems building, as I only have OS X test machines.
Evan Schoenberg <evan.s@dreskin.net>
parents:
15949
diff
changeset
|
914 static int handle; |
19408
cc36a5aac908
Fix some conversion warnings about using negative values with unsigned types. There are more, but these were easy fixes. You may think that I'm changing the API, but I'm really not - it was just wrong.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
18401
diff
changeset
|
915 |
15974
1a12ce76c4f4
The network module now registers the signal 'network-configuration-changed' and emits it when a network change is detected via libnm or the win32 network monitor. The UI could also emit this signal if it knows something network.c doesn't. UPnP and NAT-PMP respond to the signal by clearing their IP address caches; changing networks without quitting/relaunching will now lead to the new IP address being (lazily) determined. This commit also enables nat-pmp and adds nat-pmp.[h|c] to the build process; please let me know if there are any problems building, as I only have OS X test machines.
Evan Schoenberg <evan.s@dreskin.net>
parents:
15949
diff
changeset
|
916 return &handle; |
1a12ce76c4f4
The network module now registers the signal 'network-configuration-changed' and emits it when a network change is detected via libnm or the win32 network monitor. The UI could also emit this signal if it knows something network.c doesn't. UPnP and NAT-PMP respond to the signal by clearing their IP address caches; changing networks without quitting/relaunching will now lead to the new IP address being (lazily) determined. This commit also enables nat-pmp and adds nat-pmp.[h|c] to the build process; please let me know if there are any problems building, as I only have OS X test machines.
Evan Schoenberg <evan.s@dreskin.net>
parents:
15949
diff
changeset
|
917 } |
1a12ce76c4f4
The network module now registers the signal 'network-configuration-changed' and emits it when a network change is detected via libnm or the win32 network monitor. The UI could also emit this signal if it knows something network.c doesn't. UPnP and NAT-PMP respond to the signal by clearing their IP address caches; changing networks without quitting/relaunching will now lead to the new IP address being (lazily) determined. This commit also enables nat-pmp and adds nat-pmp.[h|c] to the build process; please let me know if there are any problems building, as I only have OS X test machines.
Evan Schoenberg <evan.s@dreskin.net>
parents:
15949
diff
changeset
|
918 |
27108
38c4973b5222
Add a function to remove a port mapping (UPnP or NAT-PMP) given a file
Marcus Lundblad <ml@update.uu.se>
parents:
26885
diff
changeset
|
919 static void |
38c4973b5222
Add a function to remove a port mapping (UPnP or NAT-PMP) given a file
Marcus Lundblad <ml@update.uu.se>
parents:
26885
diff
changeset
|
920 purple_network_upnp_mapping_remove_cb(gboolean sucess, gpointer data) |
38c4973b5222
Add a function to remove a port mapping (UPnP or NAT-PMP) given a file
Marcus Lundblad <ml@update.uu.se>
parents:
26885
diff
changeset
|
921 { |
38c4973b5222
Add a function to remove a port mapping (UPnP or NAT-PMP) given a file
Marcus Lundblad <ml@update.uu.se>
parents:
26885
diff
changeset
|
922 purple_debug_info("network", "done removing UPnP port mapping\n"); |
38c4973b5222
Add a function to remove a port mapping (UPnP or NAT-PMP) given a file
Marcus Lundblad <ml@update.uu.se>
parents:
26885
diff
changeset
|
923 } |
38c4973b5222
Add a function to remove a port mapping (UPnP or NAT-PMP) given a file
Marcus Lundblad <ml@update.uu.se>
parents:
26885
diff
changeset
|
924 |
38c4973b5222
Add a function to remove a port mapping (UPnP or NAT-PMP) given a file
Marcus Lundblad <ml@update.uu.se>
parents:
26885
diff
changeset
|
925 /* the reason for these functions to have these signatures is to be able to |
38c4973b5222
Add a function to remove a port mapping (UPnP or NAT-PMP) given a file
Marcus Lundblad <ml@update.uu.se>
parents:
26885
diff
changeset
|
926 use them for g_hash_table_foreach to clean remaining port mappings, which is |
38c4973b5222
Add a function to remove a port mapping (UPnP or NAT-PMP) given a file
Marcus Lundblad <ml@update.uu.se>
parents:
26885
diff
changeset
|
927 not yet done */ |
38c4973b5222
Add a function to remove a port mapping (UPnP or NAT-PMP) given a file
Marcus Lundblad <ml@update.uu.se>
parents:
26885
diff
changeset
|
928 static void |
38c4973b5222
Add a function to remove a port mapping (UPnP or NAT-PMP) given a file
Marcus Lundblad <ml@update.uu.se>
parents:
26885
diff
changeset
|
929 purple_network_upnp_mapping_remove(gpointer key, gpointer value, |
38c4973b5222
Add a function to remove a port mapping (UPnP or NAT-PMP) given a file
Marcus Lundblad <ml@update.uu.se>
parents:
26885
diff
changeset
|
930 gpointer user_data) |
38c4973b5222
Add a function to remove a port mapping (UPnP or NAT-PMP) given a file
Marcus Lundblad <ml@update.uu.se>
parents:
26885
diff
changeset
|
931 { |
38c4973b5222
Add a function to remove a port mapping (UPnP or NAT-PMP) given a file
Marcus Lundblad <ml@update.uu.se>
parents:
26885
diff
changeset
|
932 gint port = (gint) *((gint *) key); |
38c4973b5222
Add a function to remove a port mapping (UPnP or NAT-PMP) given a file
Marcus Lundblad <ml@update.uu.se>
parents:
26885
diff
changeset
|
933 gint protocol = (gint) *((gint *) value); |
38c4973b5222
Add a function to remove a port mapping (UPnP or NAT-PMP) given a file
Marcus Lundblad <ml@update.uu.se>
parents:
26885
diff
changeset
|
934 purple_debug_info("network", "removing UPnP port mapping for port %d\n", |
38c4973b5222
Add a function to remove a port mapping (UPnP or NAT-PMP) given a file
Marcus Lundblad <ml@update.uu.se>
parents:
26885
diff
changeset
|
935 port); |
38c4973b5222
Add a function to remove a port mapping (UPnP or NAT-PMP) given a file
Marcus Lundblad <ml@update.uu.se>
parents:
26885
diff
changeset
|
936 purple_upnp_remove_port_mapping(port, |
38c4973b5222
Add a function to remove a port mapping (UPnP or NAT-PMP) given a file
Marcus Lundblad <ml@update.uu.se>
parents:
26885
diff
changeset
|
937 protocol == SOCK_STREAM ? "TCP" : "UDP", |
38c4973b5222
Add a function to remove a port mapping (UPnP or NAT-PMP) given a file
Marcus Lundblad <ml@update.uu.se>
parents:
26885
diff
changeset
|
938 purple_network_upnp_mapping_remove_cb, NULL); |
27110
455e679ea0db
Remove port mappings from the hash tables when removing them.
Marcus Lundblad <ml@update.uu.se>
parents:
27108
diff
changeset
|
939 g_hash_table_remove(upnp_port_mappings, key); |
27108
38c4973b5222
Add a function to remove a port mapping (UPnP or NAT-PMP) given a file
Marcus Lundblad <ml@update.uu.se>
parents:
26885
diff
changeset
|
940 } |
38c4973b5222
Add a function to remove a port mapping (UPnP or NAT-PMP) given a file
Marcus Lundblad <ml@update.uu.se>
parents:
26885
diff
changeset
|
941 |
38c4973b5222
Add a function to remove a port mapping (UPnP or NAT-PMP) given a file
Marcus Lundblad <ml@update.uu.se>
parents:
26885
diff
changeset
|
942 static void |
38c4973b5222
Add a function to remove a port mapping (UPnP or NAT-PMP) given a file
Marcus Lundblad <ml@update.uu.se>
parents:
26885
diff
changeset
|
943 purple_network_nat_pmp_mapping_remove(gpointer key, gpointer value, |
38c4973b5222
Add a function to remove a port mapping (UPnP or NAT-PMP) given a file
Marcus Lundblad <ml@update.uu.se>
parents:
26885
diff
changeset
|
944 gpointer user_data) |
38c4973b5222
Add a function to remove a port mapping (UPnP or NAT-PMP) given a file
Marcus Lundblad <ml@update.uu.se>
parents:
26885
diff
changeset
|
945 { |
38c4973b5222
Add a function to remove a port mapping (UPnP or NAT-PMP) given a file
Marcus Lundblad <ml@update.uu.se>
parents:
26885
diff
changeset
|
946 gint port = (gint) *((gint *) key); |
38c4973b5222
Add a function to remove a port mapping (UPnP or NAT-PMP) given a file
Marcus Lundblad <ml@update.uu.se>
parents:
26885
diff
changeset
|
947 gint protocol = (gint) *((gint *) value); |
38c4973b5222
Add a function to remove a port mapping (UPnP or NAT-PMP) given a file
Marcus Lundblad <ml@update.uu.se>
parents:
26885
diff
changeset
|
948 purple_debug_info("network", "removing NAT-PMP port mapping for port %d\n", |
38c4973b5222
Add a function to remove a port mapping (UPnP or NAT-PMP) given a file
Marcus Lundblad <ml@update.uu.se>
parents:
26885
diff
changeset
|
949 port); |
38c4973b5222
Add a function to remove a port mapping (UPnP or NAT-PMP) given a file
Marcus Lundblad <ml@update.uu.se>
parents:
26885
diff
changeset
|
950 purple_pmp_destroy_map( |
38c4973b5222
Add a function to remove a port mapping (UPnP or NAT-PMP) given a file
Marcus Lundblad <ml@update.uu.se>
parents:
26885
diff
changeset
|
951 protocol == SOCK_STREAM ? PURPLE_PMP_TYPE_TCP : PURPLE_PMP_TYPE_UDP, |
38c4973b5222
Add a function to remove a port mapping (UPnP or NAT-PMP) given a file
Marcus Lundblad <ml@update.uu.se>
parents:
26885
diff
changeset
|
952 port); |
27110
455e679ea0db
Remove port mappings from the hash tables when removing them.
Marcus Lundblad <ml@update.uu.se>
parents:
27108
diff
changeset
|
953 g_hash_table_remove(nat_pmp_port_mappings, key); |
27108
38c4973b5222
Add a function to remove a port mapping (UPnP or NAT-PMP) given a file
Marcus Lundblad <ml@update.uu.se>
parents:
26885
diff
changeset
|
954 } |
38c4973b5222
Add a function to remove a port mapping (UPnP or NAT-PMP) given a file
Marcus Lundblad <ml@update.uu.se>
parents:
26885
diff
changeset
|
955 |
38c4973b5222
Add a function to remove a port mapping (UPnP or NAT-PMP) given a file
Marcus Lundblad <ml@update.uu.se>
parents:
26885
diff
changeset
|
956 void |
38c4973b5222
Add a function to remove a port mapping (UPnP or NAT-PMP) given a file
Marcus Lundblad <ml@update.uu.se>
parents:
26885
diff
changeset
|
957 purple_network_remove_port_mapping(gint fd) |
38c4973b5222
Add a function to remove a port mapping (UPnP or NAT-PMP) given a file
Marcus Lundblad <ml@update.uu.se>
parents:
26885
diff
changeset
|
958 { |
38c4973b5222
Add a function to remove a port mapping (UPnP or NAT-PMP) given a file
Marcus Lundblad <ml@update.uu.se>
parents:
26885
diff
changeset
|
959 int port = purple_network_get_port_from_fd(fd); |
38c4973b5222
Add a function to remove a port mapping (UPnP or NAT-PMP) given a file
Marcus Lundblad <ml@update.uu.se>
parents:
26885
diff
changeset
|
960 gint *protocol = g_hash_table_lookup(upnp_port_mappings, &port); |
38c4973b5222
Add a function to remove a port mapping (UPnP or NAT-PMP) given a file
Marcus Lundblad <ml@update.uu.se>
parents:
26885
diff
changeset
|
961 |
38c4973b5222
Add a function to remove a port mapping (UPnP or NAT-PMP) given a file
Marcus Lundblad <ml@update.uu.se>
parents:
26885
diff
changeset
|
962 if (protocol) { |
38c4973b5222
Add a function to remove a port mapping (UPnP or NAT-PMP) given a file
Marcus Lundblad <ml@update.uu.se>
parents:
26885
diff
changeset
|
963 purple_network_upnp_mapping_remove(&port, protocol, NULL); |
38c4973b5222
Add a function to remove a port mapping (UPnP or NAT-PMP) given a file
Marcus Lundblad <ml@update.uu.se>
parents:
26885
diff
changeset
|
964 g_hash_table_remove(upnp_port_mappings, protocol); |
38c4973b5222
Add a function to remove a port mapping (UPnP or NAT-PMP) given a file
Marcus Lundblad <ml@update.uu.se>
parents:
26885
diff
changeset
|
965 } else { |
38c4973b5222
Add a function to remove a port mapping (UPnP or NAT-PMP) given a file
Marcus Lundblad <ml@update.uu.se>
parents:
26885
diff
changeset
|
966 protocol = g_hash_table_lookup(nat_pmp_port_mappings, &port); |
38c4973b5222
Add a function to remove a port mapping (UPnP or NAT-PMP) given a file
Marcus Lundblad <ml@update.uu.se>
parents:
26885
diff
changeset
|
967 if (protocol) { |
38c4973b5222
Add a function to remove a port mapping (UPnP or NAT-PMP) given a file
Marcus Lundblad <ml@update.uu.se>
parents:
26885
diff
changeset
|
968 purple_network_nat_pmp_mapping_remove(&port, protocol, NULL); |
38c4973b5222
Add a function to remove a port mapping (UPnP or NAT-PMP) given a file
Marcus Lundblad <ml@update.uu.se>
parents:
26885
diff
changeset
|
969 g_hash_table_remove(nat_pmp_port_mappings, protocol); |
38c4973b5222
Add a function to remove a port mapping (UPnP or NAT-PMP) given a file
Marcus Lundblad <ml@update.uu.se>
parents:
26885
diff
changeset
|
970 } |
38c4973b5222
Add a function to remove a port mapping (UPnP or NAT-PMP) given a file
Marcus Lundblad <ml@update.uu.se>
parents:
26885
diff
changeset
|
971 } |
38c4973b5222
Add a function to remove a port mapping (UPnP or NAT-PMP) given a file
Marcus Lundblad <ml@update.uu.se>
parents:
26885
diff
changeset
|
972 } |
27635
7fbf964c6c6c
Move the IDN support into the DNS routines.
Paul Aurich <paul@darkrain42.org>
parents:
27231
diff
changeset
|
973 |
7fbf964c6c6c
Move the IDN support into the DNS routines.
Paul Aurich <paul@darkrain42.org>
parents:
27231
diff
changeset
|
974 int purple_network_convert_idn_to_ascii(const gchar *in, gchar **out) |
7fbf964c6c6c
Move the IDN support into the DNS routines.
Paul Aurich <paul@darkrain42.org>
parents:
27231
diff
changeset
|
975 { |
7fbf964c6c6c
Move the IDN support into the DNS routines.
Paul Aurich <paul@darkrain42.org>
parents:
27231
diff
changeset
|
976 #ifdef USE_IDN |
7fbf964c6c6c
Move the IDN support into the DNS routines.
Paul Aurich <paul@darkrain42.org>
parents:
27231
diff
changeset
|
977 char *tmp; |
7fbf964c6c6c
Move the IDN support into the DNS routines.
Paul Aurich <paul@darkrain42.org>
parents:
27231
diff
changeset
|
978 int ret; |
7fbf964c6c6c
Move the IDN support into the DNS routines.
Paul Aurich <paul@darkrain42.org>
parents:
27231
diff
changeset
|
979 |
7fbf964c6c6c
Move the IDN support into the DNS routines.
Paul Aurich <paul@darkrain42.org>
parents:
27231
diff
changeset
|
980 g_return_val_if_fail(out != NULL, -1); |
7fbf964c6c6c
Move the IDN support into the DNS routines.
Paul Aurich <paul@darkrain42.org>
parents:
27231
diff
changeset
|
981 |
7fbf964c6c6c
Move the IDN support into the DNS routines.
Paul Aurich <paul@darkrain42.org>
parents:
27231
diff
changeset
|
982 ret = idna_to_ascii_8z(in, &tmp, IDNA_USE_STD3_ASCII_RULES); |
7fbf964c6c6c
Move the IDN support into the DNS routines.
Paul Aurich <paul@darkrain42.org>
parents:
27231
diff
changeset
|
983 if (ret != IDNA_SUCCESS) { |
7fbf964c6c6c
Move the IDN support into the DNS routines.
Paul Aurich <paul@darkrain42.org>
parents:
27231
diff
changeset
|
984 *out = NULL; |
7fbf964c6c6c
Move the IDN support into the DNS routines.
Paul Aurich <paul@darkrain42.org>
parents:
27231
diff
changeset
|
985 return ret; |
7fbf964c6c6c
Move the IDN support into the DNS routines.
Paul Aurich <paul@darkrain42.org>
parents:
27231
diff
changeset
|
986 } |
7fbf964c6c6c
Move the IDN support into the DNS routines.
Paul Aurich <paul@darkrain42.org>
parents:
27231
diff
changeset
|
987 |
7fbf964c6c6c
Move the IDN support into the DNS routines.
Paul Aurich <paul@darkrain42.org>
parents:
27231
diff
changeset
|
988 *out = g_strdup(tmp); |
7fbf964c6c6c
Move the IDN support into the DNS routines.
Paul Aurich <paul@darkrain42.org>
parents:
27231
diff
changeset
|
989 /* This *MUST* be freed with free, not g_free */ |
7fbf964c6c6c
Move the IDN support into the DNS routines.
Paul Aurich <paul@darkrain42.org>
parents:
27231
diff
changeset
|
990 free(tmp); |
7fbf964c6c6c
Move the IDN support into the DNS routines.
Paul Aurich <paul@darkrain42.org>
parents:
27231
diff
changeset
|
991 return 0; |
7fbf964c6c6c
Move the IDN support into the DNS routines.
Paul Aurich <paul@darkrain42.org>
parents:
27231
diff
changeset
|
992 #else |
7fbf964c6c6c
Move the IDN support into the DNS routines.
Paul Aurich <paul@darkrain42.org>
parents:
27231
diff
changeset
|
993 g_return_val_if_fail(out != NULL, -1); |
7fbf964c6c6c
Move the IDN support into the DNS routines.
Paul Aurich <paul@darkrain42.org>
parents:
27231
diff
changeset
|
994 |
7fbf964c6c6c
Move the IDN support into the DNS routines.
Paul Aurich <paul@darkrain42.org>
parents:
27231
diff
changeset
|
995 *out = g_strdup(in); |
7fbf964c6c6c
Move the IDN support into the DNS routines.
Paul Aurich <paul@darkrain42.org>
parents:
27231
diff
changeset
|
996 return 0; |
7fbf964c6c6c
Move the IDN support into the DNS routines.
Paul Aurich <paul@darkrain42.org>
parents:
27231
diff
changeset
|
997 #endif |
7fbf964c6c6c
Move the IDN support into the DNS routines.
Paul Aurich <paul@darkrain42.org>
parents:
27231
diff
changeset
|
998 } |
7fbf964c6c6c
Move the IDN support into the DNS routines.
Paul Aurich <paul@darkrain42.org>
parents:
27231
diff
changeset
|
999 |
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
1000 void |
15822 | 1001 purple_network_init(void) |
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
1002 { |
22895
0bd86dae2734
Use pkg-config to detect NetworkManager. Also, fail if it isn't present,
Richard Laager <rlaager@wiktel.com>
parents:
22889
diff
changeset
|
1003 #ifdef HAVE_NETWORKMANAGER |
22874
790c606ff8a9
A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@wiktel.com>
parents:
22594
diff
changeset
|
1004 GError *error = NULL; |
790c606ff8a9
A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@wiktel.com>
parents:
22594
diff
changeset
|
1005 #endif |
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
1006 #ifdef _WIN32 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
1007 GError *err = NULL; |
15822 | 1008 gint cnt = wpurple_get_connected_network_count(); |
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
1009 |
24888
a6742d9eadf3
Adjust the NLA code to prevent hang on exit for Windows XP and Windows Vista.
Paul Aurich <paul@darkrain42.org>
parents:
24301
diff
changeset
|
1010 network_initialized = TRUE; |
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
1011 if (cnt < 0) /* Assume there is a network */ |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
1012 current_network_count = 1; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
1013 /* Don't listen for network changes if we can't tell anyway */ |
25401
75f72178e361
Fix 3 different race conditions in the win32 network management functionality.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
24888
diff
changeset
|
1014 else { |
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
1015 current_network_count = cnt; |
25401
75f72178e361
Fix 3 different race conditions in the win32 network management functionality.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
24888
diff
changeset
|
1016 if ((MyWSANSPIoctl = (void*) wpurple_find_and_loadproc("ws2_32.dll", "WSANSPIoctl"))) { |
75f72178e361
Fix 3 different race conditions in the win32 network management functionality.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
24888
diff
changeset
|
1017 if (!g_thread_create(wpurple_network_change_thread, NULL, FALSE, &err)) |
75f72178e361
Fix 3 different race conditions in the win32 network management functionality.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
24888
diff
changeset
|
1018 purple_debug_error("network", "Couldn't create Network Monitor thread: %s\n", err ? err->message : ""); |
75f72178e361
Fix 3 different race conditions in the win32 network management functionality.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
24888
diff
changeset
|
1019 } |
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
1020 } |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
1021 #endif |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
1022 |
16424
4999bbc52881
Works for me! Renames prefs: /core to /purple, /gaim/gtk to /pidgin, /gaim/gnt to /finch
Sean Egan <seanegan@gmail.com>
parents:
15974
diff
changeset
|
1023 purple_prefs_add_none ("/purple/network"); |
26050
ae3d25465d0f
Run an asynchronous DNS lookup for the STUN server IP (to set as a property
Marcus Lundblad <ml@update.uu.se>
parents:
24888
diff
changeset
|
1024 purple_prefs_add_string("/purple/network/stun_server", ""); |
26055
c56e8826fed0
Added support to generate relayed candidates (TURN).
Marcus Lundblad <ml@update.uu.se>
parents:
26050
diff
changeset
|
1025 purple_prefs_add_string("/purple/network/turn_server", ""); |
c56e8826fed0
Added support to generate relayed candidates (TURN).
Marcus Lundblad <ml@update.uu.se>
parents:
26050
diff
changeset
|
1026 purple_prefs_add_int ("/purple/network/turn_port", 3478); |
c56e8826fed0
Added support to generate relayed candidates (TURN).
Marcus Lundblad <ml@update.uu.se>
parents:
26050
diff
changeset
|
1027 purple_prefs_add_string("/purple/network/turn_username", ""); |
c56e8826fed0
Added support to generate relayed candidates (TURN).
Marcus Lundblad <ml@update.uu.se>
parents:
26050
diff
changeset
|
1028 purple_prefs_add_string("/purple/network/turn_password", ""); |
16424
4999bbc52881
Works for me! Renames prefs: /core to /purple, /gaim/gtk to /pidgin, /gaim/gnt to /finch
Sean Egan <seanegan@gmail.com>
parents:
15974
diff
changeset
|
1029 purple_prefs_add_bool ("/purple/network/auto_ip", TRUE); |
4999bbc52881
Works for me! Renames prefs: /core to /purple, /gaim/gtk to /pidgin, /gaim/gnt to /finch
Sean Egan <seanegan@gmail.com>
parents:
15974
diff
changeset
|
1030 purple_prefs_add_string("/purple/network/public_ip", ""); |
21697
65ef019c000b
Allow UPnP and NAT-PMP port mapping to be disabled via a pref. This means that UPnP discovery will not occur if this new pref and the "Autodetect IP Address" pref are both unchecked. Fixes #4157.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
21466
diff
changeset
|
1031 purple_prefs_add_bool ("/purple/network/map_ports", TRUE); |
16424
4999bbc52881
Works for me! Renames prefs: /core to /purple, /gaim/gtk to /pidgin, /gaim/gnt to /finch
Sean Egan <seanegan@gmail.com>
parents:
15974
diff
changeset
|
1032 purple_prefs_add_bool ("/purple/network/ports_range_use", FALSE); |
4999bbc52881
Works for me! Renames prefs: /core to /purple, /gaim/gtk to /pidgin, /gaim/gnt to /finch
Sean Egan <seanegan@gmail.com>
parents:
15974
diff
changeset
|
1033 purple_prefs_add_int ("/purple/network/ports_range_start", 1024); |
4999bbc52881
Works for me! Renames prefs: /core to /purple, /gaim/gtk to /pidgin, /gaim/gnt to /finch
Sean Egan <seanegan@gmail.com>
parents:
15974
diff
changeset
|
1034 purple_prefs_add_int ("/purple/network/ports_range_end", 2048); |
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
1035 |
21697
65ef019c000b
Allow UPnP and NAT-PMP port mapping to be disabled via a pref. This means that UPnP discovery will not occur if this new pref and the "Autodetect IP Address" pref are both unchecked. Fixes #4157.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
21466
diff
changeset
|
1036 if(purple_prefs_get_bool("/purple/network/map_ports") || purple_prefs_get_bool("/purple/network/auto_ip")) |
65ef019c000b
Allow UPnP and NAT-PMP port mapping to be disabled via a pref. This means that UPnP discovery will not occur if this new pref and the "Autodetect IP Address" pref are both unchecked. Fixes #4157.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
21466
diff
changeset
|
1037 purple_upnp_discover(NULL, NULL); |
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
1038 |
22895
0bd86dae2734
Use pkg-config to detect NetworkManager. Also, fail if it isn't present,
Richard Laager <rlaager@wiktel.com>
parents:
22889
diff
changeset
|
1039 #ifdef HAVE_NETWORKMANAGER |
22874
790c606ff8a9
A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@wiktel.com>
parents:
22594
diff
changeset
|
1040 nm_conn = dbus_g_bus_get(DBUS_BUS_SYSTEM, &error); |
790c606ff8a9
A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@wiktel.com>
parents:
22594
diff
changeset
|
1041 if (!nm_conn) { |
790c606ff8a9
A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@wiktel.com>
parents:
22594
diff
changeset
|
1042 purple_debug_warning("network", "Error connecting to DBus System service: %s.\n", error->message); |
790c606ff8a9
A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@wiktel.com>
parents:
22594
diff
changeset
|
1043 } else { |
790c606ff8a9
A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@wiktel.com>
parents:
22594
diff
changeset
|
1044 nm_proxy = dbus_g_proxy_new_for_name(nm_conn, |
790c606ff8a9
A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@wiktel.com>
parents:
22594
diff
changeset
|
1045 NM_DBUS_SERVICE, |
790c606ff8a9
A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@wiktel.com>
parents:
22594
diff
changeset
|
1046 NM_DBUS_PATH, |
790c606ff8a9
A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@wiktel.com>
parents:
22594
diff
changeset
|
1047 NM_DBUS_INTERFACE); |
22889
f5d39c44465a
Modify the NetworkManager support to use "StateChange" directly, instead of
Richard Laager <rlaager@wiktel.com>
parents:
22882
diff
changeset
|
1048 dbus_g_proxy_add_signal(nm_proxy, "StateChange", G_TYPE_UINT, G_TYPE_INVALID); |
f5d39c44465a
Modify the NetworkManager support to use "StateChange" directly, instead of
Richard Laager <rlaager@wiktel.com>
parents:
22882
diff
changeset
|
1049 dbus_g_proxy_connect_signal(nm_proxy, "StateChange", |
22874
790c606ff8a9
A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@wiktel.com>
parents:
22594
diff
changeset
|
1050 G_CALLBACK(nm_state_change_cb), NULL, NULL); |
790c606ff8a9
A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@wiktel.com>
parents:
22594
diff
changeset
|
1051 |
790c606ff8a9
A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@wiktel.com>
parents:
22594
diff
changeset
|
1052 dbus_proxy = dbus_g_proxy_new_for_name(nm_conn, |
790c606ff8a9
A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@wiktel.com>
parents:
22594
diff
changeset
|
1053 DBUS_SERVICE_DBUS, |
790c606ff8a9
A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@wiktel.com>
parents:
22594
diff
changeset
|
1054 DBUS_PATH_DBUS, |
790c606ff8a9
A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@wiktel.com>
parents:
22594
diff
changeset
|
1055 DBUS_INTERFACE_DBUS); |
790c606ff8a9
A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@wiktel.com>
parents:
22594
diff
changeset
|
1056 dbus_g_proxy_add_signal(dbus_proxy, "NameOwnerChanged", G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INVALID); |
790c606ff8a9
A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@wiktel.com>
parents:
22594
diff
changeset
|
1057 dbus_g_proxy_connect_signal(dbus_proxy, "NameOwnerChanged", |
790c606ff8a9
A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@wiktel.com>
parents:
22594
diff
changeset
|
1058 G_CALLBACK(nm_dbus_name_owner_changed_cb), NULL, NULL); |
790c606ff8a9
A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@wiktel.com>
parents:
22594
diff
changeset
|
1059 } |
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
1060 #endif |
15974
1a12ce76c4f4
The network module now registers the signal 'network-configuration-changed' and emits it when a network change is detected via libnm or the win32 network monitor. The UI could also emit this signal if it knows something network.c doesn't. UPnP and NAT-PMP respond to the signal by clearing their IP address caches; changing networks without quitting/relaunching will now lead to the new IP address being (lazily) determined. This commit also enables nat-pmp and adds nat-pmp.[h|c] to the build process; please let me know if there are any problems building, as I only have OS X test machines.
Evan Schoenberg <evan.s@dreskin.net>
parents:
15949
diff
changeset
|
1061 |
1a12ce76c4f4
The network module now registers the signal 'network-configuration-changed' and emits it when a network change is detected via libnm or the win32 network monitor. The UI could also emit this signal if it knows something network.c doesn't. UPnP and NAT-PMP respond to the signal by clearing their IP address caches; changing networks without quitting/relaunching will now lead to the new IP address being (lazily) determined. This commit also enables nat-pmp and adds nat-pmp.[h|c] to the build process; please let me know if there are any problems building, as I only have OS X test machines.
Evan Schoenberg <evan.s@dreskin.net>
parents:
15949
diff
changeset
|
1062 purple_signal_register(purple_network_get_handle(), "network-configuration-changed", |
1a12ce76c4f4
The network module now registers the signal 'network-configuration-changed' and emits it when a network change is detected via libnm or the win32 network monitor. The UI could also emit this signal if it knows something network.c doesn't. UPnP and NAT-PMP respond to the signal by clearing their IP address caches; changing networks without quitting/relaunching will now lead to the new IP address being (lazily) determined. This commit also enables nat-pmp and adds nat-pmp.[h|c] to the build process; please let me know if there are any problems building, as I only have OS X test machines.
Evan Schoenberg <evan.s@dreskin.net>
parents:
15949
diff
changeset
|
1063 purple_marshal_VOID, NULL, 0); |
19408
cc36a5aac908
Fix some conversion warnings about using negative values with unsigned types. There are more, but these were easy fixes. You may think that I'm changing the API, but I'm really not - it was just wrong.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
18401
diff
changeset
|
1064 |
15974
1a12ce76c4f4
The network module now registers the signal 'network-configuration-changed' and emits it when a network change is detected via libnm or the win32 network monitor. The UI could also emit this signal if it knows something network.c doesn't. UPnP and NAT-PMP respond to the signal by clearing their IP address caches; changing networks without quitting/relaunching will now lead to the new IP address being (lazily) determined. This commit also enables nat-pmp and adds nat-pmp.[h|c] to the build process; please let me know if there are any problems building, as I only have OS X test machines.
Evan Schoenberg <evan.s@dreskin.net>
parents:
15949
diff
changeset
|
1065 purple_pmp_init(); |
1a12ce76c4f4
The network module now registers the signal 'network-configuration-changed' and emits it when a network change is detected via libnm or the win32 network monitor. The UI could also emit this signal if it knows something network.c doesn't. UPnP and NAT-PMP respond to the signal by clearing their IP address caches; changing networks without quitting/relaunching will now lead to the new IP address being (lazily) determined. This commit also enables nat-pmp and adds nat-pmp.[h|c] to the build process; please let me know if there are any problems building, as I only have OS X test machines.
Evan Schoenberg <evan.s@dreskin.net>
parents:
15949
diff
changeset
|
1066 purple_upnp_init(); |
26050
ae3d25465d0f
Run an asynchronous DNS lookup for the STUN server IP (to set as a property
Marcus Lundblad <ml@update.uu.se>
parents:
24888
diff
changeset
|
1067 |
ae3d25465d0f
Run an asynchronous DNS lookup for the STUN server IP (to set as a property
Marcus Lundblad <ml@update.uu.se>
parents:
24888
diff
changeset
|
1068 purple_network_set_stun_server( |
ae3d25465d0f
Run an asynchronous DNS lookup for the STUN server IP (to set as a property
Marcus Lundblad <ml@update.uu.se>
parents:
24888
diff
changeset
|
1069 purple_prefs_get_string("/purple/network/stun_server")); |
26055
c56e8826fed0
Added support to generate relayed candidates (TURN).
Marcus Lundblad <ml@update.uu.se>
parents:
26050
diff
changeset
|
1070 purple_network_set_turn_server( |
c56e8826fed0
Added support to generate relayed candidates (TURN).
Marcus Lundblad <ml@update.uu.se>
parents:
26050
diff
changeset
|
1071 purple_prefs_get_string("/purple/network/turn_server")); |
27108
38c4973b5222
Add a function to remove a port mapping (UPnP or NAT-PMP) given a file
Marcus Lundblad <ml@update.uu.se>
parents:
26885
diff
changeset
|
1072 |
38c4973b5222
Add a function to remove a port mapping (UPnP or NAT-PMP) given a file
Marcus Lundblad <ml@update.uu.se>
parents:
26885
diff
changeset
|
1073 upnp_port_mappings = |
38c4973b5222
Add a function to remove a port mapping (UPnP or NAT-PMP) given a file
Marcus Lundblad <ml@update.uu.se>
parents:
26885
diff
changeset
|
1074 g_hash_table_new_full(g_int_hash, g_int_equal, g_free, g_free); |
38c4973b5222
Add a function to remove a port mapping (UPnP or NAT-PMP) given a file
Marcus Lundblad <ml@update.uu.se>
parents:
26885
diff
changeset
|
1075 nat_pmp_port_mappings = |
38c4973b5222
Add a function to remove a port mapping (UPnP or NAT-PMP) given a file
Marcus Lundblad <ml@update.uu.se>
parents:
26885
diff
changeset
|
1076 g_hash_table_new_full(g_int_hash, g_int_equal, g_free, g_free); |
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
1077 } |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
1078 |
27108
38c4973b5222
Add a function to remove a port mapping (UPnP or NAT-PMP) given a file
Marcus Lundblad <ml@update.uu.se>
parents:
26885
diff
changeset
|
1079 |
38c4973b5222
Add a function to remove a port mapping (UPnP or NAT-PMP) given a file
Marcus Lundblad <ml@update.uu.se>
parents:
26885
diff
changeset
|
1080 |
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
1081 void |
15822 | 1082 purple_network_uninit(void) |
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
1083 { |
22895
0bd86dae2734
Use pkg-config to detect NetworkManager. Also, fail if it isn't present,
Richard Laager <rlaager@wiktel.com>
parents:
22889
diff
changeset
|
1084 #ifdef HAVE_NETWORKMANAGER |
22874
790c606ff8a9
A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@wiktel.com>
parents:
22594
diff
changeset
|
1085 if (nm_proxy) { |
22889
f5d39c44465a
Modify the NetworkManager support to use "StateChange" directly, instead of
Richard Laager <rlaager@wiktel.com>
parents:
22882
diff
changeset
|
1086 dbus_g_proxy_disconnect_signal(nm_proxy, "StateChange", G_CALLBACK(nm_state_change_cb), NULL); |
22874
790c606ff8a9
A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@wiktel.com>
parents:
22594
diff
changeset
|
1087 g_object_unref(G_OBJECT(nm_proxy)); |
790c606ff8a9
A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@wiktel.com>
parents:
22594
diff
changeset
|
1088 } |
790c606ff8a9
A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@wiktel.com>
parents:
22594
diff
changeset
|
1089 if (dbus_proxy) { |
790c606ff8a9
A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@wiktel.com>
parents:
22594
diff
changeset
|
1090 dbus_g_proxy_disconnect_signal(dbus_proxy, "NameOwnerChanged", G_CALLBACK(nm_dbus_name_owner_changed_cb), NULL); |
790c606ff8a9
A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@wiktel.com>
parents:
22594
diff
changeset
|
1091 g_object_unref(G_OBJECT(dbus_proxy)); |
790c606ff8a9
A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@wiktel.com>
parents:
22594
diff
changeset
|
1092 } |
790c606ff8a9
A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@wiktel.com>
parents:
22594
diff
changeset
|
1093 if (nm_conn) |
790c606ff8a9
A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@wiktel.com>
parents:
22594
diff
changeset
|
1094 dbus_g_connection_unref(nm_conn); |
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
1095 #endif |
21067
96929e7acb86
Make purple_xfers_uninit, purple_network_uninit, and purple_plugins_uninit
Etan Reisner <pidgin@unreliablesource.net>
parents:
20347
diff
changeset
|
1096 |
24888
a6742d9eadf3
Adjust the NLA code to prevent hang on exit for Windows XP and Windows Vista.
Paul Aurich <paul@darkrain42.org>
parents:
24301
diff
changeset
|
1097 #ifdef _WIN32 |
a6742d9eadf3
Adjust the NLA code to prevent hang on exit for Windows XP and Windows Vista.
Paul Aurich <paul@darkrain42.org>
parents:
24301
diff
changeset
|
1098 g_static_mutex_lock(&mutex); |
a6742d9eadf3
Adjust the NLA code to prevent hang on exit for Windows XP and Windows Vista.
Paul Aurich <paul@darkrain42.org>
parents:
24301
diff
changeset
|
1099 network_initialized = FALSE; |
a6742d9eadf3
Adjust the NLA code to prevent hang on exit for Windows XP and Windows Vista.
Paul Aurich <paul@darkrain42.org>
parents:
24301
diff
changeset
|
1100 if (network_change_handle != NULL) { |
a6742d9eadf3
Adjust the NLA code to prevent hang on exit for Windows XP and Windows Vista.
Paul Aurich <paul@darkrain42.org>
parents:
24301
diff
changeset
|
1101 int retval; |
a6742d9eadf3
Adjust the NLA code to prevent hang on exit for Windows XP and Windows Vista.
Paul Aurich <paul@darkrain42.org>
parents:
24301
diff
changeset
|
1102 /* Trigger the NLA thread to stop waiting for network changes. Not |
a6742d9eadf3
Adjust the NLA code to prevent hang on exit for Windows XP and Windows Vista.
Paul Aurich <paul@darkrain42.org>
parents:
24301
diff
changeset
|
1103 * doing this can cause hangs on WSACleanup. */ |
a6742d9eadf3
Adjust the NLA code to prevent hang on exit for Windows XP and Windows Vista.
Paul Aurich <paul@darkrain42.org>
parents:
24301
diff
changeset
|
1104 purple_debug_warning("network", "Terminating the NLA thread\n"); |
a6742d9eadf3
Adjust the NLA code to prevent hang on exit for Windows XP and Windows Vista.
Paul Aurich <paul@darkrain42.org>
parents:
24301
diff
changeset
|
1105 if ((retval = WSALookupServiceEnd(network_change_handle)) == SOCKET_ERROR) { |
a6742d9eadf3
Adjust the NLA code to prevent hang on exit for Windows XP and Windows Vista.
Paul Aurich <paul@darkrain42.org>
parents:
24301
diff
changeset
|
1106 int errorid = WSAGetLastError(); |
a6742d9eadf3
Adjust the NLA code to prevent hang on exit for Windows XP and Windows Vista.
Paul Aurich <paul@darkrain42.org>
parents:
24301
diff
changeset
|
1107 gchar *msg = g_win32_error_message(errorid); |
a6742d9eadf3
Adjust the NLA code to prevent hang on exit for Windows XP and Windows Vista.
Paul Aurich <paul@darkrain42.org>
parents:
24301
diff
changeset
|
1108 purple_debug_warning("network", "Unable to kill NLA thread. Message: %s (%d).\n", |
a6742d9eadf3
Adjust the NLA code to prevent hang on exit for Windows XP and Windows Vista.
Paul Aurich <paul@darkrain42.org>
parents:
24301
diff
changeset
|
1109 msg, errorid); |
a6742d9eadf3
Adjust the NLA code to prevent hang on exit for Windows XP and Windows Vista.
Paul Aurich <paul@darkrain42.org>
parents:
24301
diff
changeset
|
1110 g_free(msg); |
a6742d9eadf3
Adjust the NLA code to prevent hang on exit for Windows XP and Windows Vista.
Paul Aurich <paul@darkrain42.org>
parents:
24301
diff
changeset
|
1111 } |
25401
75f72178e361
Fix 3 different race conditions in the win32 network management functionality.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
24888
diff
changeset
|
1112 network_change_handle = NULL; |
75f72178e361
Fix 3 different race conditions in the win32 network management functionality.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
24888
diff
changeset
|
1113 |
24888
a6742d9eadf3
Adjust the NLA code to prevent hang on exit for Windows XP and Windows Vista.
Paul Aurich <paul@darkrain42.org>
parents:
24301
diff
changeset
|
1114 } |
a6742d9eadf3
Adjust the NLA code to prevent hang on exit for Windows XP and Windows Vista.
Paul Aurich <paul@darkrain42.org>
parents:
24301
diff
changeset
|
1115 g_static_mutex_unlock(&mutex); |
a6742d9eadf3
Adjust the NLA code to prevent hang on exit for Windows XP and Windows Vista.
Paul Aurich <paul@darkrain42.org>
parents:
24301
diff
changeset
|
1116 |
a6742d9eadf3
Adjust the NLA code to prevent hang on exit for Windows XP and Windows Vista.
Paul Aurich <paul@darkrain42.org>
parents:
24301
diff
changeset
|
1117 #endif |
21067
96929e7acb86
Make purple_xfers_uninit, purple_network_uninit, and purple_plugins_uninit
Etan Reisner <pidgin@unreliablesource.net>
parents:
20347
diff
changeset
|
1118 purple_signal_unregister(purple_network_get_handle(), |
25401
75f72178e361
Fix 3 different race conditions in the win32 network management functionality.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
24888
diff
changeset
|
1119 "network-configuration-changed"); |
26050
ae3d25465d0f
Run an asynchronous DNS lookup for the STUN server IP (to set as a property
Marcus Lundblad <ml@update.uu.se>
parents:
24888
diff
changeset
|
1120 |
ae3d25465d0f
Run an asynchronous DNS lookup for the STUN server IP (to set as a property
Marcus Lundblad <ml@update.uu.se>
parents:
24888
diff
changeset
|
1121 if (stun_ip) |
ae3d25465d0f
Run an asynchronous DNS lookup for the STUN server IP (to set as a property
Marcus Lundblad <ml@update.uu.se>
parents:
24888
diff
changeset
|
1122 g_free(stun_ip); |
27108
38c4973b5222
Add a function to remove a port mapping (UPnP or NAT-PMP) given a file
Marcus Lundblad <ml@update.uu.se>
parents:
26885
diff
changeset
|
1123 |
38c4973b5222
Add a function to remove a port mapping (UPnP or NAT-PMP) given a file
Marcus Lundblad <ml@update.uu.se>
parents:
26885
diff
changeset
|
1124 g_hash_table_destroy(upnp_port_mappings); |
38c4973b5222
Add a function to remove a port mapping (UPnP or NAT-PMP) given a file
Marcus Lundblad <ml@update.uu.se>
parents:
26885
diff
changeset
|
1125 g_hash_table_destroy(nat_pmp_port_mappings); |
38c4973b5222
Add a function to remove a port mapping (UPnP or NAT-PMP) given a file
Marcus Lundblad <ml@update.uu.se>
parents:
26885
diff
changeset
|
1126 |
38c4973b5222
Add a function to remove a port mapping (UPnP or NAT-PMP) given a file
Marcus Lundblad <ml@update.uu.se>
parents:
26885
diff
changeset
|
1127 /* TODO: clean up remaining port mappings, note calling |
38c4973b5222
Add a function to remove a port mapping (UPnP or NAT-PMP) given a file
Marcus Lundblad <ml@update.uu.se>
parents:
26885
diff
changeset
|
1128 purple_upnp_remove_port_mapping from here doesn't quite work... */ |
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
1129 } |