libpurple/network.c

Fri, 15 Apr 2022 11:13:22 -0500

author
Belgin Știrbu <belginstirbu@hotmail.com>
date
Fri, 15 Apr 2022 11:13:22 -0500
branch
release-2.x.y
changeset 41324
f20e9970a54f
parent 41043
f14a311b8313
permissions
-rw-r--r--

Fix IRC file transfers on Windows

This might also fix some other things, like getsockname
error #10014

Testing Done:
Tested on Windows and Linux. Executed some file transfers over IRC and they worked.

Bugs closed: PIDGIN-17175

Reviewed at https://reviews.imfreedom.org/r/1382/

8231
347c8992c445 [gaim-migrate @ 8954]
Tim Ringenbach <marv@pidgin.im>
parents:
diff changeset
1 /**
347c8992c445 [gaim-migrate @ 8954]
Tim Ringenbach <marv@pidgin.im>
parents:
diff changeset
2 * @file network.c Network Implementation
347c8992c445 [gaim-migrate @ 8954]
Tim Ringenbach <marv@pidgin.im>
parents:
diff changeset
3 * @ingroup core
20147
66f05a854eee applied changes from 8a731bbd0197fbcc91a705c2d8f528154216defa
Richard Laager <rlaager@pidgin.im>
parents: 19859
diff changeset
4 */
66f05a854eee applied changes from 8a731bbd0197fbcc91a705c2d8f528154216defa
Richard Laager <rlaager@pidgin.im>
parents: 19859
diff changeset
5
66f05a854eee applied changes from 8a731bbd0197fbcc91a705c2d8f528154216defa
Richard Laager <rlaager@pidgin.im>
parents: 19859
diff changeset
6 /* purple
8231
347c8992c445 [gaim-migrate @ 8954]
Tim Ringenbach <marv@pidgin.im>
parents:
diff changeset
7 *
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15708
diff changeset
8 * Purple is the legal property of its developers, whose names are too numerous
8231
347c8992c445 [gaim-migrate @ 8954]
Tim Ringenbach <marv@pidgin.im>
parents:
diff changeset
9 * to list here. Please refer to the COPYRIGHT file distributed with this
347c8992c445 [gaim-migrate @ 8954]
Tim Ringenbach <marv@pidgin.im>
parents:
diff changeset
10 * source distribution.
347c8992c445 [gaim-migrate @ 8954]
Tim Ringenbach <marv@pidgin.im>
parents:
diff changeset
11 *
347c8992c445 [gaim-migrate @ 8954]
Tim Ringenbach <marv@pidgin.im>
parents:
diff changeset
12 * This program is free software; you can redistribute it and/or modify
347c8992c445 [gaim-migrate @ 8954]
Tim Ringenbach <marv@pidgin.im>
parents:
diff changeset
13 * it under the terms of the GNU General Public License as published by
347c8992c445 [gaim-migrate @ 8954]
Tim Ringenbach <marv@pidgin.im>
parents:
diff changeset
14 * the Free Software Foundation; either version 2 of the License, or
347c8992c445 [gaim-migrate @ 8954]
Tim Ringenbach <marv@pidgin.im>
parents:
diff changeset
15 * (at your option) any later version.
347c8992c445 [gaim-migrate @ 8954]
Tim Ringenbach <marv@pidgin.im>
parents:
diff changeset
16 *
347c8992c445 [gaim-migrate @ 8954]
Tim Ringenbach <marv@pidgin.im>
parents:
diff changeset
17 * This program is distributed in the hope that it will be useful,
347c8992c445 [gaim-migrate @ 8954]
Tim Ringenbach <marv@pidgin.im>
parents:
diff changeset
18 * but WITHOUT ANY WARRANTY; without even the implied warranty of
347c8992c445 [gaim-migrate @ 8954]
Tim Ringenbach <marv@pidgin.im>
parents:
diff changeset
19 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
347c8992c445 [gaim-migrate @ 8954]
Tim Ringenbach <marv@pidgin.im>
parents:
diff changeset
20 * GNU General Public License for more details.
347c8992c445 [gaim-migrate @ 8954]
Tim Ringenbach <marv@pidgin.im>
parents:
diff changeset
21 *
347c8992c445 [gaim-migrate @ 8954]
Tim Ringenbach <marv@pidgin.im>
parents:
diff changeset
22 * You should have received a copy of the GNU General Public License
347c8992c445 [gaim-migrate @ 8954]
Tim Ringenbach <marv@pidgin.im>
parents:
diff changeset
23 * along with this program; if not, write to the Free Software
19859
71d37b57eff2 The FSF changed its address a while ago; our files were out of date.
John Bailey <rekkanoryo@rekkanoryo.org>
parents: 19832
diff changeset
24 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
8231
347c8992c445 [gaim-migrate @ 8954]
Tim Ringenbach <marv@pidgin.im>
parents:
diff changeset
25 */
347c8992c445 [gaim-migrate @ 8954]
Tim Ringenbach <marv@pidgin.im>
parents:
diff changeset
26
8245
c1397ca0a619 [gaim-migrate @ 8968]
Herman Bloggs <herman@bluedigits.com>
parents: 8240
diff changeset
27 #include "internal.h"
8231
347c8992c445 [gaim-migrate @ 8954]
Tim Ringenbach <marv@pidgin.im>
parents:
diff changeset
28
13156
539a637c61dc [gaim-migrate @ 15518]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 13131
diff changeset
29 #ifndef _WIN32
23352
9714223ca7a7 A patch from Peter O'Gorman at The Written Word, Inc. to fix various
Peter O'Gorman <pogma@thewrittenword.com>
parents: 23185
diff changeset
30 #include <arpa/nameser.h>
14864
a1cbdeffee69 [gaim-migrate @ 17567]
Sean Egan <seanegan@pidgin.im>
parents: 14862
diff changeset
31 #include <resolv.h>
a1cbdeffee69 [gaim-migrate @ 17567]
Sean Egan <seanegan@pidgin.im>
parents: 14862
diff changeset
32 #include <netinet/in.h>
13156
539a637c61dc [gaim-migrate @ 15518]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 13131
diff changeset
33 #include <net/if.h>
539a637c61dc [gaim-migrate @ 15518]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 13131
diff changeset
34 #include <sys/ioctl.h>
29714
8c1f3beb9fdc network: Use getifaddrs() to enumerate local interfaces/IPs if available.
Paul Aurich <darkrain42@pidgin.im>
parents: 29704
diff changeset
35 #ifdef HAVE_GETIFADDRS
8c1f3beb9fdc network: Use getifaddrs() to enumerate local interfaces/IPs if available.
Paul Aurich <darkrain42@pidgin.im>
parents: 29704
diff changeset
36 #include <ifaddrs.h>
8c1f3beb9fdc network: Use getifaddrs() to enumerate local interfaces/IPs if available.
Paul Aurich <darkrain42@pidgin.im>
parents: 29704
diff changeset
37 #endif
14784
3a82321f46f2 [gaim-migrate @ 17476]
Daniel Atallah <datallah@pidgin.im>
parents: 14758
diff changeset
38 #else
3a82321f46f2 [gaim-migrate @ 17476]
Daniel Atallah <datallah@pidgin.im>
parents: 14758
diff changeset
39 #include <nspapi.h>
13156
539a637c61dc [gaim-migrate @ 15518]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 13131
diff changeset
40 #endif
539a637c61dc [gaim-migrate @ 15518]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 13131
diff changeset
41
539a637c61dc [gaim-migrate @ 15518]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 13131
diff changeset
42 /* Solaris */
539a637c61dc [gaim-migrate @ 15518]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 13131
diff changeset
43 #if defined (__SVR4) && defined (__sun)
539a637c61dc [gaim-migrate @ 15518]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 13131
diff changeset
44 #include <sys/sockio.h>
539a637c61dc [gaim-migrate @ 15518]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 13131
diff changeset
45 #endif
539a637c61dc [gaim-migrate @ 15518]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 13131
diff changeset
46
8231
347c8992c445 [gaim-migrate @ 8954]
Tim Ringenbach <marv@pidgin.im>
parents:
diff changeset
47 #include "debug.h"
347c8992c445 [gaim-migrate @ 8954]
Tim Ringenbach <marv@pidgin.im>
parents:
diff changeset
48 #include "account.h"
16035
eb4eda79a147 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 <evands@pidgin.im>
parents: 16012
diff changeset
49 #include "nat-pmp.h"
8231
347c8992c445 [gaim-migrate @ 8954]
Tim Ringenbach <marv@pidgin.im>
parents:
diff changeset
50 #include "network.h"
347c8992c445 [gaim-migrate @ 8954]
Tim Ringenbach <marv@pidgin.im>
parents:
diff changeset
51 #include "prefs.h"
11411
b74834586187 [gaim-migrate @ 13648]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11391
diff changeset
52 #include "stun.h"
11195
d84d542a04ac [gaim-migrate @ 13319]
Adam Warrington <awarring@users.sourceforge.net>
parents: 11033
diff changeset
53 #include "upnp.h"
26256
d2673c935184 Run an asynchronous DNS lookup for the STUN server IP (to set as a property
Marcus Lundblad <malu@pidgin.im>
parents: 25326
diff changeset
54 #include "dnsquery.h"
8231
347c8992c445 [gaim-migrate @ 8954]
Tim Ringenbach <marv@pidgin.im>
parents:
diff changeset
55
27898
4a6450d92e11 Move the IDN support into the DNS routines.
Paul Aurich <darkrain42@pidgin.im>
parents: 27497
diff changeset
56 #ifdef USE_IDN
4a6450d92e11 Move the IDN support into the DNS routines.
Paul Aurich <darkrain42@pidgin.im>
parents: 27497
diff changeset
57 #include <idna.h>
4a6450d92e11 Move the IDN support into the DNS routines.
Paul Aurich <darkrain42@pidgin.im>
parents: 27497
diff changeset
58 #endif
4a6450d92e11 Move the IDN support into the DNS routines.
Paul Aurich <darkrain42@pidgin.im>
parents: 27497
diff changeset
59
41043
f14a311b8313 Fixing building on Haiku
Haiku Ports Team <haikuports@freelists.org>
parents: 40916
diff changeset
60 #ifdef __HAIKU__
f14a311b8313 Fixing building on Haiku
Haiku Ports Team <haikuports@freelists.org>
parents: 40916
diff changeset
61 # ifndef SIOCGIFCONF
f14a311b8313 Fixing building on Haiku
Haiku Ports Team <haikuports@freelists.org>
parents: 40916
diff changeset
62 # include <sys/sockio.h>
f14a311b8313 Fixing building on Haiku
Haiku Ports Team <haikuports@freelists.org>
parents: 40916
diff changeset
63 # endif
f14a311b8313 Fixing building on Haiku
Haiku Ports Team <haikuports@freelists.org>
parents: 40916
diff changeset
64 #endif
f14a311b8313 Fixing building on Haiku
Haiku Ports Team <haikuports@freelists.org>
parents: 40916
diff changeset
65
15278
7f469b5c8d7a [gaim-migrate @ 18006]
Mark Doliner <markdoliner@pidgin.im>
parents: 15116
diff changeset
66 /*
7f469b5c8d7a [gaim-migrate @ 18006]
Mark Doliner <markdoliner@pidgin.im>
parents: 15116
diff changeset
67 * Calling sizeof(struct ifreq) isn't always correct on
7f469b5c8d7a [gaim-migrate @ 18006]
Mark Doliner <markdoliner@pidgin.im>
parents: 15116
diff changeset
68 * Mac OS X (and maybe others).
7f469b5c8d7a [gaim-migrate @ 18006]
Mark Doliner <markdoliner@pidgin.im>
parents: 15116
diff changeset
69 */
7f469b5c8d7a [gaim-migrate @ 18006]
Mark Doliner <markdoliner@pidgin.im>
parents: 15116
diff changeset
70 #ifdef _SIZEOF_ADDR_IFREQ
7f469b5c8d7a [gaim-migrate @ 18006]
Mark Doliner <markdoliner@pidgin.im>
parents: 15116
diff changeset
71 # define HX_SIZE_OF_IFREQ(a) _SIZEOF_ADDR_IFREQ(a)
7f469b5c8d7a [gaim-migrate @ 18006]
Mark Doliner <markdoliner@pidgin.im>
parents: 15116
diff changeset
72 #else
7f469b5c8d7a [gaim-migrate @ 18006]
Mark Doliner <markdoliner@pidgin.im>
parents: 15116
diff changeset
73 # define HX_SIZE_OF_IFREQ(a) sizeof(a)
7f469b5c8d7a [gaim-migrate @ 18006]
Mark Doliner <markdoliner@pidgin.im>
parents: 15116
diff changeset
74 #endif
7f469b5c8d7a [gaim-migrate @ 18006]
Mark Doliner <markdoliner@pidgin.im>
parents: 15116
diff changeset
75
23060
db9632a9b374 Use pkg-config to detect NetworkManager. Also, fail if it isn't present,
Richard Laager <rlaager@pidgin.im>
parents: 23054
diff changeset
76 #ifdef HAVE_NETWORKMANAGER
23039
c9b53691fe42 A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@pidgin.im>
parents: 22735
diff changeset
77 #include <dbus/dbus-glib.h>
23060
db9632a9b374 Use pkg-config to detect NetworkManager. Also, fail if it isn't present,
Richard Laager <rlaager@pidgin.im>
parents: 23054
diff changeset
78 #include <NetworkManager.h>
14758
13b9adc9efd2 [gaim-migrate @ 17448]
Sean Egan <seanegan@pidgin.im>
parents: 14329
diff changeset
79
31653
a36102ecb723 Support new connection states in NetworkMakanter 0.9. Fixes #13505.
Dan Williams <dcbw@redhat.com>
parents: 31294
diff changeset
80 #if !defined(NM_CHECK_VERSION)
a36102ecb723 Support new connection states in NetworkMakanter 0.9. Fixes #13505.
Dan Williams <dcbw@redhat.com>
parents: 31294
diff changeset
81 #define NM_CHECK_VERSION(x,y,z) 0
a36102ecb723 Support new connection states in NetworkMakanter 0.9. Fixes #13505.
Dan Williams <dcbw@redhat.com>
parents: 31294
diff changeset
82 #endif
a36102ecb723 Support new connection states in NetworkMakanter 0.9. Fixes #13505.
Dan Williams <dcbw@redhat.com>
parents: 31294
diff changeset
83
23039
c9b53691fe42 A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@pidgin.im>
parents: 22735
diff changeset
84 static DBusGConnection *nm_conn = NULL;
c9b53691fe42 A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@pidgin.im>
parents: 22735
diff changeset
85 static DBusGProxy *nm_proxy = NULL;
c9b53691fe42 A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@pidgin.im>
parents: 22735
diff changeset
86 static DBusGProxy *dbus_proxy = NULL;
24519
d4af3d043211 Improve our NetworkManager support in a couple of ways:
Richard Laager <rlaager@pidgin.im>
parents: 24044
diff changeset
87 static NMState nm_state = NM_STATE_UNKNOWN;
d4af3d043211 Improve our NetworkManager support in a couple of ways:
Richard Laager <rlaager@pidgin.im>
parents: 24044
diff changeset
88 static gboolean have_nm_state = FALSE;
14758
13b9adc9efd2 [gaim-migrate @ 17448]
Sean Egan <seanegan@pidgin.im>
parents: 14329
diff changeset
89
14784
3a82321f46f2 [gaim-migrate @ 17476]
Daniel Atallah <datallah@pidgin.im>
parents: 14758
diff changeset
90 #elif defined _WIN32
3a82321f46f2 [gaim-migrate @ 17476]
Daniel Atallah <datallah@pidgin.im>
parents: 14758
diff changeset
91 static int current_network_count;
25326
c4f4b222dbac Adjust the NLA code to prevent hang on exit for Windows XP and Windows Vista.
Paul Aurich <darkrain42@pidgin.im>
parents: 24519
diff changeset
92
c4f4b222dbac Adjust the NLA code to prevent hang on exit for Windows XP and Windows Vista.
Paul Aurich <darkrain42@pidgin.im>
parents: 24519
diff changeset
93 /* Mutex for the other global vars */
c4f4b222dbac Adjust the NLA code to prevent hang on exit for Windows XP and Windows Vista.
Paul Aurich <darkrain42@pidgin.im>
parents: 24519
diff changeset
94 static GStaticMutex mutex = G_STATIC_MUTEX_INIT;
25541
1b82a0195ff5 Fix 3 different race conditions in the win32 network management functionality.
Daniel Atallah <datallah@pidgin.im>
parents: 25326
diff changeset
95 static gboolean network_initialized = FALSE;
1b82a0195ff5 Fix 3 different race conditions in the win32 network management functionality.
Daniel Atallah <datallah@pidgin.im>
parents: 25326
diff changeset
96 static HANDLE network_change_handle = NULL;
1b82a0195ff5 Fix 3 different race conditions in the win32 network management functionality.
Daniel Atallah <datallah@pidgin.im>
parents: 25326
diff changeset
97 static int (WSAAPI *MyWSANSPIoctl) (
1b82a0195ff5 Fix 3 different race conditions in the win32 network management functionality.
Daniel Atallah <datallah@pidgin.im>
parents: 25326
diff changeset
98 HANDLE hLookup, DWORD dwControlCode, LPVOID lpvInBuffer,
1b82a0195ff5 Fix 3 different race conditions in the win32 network management functionality.
Daniel Atallah <datallah@pidgin.im>
parents: 25326
diff changeset
99 DWORD cbInBuffer, LPVOID lpvOutBuffer, DWORD cbOutBuffer,
1b82a0195ff5 Fix 3 different race conditions in the win32 network management functionality.
Daniel Atallah <datallah@pidgin.im>
parents: 25326
diff changeset
100 LPDWORD lpcbBytesReturned, LPWSACOMPLETION lpCompletion) = NULL;
14758
13b9adc9efd2 [gaim-migrate @ 17448]
Sean Egan <seanegan@pidgin.im>
parents: 14329
diff changeset
101 #endif
13b9adc9efd2 [gaim-migrate @ 17448]
Sean Egan <seanegan@pidgin.im>
parents: 14329
diff changeset
102
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15708
diff changeset
103 struct _PurpleNetworkListenData {
12909
dfcf4df1dcd7 [gaim-migrate @ 15262]
Daniel Atallah <datallah@pidgin.im>
parents: 12730
diff changeset
104 int listenfd;
dfcf4df1dcd7 [gaim-migrate @ 15262]
Daniel Atallah <datallah@pidgin.im>
parents: 12730
diff changeset
105 int socket_type;
dfcf4df1dcd7 [gaim-migrate @ 15262]
Daniel Atallah <datallah@pidgin.im>
parents: 12730
diff changeset
106 gboolean retry;
dfcf4df1dcd7 [gaim-migrate @ 15262]
Daniel Atallah <datallah@pidgin.im>
parents: 12730
diff changeset
107 gboolean adding;
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15708
diff changeset
108 PurpleNetworkListenCallback cb;
12909
dfcf4df1dcd7 [gaim-migrate @ 15262]
Daniel Atallah <datallah@pidgin.im>
parents: 12730
diff changeset
109 gpointer cb_data;
15502
250802f80d94 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 <evands@pidgin.im>
parents: 15435
diff changeset
110 UPnPMappingAddRemove *mapping_data;
30614
ba7a36c1696b Make sure we keep track of this timer and remove it if our caller frees
Mark Doliner <markdoliner@pidgin.im>
parents: 30027
diff changeset
111 int timer;
14329
05c3cc0c1f79 [gaim-migrate @ 16949]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
112 };
11391
d172e72988cc [gaim-migrate @ 13620]
Adam Warrington <awarring@users.sourceforge.net>
parents: 11336
diff changeset
113
23060
db9632a9b374 Use pkg-config to detect NetworkManager. Also, fail if it isn't present,
Richard Laager <rlaager@pidgin.im>
parents: 23054
diff changeset
114 #ifdef HAVE_NETWORKMANAGER
23039
c9b53691fe42 A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@pidgin.im>
parents: 22735
diff changeset
115 static NMState nm_get_network_state(void);
14758
13b9adc9efd2 [gaim-migrate @ 17448]
Sean Egan <seanegan@pidgin.im>
parents: 14329
diff changeset
116 #endif
13b9adc9efd2 [gaim-migrate @ 17448]
Sean Egan <seanegan@pidgin.im>
parents: 14329
diff changeset
117
24999
84d597b7e7c6 Add a -f/--force-online option to Pidgin which tells libpurple to claim the
Richard Laager <rlaager@pidgin.im>
parents: 24519
diff changeset
118 #if defined(HAVE_NETWORKMANAGER) || defined(_WIN32)
84d597b7e7c6 Add a -f/--force-online option to Pidgin which tells libpurple to claim the
Richard Laager <rlaager@pidgin.im>
parents: 24519
diff changeset
119 static gboolean force_online;
84d597b7e7c6 Add a -f/--force-online option to Pidgin which tells libpurple to claim the
Richard Laager <rlaager@pidgin.im>
parents: 24519
diff changeset
120 #endif
84d597b7e7c6 Add a -f/--force-online option to Pidgin which tells libpurple to claim the
Richard Laager <rlaager@pidgin.im>
parents: 24519
diff changeset
121
26261
ffabb135a4b6 Added support to generate relayed candidates (TURN).
Marcus Lundblad <malu@pidgin.im>
parents: 26256
diff changeset
122 /* Cached IP addresses for STUN and TURN servers (set globally in prefs) */
26256
d2673c935184 Run an asynchronous DNS lookup for the STUN server IP (to set as a property
Marcus Lundblad <malu@pidgin.im>
parents: 25326
diff changeset
123 static gchar *stun_ip = NULL;
26261
ffabb135a4b6 Added support to generate relayed candidates (TURN).
Marcus Lundblad <malu@pidgin.im>
parents: 26256
diff changeset
124 static gchar *turn_ip = NULL;
26256
d2673c935184 Run an asynchronous DNS lookup for the STUN server IP (to set as a property
Marcus Lundblad <malu@pidgin.im>
parents: 25326
diff changeset
125
27332
8240ab259385 Add a function to remove a port mapping (UPnP or NAT-PMP) given a file
Marcus Lundblad <malu@pidgin.im>
parents: 27116
diff changeset
126 /* Keep track of port mappings done with UPnP and NAT-PMP */
8240ab259385 Add a function to remove a port mapping (UPnP or NAT-PMP) given a file
Marcus Lundblad <malu@pidgin.im>
parents: 27116
diff changeset
127 static GHashTable *upnp_port_mappings = NULL;
8240ab259385 Add a function to remove a port mapping (UPnP or NAT-PMP) given a file
Marcus Lundblad <malu@pidgin.im>
parents: 27116
diff changeset
128 static GHashTable *nat_pmp_port_mappings = NULL;
8240ab259385 Add a function to remove a port mapping (UPnP or NAT-PMP) given a file
Marcus Lundblad <malu@pidgin.im>
parents: 27116
diff changeset
129
8838
c23227da7b4a [gaim-migrate @ 9604]
Mark Doliner <markdoliner@pidgin.im>
parents: 8834
diff changeset
130 const unsigned char *
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15708
diff changeset
131 purple_network_ip_atoi(const char *ip)
8838
c23227da7b4a [gaim-migrate @ 9604]
Mark Doliner <markdoliner@pidgin.im>
parents: 8834
diff changeset
132 {
c23227da7b4a [gaim-migrate @ 9604]
Mark Doliner <markdoliner@pidgin.im>
parents: 8834
diff changeset
133 static unsigned char ret[4];
8981
9fc6a61eb359 [gaim-migrate @ 9756]
Tim Ringenbach <marv@pidgin.im>
parents: 8840
diff changeset
134 gchar *delimiter = ".";
8838
c23227da7b4a [gaim-migrate @ 9604]
Mark Doliner <markdoliner@pidgin.im>
parents: 8834
diff changeset
135 gchar **split;
c23227da7b4a [gaim-migrate @ 9604]
Mark Doliner <markdoliner@pidgin.im>
parents: 8834
diff changeset
136 int i;
c23227da7b4a [gaim-migrate @ 9604]
Mark Doliner <markdoliner@pidgin.im>
parents: 8834
diff changeset
137
c23227da7b4a [gaim-migrate @ 9604]
Mark Doliner <markdoliner@pidgin.im>
parents: 8834
diff changeset
138 g_return_val_if_fail(ip != NULL, NULL);
c23227da7b4a [gaim-migrate @ 9604]
Mark Doliner <markdoliner@pidgin.im>
parents: 8834
diff changeset
139
8981
9fc6a61eb359 [gaim-migrate @ 9756]
Tim Ringenbach <marv@pidgin.im>
parents: 8840
diff changeset
140 split = g_strsplit(ip, delimiter, 4);
8838
c23227da7b4a [gaim-migrate @ 9604]
Mark Doliner <markdoliner@pidgin.im>
parents: 8834
diff changeset
141 for (i = 0; split[i] != NULL; i++)
c23227da7b4a [gaim-migrate @ 9604]
Mark Doliner <markdoliner@pidgin.im>
parents: 8834
diff changeset
142 ret[i] = atoi(split[i]);
c23227da7b4a [gaim-migrate @ 9604]
Mark Doliner <markdoliner@pidgin.im>
parents: 8834
diff changeset
143 g_strfreev(split);
c23227da7b4a [gaim-migrate @ 9604]
Mark Doliner <markdoliner@pidgin.im>
parents: 8834
diff changeset
144
c23227da7b4a [gaim-migrate @ 9604]
Mark Doliner <markdoliner@pidgin.im>
parents: 8834
diff changeset
145 /* i should always be 4 */
c23227da7b4a [gaim-migrate @ 9604]
Mark Doliner <markdoliner@pidgin.im>
parents: 8834
diff changeset
146 if (i != 4)
c23227da7b4a [gaim-migrate @ 9604]
Mark Doliner <markdoliner@pidgin.im>
parents: 8834
diff changeset
147 return NULL;
c23227da7b4a [gaim-migrate @ 9604]
Mark Doliner <markdoliner@pidgin.im>
parents: 8834
diff changeset
148
c23227da7b4a [gaim-migrate @ 9604]
Mark Doliner <markdoliner@pidgin.im>
parents: 8834
diff changeset
149 return ret;
c23227da7b4a [gaim-migrate @ 9604]
Mark Doliner <markdoliner@pidgin.im>
parents: 8834
diff changeset
150 }
c23227da7b4a [gaim-migrate @ 9604]
Mark Doliner <markdoliner@pidgin.im>
parents: 8834
diff changeset
151
8231
347c8992c445 [gaim-migrate @ 8954]
Tim Ringenbach <marv@pidgin.im>
parents:
diff changeset
152 void
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15708
diff changeset
153 purple_network_set_public_ip(const char *ip)
8231
347c8992c445 [gaim-migrate @ 8954]
Tim Ringenbach <marv@pidgin.im>
parents:
diff changeset
154 {
347c8992c445 [gaim-migrate @ 8954]
Tim Ringenbach <marv@pidgin.im>
parents:
diff changeset
155 g_return_if_fail(ip != NULL);
347c8992c445 [gaim-migrate @ 8954]
Tim Ringenbach <marv@pidgin.im>
parents:
diff changeset
156
8838
c23227da7b4a [gaim-migrate @ 9604]
Mark Doliner <markdoliner@pidgin.im>
parents: 8834
diff changeset
157 /* XXX - Ensure the IP address is valid */
c23227da7b4a [gaim-migrate @ 9604]
Mark Doliner <markdoliner@pidgin.im>
parents: 8834
diff changeset
158
16478
19107605c565 Works for me! Renames prefs: /core to /purple, /gaim/gtk to /pidgin, /gaim/gnt to /finch
Sean Egan <seanegan@pidgin.im>
parents: 16035
diff changeset
159 purple_prefs_set_string("/purple/network/public_ip", ip);
8231
347c8992c445 [gaim-migrate @ 8954]
Tim Ringenbach <marv@pidgin.im>
parents:
diff changeset
160 }
347c8992c445 [gaim-migrate @ 8954]
Tim Ringenbach <marv@pidgin.im>
parents:
diff changeset
161
347c8992c445 [gaim-migrate @ 8954]
Tim Ringenbach <marv@pidgin.im>
parents:
diff changeset
162 const char *
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15708
diff changeset
163 purple_network_get_public_ip(void)
8231
347c8992c445 [gaim-migrate @ 8954]
Tim Ringenbach <marv@pidgin.im>
parents:
diff changeset
164 {
16478
19107605c565 Works for me! Renames prefs: /core to /purple, /gaim/gtk to /pidgin, /gaim/gnt to /finch
Sean Egan <seanegan@pidgin.im>
parents: 16035
diff changeset
165 return purple_prefs_get_string("/purple/network/public_ip");
8231
347c8992c445 [gaim-migrate @ 8954]
Tim Ringenbach <marv@pidgin.im>
parents:
diff changeset
166 }
347c8992c445 [gaim-migrate @ 8954]
Tim Ringenbach <marv@pidgin.im>
parents:
diff changeset
167
347c8992c445 [gaim-migrate @ 8954]
Tim Ringenbach <marv@pidgin.im>
parents:
diff changeset
168 const char *
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15708
diff changeset
169 purple_network_get_local_system_ip(int fd)
8231
347c8992c445 [gaim-migrate @ 8954]
Tim Ringenbach <marv@pidgin.im>
parents:
diff changeset
170 {
13346
a024b2b0a160 [gaim-migrate @ 15715]
Mark Doliner <markdoliner@pidgin.im>
parents: 13168
diff changeset
171 char buffer[1024];
a024b2b0a160 [gaim-migrate @ 15715]
Mark Doliner <markdoliner@pidgin.im>
parents: 13168
diff changeset
172 static char ip[16];
a024b2b0a160 [gaim-migrate @ 15715]
Mark Doliner <markdoliner@pidgin.im>
parents: 13168
diff changeset
173 char *tmp;
a024b2b0a160 [gaim-migrate @ 15715]
Mark Doliner <markdoliner@pidgin.im>
parents: 13168
diff changeset
174 struct ifconf ifc;
a024b2b0a160 [gaim-migrate @ 15715]
Mark Doliner <markdoliner@pidgin.im>
parents: 13168
diff changeset
175 struct ifreq *ifr;
a024b2b0a160 [gaim-migrate @ 15715]
Mark Doliner <markdoliner@pidgin.im>
parents: 13168
diff changeset
176 struct sockaddr_in *sinptr;
29704
1e17cbbf18a3 Clean up a little.
Paul Aurich <darkrain42@pidgin.im>
parents: 29513
diff changeset
177 guint32 lhost = htonl((127 << 24) + 1); /* 127.0.0.1 */
13346
a024b2b0a160 [gaim-migrate @ 15715]
Mark Doliner <markdoliner@pidgin.im>
parents: 13168
diff changeset
178 long unsigned int add;
a024b2b0a160 [gaim-migrate @ 15715]
Mark Doliner <markdoliner@pidgin.im>
parents: 13168
diff changeset
179 int source = fd;
8231
347c8992c445 [gaim-migrate @ 8954]
Tim Ringenbach <marv@pidgin.im>
parents:
diff changeset
180
13346
a024b2b0a160 [gaim-migrate @ 15715]
Mark Doliner <markdoliner@pidgin.im>
parents: 13168
diff changeset
181 if (fd < 0)
a024b2b0a160 [gaim-migrate @ 15715]
Mark Doliner <markdoliner@pidgin.im>
parents: 13168
diff changeset
182 source = socket(PF_INET,SOCK_STREAM, 0);
8231
347c8992c445 [gaim-migrate @ 8954]
Tim Ringenbach <marv@pidgin.im>
parents:
diff changeset
183
13346
a024b2b0a160 [gaim-migrate @ 15715]
Mark Doliner <markdoliner@pidgin.im>
parents: 13168
diff changeset
184 ifc.ifc_len = sizeof(buffer);
a024b2b0a160 [gaim-migrate @ 15715]
Mark Doliner <markdoliner@pidgin.im>
parents: 13168
diff changeset
185 ifc.ifc_req = (struct ifreq *)buffer;
a024b2b0a160 [gaim-migrate @ 15715]
Mark Doliner <markdoliner@pidgin.im>
parents: 13168
diff changeset
186 ioctl(source, SIOCGIFCONF, &ifc);
8231
347c8992c445 [gaim-migrate @ 8954]
Tim Ringenbach <marv@pidgin.im>
parents:
diff changeset
187
35991
e6937e52930b Fix some CWE-252 coverity warnings
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents: 32077
diff changeset
188 if (fd < 0 && source >= 0)
13346
a024b2b0a160 [gaim-migrate @ 15715]
Mark Doliner <markdoliner@pidgin.im>
parents: 13168
diff changeset
189 close(source);
8231
347c8992c445 [gaim-migrate @ 8954]
Tim Ringenbach <marv@pidgin.im>
parents:
diff changeset
190
13346
a024b2b0a160 [gaim-migrate @ 15715]
Mark Doliner <markdoliner@pidgin.im>
parents: 13168
diff changeset
191 tmp = buffer;
a024b2b0a160 [gaim-migrate @ 15715]
Mark Doliner <markdoliner@pidgin.im>
parents: 13168
diff changeset
192 while (tmp < buffer + ifc.ifc_len)
a024b2b0a160 [gaim-migrate @ 15715]
Mark Doliner <markdoliner@pidgin.im>
parents: 13168
diff changeset
193 {
a024b2b0a160 [gaim-migrate @ 15715]
Mark Doliner <markdoliner@pidgin.im>
parents: 13168
diff changeset
194 ifr = (struct ifreq *)tmp;
15278
7f469b5c8d7a [gaim-migrate @ 18006]
Mark Doliner <markdoliner@pidgin.im>
parents: 15116
diff changeset
195 tmp += HX_SIZE_OF_IFREQ(*ifr);
8231
347c8992c445 [gaim-migrate @ 8954]
Tim Ringenbach <marv@pidgin.im>
parents:
diff changeset
196
13346
a024b2b0a160 [gaim-migrate @ 15715]
Mark Doliner <markdoliner@pidgin.im>
parents: 13168
diff changeset
197 if (ifr->ifr_addr.sa_family == AF_INET)
a024b2b0a160 [gaim-migrate @ 15715]
Mark Doliner <markdoliner@pidgin.im>
parents: 13168
diff changeset
198 {
a024b2b0a160 [gaim-migrate @ 15715]
Mark Doliner <markdoliner@pidgin.im>
parents: 13168
diff changeset
199 sinptr = (struct sockaddr_in *)&ifr->ifr_addr;
a024b2b0a160 [gaim-migrate @ 15715]
Mark Doliner <markdoliner@pidgin.im>
parents: 13168
diff changeset
200 if (sinptr->sin_addr.s_addr != lhost)
a024b2b0a160 [gaim-migrate @ 15715]
Mark Doliner <markdoliner@pidgin.im>
parents: 13168
diff changeset
201 {
a024b2b0a160 [gaim-migrate @ 15715]
Mark Doliner <markdoliner@pidgin.im>
parents: 13168
diff changeset
202 add = ntohl(sinptr->sin_addr.s_addr);
a024b2b0a160 [gaim-migrate @ 15715]
Mark Doliner <markdoliner@pidgin.im>
parents: 13168
diff changeset
203 g_snprintf(ip, 16, "%lu.%lu.%lu.%lu",
a024b2b0a160 [gaim-migrate @ 15715]
Mark Doliner <markdoliner@pidgin.im>
parents: 13168
diff changeset
204 ((add >> 24) & 255),
a024b2b0a160 [gaim-migrate @ 15715]
Mark Doliner <markdoliner@pidgin.im>
parents: 13168
diff changeset
205 ((add >> 16) & 255),
a024b2b0a160 [gaim-migrate @ 15715]
Mark Doliner <markdoliner@pidgin.im>
parents: 13168
diff changeset
206 ((add >> 8) & 255),
a024b2b0a160 [gaim-migrate @ 15715]
Mark Doliner <markdoliner@pidgin.im>
parents: 13168
diff changeset
207 add & 255);
8231
347c8992c445 [gaim-migrate @ 8954]
Tim Ringenbach <marv@pidgin.im>
parents:
diff changeset
208
13346
a024b2b0a160 [gaim-migrate @ 15715]
Mark Doliner <markdoliner@pidgin.im>
parents: 13168
diff changeset
209 return ip;
a024b2b0a160 [gaim-migrate @ 15715]
Mark Doliner <markdoliner@pidgin.im>
parents: 13168
diff changeset
210 }
a024b2b0a160 [gaim-migrate @ 15715]
Mark Doliner <markdoliner@pidgin.im>
parents: 13168
diff changeset
211 }
a024b2b0a160 [gaim-migrate @ 15715]
Mark Doliner <markdoliner@pidgin.im>
parents: 13168
diff changeset
212 }
a024b2b0a160 [gaim-migrate @ 15715]
Mark Doliner <markdoliner@pidgin.im>
parents: 13168
diff changeset
213
a024b2b0a160 [gaim-migrate @ 15715]
Mark Doliner <markdoliner@pidgin.im>
parents: 13168
diff changeset
214 return "0.0.0.0";
8231
347c8992c445 [gaim-migrate @ 8954]
Tim Ringenbach <marv@pidgin.im>
parents:
diff changeset
215 }
347c8992c445 [gaim-migrate @ 8954]
Tim Ringenbach <marv@pidgin.im>
parents:
diff changeset
216
29510
9c636f4b965c Add a function to enumerate all local IPs
Marcus Lundblad <malu@pidgin.im>
parents: 27898
diff changeset
217 GList *
29511
7c4b1ba4f2aa Remove IPv6 support from _get_local_system_ips, since I couldn't get it to
Marcus Lundblad <malu@pidgin.im>
parents: 29510
diff changeset
218 purple_network_get_all_local_system_ips(void)
29510
9c636f4b965c Add a function to enumerate all local IPs
Marcus Lundblad <malu@pidgin.im>
parents: 27898
diff changeset
219 {
29716
59a5b6c2e6cb Oops, probably better if we have both getifaddrs() and inet_ntop()
Paul Aurich <darkrain42@pidgin.im>
parents: 29714
diff changeset
220 #if defined(HAVE_GETIFADDRS) && defined(HAVE_INET_NTOP)
29714
8c1f3beb9fdc network: Use getifaddrs() to enumerate local interfaces/IPs if available.
Paul Aurich <darkrain42@pidgin.im>
parents: 29704
diff changeset
221 GList *result = NULL;
8c1f3beb9fdc network: Use getifaddrs() to enumerate local interfaces/IPs if available.
Paul Aurich <darkrain42@pidgin.im>
parents: 29704
diff changeset
222 struct ifaddrs *start, *ifa;
8c1f3beb9fdc network: Use getifaddrs() to enumerate local interfaces/IPs if available.
Paul Aurich <darkrain42@pidgin.im>
parents: 29704
diff changeset
223 int ret;
8c1f3beb9fdc network: Use getifaddrs() to enumerate local interfaces/IPs if available.
Paul Aurich <darkrain42@pidgin.im>
parents: 29704
diff changeset
224
8c1f3beb9fdc network: Use getifaddrs() to enumerate local interfaces/IPs if available.
Paul Aurich <darkrain42@pidgin.im>
parents: 29704
diff changeset
225 ret = getifaddrs(&start);
8c1f3beb9fdc network: Use getifaddrs() to enumerate local interfaces/IPs if available.
Paul Aurich <darkrain42@pidgin.im>
parents: 29704
diff changeset
226 if (ret < 0) {
8c1f3beb9fdc network: Use getifaddrs() to enumerate local interfaces/IPs if available.
Paul Aurich <darkrain42@pidgin.im>
parents: 29704
diff changeset
227 purple_debug_warning("network",
8c1f3beb9fdc network: Use getifaddrs() to enumerate local interfaces/IPs if available.
Paul Aurich <darkrain42@pidgin.im>
parents: 29704
diff changeset
228 "getifaddrs() failed: %s\n", g_strerror(errno));
8c1f3beb9fdc network: Use getifaddrs() to enumerate local interfaces/IPs if available.
Paul Aurich <darkrain42@pidgin.im>
parents: 29704
diff changeset
229 return NULL;
8c1f3beb9fdc network: Use getifaddrs() to enumerate local interfaces/IPs if available.
Paul Aurich <darkrain42@pidgin.im>
parents: 29704
diff changeset
230 }
8c1f3beb9fdc network: Use getifaddrs() to enumerate local interfaces/IPs if available.
Paul Aurich <darkrain42@pidgin.im>
parents: 29704
diff changeset
231
8c1f3beb9fdc network: Use getifaddrs() to enumerate local interfaces/IPs if available.
Paul Aurich <darkrain42@pidgin.im>
parents: 29704
diff changeset
232 for (ifa = start; ifa; ifa = ifa->ifa_next) {
8c1f3beb9fdc network: Use getifaddrs() to enumerate local interfaces/IPs if available.
Paul Aurich <darkrain42@pidgin.im>
parents: 29704
diff changeset
233 int family = ifa->ifa_addr ? ifa->ifa_addr->sa_family : AF_UNSPEC;
8c1f3beb9fdc network: Use getifaddrs() to enumerate local interfaces/IPs if available.
Paul Aurich <darkrain42@pidgin.im>
parents: 29704
diff changeset
234 char host[INET6_ADDRSTRLEN];
8c1f3beb9fdc network: Use getifaddrs() to enumerate local interfaces/IPs if available.
Paul Aurich <darkrain42@pidgin.im>
parents: 29704
diff changeset
235 const char *tmp = NULL;
8c1f3beb9fdc network: Use getifaddrs() to enumerate local interfaces/IPs if available.
Paul Aurich <darkrain42@pidgin.im>
parents: 29704
diff changeset
236
8c1f3beb9fdc network: Use getifaddrs() to enumerate local interfaces/IPs if available.
Paul Aurich <darkrain42@pidgin.im>
parents: 29704
diff changeset
237 if ((family != AF_INET && family != AF_INET6) || ifa->ifa_flags & IFF_LOOPBACK)
8c1f3beb9fdc network: Use getifaddrs() to enumerate local interfaces/IPs if available.
Paul Aurich <darkrain42@pidgin.im>
parents: 29704
diff changeset
238 continue;
8c1f3beb9fdc network: Use getifaddrs() to enumerate local interfaces/IPs if available.
Paul Aurich <darkrain42@pidgin.im>
parents: 29704
diff changeset
239
8c1f3beb9fdc network: Use getifaddrs() to enumerate local interfaces/IPs if available.
Paul Aurich <darkrain42@pidgin.im>
parents: 29704
diff changeset
240 if (family == AF_INET)
8c1f3beb9fdc network: Use getifaddrs() to enumerate local interfaces/IPs if available.
Paul Aurich <darkrain42@pidgin.im>
parents: 29704
diff changeset
241 tmp = inet_ntop(family, &((struct sockaddr_in *)ifa->ifa_addr)->sin_addr, host, sizeof(host));
8c1f3beb9fdc network: Use getifaddrs() to enumerate local interfaces/IPs if available.
Paul Aurich <darkrain42@pidgin.im>
parents: 29704
diff changeset
242 else {
8c1f3beb9fdc network: Use getifaddrs() to enumerate local interfaces/IPs if available.
Paul Aurich <darkrain42@pidgin.im>
parents: 29704
diff changeset
243 struct sockaddr_in6 *sockaddr = (struct sockaddr_in6 *)ifa->ifa_addr;
8c1f3beb9fdc network: Use getifaddrs() to enumerate local interfaces/IPs if available.
Paul Aurich <darkrain42@pidgin.im>
parents: 29704
diff changeset
244 /* Peer-peer link-local communication is a big TODO. I am not sure
8c1f3beb9fdc network: Use getifaddrs() to enumerate local interfaces/IPs if available.
Paul Aurich <darkrain42@pidgin.im>
parents: 29704
diff changeset
245 * how communicating link-local addresses is supposed to work, and
8c1f3beb9fdc network: Use getifaddrs() to enumerate local interfaces/IPs if available.
Paul Aurich <darkrain42@pidgin.im>
parents: 29704
diff changeset
246 * it seems like it would require attempting the cartesian product
8c1f3beb9fdc network: Use getifaddrs() to enumerate local interfaces/IPs if available.
Paul Aurich <darkrain42@pidgin.im>
parents: 29704
diff changeset
247 * of the local and remote interfaces to see if any match (eww).
8c1f3beb9fdc network: Use getifaddrs() to enumerate local interfaces/IPs if available.
Paul Aurich <darkrain42@pidgin.im>
parents: 29704
diff changeset
248 */
8c1f3beb9fdc network: Use getifaddrs() to enumerate local interfaces/IPs if available.
Paul Aurich <darkrain42@pidgin.im>
parents: 29704
diff changeset
249 if (!IN6_IS_ADDR_LINKLOCAL(&sockaddr->sin6_addr))
8c1f3beb9fdc network: Use getifaddrs() to enumerate local interfaces/IPs if available.
Paul Aurich <darkrain42@pidgin.im>
parents: 29704
diff changeset
250 tmp = inet_ntop(family, &sockaddr->sin6_addr, host, sizeof(host));
8c1f3beb9fdc network: Use getifaddrs() to enumerate local interfaces/IPs if available.
Paul Aurich <darkrain42@pidgin.im>
parents: 29704
diff changeset
251 }
8c1f3beb9fdc network: Use getifaddrs() to enumerate local interfaces/IPs if available.
Paul Aurich <darkrain42@pidgin.im>
parents: 29704
diff changeset
252 if (tmp != NULL)
8c1f3beb9fdc network: Use getifaddrs() to enumerate local interfaces/IPs if available.
Paul Aurich <darkrain42@pidgin.im>
parents: 29704
diff changeset
253 result = g_list_prepend(result, g_strdup(tmp));
8c1f3beb9fdc network: Use getifaddrs() to enumerate local interfaces/IPs if available.
Paul Aurich <darkrain42@pidgin.im>
parents: 29704
diff changeset
254 }
8c1f3beb9fdc network: Use getifaddrs() to enumerate local interfaces/IPs if available.
Paul Aurich <darkrain42@pidgin.im>
parents: 29704
diff changeset
255
8c1f3beb9fdc network: Use getifaddrs() to enumerate local interfaces/IPs if available.
Paul Aurich <darkrain42@pidgin.im>
parents: 29704
diff changeset
256 freeifaddrs(start);
8c1f3beb9fdc network: Use getifaddrs() to enumerate local interfaces/IPs if available.
Paul Aurich <darkrain42@pidgin.im>
parents: 29704
diff changeset
257
8c1f3beb9fdc network: Use getifaddrs() to enumerate local interfaces/IPs if available.
Paul Aurich <darkrain42@pidgin.im>
parents: 29704
diff changeset
258 return g_list_reverse(result);
29716
59a5b6c2e6cb Oops, probably better if we have both getifaddrs() and inet_ntop()
Paul Aurich <darkrain42@pidgin.im>
parents: 29714
diff changeset
259 #else /* HAVE_GETIFADDRS && HAVE_INET_NTOP */
29510
9c636f4b965c Add a function to enumerate all local IPs
Marcus Lundblad <malu@pidgin.im>
parents: 27898
diff changeset
260 GList *result = NULL;
29704
1e17cbbf18a3 Clean up a little.
Paul Aurich <darkrain42@pidgin.im>
parents: 29513
diff changeset
261 int source = socket(PF_INET,SOCK_STREAM, 0);
29510
9c636f4b965c Add a function to enumerate all local IPs
Marcus Lundblad <malu@pidgin.im>
parents: 27898
diff changeset
262 char buffer[1024];
9c636f4b965c Add a function to enumerate all local IPs
Marcus Lundblad <malu@pidgin.im>
parents: 27898
diff changeset
263 char *tmp;
9c636f4b965c Add a function to enumerate all local IPs
Marcus Lundblad <malu@pidgin.im>
parents: 27898
diff changeset
264 struct ifconf ifc;
9c636f4b965c Add a function to enumerate all local IPs
Marcus Lundblad <malu@pidgin.im>
parents: 27898
diff changeset
265 struct ifreq *ifr;
29704
1e17cbbf18a3 Clean up a little.
Paul Aurich <darkrain42@pidgin.im>
parents: 29513
diff changeset
266
29510
9c636f4b965c Add a function to enumerate all local IPs
Marcus Lundblad <malu@pidgin.im>
parents: 27898
diff changeset
267 ifc.ifc_len = sizeof(buffer);
9c636f4b965c Add a function to enumerate all local IPs
Marcus Lundblad <malu@pidgin.im>
parents: 27898
diff changeset
268 ifc.ifc_req = (struct ifreq *)buffer;
9c636f4b965c Add a function to enumerate all local IPs
Marcus Lundblad <malu@pidgin.im>
parents: 27898
diff changeset
269 ioctl(source, SIOCGIFCONF, &ifc);
29511
7c4b1ba4f2aa Remove IPv6 support from _get_local_system_ips, since I couldn't get it to
Marcus Lundblad <malu@pidgin.im>
parents: 29510
diff changeset
270 close(source);
29510
9c636f4b965c Add a function to enumerate all local IPs
Marcus Lundblad <malu@pidgin.im>
parents: 27898
diff changeset
271
9c636f4b965c Add a function to enumerate all local IPs
Marcus Lundblad <malu@pidgin.im>
parents: 27898
diff changeset
272 tmp = buffer;
9c636f4b965c Add a function to enumerate all local IPs
Marcus Lundblad <malu@pidgin.im>
parents: 27898
diff changeset
273 while (tmp < buffer + ifc.ifc_len) {
29511
7c4b1ba4f2aa Remove IPv6 support from _get_local_system_ips, since I couldn't get it to
Marcus Lundblad <malu@pidgin.im>
parents: 29510
diff changeset
274 char dst[INET_ADDRSTRLEN];
29510
9c636f4b965c Add a function to enumerate all local IPs
Marcus Lundblad <malu@pidgin.im>
parents: 27898
diff changeset
275
9c636f4b965c Add a function to enumerate all local IPs
Marcus Lundblad <malu@pidgin.im>
parents: 27898
diff changeset
276 ifr = (struct ifreq *)tmp;
9c636f4b965c Add a function to enumerate all local IPs
Marcus Lundblad <malu@pidgin.im>
parents: 27898
diff changeset
277 tmp += HX_SIZE_OF_IFREQ(*ifr);
9c636f4b965c Add a function to enumerate all local IPs
Marcus Lundblad <malu@pidgin.im>
parents: 27898
diff changeset
278
9c636f4b965c Add a function to enumerate all local IPs
Marcus Lundblad <malu@pidgin.im>
parents: 27898
diff changeset
279 if (ifr->ifr_addr.sa_family == AF_INET) {
9c636f4b965c Add a function to enumerate all local IPs
Marcus Lundblad <malu@pidgin.im>
parents: 27898
diff changeset
280 struct sockaddr_in *sinptr = (struct sockaddr_in *)&ifr->ifr_addr;
9c636f4b965c Add a function to enumerate all local IPs
Marcus Lundblad <malu@pidgin.im>
parents: 27898
diff changeset
281
9c636f4b965c Add a function to enumerate all local IPs
Marcus Lundblad <malu@pidgin.im>
parents: 27898
diff changeset
282 inet_ntop(AF_INET, &sinptr->sin_addr, dst,
9c636f4b965c Add a function to enumerate all local IPs
Marcus Lundblad <malu@pidgin.im>
parents: 27898
diff changeset
283 sizeof(dst));
31294
73607ab89c6f Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents: 31191
diff changeset
284 purple_debug_info("network",
29510
9c636f4b965c Add a function to enumerate all local IPs
Marcus Lundblad <malu@pidgin.im>
parents: 27898
diff changeset
285 "found local i/f with address %s on IPv4\n", dst);
9c636f4b965c Add a function to enumerate all local IPs
Marcus Lundblad <malu@pidgin.im>
parents: 27898
diff changeset
286 if (!purple_strequal(dst, "127.0.0.1")) {
9c636f4b965c Add a function to enumerate all local IPs
Marcus Lundblad <malu@pidgin.im>
parents: 27898
diff changeset
287 result = g_list_append(result, g_strdup(dst));
9c636f4b965c Add a function to enumerate all local IPs
Marcus Lundblad <malu@pidgin.im>
parents: 27898
diff changeset
288 }
9c636f4b965c Add a function to enumerate all local IPs
Marcus Lundblad <malu@pidgin.im>
parents: 27898
diff changeset
289 }
9c636f4b965c Add a function to enumerate all local IPs
Marcus Lundblad <malu@pidgin.im>
parents: 27898
diff changeset
290 }
9c636f4b965c Add a function to enumerate all local IPs
Marcus Lundblad <malu@pidgin.im>
parents: 27898
diff changeset
291
9c636f4b965c Add a function to enumerate all local IPs
Marcus Lundblad <malu@pidgin.im>
parents: 27898
diff changeset
292 return result;
29716
59a5b6c2e6cb Oops, probably better if we have both getifaddrs() and inet_ntop()
Paul Aurich <darkrain42@pidgin.im>
parents: 29714
diff changeset
293 #endif /* HAVE_GETIFADDRS && HAVE_INET_NTOP */
29510
9c636f4b965c Add a function to enumerate all local IPs
Marcus Lundblad <malu@pidgin.im>
parents: 27898
diff changeset
294 }
9c636f4b965c Add a function to enumerate all local IPs
Marcus Lundblad <malu@pidgin.im>
parents: 27898
diff changeset
295
8231
347c8992c445 [gaim-migrate @ 8954]
Tim Ringenbach <marv@pidgin.im>
parents:
diff changeset
296 const char *
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15708
diff changeset
297 purple_network_get_my_ip(int fd)
8231
347c8992c445 [gaim-migrate @ 8954]
Tim Ringenbach <marv@pidgin.im>
parents:
diff changeset
298 {
12686
ec3e7c4ff045 [gaim-migrate @ 15029]
Richard Laager <rlaager@pidgin.im>
parents: 11424
diff changeset
299 const char *ip = NULL;
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15708
diff changeset
300 PurpleStunNatDiscovery *stun;
8834
0a798e3d2b84 [gaim-migrate @ 9598]
Mark Doliner <markdoliner@pidgin.im>
parents: 8251
diff changeset
301
0a798e3d2b84 [gaim-migrate @ 9598]
Mark Doliner <markdoliner@pidgin.im>
parents: 8251
diff changeset
302 /* Check if the user specified an IP manually */
16478
19107605c565 Works for me! Renames prefs: /core to /purple, /gaim/gtk to /pidgin, /gaim/gnt to /finch
Sean Egan <seanegan@pidgin.im>
parents: 16035
diff changeset
303 if (!purple_prefs_get_bool("/purple/network/auto_ip")) {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15708
diff changeset
304 ip = purple_network_get_public_ip();
15116
037b787407ba [gaim-migrate @ 17838]
Mark Doliner <markdoliner@pidgin.im>
parents: 14959
diff changeset
305 /* Make sure the IP address entered by the user is valid */
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15708
diff changeset
306 if ((ip != NULL) && (purple_network_ip_atoi(ip) != NULL))
8834
0a798e3d2b84 [gaim-migrate @ 9598]
Mark Doliner <markdoliner@pidgin.im>
parents: 8251
diff changeset
307 return ip;
21810
0b5181178201 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 <datallah@pidgin.im>
parents: 21549
diff changeset
308 } else {
0b5181178201 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 <datallah@pidgin.im>
parents: 21549
diff changeset
309 /* Check if STUN discovery was already done */
0b5181178201 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 <datallah@pidgin.im>
parents: 21549
diff changeset
310 stun = purple_stun_discover(NULL);
0b5181178201 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 <datallah@pidgin.im>
parents: 21549
diff changeset
311 if ((stun != NULL) && (stun->status == PURPLE_STUN_STATUS_DISCOVERED))
0b5181178201 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 <datallah@pidgin.im>
parents: 21549
diff changeset
312 return stun->publicip;
11424
b0f8535daa74 [gaim-migrate @ 13661]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11411
diff changeset
313
21810
0b5181178201 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 <datallah@pidgin.im>
parents: 21549
diff changeset
314 /* Attempt to get the IP from a NAT device using UPnP */
0b5181178201 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 <datallah@pidgin.im>
parents: 21549
diff changeset
315 ip = purple_upnp_get_public_ip();
0b5181178201 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 <datallah@pidgin.im>
parents: 21549
diff changeset
316 if (ip != NULL)
0b5181178201 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 <datallah@pidgin.im>
parents: 21549
diff changeset
317 return ip;
11195
d84d542a04ac [gaim-migrate @ 13319]
Adam Warrington <awarring@users.sourceforge.net>
parents: 11033
diff changeset
318
21810
0b5181178201 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 <datallah@pidgin.im>
parents: 21549
diff changeset
319 /* Attempt to get the IP from a NAT device using NAT-PMP */
0b5181178201 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 <datallah@pidgin.im>
parents: 21549
diff changeset
320 ip = purple_pmp_get_public_ip();
0b5181178201 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 <datallah@pidgin.im>
parents: 21549
diff changeset
321 if (ip != NULL)
0b5181178201 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 <datallah@pidgin.im>
parents: 21549
diff changeset
322 return ip;
0b5181178201 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 <datallah@pidgin.im>
parents: 21549
diff changeset
323 }
15708
979f43512119 Added nat-pmp implementation and #ifdef'd out changes to network.c which would utilize it.
Evan Schoenberg <evands@pidgin.im>
parents: 15502
diff changeset
324
8834
0a798e3d2b84 [gaim-migrate @ 9598]
Mark Doliner <markdoliner@pidgin.im>
parents: 8251
diff changeset
325 /* Just fetch the IP of the local system */
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15708
diff changeset
326 return purple_network_get_local_system_ip(fd);
8231
347c8992c445 [gaim-migrate @ 8954]
Tim Ringenbach <marv@pidgin.im>
parents:
diff changeset
327 }
347c8992c445 [gaim-migrate @ 8954]
Tim Ringenbach <marv@pidgin.im>
parents:
diff changeset
328
11391
d172e72988cc [gaim-migrate @ 13620]
Adam Warrington <awarring@users.sourceforge.net>
parents: 11336
diff changeset
329
12909
dfcf4df1dcd7 [gaim-migrate @ 15262]
Daniel Atallah <datallah@pidgin.im>
parents: 12730
diff changeset
330 static void
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15708
diff changeset
331 purple_network_set_upnp_port_mapping_cb(gboolean success, gpointer data)
12909
dfcf4df1dcd7 [gaim-migrate @ 15262]
Daniel Atallah <datallah@pidgin.im>
parents: 12730
diff changeset
332 {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15708
diff changeset
333 PurpleNetworkListenData *listen_data;
14329
05c3cc0c1f79 [gaim-migrate @ 16949]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
334
05c3cc0c1f79 [gaim-migrate @ 16949]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
335 listen_data = data;
05c3cc0c1f79 [gaim-migrate @ 16949]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
336 /* TODO: Once we're keeping track of upnp requests... */
05c3cc0c1f79 [gaim-migrate @ 16949]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
337 /* listen_data->pnp_data = NULL; */
12909
dfcf4df1dcd7 [gaim-migrate @ 15262]
Daniel Atallah <datallah@pidgin.im>
parents: 12730
diff changeset
338
dfcf4df1dcd7 [gaim-migrate @ 15262]
Daniel Atallah <datallah@pidgin.im>
parents: 12730
diff changeset
339 if (!success) {
27497
2dc5a0e0c4c2 Increase the logging level of some debugging messages that seemed to be a
Mauro Brasil <mauro.brasil@tqi.com.br>
parents: 27334
diff changeset
340 purple_debug_warning("network", "Couldn't create UPnP mapping\n");
14329
05c3cc0c1f79 [gaim-migrate @ 16949]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
341 if (listen_data->retry) {
05c3cc0c1f79 [gaim-migrate @ 16949]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
342 listen_data->retry = FALSE;
05c3cc0c1f79 [gaim-migrate @ 16949]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
343 listen_data->adding = FALSE;
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15708
diff changeset
344 listen_data->mapping_data = purple_upnp_remove_port_mapping(
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15708
diff changeset
345 purple_network_get_port_from_fd(listen_data->listenfd),
15502
250802f80d94 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 <evands@pidgin.im>
parents: 15435
diff changeset
346 (listen_data->socket_type == SOCK_STREAM) ? "TCP" : "UDP",
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15708
diff changeset
347 purple_network_set_upnp_port_mapping_cb, listen_data);
12909
dfcf4df1dcd7 [gaim-migrate @ 15262]
Daniel Atallah <datallah@pidgin.im>
parents: 12730
diff changeset
348 return;
dfcf4df1dcd7 [gaim-migrate @ 15262]
Daniel Atallah <datallah@pidgin.im>
parents: 12730
diff changeset
349 }
14329
05c3cc0c1f79 [gaim-migrate @ 16949]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
350 } else if (!listen_data->adding) {
12909
dfcf4df1dcd7 [gaim-migrate @ 15262]
Daniel Atallah <datallah@pidgin.im>
parents: 12730
diff changeset
351 /* We've tried successfully to remove the port mapping.
dfcf4df1dcd7 [gaim-migrate @ 15262]
Daniel Atallah <datallah@pidgin.im>
parents: 12730
diff changeset
352 * Try to add it again */
14329
05c3cc0c1f79 [gaim-migrate @ 16949]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
353 listen_data->adding = TRUE;
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15708
diff changeset
354 listen_data->mapping_data = purple_upnp_set_port_mapping(
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15708
diff changeset
355 purple_network_get_port_from_fd(listen_data->listenfd),
15502
250802f80d94 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 <evands@pidgin.im>
parents: 15435
diff changeset
356 (listen_data->socket_type == SOCK_STREAM) ? "TCP" : "UDP",
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15708
diff changeset
357 purple_network_set_upnp_port_mapping_cb, listen_data);
12909
dfcf4df1dcd7 [gaim-migrate @ 15262]
Daniel Atallah <datallah@pidgin.im>
parents: 12730
diff changeset
358 return;
dfcf4df1dcd7 [gaim-migrate @ 15262]
Daniel Atallah <datallah@pidgin.im>
parents: 12730
diff changeset
359 }
dfcf4df1dcd7 [gaim-migrate @ 15262]
Daniel Atallah <datallah@pidgin.im>
parents: 12730
diff changeset
360
27332
8240ab259385 Add a function to remove a port mapping (UPnP or NAT-PMP) given a file
Marcus Lundblad <malu@pidgin.im>
parents: 27116
diff changeset
361 if (success) {
8240ab259385 Add a function to remove a port mapping (UPnP or NAT-PMP) given a file
Marcus Lundblad <malu@pidgin.im>
parents: 27116
diff changeset
362 /* add port mapping to hash table */
31191
163f03d8d1d2 Cast back and forth between int and pointer instead of putting pointers
Mark Doliner <markdoliner@pidgin.im>
parents: 30792
diff changeset
363 gint key = purple_network_get_port_from_fd(listen_data->listenfd);
163f03d8d1d2 Cast back and forth between int and pointer instead of putting pointers
Mark Doliner <markdoliner@pidgin.im>
parents: 30792
diff changeset
364 gint value = listen_data->socket_type;
163f03d8d1d2 Cast back and forth between int and pointer instead of putting pointers
Mark Doliner <markdoliner@pidgin.im>
parents: 30792
diff changeset
365 g_hash_table_insert(upnp_port_mappings, GINT_TO_POINTER(key), GINT_TO_POINTER(value));
27332
8240ab259385 Add a function to remove a port mapping (UPnP or NAT-PMP) given a file
Marcus Lundblad <malu@pidgin.im>
parents: 27116
diff changeset
366 }
8240ab259385 Add a function to remove a port mapping (UPnP or NAT-PMP) given a file
Marcus Lundblad <malu@pidgin.im>
parents: 27116
diff changeset
367
14329
05c3cc0c1f79 [gaim-migrate @ 16949]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
368 if (listen_data->cb)
05c3cc0c1f79 [gaim-migrate @ 16949]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
369 listen_data->cb(listen_data->listenfd, listen_data->cb_data);
12909
dfcf4df1dcd7 [gaim-migrate @ 15262]
Daniel Atallah <datallah@pidgin.im>
parents: 12730
diff changeset
370
31191
163f03d8d1d2 Cast back and forth between int and pointer instead of putting pointers
Mark Doliner <markdoliner@pidgin.im>
parents: 30792
diff changeset
371 /* Clear the UPnP mapping data, since it's complete and purple_network_listen_cancel() will try to cancel
15502
250802f80d94 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 <evands@pidgin.im>
parents: 15435
diff changeset
372 * it otherwise. */
250802f80d94 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 <evands@pidgin.im>
parents: 15435
diff changeset
373 listen_data->mapping_data = NULL;
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15708
diff changeset
374 purple_network_listen_cancel(listen_data);
12909
dfcf4df1dcd7 [gaim-migrate @ 15262]
Daniel Atallah <datallah@pidgin.im>
parents: 12730
diff changeset
375 }
dfcf4df1dcd7 [gaim-migrate @ 15262]
Daniel Atallah <datallah@pidgin.im>
parents: 12730
diff changeset
376
15933
913ba1d4b81c 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 <evands@pidgin.im>
parents: 15884
diff changeset
377 static gboolean
913ba1d4b81c 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 <evands@pidgin.im>
parents: 15884
diff changeset
378 purple_network_finish_pmp_map_cb(gpointer data)
913ba1d4b81c 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 <evands@pidgin.im>
parents: 15884
diff changeset
379 {
913ba1d4b81c 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 <evands@pidgin.im>
parents: 15884
diff changeset
380 PurpleNetworkListenData *listen_data;
31191
163f03d8d1d2 Cast back and forth between int and pointer instead of putting pointers
Mark Doliner <markdoliner@pidgin.im>
parents: 30792
diff changeset
381 gint key;
163f03d8d1d2 Cast back and forth between int and pointer instead of putting pointers
Mark Doliner <markdoliner@pidgin.im>
parents: 30792
diff changeset
382 gint value;
15963
effb28723fee Whitespace and make sure stuff is #defined to an actual value.
Mark Doliner <markdoliner@pidgin.im>
parents: 15956
diff changeset
383
15933
913ba1d4b81c 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 <evands@pidgin.im>
parents: 15884
diff changeset
384 listen_data = data;
30614
ba7a36c1696b Make sure we keep track of this timer and remove it if our caller frees
Mark Doliner <markdoliner@pidgin.im>
parents: 30027
diff changeset
385 listen_data->timer = 0;
15963
effb28723fee Whitespace and make sure stuff is #defined to an actual value.
Mark Doliner <markdoliner@pidgin.im>
parents: 15956
diff changeset
386
27334
1e3e27346559 Remove port mappings from the hash tables when removing them.
Marcus Lundblad <malu@pidgin.im>
parents: 27332
diff changeset
387 /* add port mapping to hash table */
31191
163f03d8d1d2 Cast back and forth between int and pointer instead of putting pointers
Mark Doliner <markdoliner@pidgin.im>
parents: 30792
diff changeset
388 key = purple_network_get_port_from_fd(listen_data->listenfd);
163f03d8d1d2 Cast back and forth between int and pointer instead of putting pointers
Mark Doliner <markdoliner@pidgin.im>
parents: 30792
diff changeset
389 value = listen_data->socket_type;
163f03d8d1d2 Cast back and forth between int and pointer instead of putting pointers
Mark Doliner <markdoliner@pidgin.im>
parents: 30792
diff changeset
390 g_hash_table_insert(nat_pmp_port_mappings, GINT_TO_POINTER(key), GINT_TO_POINTER(value));
27334
1e3e27346559 Remove port mappings from the hash tables when removing them.
Marcus Lundblad <malu@pidgin.im>
parents: 27332
diff changeset
391
15933
913ba1d4b81c 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 <evands@pidgin.im>
parents: 15884
diff changeset
392 if (listen_data->cb)
913ba1d4b81c 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 <evands@pidgin.im>
parents: 15884
diff changeset
393 listen_data->cb(listen_data->listenfd, listen_data->cb_data);
913ba1d4b81c 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 <evands@pidgin.im>
parents: 15884
diff changeset
394
913ba1d4b81c 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 <evands@pidgin.im>
parents: 15884
diff changeset
395 purple_network_listen_cancel(listen_data);
913ba1d4b81c 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 <evands@pidgin.im>
parents: 15884
diff changeset
396
913ba1d4b81c 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 <evands@pidgin.im>
parents: 15884
diff changeset
397 return FALSE;
913ba1d4b81c 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 <evands@pidgin.im>
parents: 15884
diff changeset
398 }
12909
dfcf4df1dcd7 [gaim-migrate @ 15262]
Daniel Atallah <datallah@pidgin.im>
parents: 12730
diff changeset
399
21549
7436059db33b 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 <datallah@pidgin.im>
parents: 21389
diff changeset
400 static gboolean listen_map_external = TRUE;
7436059db33b 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 <datallah@pidgin.im>
parents: 21389
diff changeset
401 void purple_network_listen_map_external(gboolean map_external)
7436059db33b 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 <datallah@pidgin.im>
parents: 21389
diff changeset
402 {
7436059db33b 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 <datallah@pidgin.im>
parents: 21389
diff changeset
403 listen_map_external = map_external;
7436059db33b 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 <datallah@pidgin.im>
parents: 21389
diff changeset
404 }
7436059db33b 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 <datallah@pidgin.im>
parents: 21389
diff changeset
405
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15708
diff changeset
406 static PurpleNetworkListenData *
30027
2ab6e591cf72 Add network listen functions that accept a family argument (AF_INET(6?)).
Paul Aurich <darkrain42@pidgin.im>
parents: 29716
diff changeset
407 purple_network_do_listen(unsigned short port, int socket_family, int socket_type, PurpleNetworkListenCallback cb, gpointer cb_data)
8231
347c8992c445 [gaim-migrate @ 8954]
Tim Ringenbach <marv@pidgin.im>
parents:
diff changeset
408 {
9452
0e3cdb898d3e [gaim-migrate @ 10276]
Mark Doliner <markdoliner@pidgin.im>
parents: 9449
diff changeset
409 int listenfd = -1;
8231
347c8992c445 [gaim-migrate @ 8954]
Tim Ringenbach <marv@pidgin.im>
parents:
diff changeset
410 const int on = 1;
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15708
diff changeset
411 PurpleNetworkListenData *listen_data;
15708
979f43512119 Added nat-pmp implementation and #ifdef'd out changes to network.c which would utilize it.
Evan Schoenberg <evands@pidgin.im>
parents: 15502
diff changeset
412 unsigned short actual_port;
13426
032ea2c9ce2d [gaim-migrate @ 15800]
Daniel Atallah <datallah@pidgin.im>
parents: 13346
diff changeset
413 #ifdef HAVE_GETADDRINFO
9449
8c5a1697bca6 [gaim-migrate @ 10273]
Mark Doliner <markdoliner@pidgin.im>
parents: 8981
diff changeset
414 int errnum;
8c5a1697bca6 [gaim-migrate @ 10273]
Mark Doliner <markdoliner@pidgin.im>
parents: 8981
diff changeset
415 struct addrinfo hints, *res, *next;
9456
b5f072bbe9d2 [gaim-migrate @ 10280]
Tim Ringenbach <marv@pidgin.im>
parents: 9455
diff changeset
416 char serv[6];
8231
347c8992c445 [gaim-migrate @ 8954]
Tim Ringenbach <marv@pidgin.im>
parents:
diff changeset
417
9449
8c5a1697bca6 [gaim-migrate @ 10273]
Mark Doliner <markdoliner@pidgin.im>
parents: 8981
diff changeset
418 /*
8c5a1697bca6 [gaim-migrate @ 10273]
Mark Doliner <markdoliner@pidgin.im>
parents: 8981
diff changeset
419 * Get a list of addresses on this machine.
8c5a1697bca6 [gaim-migrate @ 10273]
Mark Doliner <markdoliner@pidgin.im>
parents: 8981
diff changeset
420 */
27116
19dff7b3ed0f A patch from Scott Wolchok to replace snprintf() with g_snprintf() and
Richard Laager <rlaager@pidgin.im>
parents: 26782
diff changeset
421 g_snprintf(serv, sizeof(serv), "%hu", port);
8231
347c8992c445 [gaim-migrate @ 8954]
Tim Ringenbach <marv@pidgin.im>
parents:
diff changeset
422 memset(&hints, 0, sizeof(struct addrinfo));
347c8992c445 [gaim-migrate @ 8954]
Tim Ringenbach <marv@pidgin.im>
parents:
diff changeset
423 hints.ai_flags = AI_PASSIVE;
30027
2ab6e591cf72 Add network listen functions that accept a family argument (AF_INET(6?)).
Paul Aurich <darkrain42@pidgin.im>
parents: 29716
diff changeset
424 hints.ai_family = socket_family;
12730
f64fdbc34677 [gaim-migrate @ 15074]
Daniel Atallah <datallah@pidgin.im>
parents: 12728
diff changeset
425 hints.ai_socktype = socket_type;
9449
8c5a1697bca6 [gaim-migrate @ 10273]
Mark Doliner <markdoliner@pidgin.im>
parents: 8981
diff changeset
426 errnum = getaddrinfo(NULL /* any IP */, serv, &hints, &res);
8c5a1697bca6 [gaim-migrate @ 10273]
Mark Doliner <markdoliner@pidgin.im>
parents: 8981
diff changeset
427 if (errnum != 0) {
11221
be3982550ac0 [gaim-migrate @ 13353]
Daniel Atallah <datallah@pidgin.im>
parents: 11215
diff changeset
428 #ifndef _WIN32
21977
c87889698afb Create a purple_gai_strerror() function similar to g_str_error() which
Mark Doliner <markdoliner@pidgin.im>
parents: 21817
diff changeset
429 purple_debug_warning("network", "getaddrinfo: %s\n", purple_gai_strerror(errnum));
9449
8c5a1697bca6 [gaim-migrate @ 10273]
Mark Doliner <markdoliner@pidgin.im>
parents: 8981
diff changeset
430 if (errnum == EAI_SYSTEM)
21389
e1dd8142bb87 replace most calls to strerror with calls to g_strerror. strerror will return
Nathan Walp <nwalp@pidgin.im>
parents: 20239
diff changeset
431 purple_debug_warning("network", "getaddrinfo: system error: %s\n", g_strerror(errno));
11221
be3982550ac0 [gaim-migrate @ 13353]
Daniel Atallah <datallah@pidgin.im>
parents: 11215
diff changeset
432 #else
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15708
diff changeset
433 purple_debug_warning("network", "getaddrinfo: Error Code = %d\n", errnum);
11221
be3982550ac0 [gaim-migrate @ 13353]
Daniel Atallah <datallah@pidgin.im>
parents: 11215
diff changeset
434 #endif
14329
05c3cc0c1f79 [gaim-migrate @ 16949]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
435 return NULL;
8231
347c8992c445 [gaim-migrate @ 8954]
Tim Ringenbach <marv@pidgin.im>
parents:
diff changeset
436 }
9449
8c5a1697bca6 [gaim-migrate @ 10273]
Mark Doliner <markdoliner@pidgin.im>
parents: 8981
diff changeset
437
8c5a1697bca6 [gaim-migrate @ 10273]
Mark Doliner <markdoliner@pidgin.im>
parents: 8981
diff changeset
438 /*
8c5a1697bca6 [gaim-migrate @ 10273]
Mark Doliner <markdoliner@pidgin.im>
parents: 8981
diff changeset
439 * Go through the list of addresses and attempt to listen on
8c5a1697bca6 [gaim-migrate @ 10273]
Mark Doliner <markdoliner@pidgin.im>
parents: 8981
diff changeset
440 * one of them.
8c5a1697bca6 [gaim-migrate @ 10273]
Mark Doliner <markdoliner@pidgin.im>
parents: 8981
diff changeset
441 * XXX - Try IPv6 addresses first?
8c5a1697bca6 [gaim-migrate @ 10273]
Mark Doliner <markdoliner@pidgin.im>
parents: 8981
diff changeset
442 */
8c5a1697bca6 [gaim-migrate @ 10273]
Mark Doliner <markdoliner@pidgin.im>
parents: 8981
diff changeset
443 for (next = res; next != NULL; next = next->ai_next) {
41324
f20e9970a54f Fix IRC file transfers on Windows
Belgin Știrbu <belginstirbu@hotmail.com>
parents: 41043
diff changeset
444 #if _WIN32
f20e9970a54f Fix IRC file transfers on Windows
Belgin Știrbu <belginstirbu@hotmail.com>
parents: 41043
diff changeset
445 /*
f20e9970a54f Fix IRC file transfers on Windows
Belgin Știrbu <belginstirbu@hotmail.com>
parents: 41043
diff changeset
446 * On Windows, the address family for the transport
f20e9970a54f Fix IRC file transfers on Windows
Belgin Știrbu <belginstirbu@hotmail.com>
parents: 41043
diff changeset
447 * address should always be set to AF_INET.
f20e9970a54f Fix IRC file transfers on Windows
Belgin Știrbu <belginstirbu@hotmail.com>
parents: 41043
diff changeset
448 */
f20e9970a54f Fix IRC file transfers on Windows
Belgin Știrbu <belginstirbu@hotmail.com>
parents: 41043
diff changeset
449 if(next->ai_family != AF_INET)
f20e9970a54f Fix IRC file transfers on Windows
Belgin Știrbu <belginstirbu@hotmail.com>
parents: 41043
diff changeset
450 continue;
f20e9970a54f Fix IRC file transfers on Windows
Belgin Știrbu <belginstirbu@hotmail.com>
parents: 41043
diff changeset
451 #endif
9455
b16e0c0ac03c [gaim-migrate @ 10279]
Tim Ringenbach <marv@pidgin.im>
parents: 9452
diff changeset
452 listenfd = socket(next->ai_family, next->ai_socktype, next->ai_protocol);
8231
347c8992c445 [gaim-migrate @ 8954]
Tim Ringenbach <marv@pidgin.im>
parents:
diff changeset
453 if (listenfd < 0)
347c8992c445 [gaim-migrate @ 8954]
Tim Ringenbach <marv@pidgin.im>
parents:
diff changeset
454 continue;
9449
8c5a1697bca6 [gaim-migrate @ 10273]
Mark Doliner <markdoliner@pidgin.im>
parents: 8981
diff changeset
455 if (setsockopt(listenfd, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on)) != 0)
30027
2ab6e591cf72 Add network listen functions that accept a family argument (AF_INET(6?)).
Paul Aurich <darkrain42@pidgin.im>
parents: 29716
diff changeset
456 purple_debug_warning("network", "setsockopt(SO_REUSEADDR): %s\n", g_strerror(errno));
9455
b16e0c0ac03c [gaim-migrate @ 10279]
Tim Ringenbach <marv@pidgin.im>
parents: 9452
diff changeset
457 if (bind(listenfd, next->ai_addr, next->ai_addrlen) == 0)
8231
347c8992c445 [gaim-migrate @ 8954]
Tim Ringenbach <marv@pidgin.im>
parents:
diff changeset
458 break; /* success */
12730
f64fdbc34677 [gaim-migrate @ 15074]
Daniel Atallah <datallah@pidgin.im>
parents: 12728
diff changeset
459 /* XXX - It is unclear to me (datallah) whether we need to be
f64fdbc34677 [gaim-migrate @ 15074]
Daniel Atallah <datallah@pidgin.im>
parents: 12728
diff changeset
460 using a new socket each time */
8231
347c8992c445 [gaim-migrate @ 8954]
Tim Ringenbach <marv@pidgin.im>
parents:
diff changeset
461 close(listenfd);
9449
8c5a1697bca6 [gaim-migrate @ 10273]
Mark Doliner <markdoliner@pidgin.im>
parents: 8981
diff changeset
462 }
8231
347c8992c445 [gaim-migrate @ 8954]
Tim Ringenbach <marv@pidgin.im>
parents:
diff changeset
463
9449
8c5a1697bca6 [gaim-migrate @ 10273]
Mark Doliner <markdoliner@pidgin.im>
parents: 8981
diff changeset
464 freeaddrinfo(res);
8231
347c8992c445 [gaim-migrate @ 8954]
Tim Ringenbach <marv@pidgin.im>
parents:
diff changeset
465
9449
8c5a1697bca6 [gaim-migrate @ 10273]
Mark Doliner <markdoliner@pidgin.im>
parents: 8981
diff changeset
466 if (next == NULL)
14329
05c3cc0c1f79 [gaim-migrate @ 16949]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
467 return NULL;
8231
347c8992c445 [gaim-migrate @ 8954]
Tim Ringenbach <marv@pidgin.im>
parents:
diff changeset
468 #else
347c8992c445 [gaim-migrate @ 8954]
Tim Ringenbach <marv@pidgin.im>
parents:
diff changeset
469 struct sockaddr_in sockin;
347c8992c445 [gaim-migrate @ 8954]
Tim Ringenbach <marv@pidgin.im>
parents:
diff changeset
470
30027
2ab6e591cf72 Add network listen functions that accept a family argument (AF_INET(6?)).
Paul Aurich <darkrain42@pidgin.im>
parents: 29716
diff changeset
471 if (socket_family != AF_INET && socket_family != AF_UNSPEC) {
2ab6e591cf72 Add network listen functions that accept a family argument (AF_INET(6?)).
Paul Aurich <darkrain42@pidgin.im>
parents: 29716
diff changeset
472 purple_debug_warning("network", "Address family %d only "
2ab6e591cf72 Add network listen functions that accept a family argument (AF_INET(6?)).
Paul Aurich <darkrain42@pidgin.im>
parents: 29716
diff changeset
473 "supported when built with getaddrinfo() "
2ab6e591cf72 Add network listen functions that accept a family argument (AF_INET(6?)).
Paul Aurich <darkrain42@pidgin.im>
parents: 29716
diff changeset
474 "support\n", socket_family);
2ab6e591cf72 Add network listen functions that accept a family argument (AF_INET(6?)).
Paul Aurich <darkrain42@pidgin.im>
parents: 29716
diff changeset
475 return NULL;
2ab6e591cf72 Add network listen functions that accept a family argument (AF_INET(6?)).
Paul Aurich <darkrain42@pidgin.im>
parents: 29716
diff changeset
476 }
2ab6e591cf72 Add network listen functions that accept a family argument (AF_INET(6?)).
Paul Aurich <darkrain42@pidgin.im>
parents: 29716
diff changeset
477
12730
f64fdbc34677 [gaim-migrate @ 15074]
Daniel Atallah <datallah@pidgin.im>
parents: 12728
diff changeset
478 if ((listenfd = socket(AF_INET, socket_type, 0)) < 0) {
21389
e1dd8142bb87 replace most calls to strerror with calls to g_strerror. strerror will return
Nathan Walp <nwalp@pidgin.im>
parents: 20239
diff changeset
479 purple_debug_warning("network", "socket: %s\n", g_strerror(errno));
14329
05c3cc0c1f79 [gaim-migrate @ 16949]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
480 return NULL;
8231
347c8992c445 [gaim-migrate @ 8954]
Tim Ringenbach <marv@pidgin.im>
parents:
diff changeset
481 }
347c8992c445 [gaim-migrate @ 8954]
Tim Ringenbach <marv@pidgin.im>
parents:
diff changeset
482
9449
8c5a1697bca6 [gaim-migrate @ 10273]
Mark Doliner <markdoliner@pidgin.im>
parents: 8981
diff changeset
483 if (setsockopt(listenfd, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on)) != 0)
21389
e1dd8142bb87 replace most calls to strerror with calls to g_strerror. strerror will return
Nathan Walp <nwalp@pidgin.im>
parents: 20239
diff changeset
484 purple_debug_warning("network", "setsockopt: %s\n", g_strerror(errno));
8231
347c8992c445 [gaim-migrate @ 8954]
Tim Ringenbach <marv@pidgin.im>
parents:
diff changeset
485
347c8992c445 [gaim-migrate @ 8954]
Tim Ringenbach <marv@pidgin.im>
parents:
diff changeset
486 memset(&sockin, 0, sizeof(struct sockaddr_in));
9449
8c5a1697bca6 [gaim-migrate @ 10273]
Mark Doliner <markdoliner@pidgin.im>
parents: 8981
diff changeset
487 sockin.sin_family = PF_INET;
8251
091ca9b900c1 [gaim-migrate @ 8974]
Mark Doliner <markdoliner@pidgin.im>
parents: 8250
diff changeset
488 sockin.sin_port = htons(port);
8231
347c8992c445 [gaim-migrate @ 8954]
Tim Ringenbach <marv@pidgin.im>
parents:
diff changeset
489
347c8992c445 [gaim-migrate @ 8954]
Tim Ringenbach <marv@pidgin.im>
parents:
diff changeset
490 if (bind(listenfd, (struct sockaddr *)&sockin, sizeof(struct sockaddr_in)) != 0) {
21389
e1dd8142bb87 replace most calls to strerror with calls to g_strerror. strerror will return
Nathan Walp <nwalp@pidgin.im>
parents: 20239
diff changeset
491 purple_debug_warning("network", "bind: %s\n", g_strerror(errno));
8231
347c8992c445 [gaim-migrate @ 8954]
Tim Ringenbach <marv@pidgin.im>
parents:
diff changeset
492 close(listenfd);
14329
05c3cc0c1f79 [gaim-migrate @ 16949]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
493 return NULL;
8231
347c8992c445 [gaim-migrate @ 8954]
Tim Ringenbach <marv@pidgin.im>
parents:
diff changeset
494 }
347c8992c445 [gaim-migrate @ 8954]
Tim Ringenbach <marv@pidgin.im>
parents:
diff changeset
495 #endif
347c8992c445 [gaim-migrate @ 8954]
Tim Ringenbach <marv@pidgin.im>
parents:
diff changeset
496
12730
f64fdbc34677 [gaim-migrate @ 15074]
Daniel Atallah <datallah@pidgin.im>
parents: 12728
diff changeset
497 if (socket_type == SOCK_STREAM && listen(listenfd, 4) != 0) {
21389
e1dd8142bb87 replace most calls to strerror with calls to g_strerror. strerror will return
Nathan Walp <nwalp@pidgin.im>
parents: 20239
diff changeset
498 purple_debug_warning("network", "listen: %s\n", g_strerror(errno));
8231
347c8992c445 [gaim-migrate @ 8954]
Tim Ringenbach <marv@pidgin.im>
parents:
diff changeset
499 close(listenfd);
14329
05c3cc0c1f79 [gaim-migrate @ 16949]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
500 return NULL;
8231
347c8992c445 [gaim-migrate @ 8954]
Tim Ringenbach <marv@pidgin.im>
parents:
diff changeset
501 }
36028
fc5300cb3617 Get rid of fair amount of copy-pasta and coverity warnings
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents: 35991
diff changeset
502 _purple_network_set_common_socket_flags(listenfd);
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15708
diff changeset
503 actual_port = purple_network_get_port_from_fd(listenfd);
11391
d172e72988cc [gaim-migrate @ 13620]
Adam Warrington <awarring@users.sourceforge.net>
parents: 11336
diff changeset
504
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15708
diff changeset
505 purple_debug_info("network", "Listening on port: %hu\n", actual_port);
15963
effb28723fee Whitespace and make sure stuff is #defined to an actual value.
Mark Doliner <markdoliner@pidgin.im>
parents: 15956
diff changeset
506
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15708
diff changeset
507 listen_data = g_new0(PurpleNetworkListenData, 1);
14329
05c3cc0c1f79 [gaim-migrate @ 16949]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
508 listen_data->listenfd = listenfd;
05c3cc0c1f79 [gaim-migrate @ 16949]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
509 listen_data->adding = TRUE;
05c3cc0c1f79 [gaim-migrate @ 16949]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
510 listen_data->retry = TRUE;
05c3cc0c1f79 [gaim-migrate @ 16949]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
511 listen_data->cb = cb;
05c3cc0c1f79 [gaim-migrate @ 16949]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
512 listen_data->cb_data = cb_data;
19822
a533aa745702 Store the socket_type in the PurpleNetworkListenData correctly so that callback functions can use it correctly. Fixes #2933.
Daniel Atallah <datallah@pidgin.im>
parents: 19585
diff changeset
513 listen_data->socket_type = socket_type;
11195
d84d542a04ac [gaim-migrate @ 13319]
Adam Warrington <awarring@users.sourceforge.net>
parents: 11033
diff changeset
514
30027
2ab6e591cf72 Add network listen functions that accept a family argument (AF_INET(6?)).
Paul Aurich <darkrain42@pidgin.im>
parents: 29716
diff changeset
515 if (!purple_socket_speaks_ipv4(listenfd) || !listen_map_external ||
2ab6e591cf72 Add network listen functions that accept a family argument (AF_INET(6?)).
Paul Aurich <darkrain42@pidgin.im>
parents: 29716
diff changeset
516 !purple_prefs_get_bool("/purple/network/map_ports"))
21549
7436059db33b 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 <datallah@pidgin.im>
parents: 21389
diff changeset
517 {
7436059db33b 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 <datallah@pidgin.im>
parents: 21389
diff changeset
518 purple_debug_info("network", "Skipping external port mapping.\n");
7436059db33b 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 <datallah@pidgin.im>
parents: 21389
diff changeset
519 /* The pmp_map_cb does what we want to do */
30614
ba7a36c1696b Make sure we keep track of this timer and remove it if our caller frees
Mark Doliner <markdoliner@pidgin.im>
parents: 30027
diff changeset
520 listen_data->timer = purple_timeout_add(0, purple_network_finish_pmp_map_cb, listen_data);
21549
7436059db33b 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 <datallah@pidgin.im>
parents: 21389
diff changeset
521 }
15708
979f43512119 Added nat-pmp implementation and #ifdef'd out changes to network.c which would utilize it.
Evan Schoenberg <evands@pidgin.im>
parents: 15502
diff changeset
522 /* Attempt a NAT-PMP Mapping, which will return immediately */
21549
7436059db33b 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 <datallah@pidgin.im>
parents: 21389
diff changeset
523 else if (purple_pmp_create_map(((socket_type == SOCK_STREAM) ? PURPLE_PMP_TYPE_TCP : PURPLE_PMP_TYPE_UDP),
16012
77b7fe1bfe69 purple_pmp_create_map() returns a gboolean now, not a pointer
Evan Schoenberg <evands@pidgin.im>
parents: 15963
diff changeset
524 actual_port, actual_port, PURPLE_PMP_LIFETIME))
15933
913ba1d4b81c 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 <evands@pidgin.im>
parents: 15884
diff changeset
525 {
21549
7436059db33b 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 <datallah@pidgin.im>
parents: 21389
diff changeset
526 purple_debug_info("network", "Created NAT-PMP mapping on port %i\n", actual_port);
15933
913ba1d4b81c 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 <evands@pidgin.im>
parents: 15884
diff changeset
527 /* We want to return listen_data now, and on the next run loop trigger the cb and destroy listen_data */
30614
ba7a36c1696b Make sure we keep track of this timer and remove it if our caller frees
Mark Doliner <markdoliner@pidgin.im>
parents: 30027
diff changeset
528 listen_data->timer = purple_timeout_add(0, purple_network_finish_pmp_map_cb, listen_data);
15933
913ba1d4b81c 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 <evands@pidgin.im>
parents: 15884
diff changeset
529 }
913ba1d4b81c 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 <evands@pidgin.im>
parents: 15884
diff changeset
530 else
913ba1d4b81c 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 <evands@pidgin.im>
parents: 15884
diff changeset
531 {
913ba1d4b81c 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 <evands@pidgin.im>
parents: 15884
diff changeset
532 /* Attempt a UPnP Mapping */
913ba1d4b81c 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 <evands@pidgin.im>
parents: 15884
diff changeset
533 listen_data->mapping_data = purple_upnp_set_port_mapping(
913ba1d4b81c 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 <evands@pidgin.im>
parents: 15884
diff changeset
534 actual_port,
913ba1d4b81c 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 <evands@pidgin.im>
parents: 15884
diff changeset
535 (socket_type == SOCK_STREAM) ? "TCP" : "UDP",
913ba1d4b81c 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 <evands@pidgin.im>
parents: 15884
diff changeset
536 purple_network_set_upnp_port_mapping_cb, listen_data);
913ba1d4b81c 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 <evands@pidgin.im>
parents: 15884
diff changeset
537 }
12909
dfcf4df1dcd7 [gaim-migrate @ 15262]
Daniel Atallah <datallah@pidgin.im>
parents: 12730
diff changeset
538
14329
05c3cc0c1f79 [gaim-migrate @ 16949]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
539 return listen_data;
8231
347c8992c445 [gaim-migrate @ 8954]
Tim Ringenbach <marv@pidgin.im>
parents:
diff changeset
540 }
347c8992c445 [gaim-migrate @ 8954]
Tim Ringenbach <marv@pidgin.im>
parents:
diff changeset
541
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15708
diff changeset
542 PurpleNetworkListenData *
30027
2ab6e591cf72 Add network listen functions that accept a family argument (AF_INET(6?)).
Paul Aurich <darkrain42@pidgin.im>
parents: 29716
diff changeset
543 purple_network_listen_family(unsigned short port, int socket_family,
2ab6e591cf72 Add network listen functions that accept a family argument (AF_INET(6?)).
Paul Aurich <darkrain42@pidgin.im>
parents: 29716
diff changeset
544 int socket_type, PurpleNetworkListenCallback cb,
2ab6e591cf72 Add network listen functions that accept a family argument (AF_INET(6?)).
Paul Aurich <darkrain42@pidgin.im>
parents: 29716
diff changeset
545 gpointer cb_data)
8246
c83c0421149a [gaim-migrate @ 8969]
Mark Doliner <markdoliner@pidgin.im>
parents: 8245
diff changeset
546 {
14329
05c3cc0c1f79 [gaim-migrate @ 16949]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
547 g_return_val_if_fail(port != 0, NULL);
8250
e855dcce1fa0 [gaim-migrate @ 8973]
Mark Doliner <markdoliner@pidgin.im>
parents: 8248
diff changeset
548
30027
2ab6e591cf72 Add network listen functions that accept a family argument (AF_INET(6?)).
Paul Aurich <darkrain42@pidgin.im>
parents: 29716
diff changeset
549 return purple_network_do_listen(port, socket_family, socket_type,
2ab6e591cf72 Add network listen functions that accept a family argument (AF_INET(6?)).
Paul Aurich <darkrain42@pidgin.im>
parents: 29716
diff changeset
550 cb, cb_data);
8246
c83c0421149a [gaim-migrate @ 8969]
Mark Doliner <markdoliner@pidgin.im>
parents: 8245
diff changeset
551 }
c83c0421149a [gaim-migrate @ 8969]
Mark Doliner <markdoliner@pidgin.im>
parents: 8245
diff changeset
552
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15708
diff changeset
553 PurpleNetworkListenData *
30027
2ab6e591cf72 Add network listen functions that accept a family argument (AF_INET(6?)).
Paul Aurich <darkrain42@pidgin.im>
parents: 29716
diff changeset
554 purple_network_listen(unsigned short port, int socket_type,
2ab6e591cf72 Add network listen functions that accept a family argument (AF_INET(6?)).
Paul Aurich <darkrain42@pidgin.im>
parents: 29716
diff changeset
555 PurpleNetworkListenCallback cb, gpointer cb_data)
2ab6e591cf72 Add network listen functions that accept a family argument (AF_INET(6?)).
Paul Aurich <darkrain42@pidgin.im>
parents: 29716
diff changeset
556 {
2ab6e591cf72 Add network listen functions that accept a family argument (AF_INET(6?)).
Paul Aurich <darkrain42@pidgin.im>
parents: 29716
diff changeset
557 return purple_network_listen_family(port, AF_UNSPEC, socket_type,
2ab6e591cf72 Add network listen functions that accept a family argument (AF_INET(6?)).
Paul Aurich <darkrain42@pidgin.im>
parents: 29716
diff changeset
558 cb, cb_data);
2ab6e591cf72 Add network listen functions that accept a family argument (AF_INET(6?)).
Paul Aurich <darkrain42@pidgin.im>
parents: 29716
diff changeset
559 }
2ab6e591cf72 Add network listen functions that accept a family argument (AF_INET(6?)).
Paul Aurich <darkrain42@pidgin.im>
parents: 29716
diff changeset
560
2ab6e591cf72 Add network listen functions that accept a family argument (AF_INET(6?)).
Paul Aurich <darkrain42@pidgin.im>
parents: 29716
diff changeset
561 PurpleNetworkListenData *
2ab6e591cf72 Add network listen functions that accept a family argument (AF_INET(6?)).
Paul Aurich <darkrain42@pidgin.im>
parents: 29716
diff changeset
562 purple_network_listen_range_family(unsigned short start, unsigned short end,
2ab6e591cf72 Add network listen functions that accept a family argument (AF_INET(6?)).
Paul Aurich <darkrain42@pidgin.im>
parents: 29716
diff changeset
563 int socket_family, int socket_type,
2ab6e591cf72 Add network listen functions that accept a family argument (AF_INET(6?)).
Paul Aurich <darkrain42@pidgin.im>
parents: 29716
diff changeset
564 PurpleNetworkListenCallback cb,
2ab6e591cf72 Add network listen functions that accept a family argument (AF_INET(6?)).
Paul Aurich <darkrain42@pidgin.im>
parents: 29716
diff changeset
565 gpointer cb_data)
8231
347c8992c445 [gaim-migrate @ 8954]
Tim Ringenbach <marv@pidgin.im>
parents:
diff changeset
566 {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15708
diff changeset
567 PurpleNetworkListenData *ret = NULL;
8231
347c8992c445 [gaim-migrate @ 8954]
Tim Ringenbach <marv@pidgin.im>
parents:
diff changeset
568
16478
19107605c565 Works for me! Renames prefs: /core to /purple, /gaim/gtk to /pidgin, /gaim/gnt to /finch
Sean Egan <seanegan@pidgin.im>
parents: 16035
diff changeset
569 if (purple_prefs_get_bool("/purple/network/ports_range_use")) {
19107605c565 Works for me! Renames prefs: /core to /purple, /gaim/gtk to /pidgin, /gaim/gnt to /finch
Sean Egan <seanegan@pidgin.im>
parents: 16035
diff changeset
570 start = purple_prefs_get_int("/purple/network/ports_range_start");
19107605c565 Works for me! Renames prefs: /core to /purple, /gaim/gtk to /pidgin, /gaim/gnt to /finch
Sean Egan <seanegan@pidgin.im>
parents: 16035
diff changeset
571 end = purple_prefs_get_int("/purple/network/ports_range_end");
8250
e855dcce1fa0 [gaim-migrate @ 8973]
Mark Doliner <markdoliner@pidgin.im>
parents: 8248
diff changeset
572 } else {
e855dcce1fa0 [gaim-migrate @ 8973]
Mark Doliner <markdoliner@pidgin.im>
parents: 8248
diff changeset
573 if (end < start)
e855dcce1fa0 [gaim-migrate @ 8973]
Mark Doliner <markdoliner@pidgin.im>
parents: 8248
diff changeset
574 end = start;
8239
d19f1c66720c [gaim-migrate @ 8962]
Mark Doliner <markdoliner@pidgin.im>
parents: 8231
diff changeset
575 }
8231
347c8992c445 [gaim-migrate @ 8954]
Tim Ringenbach <marv@pidgin.im>
parents:
diff changeset
576
347c8992c445 [gaim-migrate @ 8954]
Tim Ringenbach <marv@pidgin.im>
parents:
diff changeset
577 for (; start <= end; start++) {
30027
2ab6e591cf72 Add network listen functions that accept a family argument (AF_INET(6?)).
Paul Aurich <darkrain42@pidgin.im>
parents: 29716
diff changeset
578 ret = purple_network_do_listen(start, AF_UNSPEC, socket_type, cb, cb_data);
14329
05c3cc0c1f79 [gaim-migrate @ 16949]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
579 if (ret != NULL)
8231
347c8992c445 [gaim-migrate @ 8954]
Tim Ringenbach <marv@pidgin.im>
parents:
diff changeset
580 break;
347c8992c445 [gaim-migrate @ 8954]
Tim Ringenbach <marv@pidgin.im>
parents:
diff changeset
581 }
347c8992c445 [gaim-migrate @ 8954]
Tim Ringenbach <marv@pidgin.im>
parents:
diff changeset
582
347c8992c445 [gaim-migrate @ 8954]
Tim Ringenbach <marv@pidgin.im>
parents:
diff changeset
583 return ret;
347c8992c445 [gaim-migrate @ 8954]
Tim Ringenbach <marv@pidgin.im>
parents:
diff changeset
584 }
347c8992c445 [gaim-migrate @ 8954]
Tim Ringenbach <marv@pidgin.im>
parents:
diff changeset
585
30027
2ab6e591cf72 Add network listen functions that accept a family argument (AF_INET(6?)).
Paul Aurich <darkrain42@pidgin.im>
parents: 29716
diff changeset
586 PurpleNetworkListenData *
2ab6e591cf72 Add network listen functions that accept a family argument (AF_INET(6?)).
Paul Aurich <darkrain42@pidgin.im>
parents: 29716
diff changeset
587 purple_network_listen_range(unsigned short start, unsigned short end,
2ab6e591cf72 Add network listen functions that accept a family argument (AF_INET(6?)).
Paul Aurich <darkrain42@pidgin.im>
parents: 29716
diff changeset
588 int socket_type, PurpleNetworkListenCallback cb,
2ab6e591cf72 Add network listen functions that accept a family argument (AF_INET(6?)).
Paul Aurich <darkrain42@pidgin.im>
parents: 29716
diff changeset
589 gpointer cb_data)
2ab6e591cf72 Add network listen functions that accept a family argument (AF_INET(6?)).
Paul Aurich <darkrain42@pidgin.im>
parents: 29716
diff changeset
590 {
2ab6e591cf72 Add network listen functions that accept a family argument (AF_INET(6?)).
Paul Aurich <darkrain42@pidgin.im>
parents: 29716
diff changeset
591 return purple_network_listen_range_family(start, end, AF_UNSPEC,
2ab6e591cf72 Add network listen functions that accept a family argument (AF_INET(6?)).
Paul Aurich <darkrain42@pidgin.im>
parents: 29716
diff changeset
592 socket_type, cb, cb_data);
2ab6e591cf72 Add network listen functions that accept a family argument (AF_INET(6?)).
Paul Aurich <darkrain42@pidgin.im>
parents: 29716
diff changeset
593 }
2ab6e591cf72 Add network listen functions that accept a family argument (AF_INET(6?)).
Paul Aurich <darkrain42@pidgin.im>
parents: 29716
diff changeset
594
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15708
diff changeset
595 void purple_network_listen_cancel(PurpleNetworkListenData *listen_data)
14329
05c3cc0c1f79 [gaim-migrate @ 16949]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
596 {
15502
250802f80d94 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 <evands@pidgin.im>
parents: 15435
diff changeset
597 if (listen_data->mapping_data != NULL)
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15708
diff changeset
598 purple_upnp_cancel_port_mapping(listen_data->mapping_data);
15502
250802f80d94 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 <evands@pidgin.im>
parents: 15435
diff changeset
599
30614
ba7a36c1696b Make sure we keep track of this timer and remove it if our caller frees
Mark Doliner <markdoliner@pidgin.im>
parents: 30027
diff changeset
600 if (listen_data->timer > 0)
ba7a36c1696b Make sure we keep track of this timer and remove it if our caller frees
Mark Doliner <markdoliner@pidgin.im>
parents: 30027
diff changeset
601 purple_timeout_remove(listen_data->timer);
ba7a36c1696b Make sure we keep track of this timer and remove it if our caller frees
Mark Doliner <markdoliner@pidgin.im>
parents: 30027
diff changeset
602
14329
05c3cc0c1f79 [gaim-migrate @ 16949]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
603 g_free(listen_data);
05c3cc0c1f79 [gaim-migrate @ 16949]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
604 }
05c3cc0c1f79 [gaim-migrate @ 16949]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
605
8834
0a798e3d2b84 [gaim-migrate @ 9598]
Mark Doliner <markdoliner@pidgin.im>
parents: 8251
diff changeset
606 unsigned short
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15708
diff changeset
607 purple_network_get_port_from_fd(int fd)
8231
347c8992c445 [gaim-migrate @ 8954]
Tim Ringenbach <marv@pidgin.im>
parents:
diff changeset
608 {
41324
f20e9970a54f Fix IRC file transfers on Windows
Belgin Știrbu <belginstirbu@hotmail.com>
parents: 41043
diff changeset
609 common_sockaddr_t addr;
8231
347c8992c445 [gaim-migrate @ 8954]
Tim Ringenbach <marv@pidgin.im>
parents:
diff changeset
610 socklen_t len;
347c8992c445 [gaim-migrate @ 8954]
Tim Ringenbach <marv@pidgin.im>
parents:
diff changeset
611
9449
8c5a1697bca6 [gaim-migrate @ 10273]
Mark Doliner <markdoliner@pidgin.im>
parents: 8981
diff changeset
612 g_return_val_if_fail(fd >= 0, 0);
8231
347c8992c445 [gaim-migrate @ 8954]
Tim Ringenbach <marv@pidgin.im>
parents:
diff changeset
613
347c8992c445 [gaim-migrate @ 8954]
Tim Ringenbach <marv@pidgin.im>
parents:
diff changeset
614 len = sizeof(addr);
347c8992c445 [gaim-migrate @ 8954]
Tim Ringenbach <marv@pidgin.im>
parents:
diff changeset
615 if (getsockname(fd, (struct sockaddr *) &addr, &len) == -1) {
21389
e1dd8142bb87 replace most calls to strerror with calls to g_strerror. strerror will return
Nathan Walp <nwalp@pidgin.im>
parents: 20239
diff changeset
616 purple_debug_warning("network", "getsockname: %s\n", g_strerror(errno));
8231
347c8992c445 [gaim-migrate @ 8954]
Tim Ringenbach <marv@pidgin.im>
parents:
diff changeset
617 return 0;
347c8992c445 [gaim-migrate @ 8954]
Tim Ringenbach <marv@pidgin.im>
parents:
diff changeset
618 }
347c8992c445 [gaim-migrate @ 8954]
Tim Ringenbach <marv@pidgin.im>
parents:
diff changeset
619
41324
f20e9970a54f Fix IRC file transfers on Windows
Belgin Știrbu <belginstirbu@hotmail.com>
parents: 41043
diff changeset
620 return ntohs(addr.in.sin_port);
8231
347c8992c445 [gaim-migrate @ 8954]
Tim Ringenbach <marv@pidgin.im>
parents:
diff changeset
621 }
347c8992c445 [gaim-migrate @ 8954]
Tim Ringenbach <marv@pidgin.im>
parents:
diff changeset
622
14784
3a82321f46f2 [gaim-migrate @ 17476]
Daniel Atallah <datallah@pidgin.im>
parents: 14758
diff changeset
623 #ifdef _WIN32
14853
d06b1f28a8b2 [gaim-migrate @ 17556]
Daniel Atallah <datallah@pidgin.im>
parents: 14842
diff changeset
624 #ifndef NS_NLA
d06b1f28a8b2 [gaim-migrate @ 17556]
Daniel Atallah <datallah@pidgin.im>
parents: 14842
diff changeset
625 #define NS_NLA 15
d06b1f28a8b2 [gaim-migrate @ 17556]
Daniel Atallah <datallah@pidgin.im>
parents: 14842
diff changeset
626 #endif
14842
fe08ba80d369 [gaim-migrate @ 17544]
Daniel Atallah <datallah@pidgin.im>
parents: 14839
diff changeset
627 static gint
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15708
diff changeset
628 wpurple_get_connected_network_count(void)
14784
3a82321f46f2 [gaim-migrate @ 17476]
Daniel Atallah <datallah@pidgin.im>
parents: 14758
diff changeset
629 {
19585
14b519abcc26 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 <datallah@pidgin.im>
parents: 18555
diff changeset
630 gint net_cnt = 0;
14784
3a82321f46f2 [gaim-migrate @ 17476]
Daniel Atallah <datallah@pidgin.im>
parents: 14758
diff changeset
631
3a82321f46f2 [gaim-migrate @ 17476]
Daniel Atallah <datallah@pidgin.im>
parents: 14758
diff changeset
632 WSAQUERYSET qs;
3a82321f46f2 [gaim-migrate @ 17476]
Daniel Atallah <datallah@pidgin.im>
parents: 14758
diff changeset
633 HANDLE h;
14957
1519e663dd9b [gaim-migrate @ 17667]
Daniel Atallah <datallah@pidgin.im>
parents: 14877
diff changeset
634 gint retval;
1519e663dd9b [gaim-migrate @ 17667]
Daniel Atallah <datallah@pidgin.im>
parents: 14877
diff changeset
635 int errorid;
14784
3a82321f46f2 [gaim-migrate @ 17476]
Daniel Atallah <datallah@pidgin.im>
parents: 14758
diff changeset
636
3a82321f46f2 [gaim-migrate @ 17476]
Daniel Atallah <datallah@pidgin.im>
parents: 14758
diff changeset
637 memset(&qs, 0, sizeof(WSAQUERYSET));
3a82321f46f2 [gaim-migrate @ 17476]
Daniel Atallah <datallah@pidgin.im>
parents: 14758
diff changeset
638 qs.dwSize = sizeof(WSAQUERYSET);
14853
d06b1f28a8b2 [gaim-migrate @ 17556]
Daniel Atallah <datallah@pidgin.im>
parents: 14842
diff changeset
639 qs.dwNameSpace = NS_NLA;
14784
3a82321f46f2 [gaim-migrate @ 17476]
Daniel Atallah <datallah@pidgin.im>
parents: 14758
diff changeset
640
38164
a66a4f09ea6a win32: Explicitly use ANSI versions of the WSALookup APIs
Daniel Atallah <datallah@pidgin.im>
parents: 36028
diff changeset
641 retval = WSALookupServiceBeginA(&qs, LUP_RETURN_ALL, &h);
14784
3a82321f46f2 [gaim-migrate @ 17476]
Daniel Atallah <datallah@pidgin.im>
parents: 14758
diff changeset
642 if (retval != ERROR_SUCCESS) {
14957
1519e663dd9b [gaim-migrate @ 17667]
Daniel Atallah <datallah@pidgin.im>
parents: 14877
diff changeset
643 gchar *msg;
1519e663dd9b [gaim-migrate @ 17667]
Daniel Atallah <datallah@pidgin.im>
parents: 14877
diff changeset
644 errorid = WSAGetLastError();
1519e663dd9b [gaim-migrate @ 17667]
Daniel Atallah <datallah@pidgin.im>
parents: 14877
diff changeset
645 msg = g_win32_error_message(errorid);
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15708
diff changeset
646 purple_debug_warning("network", "Couldn't retrieve NLA SP lookup handle. "
14853
d06b1f28a8b2 [gaim-migrate @ 17556]
Daniel Atallah <datallah@pidgin.im>
parents: 14842
diff changeset
647 "NLA service is probably not running. Message: %s (%d).\n",
d06b1f28a8b2 [gaim-migrate @ 17556]
Daniel Atallah <datallah@pidgin.im>
parents: 14842
diff changeset
648 msg, errorid);
14784
3a82321f46f2 [gaim-migrate @ 17476]
Daniel Atallah <datallah@pidgin.im>
parents: 14758
diff changeset
649 g_free(msg);
14838
40cc5f858426 [gaim-migrate @ 17540]
Daniel Atallah <datallah@pidgin.im>
parents: 14784
diff changeset
650
14842
fe08ba80d369 [gaim-migrate @ 17544]
Daniel Atallah <datallah@pidgin.im>
parents: 14839
diff changeset
651 return -1;
14784
3a82321f46f2 [gaim-migrate @ 17476]
Daniel Atallah <datallah@pidgin.im>
parents: 14758
diff changeset
652 } else {
38165
b3ad11cab64e win32: Allow for arbitrary buffer size used for retrieving NLA responses
Daniel Atallah <datallah@pidgin.im>
parents: 38164
diff changeset
653 gchar *buf = NULL;
14784
3a82321f46f2 [gaim-migrate @ 17476]
Daniel Atallah <datallah@pidgin.im>
parents: 14758
diff changeset
654 WSAQUERYSET *res = (LPWSAQUERYSET) buf;
38165
b3ad11cab64e win32: Allow for arbitrary buffer size used for retrieving NLA responses
Daniel Atallah <datallah@pidgin.im>
parents: 38164
diff changeset
655 DWORD current_size = 0;
38166
3094e049f882 win32: add some sanity checks to avoid infinite loops or large memory allocations when retrieving NLA responses
Daniel Atallah <datallah@pidgin.im>
parents: 38165
diff changeset
656 int iteration_count = 0;
3094e049f882 win32: add some sanity checks to avoid infinite loops or large memory allocations when retrieving NLA responses
Daniel Atallah <datallah@pidgin.im>
parents: 38165
diff changeset
657 while (iteration_count++ < 100) {
38165
b3ad11cab64e win32: Allow for arbitrary buffer size used for retrieving NLA responses
Daniel Atallah <datallah@pidgin.im>
parents: 38164
diff changeset
658 DWORD size = current_size;
b3ad11cab64e win32: Allow for arbitrary buffer size used for retrieving NLA responses
Daniel Atallah <datallah@pidgin.im>
parents: 38164
diff changeset
659 retval = WSALookupServiceNextA(h, 0, &size, res);
b3ad11cab64e win32: Allow for arbitrary buffer size used for retrieving NLA responses
Daniel Atallah <datallah@pidgin.im>
parents: 38164
diff changeset
660 if (retval == ERROR_SUCCESS) {
b3ad11cab64e win32: Allow for arbitrary buffer size used for retrieving NLA responses
Daniel Atallah <datallah@pidgin.im>
parents: 38164
diff changeset
661 net_cnt++;
b3ad11cab64e win32: Allow for arbitrary buffer size used for retrieving NLA responses
Daniel Atallah <datallah@pidgin.im>
parents: 38164
diff changeset
662 purple_debug_info("network", "found network '%s'\n",
b3ad11cab64e win32: Allow for arbitrary buffer size used for retrieving NLA responses
Daniel Atallah <datallah@pidgin.im>
parents: 38164
diff changeset
663 res->lpszServiceInstanceName ? res->lpszServiceInstanceName : "(NULL)");
b3ad11cab64e win32: Allow for arbitrary buffer size used for retrieving NLA responses
Daniel Atallah <datallah@pidgin.im>
parents: 38164
diff changeset
664 } else {
b3ad11cab64e win32: Allow for arbitrary buffer size used for retrieving NLA responses
Daniel Atallah <datallah@pidgin.im>
parents: 38164
diff changeset
665 errorid = WSAGetLastError();
b3ad11cab64e win32: Allow for arbitrary buffer size used for retrieving NLA responses
Daniel Atallah <datallah@pidgin.im>
parents: 38164
diff changeset
666 if (errorid == WSAEFAULT) {
38166
3094e049f882 win32: add some sanity checks to avoid infinite loops or large memory allocations when retrieving NLA responses
Daniel Atallah <datallah@pidgin.im>
parents: 38165
diff changeset
667 if (size == 0 || size > 102400) {
3094e049f882 win32: add some sanity checks to avoid infinite loops or large memory allocations when retrieving NLA responses
Daniel Atallah <datallah@pidgin.im>
parents: 38165
diff changeset
668 purple_debug_warning("network", "Got unexpected NLA buffer size %" G_GUINT32_FORMAT ".\n", (guint32) size);
3094e049f882 win32: add some sanity checks to avoid infinite loops or large memory allocations when retrieving NLA responses
Daniel Atallah <datallah@pidgin.im>
parents: 38165
diff changeset
669 break;
3094e049f882 win32: add some sanity checks to avoid infinite loops or large memory allocations when retrieving NLA responses
Daniel Atallah <datallah@pidgin.im>
parents: 38165
diff changeset
670 }
38165
b3ad11cab64e win32: Allow for arbitrary buffer size used for retrieving NLA responses
Daniel Atallah <datallah@pidgin.im>
parents: 38164
diff changeset
671 buf = g_realloc(buf, size);
b3ad11cab64e win32: Allow for arbitrary buffer size used for retrieving NLA responses
Daniel Atallah <datallah@pidgin.im>
parents: 38164
diff changeset
672 res = (LPWSAQUERYSET) buf;
b3ad11cab64e win32: Allow for arbitrary buffer size used for retrieving NLA responses
Daniel Atallah <datallah@pidgin.im>
parents: 38164
diff changeset
673 current_size = size;
b3ad11cab64e win32: Allow for arbitrary buffer size used for retrieving NLA responses
Daniel Atallah <datallah@pidgin.im>
parents: 38164
diff changeset
674 } else {
b3ad11cab64e win32: Allow for arbitrary buffer size used for retrieving NLA responses
Daniel Atallah <datallah@pidgin.im>
parents: 38164
diff changeset
675 break;
b3ad11cab64e win32: Allow for arbitrary buffer size used for retrieving NLA responses
Daniel Atallah <datallah@pidgin.im>
parents: 38164
diff changeset
676 }
b3ad11cab64e win32: Allow for arbitrary buffer size used for retrieving NLA responses
Daniel Atallah <datallah@pidgin.im>
parents: 38164
diff changeset
677 }
14784
3a82321f46f2 [gaim-migrate @ 17476]
Daniel Atallah <datallah@pidgin.im>
parents: 14758
diff changeset
678 }
38165
b3ad11cab64e win32: Allow for arbitrary buffer size used for retrieving NLA responses
Daniel Atallah <datallah@pidgin.im>
parents: 38164
diff changeset
679 g_free(buf);
14784
3a82321f46f2 [gaim-migrate @ 17476]
Daniel Atallah <datallah@pidgin.im>
parents: 14758
diff changeset
680
14957
1519e663dd9b [gaim-migrate @ 17667]
Daniel Atallah <datallah@pidgin.im>
parents: 14877
diff changeset
681 if (!(errorid == WSA_E_NO_MORE || errorid == WSAENOMORE)) {
1519e663dd9b [gaim-migrate @ 17667]
Daniel Atallah <datallah@pidgin.im>
parents: 14877
diff changeset
682 gchar *msg = g_win32_error_message(errorid);
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15708
diff changeset
683 purple_debug_error("network", "got unexpected NLA response %s (%d)\n", msg, errorid);
14957
1519e663dd9b [gaim-migrate @ 17667]
Daniel Atallah <datallah@pidgin.im>
parents: 14877
diff changeset
684 g_free(msg);
1519e663dd9b [gaim-migrate @ 17667]
Daniel Atallah <datallah@pidgin.im>
parents: 14877
diff changeset
685
1519e663dd9b [gaim-migrate @ 17667]
Daniel Atallah <datallah@pidgin.im>
parents: 14877
diff changeset
686 net_cnt = -1;
1519e663dd9b [gaim-migrate @ 17667]
Daniel Atallah <datallah@pidgin.im>
parents: 14877
diff changeset
687 }
1519e663dd9b [gaim-migrate @ 17667]
Daniel Atallah <datallah@pidgin.im>
parents: 14877
diff changeset
688
1519e663dd9b [gaim-migrate @ 17667]
Daniel Atallah <datallah@pidgin.im>
parents: 14877
diff changeset
689 retval = WSALookupServiceEnd(h);
14784
3a82321f46f2 [gaim-migrate @ 17476]
Daniel Atallah <datallah@pidgin.im>
parents: 14758
diff changeset
690 }
3a82321f46f2 [gaim-migrate @ 17476]
Daniel Atallah <datallah@pidgin.im>
parents: 14758
diff changeset
691
3a82321f46f2 [gaim-migrate @ 17476]
Daniel Atallah <datallah@pidgin.im>
parents: 14758
diff changeset
692 return net_cnt;
3a82321f46f2 [gaim-migrate @ 17476]
Daniel Atallah <datallah@pidgin.im>
parents: 14758
diff changeset
693
3a82321f46f2 [gaim-migrate @ 17476]
Daniel Atallah <datallah@pidgin.im>
parents: 14758
diff changeset
694 }
3a82321f46f2 [gaim-migrate @ 17476]
Daniel Atallah <datallah@pidgin.im>
parents: 14758
diff changeset
695
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15708
diff changeset
696 static gboolean wpurple_network_change_thread_cb(gpointer data)
14784
3a82321f46f2 [gaim-migrate @ 17476]
Daniel Atallah <datallah@pidgin.im>
parents: 14758
diff changeset
697 {
14842
fe08ba80d369 [gaim-migrate @ 17544]
Daniel Atallah <datallah@pidgin.im>
parents: 14839
diff changeset
698 gint new_count;
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15708
diff changeset
699 PurpleConnectionUiOps *ui_ops = purple_connections_get_ui_ops();
14784
3a82321f46f2 [gaim-migrate @ 17476]
Daniel Atallah <datallah@pidgin.im>
parents: 14758
diff changeset
700
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15708
diff changeset
701 new_count = wpurple_get_connected_network_count();
14784
3a82321f46f2 [gaim-migrate @ 17476]
Daniel Atallah <datallah@pidgin.im>
parents: 14758
diff changeset
702
14842
fe08ba80d369 [gaim-migrate @ 17544]
Daniel Atallah <datallah@pidgin.im>
parents: 14839
diff changeset
703 if (new_count < 0)
fe08ba80d369 [gaim-migrate @ 17544]
Daniel Atallah <datallah@pidgin.im>
parents: 14839
diff changeset
704 return FALSE;
fe08ba80d369 [gaim-migrate @ 17544]
Daniel Atallah <datallah@pidgin.im>
parents: 14839
diff changeset
705
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15708
diff changeset
706 purple_debug_info("network", "Received Network Change Notification. Current network count is %d, previous count was %d.\n", new_count, current_network_count);
14784
3a82321f46f2 [gaim-migrate @ 17476]
Daniel Atallah <datallah@pidgin.im>
parents: 14758
diff changeset
707
16035
eb4eda79a147 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 <evands@pidgin.im>
parents: 16012
diff changeset
708 purple_signal_emit(purple_network_get_handle(), "network-configuration-changed", NULL);
eb4eda79a147 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 <evands@pidgin.im>
parents: 16012
diff changeset
709
14877
084d14fe0445 [gaim-migrate @ 17581]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 14864
diff changeset
710 if (new_count > 0 && ui_ops != NULL && ui_ops->network_connected != NULL) {
14784
3a82321f46f2 [gaim-migrate @ 17476]
Daniel Atallah <datallah@pidgin.im>
parents: 14758
diff changeset
711 ui_ops->network_connected();
14877
084d14fe0445 [gaim-migrate @ 17581]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 14864
diff changeset
712 } else if (new_count == 0 && current_network_count > 0 &&
084d14fe0445 [gaim-migrate @ 17581]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 14864
diff changeset
713 ui_ops != NULL && ui_ops->network_disconnected != NULL) {
14784
3a82321f46f2 [gaim-migrate @ 17476]
Daniel Atallah <datallah@pidgin.im>
parents: 14758
diff changeset
714 ui_ops->network_disconnected();
3a82321f46f2 [gaim-migrate @ 17476]
Daniel Atallah <datallah@pidgin.im>
parents: 14758
diff changeset
715 }
3a82321f46f2 [gaim-migrate @ 17476]
Daniel Atallah <datallah@pidgin.im>
parents: 14758
diff changeset
716
3a82321f46f2 [gaim-migrate @ 17476]
Daniel Atallah <datallah@pidgin.im>
parents: 14758
diff changeset
717 current_network_count = new_count;
3a82321f46f2 [gaim-migrate @ 17476]
Daniel Atallah <datallah@pidgin.im>
parents: 14758
diff changeset
718
3a82321f46f2 [gaim-migrate @ 17476]
Daniel Atallah <datallah@pidgin.im>
parents: 14758
diff changeset
719 return FALSE;
3a82321f46f2 [gaim-migrate @ 17476]
Daniel Atallah <datallah@pidgin.im>
parents: 14758
diff changeset
720 }
3a82321f46f2 [gaim-migrate @ 17476]
Daniel Atallah <datallah@pidgin.im>
parents: 14758
diff changeset
721
25541
1b82a0195ff5 Fix 3 different race conditions in the win32 network management functionality.
Daniel Atallah <datallah@pidgin.im>
parents: 25326
diff changeset
722 static gboolean _print_debug_msg(gpointer data) {
1b82a0195ff5 Fix 3 different race conditions in the win32 network management functionality.
Daniel Atallah <datallah@pidgin.im>
parents: 25326
diff changeset
723 gchar *msg = data;
30792
155b65d26118 Fix some cases where an arbitrary string was being specified as a printf format.
Daniel Atallah <datallah@pidgin.im>
parents: 30753
diff changeset
724 purple_debug_warning("network", "%s", msg);
25541
1b82a0195ff5 Fix 3 different race conditions in the win32 network management functionality.
Daniel Atallah <datallah@pidgin.im>
parents: 25326
diff changeset
725 g_free(msg);
1b82a0195ff5 Fix 3 different race conditions in the win32 network management functionality.
Daniel Atallah <datallah@pidgin.im>
parents: 25326
diff changeset
726 return FALSE;
1b82a0195ff5 Fix 3 different race conditions in the win32 network management functionality.
Daniel Atallah <datallah@pidgin.im>
parents: 25326
diff changeset
727 }
1b82a0195ff5 Fix 3 different race conditions in the win32 network management functionality.
Daniel Atallah <datallah@pidgin.im>
parents: 25326
diff changeset
728
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15708
diff changeset
729 static gpointer wpurple_network_change_thread(gpointer data)
14784
3a82321f46f2 [gaim-migrate @ 17476]
Daniel Atallah <datallah@pidgin.im>
parents: 14758
diff changeset
730 {
3a82321f46f2 [gaim-migrate @ 17476]
Daniel Atallah <datallah@pidgin.im>
parents: 14758
diff changeset
731 WSAQUERYSET qs;
25326
c4f4b222dbac Adjust the NLA code to prevent hang on exit for Windows XP and Windows Vista.
Paul Aurich <darkrain42@pidgin.im>
parents: 24519
diff changeset
732 WSAEVENT *nla_event;
25541
1b82a0195ff5 Fix 3 different race conditions in the win32 network management functionality.
Daniel Atallah <datallah@pidgin.im>
parents: 25326
diff changeset
733 time_t last_trigger = time(NULL) - 31;
38165
b3ad11cab64e win32: Allow for arbitrary buffer size used for retrieving NLA responses
Daniel Atallah <datallah@pidgin.im>
parents: 38164
diff changeset
734 gchar *buf = NULL;
25541
1b82a0195ff5 Fix 3 different race conditions in the win32 network management functionality.
Daniel Atallah <datallah@pidgin.im>
parents: 25326
diff changeset
735 WSAQUERYSET *res = (LPWSAQUERYSET) buf;
38165
b3ad11cab64e win32: Allow for arbitrary buffer size used for retrieving NLA responses
Daniel Atallah <datallah@pidgin.im>
parents: 38164
diff changeset
736 DWORD current_size = 0;
14784
3a82321f46f2 [gaim-migrate @ 17476]
Daniel Atallah <datallah@pidgin.im>
parents: 14758
diff changeset
737
25326
c4f4b222dbac Adjust the NLA code to prevent hang on exit for Windows XP and Windows Vista.
Paul Aurich <darkrain42@pidgin.im>
parents: 24519
diff changeset
738 if ((nla_event = WSACreateEvent()) == WSA_INVALID_EVENT) {
c4f4b222dbac Adjust the NLA code to prevent hang on exit for Windows XP and Windows Vista.
Paul Aurich <darkrain42@pidgin.im>
parents: 24519
diff changeset
739 int errorid = WSAGetLastError();
c4f4b222dbac Adjust the NLA code to prevent hang on exit for Windows XP and Windows Vista.
Paul Aurich <darkrain42@pidgin.im>
parents: 24519
diff changeset
740 gchar *msg = g_win32_error_message(errorid);
25541
1b82a0195ff5 Fix 3 different race conditions in the win32 network management functionality.
Daniel Atallah <datallah@pidgin.im>
parents: 25326
diff changeset
741 purple_timeout_add(0, _print_debug_msg,
1b82a0195ff5 Fix 3 different race conditions in the win32 network management functionality.
Daniel Atallah <datallah@pidgin.im>
parents: 25326
diff changeset
742 g_strdup_printf("Couldn't create WSA event. "
1b82a0195ff5 Fix 3 different race conditions in the win32 network management functionality.
Daniel Atallah <datallah@pidgin.im>
parents: 25326
diff changeset
743 "Message: %s (%d).\n", msg, errorid));
25326
c4f4b222dbac Adjust the NLA code to prevent hang on exit for Windows XP and Windows Vista.
Paul Aurich <darkrain42@pidgin.im>
parents: 24519
diff changeset
744 g_free(msg);
c4f4b222dbac Adjust the NLA code to prevent hang on exit for Windows XP and Windows Vista.
Paul Aurich <darkrain42@pidgin.im>
parents: 24519
diff changeset
745 g_thread_exit(NULL);
c4f4b222dbac Adjust the NLA code to prevent hang on exit for Windows XP and Windows Vista.
Paul Aurich <darkrain42@pidgin.im>
parents: 24519
diff changeset
746 return NULL;
c4f4b222dbac Adjust the NLA code to prevent hang on exit for Windows XP and Windows Vista.
Paul Aurich <darkrain42@pidgin.im>
parents: 24519
diff changeset
747 }
c4f4b222dbac Adjust the NLA code to prevent hang on exit for Windows XP and Windows Vista.
Paul Aurich <darkrain42@pidgin.im>
parents: 24519
diff changeset
748
14784
3a82321f46f2 [gaim-migrate @ 17476]
Daniel Atallah <datallah@pidgin.im>
parents: 14758
diff changeset
749 while (TRUE) {
3a82321f46f2 [gaim-migrate @ 17476]
Daniel Atallah <datallah@pidgin.im>
parents: 14758
diff changeset
750 int retval;
38166
3094e049f882 win32: add some sanity checks to avoid infinite loops or large memory allocations when retrieving NLA responses
Daniel Atallah <datallah@pidgin.im>
parents: 38165
diff changeset
751 int iteration_count;
14784
3a82321f46f2 [gaim-migrate @ 17476]
Daniel Atallah <datallah@pidgin.im>
parents: 14758
diff changeset
752 DWORD retLen = 0;
25326
c4f4b222dbac Adjust the NLA code to prevent hang on exit for Windows XP and Windows Vista.
Paul Aurich <darkrain42@pidgin.im>
parents: 24519
diff changeset
753 WSACOMPLETION completion;
c4f4b222dbac Adjust the NLA code to prevent hang on exit for Windows XP and Windows Vista.
Paul Aurich <darkrain42@pidgin.im>
parents: 24519
diff changeset
754 WSAOVERLAPPED overlapped;
c4f4b222dbac Adjust the NLA code to prevent hang on exit for Windows XP and Windows Vista.
Paul Aurich <darkrain42@pidgin.im>
parents: 24519
diff changeset
755
c4f4b222dbac Adjust the NLA code to prevent hang on exit for Windows XP and Windows Vista.
Paul Aurich <darkrain42@pidgin.im>
parents: 24519
diff changeset
756 g_static_mutex_lock(&mutex);
c4f4b222dbac Adjust the NLA code to prevent hang on exit for Windows XP and Windows Vista.
Paul Aurich <darkrain42@pidgin.im>
parents: 24519
diff changeset
757 if (network_initialized == FALSE) {
c4f4b222dbac Adjust the NLA code to prevent hang on exit for Windows XP and Windows Vista.
Paul Aurich <darkrain42@pidgin.im>
parents: 24519
diff changeset
758 /* purple_network_uninit has been called */
c4f4b222dbac Adjust the NLA code to prevent hang on exit for Windows XP and Windows Vista.
Paul Aurich <darkrain42@pidgin.im>
parents: 24519
diff changeset
759 WSACloseEvent(nla_event);
c4f4b222dbac Adjust the NLA code to prevent hang on exit for Windows XP and Windows Vista.
Paul Aurich <darkrain42@pidgin.im>
parents: 24519
diff changeset
760 g_static_mutex_unlock(&mutex);
c4f4b222dbac Adjust the NLA code to prevent hang on exit for Windows XP and Windows Vista.
Paul Aurich <darkrain42@pidgin.im>
parents: 24519
diff changeset
761 g_thread_exit(NULL);
c4f4b222dbac Adjust the NLA code to prevent hang on exit for Windows XP and Windows Vista.
Paul Aurich <darkrain42@pidgin.im>
parents: 24519
diff changeset
762 return NULL;
c4f4b222dbac Adjust the NLA code to prevent hang on exit for Windows XP and Windows Vista.
Paul Aurich <darkrain42@pidgin.im>
parents: 24519
diff changeset
763 }
14784
3a82321f46f2 [gaim-migrate @ 17476]
Daniel Atallah <datallah@pidgin.im>
parents: 14758
diff changeset
764
25541
1b82a0195ff5 Fix 3 different race conditions in the win32 network management functionality.
Daniel Atallah <datallah@pidgin.im>
parents: 25326
diff changeset
765 if (network_change_handle == NULL) {
1b82a0195ff5 Fix 3 different race conditions in the win32 network management functionality.
Daniel Atallah <datallah@pidgin.im>
parents: 25326
diff changeset
766 memset(&qs, 0, sizeof(WSAQUERYSET));
1b82a0195ff5 Fix 3 different race conditions in the win32 network management functionality.
Daniel Atallah <datallah@pidgin.im>
parents: 25326
diff changeset
767 qs.dwSize = sizeof(WSAQUERYSET);
1b82a0195ff5 Fix 3 different race conditions in the win32 network management functionality.
Daniel Atallah <datallah@pidgin.im>
parents: 25326
diff changeset
768 qs.dwNameSpace = NS_NLA;
38164
a66a4f09ea6a win32: Explicitly use ANSI versions of the WSALookup APIs
Daniel Atallah <datallah@pidgin.im>
parents: 36028
diff changeset
769 if (WSALookupServiceBeginA(&qs, 0, &network_change_handle) == SOCKET_ERROR) {
25541
1b82a0195ff5 Fix 3 different race conditions in the win32 network management functionality.
Daniel Atallah <datallah@pidgin.im>
parents: 25326
diff changeset
770 int errorid = WSAGetLastError();
1b82a0195ff5 Fix 3 different race conditions in the win32 network management functionality.
Daniel Atallah <datallah@pidgin.im>
parents: 25326
diff changeset
771 gchar *msg = g_win32_error_message(errorid);
1b82a0195ff5 Fix 3 different race conditions in the win32 network management functionality.
Daniel Atallah <datallah@pidgin.im>
parents: 25326
diff changeset
772 purple_timeout_add(0, _print_debug_msg,
1b82a0195ff5 Fix 3 different race conditions in the win32 network management functionality.
Daniel Atallah <datallah@pidgin.im>
parents: 25326
diff changeset
773 g_strdup_printf("Couldn't retrieve NLA SP lookup handle. "
1b82a0195ff5 Fix 3 different race conditions in the win32 network management functionality.
Daniel Atallah <datallah@pidgin.im>
parents: 25326
diff changeset
774 "NLA service is probably not running. Message: %s (%d).\n",
1b82a0195ff5 Fix 3 different race conditions in the win32 network management functionality.
Daniel Atallah <datallah@pidgin.im>
parents: 25326
diff changeset
775 msg, errorid));
1b82a0195ff5 Fix 3 different race conditions in the win32 network management functionality.
Daniel Atallah <datallah@pidgin.im>
parents: 25326
diff changeset
776 g_free(msg);
1b82a0195ff5 Fix 3 different race conditions in the win32 network management functionality.
Daniel Atallah <datallah@pidgin.im>
parents: 25326
diff changeset
777 WSACloseEvent(nla_event);
1b82a0195ff5 Fix 3 different race conditions in the win32 network management functionality.
Daniel Atallah <datallah@pidgin.im>
parents: 25326
diff changeset
778 g_static_mutex_unlock(&mutex);
1b82a0195ff5 Fix 3 different race conditions in the win32 network management functionality.
Daniel Atallah <datallah@pidgin.im>
parents: 25326
diff changeset
779 g_thread_exit(NULL);
1b82a0195ff5 Fix 3 different race conditions in the win32 network management functionality.
Daniel Atallah <datallah@pidgin.im>
parents: 25326
diff changeset
780 return NULL;
1b82a0195ff5 Fix 3 different race conditions in the win32 network management functionality.
Daniel Atallah <datallah@pidgin.im>
parents: 25326
diff changeset
781 }
14853
d06b1f28a8b2 [gaim-migrate @ 17556]
Daniel Atallah <datallah@pidgin.im>
parents: 14842
diff changeset
782 }
25326
c4f4b222dbac Adjust the NLA code to prevent hang on exit for Windows XP and Windows Vista.
Paul Aurich <darkrain42@pidgin.im>
parents: 24519
diff changeset
783 g_static_mutex_unlock(&mutex);
14784
3a82321f46f2 [gaim-migrate @ 17476]
Daniel Atallah <datallah@pidgin.im>
parents: 14758
diff changeset
784
25326
c4f4b222dbac Adjust the NLA code to prevent hang on exit for Windows XP and Windows Vista.
Paul Aurich <darkrain42@pidgin.im>
parents: 24519
diff changeset
785 memset(&completion, 0, sizeof(WSACOMPLETION));
c4f4b222dbac Adjust the NLA code to prevent hang on exit for Windows XP and Windows Vista.
Paul Aurich <darkrain42@pidgin.im>
parents: 24519
diff changeset
786 completion.Type = NSP_NOTIFY_EVENT;
c4f4b222dbac Adjust the NLA code to prevent hang on exit for Windows XP and Windows Vista.
Paul Aurich <darkrain42@pidgin.im>
parents: 24519
diff changeset
787 overlapped.hEvent = nla_event;
c4f4b222dbac Adjust the NLA code to prevent hang on exit for Windows XP and Windows Vista.
Paul Aurich <darkrain42@pidgin.im>
parents: 24519
diff changeset
788 completion.Parameters.Event.lpOverlapped = &overlapped;
c4f4b222dbac Adjust the NLA code to prevent hang on exit for Windows XP and Windows Vista.
Paul Aurich <darkrain42@pidgin.im>
parents: 24519
diff changeset
789
c4f4b222dbac Adjust the NLA code to prevent hang on exit for Windows XP and Windows Vista.
Paul Aurich <darkrain42@pidgin.im>
parents: 24519
diff changeset
790 if (MyWSANSPIoctl(network_change_handle, SIO_NSP_NOTIFY_CHANGE, NULL, 0, NULL, 0, &retLen, &completion) == SOCKET_ERROR) {
14853
d06b1f28a8b2 [gaim-migrate @ 17556]
Daniel Atallah <datallah@pidgin.im>
parents: 14842
diff changeset
791 int errorid = WSAGetLastError();
25541
1b82a0195ff5 Fix 3 different race conditions in the win32 network management functionality.
Daniel Atallah <datallah@pidgin.im>
parents: 25326
diff changeset
792 if (errorid == WSA_INVALID_HANDLE) {
1b82a0195ff5 Fix 3 different race conditions in the win32 network management functionality.
Daniel Atallah <datallah@pidgin.im>
parents: 25326
diff changeset
793 purple_timeout_add(0, _print_debug_msg,
1b82a0195ff5 Fix 3 different race conditions in the win32 network management functionality.
Daniel Atallah <datallah@pidgin.im>
parents: 25326
diff changeset
794 g_strdup("Invalid NLA handle; resetting.\n"));
1b82a0195ff5 Fix 3 different race conditions in the win32 network management functionality.
Daniel Atallah <datallah@pidgin.im>
parents: 25326
diff changeset
795 g_static_mutex_lock(&mutex);
1b82a0195ff5 Fix 3 different race conditions in the win32 network management functionality.
Daniel Atallah <datallah@pidgin.im>
parents: 25326
diff changeset
796 retval = WSALookupServiceEnd(network_change_handle);
1b82a0195ff5 Fix 3 different race conditions in the win32 network management functionality.
Daniel Atallah <datallah@pidgin.im>
parents: 25326
diff changeset
797 network_change_handle = NULL;
1b82a0195ff5 Fix 3 different race conditions in the win32 network management functionality.
Daniel Atallah <datallah@pidgin.im>
parents: 25326
diff changeset
798 g_static_mutex_unlock(&mutex);
1b82a0195ff5 Fix 3 different race conditions in the win32 network management functionality.
Daniel Atallah <datallah@pidgin.im>
parents: 25326
diff changeset
799 continue;
25326
c4f4b222dbac Adjust the NLA code to prevent hang on exit for Windows XP and Windows Vista.
Paul Aurich <darkrain42@pidgin.im>
parents: 24519
diff changeset
800 /* WSA_IO_PENDING indicates successful async notification will happen */
25541
1b82a0195ff5 Fix 3 different race conditions in the win32 network management functionality.
Daniel Atallah <datallah@pidgin.im>
parents: 25326
diff changeset
801 } else if (errorid != WSA_IO_PENDING) {
25326
c4f4b222dbac Adjust the NLA code to prevent hang on exit for Windows XP and Windows Vista.
Paul Aurich <darkrain42@pidgin.im>
parents: 24519
diff changeset
802 gchar *msg = g_win32_error_message(errorid);
25541
1b82a0195ff5 Fix 3 different race conditions in the win32 network management functionality.
Daniel Atallah <datallah@pidgin.im>
parents: 25326
diff changeset
803 purple_timeout_add(0, _print_debug_msg,
1b82a0195ff5 Fix 3 different race conditions in the win32 network management functionality.
Daniel Atallah <datallah@pidgin.im>
parents: 25326
diff changeset
804 g_strdup_printf("Unable to wait for changes. Message: %s (%d).\n",
1b82a0195ff5 Fix 3 different race conditions in the win32 network management functionality.
Daniel Atallah <datallah@pidgin.im>
parents: 25326
diff changeset
805 msg, errorid));
25326
c4f4b222dbac Adjust the NLA code to prevent hang on exit for Windows XP and Windows Vista.
Paul Aurich <darkrain42@pidgin.im>
parents: 24519
diff changeset
806 g_free(msg);
c4f4b222dbac Adjust the NLA code to prevent hang on exit for Windows XP and Windows Vista.
Paul Aurich <darkrain42@pidgin.im>
parents: 24519
diff changeset
807 }
14853
d06b1f28a8b2 [gaim-migrate @ 17556]
Daniel Atallah <datallah@pidgin.im>
parents: 14842
diff changeset
808 }
14784
3a82321f46f2 [gaim-migrate @ 17476]
Daniel Atallah <datallah@pidgin.im>
parents: 14758
diff changeset
809
25541
1b82a0195ff5 Fix 3 different race conditions in the win32 network management functionality.
Daniel Atallah <datallah@pidgin.im>
parents: 25326
diff changeset
810 /* Make sure at least 30 seconds have elapsed since the last
1b82a0195ff5 Fix 3 different race conditions in the win32 network management functionality.
Daniel Atallah <datallah@pidgin.im>
parents: 25326
diff changeset
811 * notification so we don't peg the cpu if this keeps changing. */
1b82a0195ff5 Fix 3 different race conditions in the win32 network management functionality.
Daniel Atallah <datallah@pidgin.im>
parents: 25326
diff changeset
812 if ((time(NULL) - last_trigger) < 30)
1b82a0195ff5 Fix 3 different race conditions in the win32 network management functionality.
Daniel Atallah <datallah@pidgin.im>
parents: 25326
diff changeset
813 Sleep(30000);
1b82a0195ff5 Fix 3 different race conditions in the win32 network management functionality.
Daniel Atallah <datallah@pidgin.im>
parents: 25326
diff changeset
814
25326
c4f4b222dbac Adjust the NLA code to prevent hang on exit for Windows XP and Windows Vista.
Paul Aurich <darkrain42@pidgin.im>
parents: 24519
diff changeset
815 /* This will block until NLA notifies us */
c4f4b222dbac Adjust the NLA code to prevent hang on exit for Windows XP and Windows Vista.
Paul Aurich <darkrain42@pidgin.im>
parents: 24519
diff changeset
816 retval = WaitForSingleObjectEx(nla_event, WSA_INFINITE, TRUE);
c4f4b222dbac Adjust the NLA code to prevent hang on exit for Windows XP and Windows Vista.
Paul Aurich <darkrain42@pidgin.im>
parents: 24519
diff changeset
817
25541
1b82a0195ff5 Fix 3 different race conditions in the win32 network management functionality.
Daniel Atallah <datallah@pidgin.im>
parents: 25326
diff changeset
818 last_trigger = time(NULL);
1b82a0195ff5 Fix 3 different race conditions in the win32 network management functionality.
Daniel Atallah <datallah@pidgin.im>
parents: 25326
diff changeset
819
25326
c4f4b222dbac Adjust the NLA code to prevent hang on exit for Windows XP and Windows Vista.
Paul Aurich <darkrain42@pidgin.im>
parents: 24519
diff changeset
820 g_static_mutex_lock(&mutex);
c4f4b222dbac Adjust the NLA code to prevent hang on exit for Windows XP and Windows Vista.
Paul Aurich <darkrain42@pidgin.im>
parents: 24519
diff changeset
821 if (network_initialized == FALSE) {
c4f4b222dbac Adjust the NLA code to prevent hang on exit for Windows XP and Windows Vista.
Paul Aurich <darkrain42@pidgin.im>
parents: 24519
diff changeset
822 /* Time to die */
c4f4b222dbac Adjust the NLA code to prevent hang on exit for Windows XP and Windows Vista.
Paul Aurich <darkrain42@pidgin.im>
parents: 24519
diff changeset
823 WSACloseEvent(nla_event);
c4f4b222dbac Adjust the NLA code to prevent hang on exit for Windows XP and Windows Vista.
Paul Aurich <darkrain42@pidgin.im>
parents: 24519
diff changeset
824 g_static_mutex_unlock(&mutex);
c4f4b222dbac Adjust the NLA code to prevent hang on exit for Windows XP and Windows Vista.
Paul Aurich <darkrain42@pidgin.im>
parents: 24519
diff changeset
825 g_thread_exit(NULL);
c4f4b222dbac Adjust the NLA code to prevent hang on exit for Windows XP and Windows Vista.
Paul Aurich <darkrain42@pidgin.im>
parents: 24519
diff changeset
826 return NULL;
c4f4b222dbac Adjust the NLA code to prevent hang on exit for Windows XP and Windows Vista.
Paul Aurich <darkrain42@pidgin.im>
parents: 24519
diff changeset
827 }
c4f4b222dbac Adjust the NLA code to prevent hang on exit for Windows XP and Windows Vista.
Paul Aurich <darkrain42@pidgin.im>
parents: 24519
diff changeset
828
38166
3094e049f882 win32: add some sanity checks to avoid infinite loops or large memory allocations when retrieving NLA responses
Daniel Atallah <datallah@pidgin.im>
parents: 38165
diff changeset
829 iteration_count = 0;
3094e049f882 win32: add some sanity checks to avoid infinite loops or large memory allocations when retrieving NLA responses
Daniel Atallah <datallah@pidgin.im>
parents: 38165
diff changeset
830 while (iteration_count++ < 100) {
38165
b3ad11cab64e win32: Allow for arbitrary buffer size used for retrieving NLA responses
Daniel Atallah <datallah@pidgin.im>
parents: 38164
diff changeset
831 DWORD size = current_size;
b3ad11cab64e win32: Allow for arbitrary buffer size used for retrieving NLA responses
Daniel Atallah <datallah@pidgin.im>
parents: 38164
diff changeset
832 retval = WSALookupServiceNextA(network_change_handle, 0, &size, res);
b3ad11cab64e win32: Allow for arbitrary buffer size used for retrieving NLA responses
Daniel Atallah <datallah@pidgin.im>
parents: 38164
diff changeset
833 if (retval == ERROR_SUCCESS) {
b3ad11cab64e win32: Allow for arbitrary buffer size used for retrieving NLA responses
Daniel Atallah <datallah@pidgin.im>
parents: 38164
diff changeset
834 /*purple_timeout_add(0, _print_debug_msg,
25541
1b82a0195ff5 Fix 3 different race conditions in the win32 network management functionality.
Daniel Atallah <datallah@pidgin.im>
parents: 25326
diff changeset
835 g_strdup_printf("thread found network '%s'\n",
1b82a0195ff5 Fix 3 different race conditions in the win32 network management functionality.
Daniel Atallah <datallah@pidgin.im>
parents: 25326
diff changeset
836 res->lpszServiceInstanceName ? res->lpszServiceInstanceName : "(NULL)"));*/
38165
b3ad11cab64e win32: Allow for arbitrary buffer size used for retrieving NLA responses
Daniel Atallah <datallah@pidgin.im>
parents: 38164
diff changeset
837 } else {
b3ad11cab64e win32: Allow for arbitrary buffer size used for retrieving NLA responses
Daniel Atallah <datallah@pidgin.im>
parents: 38164
diff changeset
838 int errorid = WSAGetLastError();
b3ad11cab64e win32: Allow for arbitrary buffer size used for retrieving NLA responses
Daniel Atallah <datallah@pidgin.im>
parents: 38164
diff changeset
839 if (errorid == WSAEFAULT) {
38166
3094e049f882 win32: add some sanity checks to avoid infinite loops or large memory allocations when retrieving NLA responses
Daniel Atallah <datallah@pidgin.im>
parents: 38165
diff changeset
840 if (size == 0 || size > 102400) {
3094e049f882 win32: add some sanity checks to avoid infinite loops or large memory allocations when retrieving NLA responses
Daniel Atallah <datallah@pidgin.im>
parents: 38165
diff changeset
841 purple_timeout_add(0, _print_debug_msg,
3094e049f882 win32: add some sanity checks to avoid infinite loops or large memory allocations when retrieving NLA responses
Daniel Atallah <datallah@pidgin.im>
parents: 38165
diff changeset
842 g_strdup_printf("Thread got unexpected NLA buffer size %" G_GUINT32_FORMAT ".\n", (guint32) size));
3094e049f882 win32: add some sanity checks to avoid infinite loops or large memory allocations when retrieving NLA responses
Daniel Atallah <datallah@pidgin.im>
parents: 38165
diff changeset
843 break;
3094e049f882 win32: add some sanity checks to avoid infinite loops or large memory allocations when retrieving NLA responses
Daniel Atallah <datallah@pidgin.im>
parents: 38165
diff changeset
844 }
38165
b3ad11cab64e win32: Allow for arbitrary buffer size used for retrieving NLA responses
Daniel Atallah <datallah@pidgin.im>
parents: 38164
diff changeset
845 buf = g_realloc(buf, size);
b3ad11cab64e win32: Allow for arbitrary buffer size used for retrieving NLA responses
Daniel Atallah <datallah@pidgin.im>
parents: 38164
diff changeset
846 res = (LPWSAQUERYSET) buf;
b3ad11cab64e win32: Allow for arbitrary buffer size used for retrieving NLA responses
Daniel Atallah <datallah@pidgin.im>
parents: 38164
diff changeset
847 current_size = size;
b3ad11cab64e win32: Allow for arbitrary buffer size used for retrieving NLA responses
Daniel Atallah <datallah@pidgin.im>
parents: 38164
diff changeset
848 } else {
b3ad11cab64e win32: Allow for arbitrary buffer size used for retrieving NLA responses
Daniel Atallah <datallah@pidgin.im>
parents: 38164
diff changeset
849 break;
b3ad11cab64e win32: Allow for arbitrary buffer size used for retrieving NLA responses
Daniel Atallah <datallah@pidgin.im>
parents: 38164
diff changeset
850 }
b3ad11cab64e win32: Allow for arbitrary buffer size used for retrieving NLA responses
Daniel Atallah <datallah@pidgin.im>
parents: 38164
diff changeset
851 }
b3ad11cab64e win32: Allow for arbitrary buffer size used for retrieving NLA responses
Daniel Atallah <datallah@pidgin.im>
parents: 38164
diff changeset
852
25541
1b82a0195ff5 Fix 3 different race conditions in the win32 network management functionality.
Daniel Atallah <datallah@pidgin.im>
parents: 25326
diff changeset
853 }
38165
b3ad11cab64e win32: Allow for arbitrary buffer size used for retrieving NLA responses
Daniel Atallah <datallah@pidgin.im>
parents: 38164
diff changeset
854 g_free(buf);
b3ad11cab64e win32: Allow for arbitrary buffer size used for retrieving NLA responses
Daniel Atallah <datallah@pidgin.im>
parents: 38164
diff changeset
855 buf = NULL;
b3ad11cab64e win32: Allow for arbitrary buffer size used for retrieving NLA responses
Daniel Atallah <datallah@pidgin.im>
parents: 38164
diff changeset
856 current_size = 0;
25541
1b82a0195ff5 Fix 3 different race conditions in the win32 network management functionality.
Daniel Atallah <datallah@pidgin.im>
parents: 25326
diff changeset
857
25326
c4f4b222dbac Adjust the NLA code to prevent hang on exit for Windows XP and Windows Vista.
Paul Aurich <darkrain42@pidgin.im>
parents: 24519
diff changeset
858 WSAResetEvent(nla_event);
c4f4b222dbac Adjust the NLA code to prevent hang on exit for Windows XP and Windows Vista.
Paul Aurich <darkrain42@pidgin.im>
parents: 24519
diff changeset
859 g_static_mutex_unlock(&mutex);
14784
3a82321f46f2 [gaim-migrate @ 17476]
Daniel Atallah <datallah@pidgin.im>
parents: 14758
diff changeset
860
21549
7436059db33b 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 <datallah@pidgin.im>
parents: 21389
diff changeset
861 purple_timeout_add(0, wpurple_network_change_thread_cb, NULL);
14784
3a82321f46f2 [gaim-migrate @ 17476]
Daniel Atallah <datallah@pidgin.im>
parents: 14758
diff changeset
862 }
14853
d06b1f28a8b2 [gaim-migrate @ 17556]
Daniel Atallah <datallah@pidgin.im>
parents: 14842
diff changeset
863
d06b1f28a8b2 [gaim-migrate @ 17556]
Daniel Atallah <datallah@pidgin.im>
parents: 14842
diff changeset
864 g_thread_exit(NULL);
d06b1f28a8b2 [gaim-migrate @ 17556]
Daniel Atallah <datallah@pidgin.im>
parents: 14842
diff changeset
865 return NULL;
14784
3a82321f46f2 [gaim-migrate @ 17476]
Daniel Atallah <datallah@pidgin.im>
parents: 14758
diff changeset
866 }
3a82321f46f2 [gaim-migrate @ 17476]
Daniel Atallah <datallah@pidgin.im>
parents: 14758
diff changeset
867 #endif
3a82321f46f2 [gaim-migrate @ 17476]
Daniel Atallah <datallah@pidgin.im>
parents: 14758
diff changeset
868
14758
13b9adc9efd2 [gaim-migrate @ 17448]
Sean Egan <seanegan@pidgin.im>
parents: 14329
diff changeset
869 gboolean
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15708
diff changeset
870 purple_network_is_available(void)
14758
13b9adc9efd2 [gaim-migrate @ 17448]
Sean Egan <seanegan@pidgin.im>
parents: 14329
diff changeset
871 {
23060
db9632a9b374 Use pkg-config to detect NetworkManager. Also, fail if it isn't present,
Richard Laager <rlaager@pidgin.im>
parents: 23054
diff changeset
872 #ifdef HAVE_NETWORKMANAGER
24999
84d597b7e7c6 Add a -f/--force-online option to Pidgin which tells libpurple to claim the
Richard Laager <rlaager@pidgin.im>
parents: 24519
diff changeset
873 if (force_online)
84d597b7e7c6 Add a -f/--force-online option to Pidgin which tells libpurple to claim the
Richard Laager <rlaager@pidgin.im>
parents: 24519
diff changeset
874 return TRUE;
84d597b7e7c6 Add a -f/--force-online option to Pidgin which tells libpurple to claim the
Richard Laager <rlaager@pidgin.im>
parents: 24519
diff changeset
875
24519
d4af3d043211 Improve our NetworkManager support in a couple of ways:
Richard Laager <rlaager@pidgin.im>
parents: 24044
diff changeset
876 if (!have_nm_state)
23047
f2c25bf1e0fd Fix some whitespace as noticed by QuLogic.
Richard Laager <rlaager@pidgin.im>
parents: 23041
diff changeset
877 {
24519
d4af3d043211 Improve our NetworkManager support in a couple of ways:
Richard Laager <rlaager@pidgin.im>
parents: 24044
diff changeset
878 have_nm_state = TRUE;
d4af3d043211 Improve our NetworkManager support in a couple of ways:
Richard Laager <rlaager@pidgin.im>
parents: 24044
diff changeset
879 nm_state = nm_get_network_state();
d4af3d043211 Improve our NetworkManager support in a couple of ways:
Richard Laager <rlaager@pidgin.im>
parents: 24044
diff changeset
880 if (nm_state == NM_STATE_UNKNOWN)
d4af3d043211 Improve our NetworkManager support in a couple of ways:
Richard Laager <rlaager@pidgin.im>
parents: 24044
diff changeset
881 purple_debug_warning("network", "NetworkManager not active. Assuming connection exists.\n");
23041
58661da65e36 Changes suggested by QuLogic to fix my broken changes to the NetworkManager
Richard Laager <rlaager@pidgin.im>
parents: 23040
diff changeset
882 }
24519
d4af3d043211 Improve our NetworkManager support in a couple of ways:
Richard Laager <rlaager@pidgin.im>
parents: 24044
diff changeset
883
32077
09eab14835d9 *** Plucked rev 10ead4688e3af4132d454fa3bc241480500651c9 (dcbw@redhat.com):
Mark Doliner <markdoliner@pidgin.im>
parents: 31831
diff changeset
884 switch (nm_state)
09eab14835d9 *** Plucked rev 10ead4688e3af4132d454fa3bc241480500651c9 (dcbw@redhat.com):
Mark Doliner <markdoliner@pidgin.im>
parents: 31831
diff changeset
885 {
09eab14835d9 *** Plucked rev 10ead4688e3af4132d454fa3bc241480500651c9 (dcbw@redhat.com):
Mark Doliner <markdoliner@pidgin.im>
parents: 31831
diff changeset
886 case NM_STATE_UNKNOWN:
09eab14835d9 *** Plucked rev 10ead4688e3af4132d454fa3bc241480500651c9 (dcbw@redhat.com):
Mark Doliner <markdoliner@pidgin.im>
parents: 31831
diff changeset
887 #if NM_CHECK_VERSION(0,8,992)
09eab14835d9 *** Plucked rev 10ead4688e3af4132d454fa3bc241480500651c9 (dcbw@redhat.com):
Mark Doliner <markdoliner@pidgin.im>
parents: 31831
diff changeset
888 case NM_STATE_CONNECTED_LOCAL:
09eab14835d9 *** Plucked rev 10ead4688e3af4132d454fa3bc241480500651c9 (dcbw@redhat.com):
Mark Doliner <markdoliner@pidgin.im>
parents: 31831
diff changeset
889 case NM_STATE_CONNECTED_SITE:
09eab14835d9 *** Plucked rev 10ead4688e3af4132d454fa3bc241480500651c9 (dcbw@redhat.com):
Mark Doliner <markdoliner@pidgin.im>
parents: 31831
diff changeset
890 case NM_STATE_CONNECTED_GLOBAL:
09eab14835d9 *** Plucked rev 10ead4688e3af4132d454fa3bc241480500651c9 (dcbw@redhat.com):
Mark Doliner <markdoliner@pidgin.im>
parents: 31831
diff changeset
891 #else
09eab14835d9 *** Plucked rev 10ead4688e3af4132d454fa3bc241480500651c9 (dcbw@redhat.com):
Mark Doliner <markdoliner@pidgin.im>
parents: 31831
diff changeset
892 case NM_STATE_CONNECTED:
09eab14835d9 *** Plucked rev 10ead4688e3af4132d454fa3bc241480500651c9 (dcbw@redhat.com):
Mark Doliner <markdoliner@pidgin.im>
parents: 31831
diff changeset
893 #endif
09eab14835d9 *** Plucked rev 10ead4688e3af4132d454fa3bc241480500651c9 (dcbw@redhat.com):
Mark Doliner <markdoliner@pidgin.im>
parents: 31831
diff changeset
894 return TRUE;
09eab14835d9 *** Plucked rev 10ead4688e3af4132d454fa3bc241480500651c9 (dcbw@redhat.com):
Mark Doliner <markdoliner@pidgin.im>
parents: 31831
diff changeset
895 default:
09eab14835d9 *** Plucked rev 10ead4688e3af4132d454fa3bc241480500651c9 (dcbw@redhat.com):
Mark Doliner <markdoliner@pidgin.im>
parents: 31831
diff changeset
896 break;
09eab14835d9 *** Plucked rev 10ead4688e3af4132d454fa3bc241480500651c9 (dcbw@redhat.com):
Mark Doliner <markdoliner@pidgin.im>
parents: 31831
diff changeset
897 }
23041
58661da65e36 Changes suggested by QuLogic to fix my broken changes to the NetworkManager
Richard Laager <rlaager@pidgin.im>
parents: 23040
diff changeset
898
58661da65e36 Changes suggested by QuLogic to fix my broken changes to the NetworkManager
Richard Laager <rlaager@pidgin.im>
parents: 23040
diff changeset
899 return FALSE;
58661da65e36 Changes suggested by QuLogic to fix my broken changes to the NetworkManager
Richard Laager <rlaager@pidgin.im>
parents: 23040
diff changeset
900
14839
221c60cc76e0 [gaim-migrate @ 17541]
Daniel Atallah <datallah@pidgin.im>
parents: 14838
diff changeset
901 #elif defined _WIN32
24999
84d597b7e7c6 Add a -f/--force-online option to Pidgin which tells libpurple to claim the
Richard Laager <rlaager@pidgin.im>
parents: 24519
diff changeset
902 return (current_network_count > 0 || force_online);
23041
58661da65e36 Changes suggested by QuLogic to fix my broken changes to the NetworkManager
Richard Laager <rlaager@pidgin.im>
parents: 23040
diff changeset
903 #else
58661da65e36 Changes suggested by QuLogic to fix my broken changes to the NetworkManager
Richard Laager <rlaager@pidgin.im>
parents: 23040
diff changeset
904 return TRUE;
14758
13b9adc9efd2 [gaim-migrate @ 17448]
Sean Egan <seanegan@pidgin.im>
parents: 14329
diff changeset
905 #endif
13b9adc9efd2 [gaim-migrate @ 17448]
Sean Egan <seanegan@pidgin.im>
parents: 14329
diff changeset
906 }
13b9adc9efd2 [gaim-migrate @ 17448]
Sean Egan <seanegan@pidgin.im>
parents: 14329
diff changeset
907
24999
84d597b7e7c6 Add a -f/--force-online option to Pidgin which tells libpurple to claim the
Richard Laager <rlaager@pidgin.im>
parents: 24519
diff changeset
908 void
84d597b7e7c6 Add a -f/--force-online option to Pidgin which tells libpurple to claim the
Richard Laager <rlaager@pidgin.im>
parents: 24519
diff changeset
909 purple_network_force_online()
84d597b7e7c6 Add a -f/--force-online option to Pidgin which tells libpurple to claim the
Richard Laager <rlaager@pidgin.im>
parents: 24519
diff changeset
910 {
84d597b7e7c6 Add a -f/--force-online option to Pidgin which tells libpurple to claim the
Richard Laager <rlaager@pidgin.im>
parents: 24519
diff changeset
911 #if defined(HAVE_NETWORKMANAGER) || defined(_WIN32)
84d597b7e7c6 Add a -f/--force-online option to Pidgin which tells libpurple to claim the
Richard Laager <rlaager@pidgin.im>
parents: 24519
diff changeset
912 force_online = TRUE;
84d597b7e7c6 Add a -f/--force-online option to Pidgin which tells libpurple to claim the
Richard Laager <rlaager@pidgin.im>
parents: 24519
diff changeset
913 #endif
84d597b7e7c6 Add a -f/--force-online option to Pidgin which tells libpurple to claim the
Richard Laager <rlaager@pidgin.im>
parents: 24519
diff changeset
914 }
84d597b7e7c6 Add a -f/--force-online option to Pidgin which tells libpurple to claim the
Richard Laager <rlaager@pidgin.im>
parents: 24519
diff changeset
915
23060
db9632a9b374 Use pkg-config to detect NetworkManager. Also, fail if it isn't present,
Richard Laager <rlaager@pidgin.im>
parents: 23054
diff changeset
916 #ifdef HAVE_NETWORKMANAGER
22735
a9c84e4679d8 Make some more things static
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 21977
diff changeset
917 static void
23039
c9b53691fe42 A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@pidgin.im>
parents: 22735
diff changeset
918 nm_update_state(NMState state)
14758
13b9adc9efd2 [gaim-migrate @ 17448]
Sean Egan <seanegan@pidgin.im>
parents: 14329
diff changeset
919 {
24519
d4af3d043211 Improve our NetworkManager support in a couple of ways:
Richard Laager <rlaager@pidgin.im>
parents: 24044
diff changeset
920 NMState prev = nm_state;
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15708
diff changeset
921 PurpleConnectionUiOps *ui_ops = purple_connections_get_ui_ops();
14758
13b9adc9efd2 [gaim-migrate @ 17448]
Sean Egan <seanegan@pidgin.im>
parents: 14329
diff changeset
922
24519
d4af3d043211 Improve our NetworkManager support in a couple of ways:
Richard Laager <rlaager@pidgin.im>
parents: 24044
diff changeset
923 have_nm_state = TRUE;
d4af3d043211 Improve our NetworkManager support in a couple of ways:
Richard Laager <rlaager@pidgin.im>
parents: 24044
diff changeset
924 nm_state = state;
d4af3d043211 Improve our NetworkManager support in a couple of ways:
Richard Laager <rlaager@pidgin.im>
parents: 24044
diff changeset
925
16035
eb4eda79a147 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 <evands@pidgin.im>
parents: 16012
diff changeset
926 purple_signal_emit(purple_network_get_handle(), "network-configuration-changed", NULL);
eb4eda79a147 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 <evands@pidgin.im>
parents: 16012
diff changeset
927
23039
c9b53691fe42 A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@pidgin.im>
parents: 22735
diff changeset
928 switch(state)
14758
13b9adc9efd2 [gaim-migrate @ 17448]
Sean Egan <seanegan@pidgin.im>
parents: 14329
diff changeset
929 {
31653
a36102ecb723 Support new connection states in NetworkMakanter 0.9. Fixes #13505.
Dan Williams <dcbw@redhat.com>
parents: 31294
diff changeset
930 #if NM_CHECK_VERSION(0,8,992)
a36102ecb723 Support new connection states in NetworkMakanter 0.9. Fixes #13505.
Dan Williams <dcbw@redhat.com>
parents: 31294
diff changeset
931 case NM_STATE_CONNECTED_LOCAL:
a36102ecb723 Support new connection states in NetworkMakanter 0.9. Fixes #13505.
Dan Williams <dcbw@redhat.com>
parents: 31294
diff changeset
932 case NM_STATE_CONNECTED_SITE:
a36102ecb723 Support new connection states in NetworkMakanter 0.9. Fixes #13505.
Dan Williams <dcbw@redhat.com>
parents: 31294
diff changeset
933 case NM_STATE_CONNECTED_GLOBAL:
a36102ecb723 Support new connection states in NetworkMakanter 0.9. Fixes #13505.
Dan Williams <dcbw@redhat.com>
parents: 31294
diff changeset
934 #else
23039
c9b53691fe42 A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@pidgin.im>
parents: 22735
diff changeset
935 case NM_STATE_CONNECTED:
31653
a36102ecb723 Support new connection states in NetworkMakanter 0.9. Fixes #13505.
Dan Williams <dcbw@redhat.com>
parents: 31294
diff changeset
936 #endif
23039
c9b53691fe42 A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@pidgin.im>
parents: 22735
diff changeset
937 /* Call res_init in case DNS servers have changed */
c9b53691fe42 A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@pidgin.im>
parents: 22735
diff changeset
938 res_init();
26256
d2673c935184 Run an asynchronous DNS lookup for the STUN server IP (to set as a property
Marcus Lundblad <malu@pidgin.im>
parents: 25326
diff changeset
939 /* update STUN IP in case we it changed (theoretically we could
d2673c935184 Run an asynchronous DNS lookup for the STUN server IP (to set as a property
Marcus Lundblad <malu@pidgin.im>
parents: 25326
diff changeset
940 have gone from IPv4 to IPv6, f.ex. or we were previously
d2673c935184 Run an asynchronous DNS lookup for the STUN server IP (to set as a property
Marcus Lundblad <malu@pidgin.im>
parents: 25326
diff changeset
941 offline */
d2673c935184 Run an asynchronous DNS lookup for the STUN server IP (to set as a property
Marcus Lundblad <malu@pidgin.im>
parents: 25326
diff changeset
942 purple_network_set_stun_server(
d2673c935184 Run an asynchronous DNS lookup for the STUN server IP (to set as a property
Marcus Lundblad <malu@pidgin.im>
parents: 25326
diff changeset
943 purple_prefs_get_string("/purple/network/stun_server"));
26261
ffabb135a4b6 Added support to generate relayed candidates (TURN).
Marcus Lundblad <malu@pidgin.im>
parents: 26256
diff changeset
944 purple_network_set_turn_server(
ffabb135a4b6 Added support to generate relayed candidates (TURN).
Marcus Lundblad <malu@pidgin.im>
parents: 26256
diff changeset
945 purple_prefs_get_string("/purple/network/turn_server"));
31294
73607ab89c6f Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents: 31191
diff changeset
946
23039
c9b53691fe42 A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@pidgin.im>
parents: 22735
diff changeset
947 if (ui_ops != NULL && ui_ops->network_connected != NULL)
c9b53691fe42 A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@pidgin.im>
parents: 22735
diff changeset
948 ui_ops->network_connected();
14758
13b9adc9efd2 [gaim-migrate @ 17448]
Sean Egan <seanegan@pidgin.im>
parents: 14329
diff changeset
949 break;
23039
c9b53691fe42 A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@pidgin.im>
parents: 22735
diff changeset
950 case NM_STATE_ASLEEP:
c9b53691fe42 A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@pidgin.im>
parents: 22735
diff changeset
951 case NM_STATE_CONNECTING:
c9b53691fe42 A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@pidgin.im>
parents: 22735
diff changeset
952 case NM_STATE_DISCONNECTED:
31653
a36102ecb723 Support new connection states in NetworkMakanter 0.9. Fixes #13505.
Dan Williams <dcbw@redhat.com>
parents: 31294
diff changeset
953 #if NM_CHECK_VERSION(0,8,992)
a36102ecb723 Support new connection states in NetworkMakanter 0.9. Fixes #13505.
Dan Williams <dcbw@redhat.com>
parents: 31294
diff changeset
954 case NM_STATE_DISCONNECTING:
a36102ecb723 Support new connection states in NetworkMakanter 0.9. Fixes #13505.
Dan Williams <dcbw@redhat.com>
parents: 31294
diff changeset
955 #endif
39615
bfa20ee4084f Fix build against NetworkManager 1.0+.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 38256
diff changeset
956 #if NM_CHECK_VERSION(1,0,0)
bfa20ee4084f Fix build against NetworkManager 1.0+.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 38256
diff changeset
957 if (prev != NM_STATE_CONNECTED_GLOBAL && prev != NM_STATE_UNKNOWN)
bfa20ee4084f Fix build against NetworkManager 1.0+.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 38256
diff changeset
958 break;
bfa20ee4084f Fix build against NetworkManager 1.0+.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 38256
diff changeset
959 #else
24519
d4af3d043211 Improve our NetworkManager support in a couple of ways:
Richard Laager <rlaager@pidgin.im>
parents: 24044
diff changeset
960 if (prev != NM_STATE_CONNECTED && prev != NM_STATE_UNKNOWN)
23039
c9b53691fe42 A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@pidgin.im>
parents: 22735
diff changeset
961 break;
39615
bfa20ee4084f Fix build against NetworkManager 1.0+.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 38256
diff changeset
962 #endif
23039
c9b53691fe42 A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@pidgin.im>
parents: 22735
diff changeset
963 if (ui_ops != NULL && ui_ops->network_disconnected != NULL)
c9b53691fe42 A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@pidgin.im>
parents: 22735
diff changeset
964 ui_ops->network_disconnected();
c9b53691fe42 A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@pidgin.im>
parents: 22735
diff changeset
965 break;
c9b53691fe42 A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@pidgin.im>
parents: 22735
diff changeset
966 case NM_STATE_UNKNOWN:
c9b53691fe42 A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@pidgin.im>
parents: 22735
diff changeset
967 default:
c9b53691fe42 A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@pidgin.im>
parents: 22735
diff changeset
968 break;
14758
13b9adc9efd2 [gaim-migrate @ 17448]
Sean Egan <seanegan@pidgin.im>
parents: 14329
diff changeset
969 }
13b9adc9efd2 [gaim-migrate @ 17448]
Sean Egan <seanegan@pidgin.im>
parents: 14329
diff changeset
970 }
23039
c9b53691fe42 A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@pidgin.im>
parents: 22735
diff changeset
971
c9b53691fe42 A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@pidgin.im>
parents: 22735
diff changeset
972 static void
c9b53691fe42 A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@pidgin.im>
parents: 22735
diff changeset
973 nm_state_change_cb(DBusGProxy *proxy, NMState state, gpointer user_data)
c9b53691fe42 A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@pidgin.im>
parents: 22735
diff changeset
974 {
c9b53691fe42 A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@pidgin.im>
parents: 22735
diff changeset
975 purple_debug_info("network", "Got StateChange from NetworkManager: %d.\n", state);
c9b53691fe42 A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@pidgin.im>
parents: 22735
diff changeset
976 nm_update_state(state);
c9b53691fe42 A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@pidgin.im>
parents: 22735
diff changeset
977 }
c9b53691fe42 A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@pidgin.im>
parents: 22735
diff changeset
978
c9b53691fe42 A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@pidgin.im>
parents: 22735
diff changeset
979 static NMState
c9b53691fe42 A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@pidgin.im>
parents: 22735
diff changeset
980 nm_get_network_state(void)
c9b53691fe42 A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@pidgin.im>
parents: 22735
diff changeset
981 {
c9b53691fe42 A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@pidgin.im>
parents: 22735
diff changeset
982 GError *err = NULL;
c9b53691fe42 A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@pidgin.im>
parents: 22735
diff changeset
983 NMState state = NM_STATE_UNKNOWN;
c9b53691fe42 A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@pidgin.im>
parents: 22735
diff changeset
984
c9b53691fe42 A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@pidgin.im>
parents: 22735
diff changeset
985 if (!nm_proxy)
c9b53691fe42 A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@pidgin.im>
parents: 22735
diff changeset
986 return NM_STATE_UNKNOWN;
c9b53691fe42 A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@pidgin.im>
parents: 22735
diff changeset
987
c9b53691fe42 A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@pidgin.im>
parents: 22735
diff changeset
988 if (!dbus_g_proxy_call(nm_proxy, "state", &err, G_TYPE_INVALID, G_TYPE_UINT, &state, G_TYPE_INVALID)) {
23185
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 23060
diff changeset
989 g_error_free(err);
23039
c9b53691fe42 A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@pidgin.im>
parents: 22735
diff changeset
990 return NM_STATE_UNKNOWN;
c9b53691fe42 A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@pidgin.im>
parents: 22735
diff changeset
991 }
c9b53691fe42 A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@pidgin.im>
parents: 22735
diff changeset
992
c9b53691fe42 A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@pidgin.im>
parents: 22735
diff changeset
993 return state;
c9b53691fe42 A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@pidgin.im>
parents: 22735
diff changeset
994 }
c9b53691fe42 A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@pidgin.im>
parents: 22735
diff changeset
995
c9b53691fe42 A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@pidgin.im>
parents: 22735
diff changeset
996 static void
c9b53691fe42 A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@pidgin.im>
parents: 22735
diff changeset
997 nm_dbus_name_owner_changed_cb(DBusGProxy *proxy, char *service, char *old_owner, char *new_owner, gpointer user_data)
c9b53691fe42 A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@pidgin.im>
parents: 22735
diff changeset
998 {
38256
035f00c4fd87 Replace misused g_str_equal() with purple_strequal()
qarkai <qarkai@gmail.com>
parents: 38166
diff changeset
999 if (purple_strequal(service, NM_DBUS_SERVICE)) {
23039
c9b53691fe42 A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@pidgin.im>
parents: 22735
diff changeset
1000 gboolean old_owner_good = old_owner && (old_owner[0] != '\0');
c9b53691fe42 A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@pidgin.im>
parents: 22735
diff changeset
1001 gboolean new_owner_good = new_owner && (new_owner[0] != '\0');
c9b53691fe42 A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@pidgin.im>
parents: 22735
diff changeset
1002
c9b53691fe42 A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@pidgin.im>
parents: 22735
diff changeset
1003 purple_debug_info("network", "Got NameOwnerChanged signal, service = '%s', old_owner = '%s', new_owner = '%s'\n", service, old_owner, new_owner);
c9b53691fe42 A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@pidgin.im>
parents: 22735
diff changeset
1004 if (!old_owner_good && new_owner_good) { /* Equivalent to old ServiceCreated signal */
c9b53691fe42 A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@pidgin.im>
parents: 22735
diff changeset
1005 purple_debug_info("network", "NetworkManager has started.\n");
c9b53691fe42 A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@pidgin.im>
parents: 22735
diff changeset
1006 nm_update_state(nm_get_network_state());
c9b53691fe42 A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@pidgin.im>
parents: 22735
diff changeset
1007 } else if (old_owner_good && !new_owner_good) { /* Equivalent to old ServiceDeleted signal */
c9b53691fe42 A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@pidgin.im>
parents: 22735
diff changeset
1008 purple_debug_info("network", "NetworkManager has gone away.\n");
c9b53691fe42 A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@pidgin.im>
parents: 22735
diff changeset
1009 nm_update_state(NM_STATE_UNKNOWN);
c9b53691fe42 A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@pidgin.im>
parents: 22735
diff changeset
1010 }
c9b53691fe42 A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@pidgin.im>
parents: 22735
diff changeset
1011 }
c9b53691fe42 A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@pidgin.im>
parents: 22735
diff changeset
1012 }
c9b53691fe42 A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@pidgin.im>
parents: 22735
diff changeset
1013
14758
13b9adc9efd2 [gaim-migrate @ 17448]
Sean Egan <seanegan@pidgin.im>
parents: 14329
diff changeset
1014 #endif
13b9adc9efd2 [gaim-migrate @ 17448]
Sean Egan <seanegan@pidgin.im>
parents: 14329
diff changeset
1015
26256
d2673c935184 Run an asynchronous DNS lookup for the STUN server IP (to set as a property
Marcus Lundblad <malu@pidgin.im>
parents: 25326
diff changeset
1016 static void
31294
73607ab89c6f Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents: 31191
diff changeset
1017 purple_network_ip_lookup_cb(GSList *hosts, gpointer data,
26256
d2673c935184 Run an asynchronous DNS lookup for the STUN server IP (to set as a property
Marcus Lundblad <malu@pidgin.im>
parents: 25326
diff changeset
1018 const char *error_message)
d2673c935184 Run an asynchronous DNS lookup for the STUN server IP (to set as a property
Marcus Lundblad <malu@pidgin.im>
parents: 25326
diff changeset
1019 {
31294
73607ab89c6f Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents: 31191
diff changeset
1020 const gchar **ip = (const gchar **) data;
26262
1ad96aa2e92a Removed some extra tabs on blank lines
Marcus Lundblad <malu@pidgin.im>
parents: 26261
diff changeset
1021
26256
d2673c935184 Run an asynchronous DNS lookup for the STUN server IP (to set as a property
Marcus Lundblad <malu@pidgin.im>
parents: 25326
diff changeset
1022 if (error_message) {
26261
ffabb135a4b6 Added support to generate relayed candidates (TURN).
Marcus Lundblad <malu@pidgin.im>
parents: 26256
diff changeset
1023 purple_debug_error("network", "lookup of IP address failed: %s\n",
26256
d2673c935184 Run an asynchronous DNS lookup for the STUN server IP (to set as a property
Marcus Lundblad <malu@pidgin.im>
parents: 25326
diff changeset
1024 error_message);
d2673c935184 Run an asynchronous DNS lookup for the STUN server IP (to set as a property
Marcus Lundblad <malu@pidgin.im>
parents: 25326
diff changeset
1025 g_slist_free(hosts);
d2673c935184 Run an asynchronous DNS lookup for the STUN server IP (to set as a property
Marcus Lundblad <malu@pidgin.im>
parents: 25326
diff changeset
1026 return;
d2673c935184 Run an asynchronous DNS lookup for the STUN server IP (to set as a property
Marcus Lundblad <malu@pidgin.im>
parents: 25326
diff changeset
1027 }
26262
1ad96aa2e92a Removed some extra tabs on blank lines
Marcus Lundblad <malu@pidgin.im>
parents: 26261
diff changeset
1028
26256
d2673c935184 Run an asynchronous DNS lookup for the STUN server IP (to set as a property
Marcus Lundblad <malu@pidgin.im>
parents: 25326
diff changeset
1029 if (hosts && g_slist_next(hosts)) {
31294
73607ab89c6f Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents: 31191
diff changeset
1030 struct sockaddr *addr = g_slist_next(hosts)->data;
26256
d2673c935184 Run an asynchronous DNS lookup for the STUN server IP (to set as a property
Marcus Lundblad <malu@pidgin.im>
parents: 25326
diff changeset
1031 char dst[INET6_ADDRSTRLEN];
31294
73607ab89c6f Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents: 31191
diff changeset
1032
26256
d2673c935184 Run an asynchronous DNS lookup for the STUN server IP (to set as a property
Marcus Lundblad <malu@pidgin.im>
parents: 25326
diff changeset
1033 if (addr->sa_family == AF_INET6) {
31294
73607ab89c6f Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents: 31191
diff changeset
1034 inet_ntop(addr->sa_family, &((struct sockaddr_in6 *) addr)->sin6_addr,
26256
d2673c935184 Run an asynchronous DNS lookup for the STUN server IP (to set as a property
Marcus Lundblad <malu@pidgin.im>
parents: 25326
diff changeset
1035 dst, sizeof(dst));
d2673c935184 Run an asynchronous DNS lookup for the STUN server IP (to set as a property
Marcus Lundblad <malu@pidgin.im>
parents: 25326
diff changeset
1036 } else {
31294
73607ab89c6f Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents: 31191
diff changeset
1037 inet_ntop(addr->sa_family, &((struct sockaddr_in *) addr)->sin_addr,
26256
d2673c935184 Run an asynchronous DNS lookup for the STUN server IP (to set as a property
Marcus Lundblad <malu@pidgin.im>
parents: 25326
diff changeset
1038 dst, sizeof(dst));
d2673c935184 Run an asynchronous DNS lookup for the STUN server IP (to set as a property
Marcus Lundblad <malu@pidgin.im>
parents: 25326
diff changeset
1039 }
26262
1ad96aa2e92a Removed some extra tabs on blank lines
Marcus Lundblad <malu@pidgin.im>
parents: 26261
diff changeset
1040
26261
ffabb135a4b6 Added support to generate relayed candidates (TURN).
Marcus Lundblad <malu@pidgin.im>
parents: 26256
diff changeset
1041 *ip = g_strdup(dst);
ffabb135a4b6 Added support to generate relayed candidates (TURN).
Marcus Lundblad <malu@pidgin.im>
parents: 26256
diff changeset
1042 purple_debug_info("network", "set IP address: %s\n", *ip);
26256
d2673c935184 Run an asynchronous DNS lookup for the STUN server IP (to set as a property
Marcus Lundblad <malu@pidgin.im>
parents: 25326
diff changeset
1043 }
26782
0d61de90ae02 Don't leak the struct sockaddr* from purple_dnsquery_a.
Paul Aurich <darkrain42@pidgin.im>
parents: 26337
diff changeset
1044
0d61de90ae02 Don't leak the struct sockaddr* from purple_dnsquery_a.
Paul Aurich <darkrain42@pidgin.im>
parents: 26337
diff changeset
1045 while (hosts != NULL) {
0d61de90ae02 Don't leak the struct sockaddr* from purple_dnsquery_a.
Paul Aurich <darkrain42@pidgin.im>
parents: 26337
diff changeset
1046 hosts = g_slist_delete_link(hosts, hosts);
0d61de90ae02 Don't leak the struct sockaddr* from purple_dnsquery_a.
Paul Aurich <darkrain42@pidgin.im>
parents: 26337
diff changeset
1047 /* Free the address */
0d61de90ae02 Don't leak the struct sockaddr* from purple_dnsquery_a.
Paul Aurich <darkrain42@pidgin.im>
parents: 26337
diff changeset
1048 g_free(hosts->data);
0d61de90ae02 Don't leak the struct sockaddr* from purple_dnsquery_a.
Paul Aurich <darkrain42@pidgin.im>
parents: 26337
diff changeset
1049 hosts = g_slist_delete_link(hosts, hosts);
0d61de90ae02 Don't leak the struct sockaddr* from purple_dnsquery_a.
Paul Aurich <darkrain42@pidgin.im>
parents: 26337
diff changeset
1050 }
26256
d2673c935184 Run an asynchronous DNS lookup for the STUN server IP (to set as a property
Marcus Lundblad <malu@pidgin.im>
parents: 25326
diff changeset
1051 }
d2673c935184 Run an asynchronous DNS lookup for the STUN server IP (to set as a property
Marcus Lundblad <malu@pidgin.im>
parents: 25326
diff changeset
1052
d2673c935184 Run an asynchronous DNS lookup for the STUN server IP (to set as a property
Marcus Lundblad <malu@pidgin.im>
parents: 25326
diff changeset
1053 void
d2673c935184 Run an asynchronous DNS lookup for the STUN server IP (to set as a property
Marcus Lundblad <malu@pidgin.im>
parents: 25326
diff changeset
1054 purple_network_set_stun_server(const gchar *stun_server)
d2673c935184 Run an asynchronous DNS lookup for the STUN server IP (to set as a property
Marcus Lundblad <malu@pidgin.im>
parents: 25326
diff changeset
1055 {
d2673c935184 Run an asynchronous DNS lookup for the STUN server IP (to set as a property
Marcus Lundblad <malu@pidgin.im>
parents: 25326
diff changeset
1056 if (stun_server && stun_server[0] != '\0') {
d2673c935184 Run an asynchronous DNS lookup for the STUN server IP (to set as a property
Marcus Lundblad <malu@pidgin.im>
parents: 25326
diff changeset
1057 if (purple_network_is_available()) {
d2673c935184 Run an asynchronous DNS lookup for the STUN server IP (to set as a property
Marcus Lundblad <malu@pidgin.im>
parents: 25326
diff changeset
1058 purple_debug_info("network", "running DNS query for STUN server\n");
31680
d3902c687705 Use the new account-contextual DNS API everywhere. Refs #11110
Daniel Atallah <datallah@pidgin.im>
parents: 31653
diff changeset
1059 purple_dnsquery_a_account(NULL, stun_server, 3478, purple_network_ip_lookup_cb,
26261
ffabb135a4b6 Added support to generate relayed candidates (TURN).
Marcus Lundblad <malu@pidgin.im>
parents: 26256
diff changeset
1060 &stun_ip);
26256
d2673c935184 Run an asynchronous DNS lookup for the STUN server IP (to set as a property
Marcus Lundblad <malu@pidgin.im>
parents: 25326
diff changeset
1061 } else {
31294
73607ab89c6f Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents: 31191
diff changeset
1062 purple_debug_info("network",
26256
d2673c935184 Run an asynchronous DNS lookup for the STUN server IP (to set as a property
Marcus Lundblad <malu@pidgin.im>
parents: 25326
diff changeset
1063 "network is unavailable, don't try to update STUN IP");
d2673c935184 Run an asynchronous DNS lookup for the STUN server IP (to set as a property
Marcus Lundblad <malu@pidgin.im>
parents: 25326
diff changeset
1064 }
d2673c935184 Run an asynchronous DNS lookup for the STUN server IP (to set as a property
Marcus Lundblad <malu@pidgin.im>
parents: 25326
diff changeset
1065 } else if (stun_ip) {
d2673c935184 Run an asynchronous DNS lookup for the STUN server IP (to set as a property
Marcus Lundblad <malu@pidgin.im>
parents: 25326
diff changeset
1066 g_free(stun_ip);
d2673c935184 Run an asynchronous DNS lookup for the STUN server IP (to set as a property
Marcus Lundblad <malu@pidgin.im>
parents: 25326
diff changeset
1067 stun_ip = NULL;
d2673c935184 Run an asynchronous DNS lookup for the STUN server IP (to set as a property
Marcus Lundblad <malu@pidgin.im>
parents: 25326
diff changeset
1068 }
d2673c935184 Run an asynchronous DNS lookup for the STUN server IP (to set as a property
Marcus Lundblad <malu@pidgin.im>
parents: 25326
diff changeset
1069 }
d2673c935184 Run an asynchronous DNS lookup for the STUN server IP (to set as a property
Marcus Lundblad <malu@pidgin.im>
parents: 25326
diff changeset
1070
26261
ffabb135a4b6 Added support to generate relayed candidates (TURN).
Marcus Lundblad <malu@pidgin.im>
parents: 26256
diff changeset
1071 void
ffabb135a4b6 Added support to generate relayed candidates (TURN).
Marcus Lundblad <malu@pidgin.im>
parents: 26256
diff changeset
1072 purple_network_set_turn_server(const gchar *turn_server)
ffabb135a4b6 Added support to generate relayed candidates (TURN).
Marcus Lundblad <malu@pidgin.im>
parents: 26256
diff changeset
1073 {
ffabb135a4b6 Added support to generate relayed candidates (TURN).
Marcus Lundblad <malu@pidgin.im>
parents: 26256
diff changeset
1074 if (turn_server && turn_server[0] != '\0') {
ffabb135a4b6 Added support to generate relayed candidates (TURN).
Marcus Lundblad <malu@pidgin.im>
parents: 26256
diff changeset
1075 if (purple_network_is_available()) {
ffabb135a4b6 Added support to generate relayed candidates (TURN).
Marcus Lundblad <malu@pidgin.im>
parents: 26256
diff changeset
1076 purple_debug_info("network", "running DNS query for TURN server\n");
31680
d3902c687705 Use the new account-contextual DNS API everywhere. Refs #11110
Daniel Atallah <datallah@pidgin.im>
parents: 31653
diff changeset
1077 purple_dnsquery_a_account(NULL, turn_server,
31294
73607ab89c6f Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents: 31191
diff changeset
1078 purple_prefs_get_int("/purple/network/turn_port"),
26261
ffabb135a4b6 Added support to generate relayed candidates (TURN).
Marcus Lundblad <malu@pidgin.im>
parents: 26256
diff changeset
1079 purple_network_ip_lookup_cb, &turn_ip);
ffabb135a4b6 Added support to generate relayed candidates (TURN).
Marcus Lundblad <malu@pidgin.im>
parents: 26256
diff changeset
1080 } else {
31294
73607ab89c6f Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents: 31191
diff changeset
1081 purple_debug_info("network",
26261
ffabb135a4b6 Added support to generate relayed candidates (TURN).
Marcus Lundblad <malu@pidgin.im>
parents: 26256
diff changeset
1082 "network is unavailable, don't try to update TURN IP");
ffabb135a4b6 Added support to generate relayed candidates (TURN).
Marcus Lundblad <malu@pidgin.im>
parents: 26256
diff changeset
1083 }
ffabb135a4b6 Added support to generate relayed candidates (TURN).
Marcus Lundblad <malu@pidgin.im>
parents: 26256
diff changeset
1084 } else if (turn_ip) {
ffabb135a4b6 Added support to generate relayed candidates (TURN).
Marcus Lundblad <malu@pidgin.im>
parents: 26256
diff changeset
1085 g_free(turn_ip);
ffabb135a4b6 Added support to generate relayed candidates (TURN).
Marcus Lundblad <malu@pidgin.im>
parents: 26256
diff changeset
1086 turn_ip = NULL;
ffabb135a4b6 Added support to generate relayed candidates (TURN).
Marcus Lundblad <malu@pidgin.im>
parents: 26256
diff changeset
1087 }
ffabb135a4b6 Added support to generate relayed candidates (TURN).
Marcus Lundblad <malu@pidgin.im>
parents: 26256
diff changeset
1088 }
ffabb135a4b6 Added support to generate relayed candidates (TURN).
Marcus Lundblad <malu@pidgin.im>
parents: 26256
diff changeset
1089
ffabb135a4b6 Added support to generate relayed candidates (TURN).
Marcus Lundblad <malu@pidgin.im>
parents: 26256
diff changeset
1090
26256
d2673c935184 Run an asynchronous DNS lookup for the STUN server IP (to set as a property
Marcus Lundblad <malu@pidgin.im>
parents: 25326
diff changeset
1091 const gchar *
d2673c935184 Run an asynchronous DNS lookup for the STUN server IP (to set as a property
Marcus Lundblad <malu@pidgin.im>
parents: 25326
diff changeset
1092 purple_network_get_stun_ip(void)
d2673c935184 Run an asynchronous DNS lookup for the STUN server IP (to set as a property
Marcus Lundblad <malu@pidgin.im>
parents: 25326
diff changeset
1093 {
d2673c935184 Run an asynchronous DNS lookup for the STUN server IP (to set as a property
Marcus Lundblad <malu@pidgin.im>
parents: 25326
diff changeset
1094 return stun_ip;
d2673c935184 Run an asynchronous DNS lookup for the STUN server IP (to set as a property
Marcus Lundblad <malu@pidgin.im>
parents: 25326
diff changeset
1095 }
d2673c935184 Run an asynchronous DNS lookup for the STUN server IP (to set as a property
Marcus Lundblad <malu@pidgin.im>
parents: 25326
diff changeset
1096
26261
ffabb135a4b6 Added support to generate relayed candidates (TURN).
Marcus Lundblad <malu@pidgin.im>
parents: 26256
diff changeset
1097 const gchar *
ffabb135a4b6 Added support to generate relayed candidates (TURN).
Marcus Lundblad <malu@pidgin.im>
parents: 26256
diff changeset
1098 purple_network_get_turn_ip(void)
ffabb135a4b6 Added support to generate relayed candidates (TURN).
Marcus Lundblad <malu@pidgin.im>
parents: 26256
diff changeset
1099 {
ffabb135a4b6 Added support to generate relayed candidates (TURN).
Marcus Lundblad <malu@pidgin.im>
parents: 26256
diff changeset
1100 return turn_ip;
ffabb135a4b6 Added support to generate relayed candidates (TURN).
Marcus Lundblad <malu@pidgin.im>
parents: 26256
diff changeset
1101 }
ffabb135a4b6 Added support to generate relayed candidates (TURN).
Marcus Lundblad <malu@pidgin.im>
parents: 26256
diff changeset
1102
16035
eb4eda79a147 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 <evands@pidgin.im>
parents: 16012
diff changeset
1103 void *
eb4eda79a147 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 <evands@pidgin.im>
parents: 16012
diff changeset
1104 purple_network_get_handle(void)
eb4eda79a147 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 <evands@pidgin.im>
parents: 16012
diff changeset
1105 {
eb4eda79a147 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 <evands@pidgin.im>
parents: 16012
diff changeset
1106 static int handle;
19585
14b519abcc26 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 <datallah@pidgin.im>
parents: 18555
diff changeset
1107
16035
eb4eda79a147 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 <evands@pidgin.im>
parents: 16012
diff changeset
1108 return &handle;
eb4eda79a147 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 <evands@pidgin.im>
parents: 16012
diff changeset
1109 }
eb4eda79a147 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 <evands@pidgin.im>
parents: 16012
diff changeset
1110
27332
8240ab259385 Add a function to remove a port mapping (UPnP or NAT-PMP) given a file
Marcus Lundblad <malu@pidgin.im>
parents: 27116
diff changeset
1111 static void
8240ab259385 Add a function to remove a port mapping (UPnP or NAT-PMP) given a file
Marcus Lundblad <malu@pidgin.im>
parents: 27116
diff changeset
1112 purple_network_upnp_mapping_remove_cb(gboolean sucess, gpointer data)
8240ab259385 Add a function to remove a port mapping (UPnP or NAT-PMP) given a file
Marcus Lundblad <malu@pidgin.im>
parents: 27116
diff changeset
1113 {
8240ab259385 Add a function to remove a port mapping (UPnP or NAT-PMP) given a file
Marcus Lundblad <malu@pidgin.im>
parents: 27116
diff changeset
1114 purple_debug_info("network", "done removing UPnP port mapping\n");
8240ab259385 Add a function to remove a port mapping (UPnP or NAT-PMP) given a file
Marcus Lundblad <malu@pidgin.im>
parents: 27116
diff changeset
1115 }
8240ab259385 Add a function to remove a port mapping (UPnP or NAT-PMP) given a file
Marcus Lundblad <malu@pidgin.im>
parents: 27116
diff changeset
1116
8240ab259385 Add a function to remove a port mapping (UPnP or NAT-PMP) given a file
Marcus Lundblad <malu@pidgin.im>
parents: 27116
diff changeset
1117 /* the reason for these functions to have these signatures is to be able to
8240ab259385 Add a function to remove a port mapping (UPnP or NAT-PMP) given a file
Marcus Lundblad <malu@pidgin.im>
parents: 27116
diff changeset
1118 use them for g_hash_table_foreach to clean remaining port mappings, which is
8240ab259385 Add a function to remove a port mapping (UPnP or NAT-PMP) given a file
Marcus Lundblad <malu@pidgin.im>
parents: 27116
diff changeset
1119 not yet done */
8240ab259385 Add a function to remove a port mapping (UPnP or NAT-PMP) given a file
Marcus Lundblad <malu@pidgin.im>
parents: 27116
diff changeset
1120 static void
8240ab259385 Add a function to remove a port mapping (UPnP or NAT-PMP) given a file
Marcus Lundblad <malu@pidgin.im>
parents: 27116
diff changeset
1121 purple_network_upnp_mapping_remove(gpointer key, gpointer value,
8240ab259385 Add a function to remove a port mapping (UPnP or NAT-PMP) given a file
Marcus Lundblad <malu@pidgin.im>
parents: 27116
diff changeset
1122 gpointer user_data)
8240ab259385 Add a function to remove a port mapping (UPnP or NAT-PMP) given a file
Marcus Lundblad <malu@pidgin.im>
parents: 27116
diff changeset
1123 {
31191
163f03d8d1d2 Cast back and forth between int and pointer instead of putting pointers
Mark Doliner <markdoliner@pidgin.im>
parents: 30792
diff changeset
1124 gint port = GPOINTER_TO_INT(key);
163f03d8d1d2 Cast back and forth between int and pointer instead of putting pointers
Mark Doliner <markdoliner@pidgin.im>
parents: 30792
diff changeset
1125 gint protocol = GPOINTER_TO_INT(value);
27332
8240ab259385 Add a function to remove a port mapping (UPnP or NAT-PMP) given a file
Marcus Lundblad <malu@pidgin.im>
parents: 27116
diff changeset
1126 purple_debug_info("network", "removing UPnP port mapping for port %d\n",
8240ab259385 Add a function to remove a port mapping (UPnP or NAT-PMP) given a file
Marcus Lundblad <malu@pidgin.im>
parents: 27116
diff changeset
1127 port);
31191
163f03d8d1d2 Cast back and forth between int and pointer instead of putting pointers
Mark Doliner <markdoliner@pidgin.im>
parents: 30792
diff changeset
1128 purple_upnp_remove_port_mapping(port,
163f03d8d1d2 Cast back and forth between int and pointer instead of putting pointers
Mark Doliner <markdoliner@pidgin.im>
parents: 30792
diff changeset
1129 protocol == SOCK_STREAM ? "TCP" : "UDP",
27332
8240ab259385 Add a function to remove a port mapping (UPnP or NAT-PMP) given a file
Marcus Lundblad <malu@pidgin.im>
parents: 27116
diff changeset
1130 purple_network_upnp_mapping_remove_cb, NULL);
31191
163f03d8d1d2 Cast back and forth between int and pointer instead of putting pointers
Mark Doliner <markdoliner@pidgin.im>
parents: 30792
diff changeset
1131 g_hash_table_remove(upnp_port_mappings, GINT_TO_POINTER(port));
27332
8240ab259385 Add a function to remove a port mapping (UPnP or NAT-PMP) given a file
Marcus Lundblad <malu@pidgin.im>
parents: 27116
diff changeset
1132 }
8240ab259385 Add a function to remove a port mapping (UPnP or NAT-PMP) given a file
Marcus Lundblad <malu@pidgin.im>
parents: 27116
diff changeset
1133
8240ab259385 Add a function to remove a port mapping (UPnP or NAT-PMP) given a file
Marcus Lundblad <malu@pidgin.im>
parents: 27116
diff changeset
1134 static void
8240ab259385 Add a function to remove a port mapping (UPnP or NAT-PMP) given a file
Marcus Lundblad <malu@pidgin.im>
parents: 27116
diff changeset
1135 purple_network_nat_pmp_mapping_remove(gpointer key, gpointer value,
8240ab259385 Add a function to remove a port mapping (UPnP or NAT-PMP) given a file
Marcus Lundblad <malu@pidgin.im>
parents: 27116
diff changeset
1136 gpointer user_data)
8240ab259385 Add a function to remove a port mapping (UPnP or NAT-PMP) given a file
Marcus Lundblad <malu@pidgin.im>
parents: 27116
diff changeset
1137 {
31191
163f03d8d1d2 Cast back and forth between int and pointer instead of putting pointers
Mark Doliner <markdoliner@pidgin.im>
parents: 30792
diff changeset
1138 gint port = GPOINTER_TO_INT(key);
163f03d8d1d2 Cast back and forth between int and pointer instead of putting pointers
Mark Doliner <markdoliner@pidgin.im>
parents: 30792
diff changeset
1139 gint protocol = GPOINTER_TO_INT(value);
27332
8240ab259385 Add a function to remove a port mapping (UPnP or NAT-PMP) given a file
Marcus Lundblad <malu@pidgin.im>
parents: 27116
diff changeset
1140 purple_debug_info("network", "removing NAT-PMP port mapping for port %d\n",
8240ab259385 Add a function to remove a port mapping (UPnP or NAT-PMP) given a file
Marcus Lundblad <malu@pidgin.im>
parents: 27116
diff changeset
1141 port);
8240ab259385 Add a function to remove a port mapping (UPnP or NAT-PMP) given a file
Marcus Lundblad <malu@pidgin.im>
parents: 27116
diff changeset
1142 purple_pmp_destroy_map(
31191
163f03d8d1d2 Cast back and forth between int and pointer instead of putting pointers
Mark Doliner <markdoliner@pidgin.im>
parents: 30792
diff changeset
1143 protocol == SOCK_STREAM ? PURPLE_PMP_TYPE_TCP : PURPLE_PMP_TYPE_UDP,
27332
8240ab259385 Add a function to remove a port mapping (UPnP or NAT-PMP) given a file
Marcus Lundblad <malu@pidgin.im>
parents: 27116
diff changeset
1144 port);
31191
163f03d8d1d2 Cast back and forth between int and pointer instead of putting pointers
Mark Doliner <markdoliner@pidgin.im>
parents: 30792
diff changeset
1145 g_hash_table_remove(nat_pmp_port_mappings, GINT_TO_POINTER(port));
27332
8240ab259385 Add a function to remove a port mapping (UPnP or NAT-PMP) given a file
Marcus Lundblad <malu@pidgin.im>
parents: 27116
diff changeset
1146 }
8240ab259385 Add a function to remove a port mapping (UPnP or NAT-PMP) given a file
Marcus Lundblad <malu@pidgin.im>
parents: 27116
diff changeset
1147
8240ab259385 Add a function to remove a port mapping (UPnP or NAT-PMP) given a file
Marcus Lundblad <malu@pidgin.im>
parents: 27116
diff changeset
1148 void
8240ab259385 Add a function to remove a port mapping (UPnP or NAT-PMP) given a file
Marcus Lundblad <malu@pidgin.im>
parents: 27116
diff changeset
1149 purple_network_remove_port_mapping(gint fd)
8240ab259385 Add a function to remove a port mapping (UPnP or NAT-PMP) given a file
Marcus Lundblad <malu@pidgin.im>
parents: 27116
diff changeset
1150 {
8240ab259385 Add a function to remove a port mapping (UPnP or NAT-PMP) given a file
Marcus Lundblad <malu@pidgin.im>
parents: 27116
diff changeset
1151 int port = purple_network_get_port_from_fd(fd);
31191
163f03d8d1d2 Cast back and forth between int and pointer instead of putting pointers
Mark Doliner <markdoliner@pidgin.im>
parents: 30792
diff changeset
1152 gint protocol = GPOINTER_TO_INT(g_hash_table_lookup(upnp_port_mappings, GINT_TO_POINTER(port)));
27332
8240ab259385 Add a function to remove a port mapping (UPnP or NAT-PMP) given a file
Marcus Lundblad <malu@pidgin.im>
parents: 27116
diff changeset
1153
8240ab259385 Add a function to remove a port mapping (UPnP or NAT-PMP) given a file
Marcus Lundblad <malu@pidgin.im>
parents: 27116
diff changeset
1154 if (protocol) {
31191
163f03d8d1d2 Cast back and forth between int and pointer instead of putting pointers
Mark Doliner <markdoliner@pidgin.im>
parents: 30792
diff changeset
1155 purple_network_upnp_mapping_remove(GINT_TO_POINTER(port), GINT_TO_POINTER(protocol), NULL);
27332
8240ab259385 Add a function to remove a port mapping (UPnP or NAT-PMP) given a file
Marcus Lundblad <malu@pidgin.im>
parents: 27116
diff changeset
1156 } else {
31191
163f03d8d1d2 Cast back and forth between int and pointer instead of putting pointers
Mark Doliner <markdoliner@pidgin.im>
parents: 30792
diff changeset
1157 protocol = GPOINTER_TO_INT(g_hash_table_lookup(nat_pmp_port_mappings, GINT_TO_POINTER(port)));
27332
8240ab259385 Add a function to remove a port mapping (UPnP or NAT-PMP) given a file
Marcus Lundblad <malu@pidgin.im>
parents: 27116
diff changeset
1158 if (protocol) {
31191
163f03d8d1d2 Cast back and forth between int and pointer instead of putting pointers
Mark Doliner <markdoliner@pidgin.im>
parents: 30792
diff changeset
1159 purple_network_nat_pmp_mapping_remove(GINT_TO_POINTER(port), GINT_TO_POINTER(protocol), NULL);
27332
8240ab259385 Add a function to remove a port mapping (UPnP or NAT-PMP) given a file
Marcus Lundblad <malu@pidgin.im>
parents: 27116
diff changeset
1160 }
8240ab259385 Add a function to remove a port mapping (UPnP or NAT-PMP) given a file
Marcus Lundblad <malu@pidgin.im>
parents: 27116
diff changeset
1161 }
8240ab259385 Add a function to remove a port mapping (UPnP or NAT-PMP) given a file
Marcus Lundblad <malu@pidgin.im>
parents: 27116
diff changeset
1162 }
27898
4a6450d92e11 Move the IDN support into the DNS routines.
Paul Aurich <darkrain42@pidgin.im>
parents: 27497
diff changeset
1163
4a6450d92e11 Move the IDN support into the DNS routines.
Paul Aurich <darkrain42@pidgin.im>
parents: 27497
diff changeset
1164 int purple_network_convert_idn_to_ascii(const gchar *in, gchar **out)
4a6450d92e11 Move the IDN support into the DNS routines.
Paul Aurich <darkrain42@pidgin.im>
parents: 27497
diff changeset
1165 {
4a6450d92e11 Move the IDN support into the DNS routines.
Paul Aurich <darkrain42@pidgin.im>
parents: 27497
diff changeset
1166 #ifdef USE_IDN
4a6450d92e11 Move the IDN support into the DNS routines.
Paul Aurich <darkrain42@pidgin.im>
parents: 27497
diff changeset
1167 char *tmp;
4a6450d92e11 Move the IDN support into the DNS routines.
Paul Aurich <darkrain42@pidgin.im>
parents: 27497
diff changeset
1168 int ret;
4a6450d92e11 Move the IDN support into the DNS routines.
Paul Aurich <darkrain42@pidgin.im>
parents: 27497
diff changeset
1169
4a6450d92e11 Move the IDN support into the DNS routines.
Paul Aurich <darkrain42@pidgin.im>
parents: 27497
diff changeset
1170 g_return_val_if_fail(out != NULL, -1);
4a6450d92e11 Move the IDN support into the DNS routines.
Paul Aurich <darkrain42@pidgin.im>
parents: 27497
diff changeset
1171
4a6450d92e11 Move the IDN support into the DNS routines.
Paul Aurich <darkrain42@pidgin.im>
parents: 27497
diff changeset
1172 ret = idna_to_ascii_8z(in, &tmp, IDNA_USE_STD3_ASCII_RULES);
4a6450d92e11 Move the IDN support into the DNS routines.
Paul Aurich <darkrain42@pidgin.im>
parents: 27497
diff changeset
1173 if (ret != IDNA_SUCCESS) {
4a6450d92e11 Move the IDN support into the DNS routines.
Paul Aurich <darkrain42@pidgin.im>
parents: 27497
diff changeset
1174 *out = NULL;
4a6450d92e11 Move the IDN support into the DNS routines.
Paul Aurich <darkrain42@pidgin.im>
parents: 27497
diff changeset
1175 return ret;
4a6450d92e11 Move the IDN support into the DNS routines.
Paul Aurich <darkrain42@pidgin.im>
parents: 27497
diff changeset
1176 }
4a6450d92e11 Move the IDN support into the DNS routines.
Paul Aurich <darkrain42@pidgin.im>
parents: 27497
diff changeset
1177
4a6450d92e11 Move the IDN support into the DNS routines.
Paul Aurich <darkrain42@pidgin.im>
parents: 27497
diff changeset
1178 *out = g_strdup(tmp);
4a6450d92e11 Move the IDN support into the DNS routines.
Paul Aurich <darkrain42@pidgin.im>
parents: 27497
diff changeset
1179 /* This *MUST* be freed with free, not g_free */
4a6450d92e11 Move the IDN support into the DNS routines.
Paul Aurich <darkrain42@pidgin.im>
parents: 27497
diff changeset
1180 free(tmp);
4a6450d92e11 Move the IDN support into the DNS routines.
Paul Aurich <darkrain42@pidgin.im>
parents: 27497
diff changeset
1181 return 0;
4a6450d92e11 Move the IDN support into the DNS routines.
Paul Aurich <darkrain42@pidgin.im>
parents: 27497
diff changeset
1182 #else
4a6450d92e11 Move the IDN support into the DNS routines.
Paul Aurich <darkrain42@pidgin.im>
parents: 27497
diff changeset
1183 g_return_val_if_fail(out != NULL, -1);
4a6450d92e11 Move the IDN support into the DNS routines.
Paul Aurich <darkrain42@pidgin.im>
parents: 27497
diff changeset
1184
4a6450d92e11 Move the IDN support into the DNS routines.
Paul Aurich <darkrain42@pidgin.im>
parents: 27497
diff changeset
1185 *out = g_strdup(in);
4a6450d92e11 Move the IDN support into the DNS routines.
Paul Aurich <darkrain42@pidgin.im>
parents: 27497
diff changeset
1186 return 0;
4a6450d92e11 Move the IDN support into the DNS routines.
Paul Aurich <darkrain42@pidgin.im>
parents: 27497
diff changeset
1187 #endif
4a6450d92e11 Move the IDN support into the DNS routines.
Paul Aurich <darkrain42@pidgin.im>
parents: 27497
diff changeset
1188 }
4a6450d92e11 Move the IDN support into the DNS routines.
Paul Aurich <darkrain42@pidgin.im>
parents: 27497
diff changeset
1189
36028
fc5300cb3617 Get rid of fair amount of copy-pasta and coverity warnings
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents: 35991
diff changeset
1190 gboolean
fc5300cb3617 Get rid of fair amount of copy-pasta and coverity warnings
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents: 35991
diff changeset
1191 _purple_network_set_common_socket_flags(int fd)
fc5300cb3617 Get rid of fair amount of copy-pasta and coverity warnings
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents: 35991
diff changeset
1192 {
fc5300cb3617 Get rid of fair amount of copy-pasta and coverity warnings
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents: 35991
diff changeset
1193 int flags;
fc5300cb3617 Get rid of fair amount of copy-pasta and coverity warnings
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents: 35991
diff changeset
1194 gboolean succ = TRUE;
fc5300cb3617 Get rid of fair amount of copy-pasta and coverity warnings
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents: 35991
diff changeset
1195
fc5300cb3617 Get rid of fair amount of copy-pasta and coverity warnings
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents: 35991
diff changeset
1196 g_return_val_if_fail(fd >= 0, FALSE);
fc5300cb3617 Get rid of fair amount of copy-pasta and coverity warnings
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents: 35991
diff changeset
1197
fc5300cb3617 Get rid of fair amount of copy-pasta and coverity warnings
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents: 35991
diff changeset
1198 flags = fcntl(fd, F_GETFL);
fc5300cb3617 Get rid of fair amount of copy-pasta and coverity warnings
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents: 35991
diff changeset
1199
fc5300cb3617 Get rid of fair amount of copy-pasta and coverity warnings
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents: 35991
diff changeset
1200 if (fcntl(fd, F_SETFL, flags | O_NONBLOCK) != 0) {
fc5300cb3617 Get rid of fair amount of copy-pasta and coverity warnings
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents: 35991
diff changeset
1201 purple_debug_warning("network",
fc5300cb3617 Get rid of fair amount of copy-pasta and coverity warnings
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents: 35991
diff changeset
1202 "Couldn't set O_NONBLOCK flag\n");
fc5300cb3617 Get rid of fair amount of copy-pasta and coverity warnings
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents: 35991
diff changeset
1203 succ = FALSE;
fc5300cb3617 Get rid of fair amount of copy-pasta and coverity warnings
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents: 35991
diff changeset
1204 }
fc5300cb3617 Get rid of fair amount of copy-pasta and coverity warnings
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents: 35991
diff changeset
1205
fc5300cb3617 Get rid of fair amount of copy-pasta and coverity warnings
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents: 35991
diff changeset
1206 #ifndef _WIN32
fc5300cb3617 Get rid of fair amount of copy-pasta and coverity warnings
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents: 35991
diff changeset
1207 if (fcntl(fd, F_SETFD, FD_CLOEXEC) != 0) {
fc5300cb3617 Get rid of fair amount of copy-pasta and coverity warnings
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents: 35991
diff changeset
1208 purple_debug_warning("network",
fc5300cb3617 Get rid of fair amount of copy-pasta and coverity warnings
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents: 35991
diff changeset
1209 "Couldn't set FD_CLOEXEC flag\n");
fc5300cb3617 Get rid of fair amount of copy-pasta and coverity warnings
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents: 35991
diff changeset
1210 succ = FALSE;
fc5300cb3617 Get rid of fair amount of copy-pasta and coverity warnings
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents: 35991
diff changeset
1211 }
fc5300cb3617 Get rid of fair amount of copy-pasta and coverity warnings
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents: 35991
diff changeset
1212 #endif
fc5300cb3617 Get rid of fair amount of copy-pasta and coverity warnings
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents: 35991
diff changeset
1213
fc5300cb3617 Get rid of fair amount of copy-pasta and coverity warnings
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents: 35991
diff changeset
1214 return succ;
fc5300cb3617 Get rid of fair amount of copy-pasta and coverity warnings
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents: 35991
diff changeset
1215 }
fc5300cb3617 Get rid of fair amount of copy-pasta and coverity warnings
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents: 35991
diff changeset
1216
8231
347c8992c445 [gaim-migrate @ 8954]
Tim Ringenbach <marv@pidgin.im>
parents:
diff changeset
1217 void
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15708
diff changeset
1218 purple_network_init(void)
8231
347c8992c445 [gaim-migrate @ 8954]
Tim Ringenbach <marv@pidgin.im>
parents:
diff changeset
1219 {
23060
db9632a9b374 Use pkg-config to detect NetworkManager. Also, fail if it isn't present,
Richard Laager <rlaager@pidgin.im>
parents: 23054
diff changeset
1220 #ifdef HAVE_NETWORKMANAGER
23039
c9b53691fe42 A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@pidgin.im>
parents: 22735
diff changeset
1221 GError *error = NULL;
c9b53691fe42 A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@pidgin.im>
parents: 22735
diff changeset
1222 #endif
14784
3a82321f46f2 [gaim-migrate @ 17476]
Daniel Atallah <datallah@pidgin.im>
parents: 14758
diff changeset
1223 #ifdef _WIN32
3a82321f46f2 [gaim-migrate @ 17476]
Daniel Atallah <datallah@pidgin.im>
parents: 14758
diff changeset
1224 GError *err = NULL;
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15708
diff changeset
1225 gint cnt = wpurple_get_connected_network_count();
14842
fe08ba80d369 [gaim-migrate @ 17544]
Daniel Atallah <datallah@pidgin.im>
parents: 14839
diff changeset
1226
25326
c4f4b222dbac Adjust the NLA code to prevent hang on exit for Windows XP and Windows Vista.
Paul Aurich <darkrain42@pidgin.im>
parents: 24519
diff changeset
1227 network_initialized = TRUE;
14842
fe08ba80d369 [gaim-migrate @ 17544]
Daniel Atallah <datallah@pidgin.im>
parents: 14839
diff changeset
1228 if (cnt < 0) /* Assume there is a network */
fe08ba80d369 [gaim-migrate @ 17544]
Daniel Atallah <datallah@pidgin.im>
parents: 14839
diff changeset
1229 current_network_count = 1;
fe08ba80d369 [gaim-migrate @ 17544]
Daniel Atallah <datallah@pidgin.im>
parents: 14839
diff changeset
1230 /* Don't listen for network changes if we can't tell anyway */
25541
1b82a0195ff5 Fix 3 different race conditions in the win32 network management functionality.
Daniel Atallah <datallah@pidgin.im>
parents: 25326
diff changeset
1231 else {
14842
fe08ba80d369 [gaim-migrate @ 17544]
Daniel Atallah <datallah@pidgin.im>
parents: 14839
diff changeset
1232 current_network_count = cnt;
25541
1b82a0195ff5 Fix 3 different race conditions in the win32 network management functionality.
Daniel Atallah <datallah@pidgin.im>
parents: 25326
diff changeset
1233 if ((MyWSANSPIoctl = (void*) wpurple_find_and_loadproc("ws2_32.dll", "WSANSPIoctl"))) {
1b82a0195ff5 Fix 3 different race conditions in the win32 network management functionality.
Daniel Atallah <datallah@pidgin.im>
parents: 25326
diff changeset
1234 if (!g_thread_create(wpurple_network_change_thread, NULL, FALSE, &err))
1b82a0195ff5 Fix 3 different race conditions in the win32 network management functionality.
Daniel Atallah <datallah@pidgin.im>
parents: 25326
diff changeset
1235 purple_debug_error("network", "Couldn't create Network Monitor thread: %s\n", err ? err->message : "");
1b82a0195ff5 Fix 3 different race conditions in the win32 network management functionality.
Daniel Atallah <datallah@pidgin.im>
parents: 25326
diff changeset
1236 }
14842
fe08ba80d369 [gaim-migrate @ 17544]
Daniel Atallah <datallah@pidgin.im>
parents: 14839
diff changeset
1237 }
14784
3a82321f46f2 [gaim-migrate @ 17476]
Daniel Atallah <datallah@pidgin.im>
parents: 14758
diff changeset
1238 #endif
3a82321f46f2 [gaim-migrate @ 17476]
Daniel Atallah <datallah@pidgin.im>
parents: 14758
diff changeset
1239
16478
19107605c565 Works for me! Renames prefs: /core to /purple, /gaim/gtk to /pidgin, /gaim/gnt to /finch
Sean Egan <seanegan@pidgin.im>
parents: 16035
diff changeset
1240 purple_prefs_add_none ("/purple/network");
26256
d2673c935184 Run an asynchronous DNS lookup for the STUN server IP (to set as a property
Marcus Lundblad <malu@pidgin.im>
parents: 25326
diff changeset
1241 purple_prefs_add_string("/purple/network/stun_server", "");
26261
ffabb135a4b6 Added support to generate relayed candidates (TURN).
Marcus Lundblad <malu@pidgin.im>
parents: 26256
diff changeset
1242 purple_prefs_add_string("/purple/network/turn_server", "");
ffabb135a4b6 Added support to generate relayed candidates (TURN).
Marcus Lundblad <malu@pidgin.im>
parents: 26256
diff changeset
1243 purple_prefs_add_int ("/purple/network/turn_port", 3478);
31831
c3778a69ecee Add support for using TCP relaying with TURN
Marcus Lundblad <malu@pidgin.im>
parents: 31680
diff changeset
1244 purple_prefs_add_int ("/purple/network/turn_port_tcp", 3478);
26261
ffabb135a4b6 Added support to generate relayed candidates (TURN).
Marcus Lundblad <malu@pidgin.im>
parents: 26256
diff changeset
1245 purple_prefs_add_string("/purple/network/turn_username", "");
ffabb135a4b6 Added support to generate relayed candidates (TURN).
Marcus Lundblad <malu@pidgin.im>
parents: 26256
diff changeset
1246 purple_prefs_add_string("/purple/network/turn_password", "");
40916
ad5beb40c3fe In 2021 we should NOT be enabling UPnP and IP auto discovery by default
Gary Kramlich <grim@reaperworld.com>
parents: 39615
diff changeset
1247 purple_prefs_add_bool ("/purple/network/auto_ip", FALSE);
16478
19107605c565 Works for me! Renames prefs: /core to /purple, /gaim/gtk to /pidgin, /gaim/gnt to /finch
Sean Egan <seanegan@pidgin.im>
parents: 16035
diff changeset
1248 purple_prefs_add_string("/purple/network/public_ip", "");
40916
ad5beb40c3fe In 2021 we should NOT be enabling UPnP and IP auto discovery by default
Gary Kramlich <grim@reaperworld.com>
parents: 39615
diff changeset
1249 purple_prefs_add_bool ("/purple/network/map_ports", FALSE);
16478
19107605c565 Works for me! Renames prefs: /core to /purple, /gaim/gtk to /pidgin, /gaim/gnt to /finch
Sean Egan <seanegan@pidgin.im>
parents: 16035
diff changeset
1250 purple_prefs_add_bool ("/purple/network/ports_range_use", FALSE);
19107605c565 Works for me! Renames prefs: /core to /purple, /gaim/gtk to /pidgin, /gaim/gnt to /finch
Sean Egan <seanegan@pidgin.im>
parents: 16035
diff changeset
1251 purple_prefs_add_int ("/purple/network/ports_range_start", 1024);
19107605c565 Works for me! Renames prefs: /core to /purple, /gaim/gtk to /pidgin, /gaim/gnt to /finch
Sean Egan <seanegan@pidgin.im>
parents: 16035
diff changeset
1252 purple_prefs_add_int ("/purple/network/ports_range_end", 2048);
12909
dfcf4df1dcd7 [gaim-migrate @ 15262]
Daniel Atallah <datallah@pidgin.im>
parents: 12730
diff changeset
1253
21810
0b5181178201 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 <datallah@pidgin.im>
parents: 21549
diff changeset
1254 if(purple_prefs_get_bool("/purple/network/map_ports") || purple_prefs_get_bool("/purple/network/auto_ip"))
0b5181178201 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 <datallah@pidgin.im>
parents: 21549
diff changeset
1255 purple_upnp_discover(NULL, NULL);
14758
13b9adc9efd2 [gaim-migrate @ 17448]
Sean Egan <seanegan@pidgin.im>
parents: 14329
diff changeset
1256
23060
db9632a9b374 Use pkg-config to detect NetworkManager. Also, fail if it isn't present,
Richard Laager <rlaager@pidgin.im>
parents: 23054
diff changeset
1257 #ifdef HAVE_NETWORKMANAGER
23039
c9b53691fe42 A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@pidgin.im>
parents: 22735
diff changeset
1258 nm_conn = dbus_g_bus_get(DBUS_BUS_SYSTEM, &error);
c9b53691fe42 A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@pidgin.im>
parents: 22735
diff changeset
1259 if (!nm_conn) {
c9b53691fe42 A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@pidgin.im>
parents: 22735
diff changeset
1260 purple_debug_warning("network", "Error connecting to DBus System service: %s.\n", error->message);
c9b53691fe42 A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@pidgin.im>
parents: 22735
diff changeset
1261 } else {
c9b53691fe42 A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@pidgin.im>
parents: 22735
diff changeset
1262 nm_proxy = dbus_g_proxy_new_for_name(nm_conn,
c9b53691fe42 A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@pidgin.im>
parents: 22735
diff changeset
1263 NM_DBUS_SERVICE,
c9b53691fe42 A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@pidgin.im>
parents: 22735
diff changeset
1264 NM_DBUS_PATH,
c9b53691fe42 A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@pidgin.im>
parents: 22735
diff changeset
1265 NM_DBUS_INTERFACE);
32077
09eab14835d9 *** Plucked rev 10ead4688e3af4132d454fa3bc241480500651c9 (dcbw@redhat.com):
Mark Doliner <markdoliner@pidgin.im>
parents: 31831
diff changeset
1266 /* NM 0.6 signal */
23054
2dc4cdd54b28 Modify the NetworkManager support to use "StateChange" directly, instead of
Richard Laager <rlaager@pidgin.im>
parents: 23047
diff changeset
1267 dbus_g_proxy_add_signal(nm_proxy, "StateChange", G_TYPE_UINT, G_TYPE_INVALID);
2dc4cdd54b28 Modify the NetworkManager support to use "StateChange" directly, instead of
Richard Laager <rlaager@pidgin.im>
parents: 23047
diff changeset
1268 dbus_g_proxy_connect_signal(nm_proxy, "StateChange",
23039
c9b53691fe42 A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@pidgin.im>
parents: 22735
diff changeset
1269 G_CALLBACK(nm_state_change_cb), NULL, NULL);
32077
09eab14835d9 *** Plucked rev 10ead4688e3af4132d454fa3bc241480500651c9 (dcbw@redhat.com):
Mark Doliner <markdoliner@pidgin.im>
parents: 31831
diff changeset
1270 /* NM 0.7 and later signal */
09eab14835d9 *** Plucked rev 10ead4688e3af4132d454fa3bc241480500651c9 (dcbw@redhat.com):
Mark Doliner <markdoliner@pidgin.im>
parents: 31831
diff changeset
1271 dbus_g_proxy_add_signal(nm_proxy, "StateChanged", G_TYPE_UINT, G_TYPE_INVALID);
09eab14835d9 *** Plucked rev 10ead4688e3af4132d454fa3bc241480500651c9 (dcbw@redhat.com):
Mark Doliner <markdoliner@pidgin.im>
parents: 31831
diff changeset
1272 dbus_g_proxy_connect_signal(nm_proxy, "StateChanged",
09eab14835d9 *** Plucked rev 10ead4688e3af4132d454fa3bc241480500651c9 (dcbw@redhat.com):
Mark Doliner <markdoliner@pidgin.im>
parents: 31831
diff changeset
1273 G_CALLBACK(nm_state_change_cb), NULL, NULL);
23039
c9b53691fe42 A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@pidgin.im>
parents: 22735
diff changeset
1274
c9b53691fe42 A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@pidgin.im>
parents: 22735
diff changeset
1275 dbus_proxy = dbus_g_proxy_new_for_name(nm_conn,
c9b53691fe42 A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@pidgin.im>
parents: 22735
diff changeset
1276 DBUS_SERVICE_DBUS,
c9b53691fe42 A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@pidgin.im>
parents: 22735
diff changeset
1277 DBUS_PATH_DBUS,
c9b53691fe42 A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@pidgin.im>
parents: 22735
diff changeset
1278 DBUS_INTERFACE_DBUS);
c9b53691fe42 A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@pidgin.im>
parents: 22735
diff changeset
1279 dbus_g_proxy_add_signal(dbus_proxy, "NameOwnerChanged", G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INVALID);
c9b53691fe42 A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@pidgin.im>
parents: 22735
diff changeset
1280 dbus_g_proxy_connect_signal(dbus_proxy, "NameOwnerChanged",
c9b53691fe42 A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@pidgin.im>
parents: 22735
diff changeset
1281 G_CALLBACK(nm_dbus_name_owner_changed_cb), NULL, NULL);
c9b53691fe42 A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@pidgin.im>
parents: 22735
diff changeset
1282 }
14758
13b9adc9efd2 [gaim-migrate @ 17448]
Sean Egan <seanegan@pidgin.im>
parents: 14329
diff changeset
1283 #endif
16035
eb4eda79a147 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 <evands@pidgin.im>
parents: 16012
diff changeset
1284
eb4eda79a147 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 <evands@pidgin.im>
parents: 16012
diff changeset
1285 purple_signal_register(purple_network_get_handle(), "network-configuration-changed",
eb4eda79a147 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 <evands@pidgin.im>
parents: 16012
diff changeset
1286 purple_marshal_VOID, NULL, 0);
19585
14b519abcc26 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 <datallah@pidgin.im>
parents: 18555
diff changeset
1287
16035
eb4eda79a147 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 <evands@pidgin.im>
parents: 16012
diff changeset
1288 purple_pmp_init();
eb4eda79a147 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 <evands@pidgin.im>
parents: 16012
diff changeset
1289 purple_upnp_init();
31191
163f03d8d1d2 Cast back and forth between int and pointer instead of putting pointers
Mark Doliner <markdoliner@pidgin.im>
parents: 30792
diff changeset
1290
26256
d2673c935184 Run an asynchronous DNS lookup for the STUN server IP (to set as a property
Marcus Lundblad <malu@pidgin.im>
parents: 25326
diff changeset
1291 purple_network_set_stun_server(
d2673c935184 Run an asynchronous DNS lookup for the STUN server IP (to set as a property
Marcus Lundblad <malu@pidgin.im>
parents: 25326
diff changeset
1292 purple_prefs_get_string("/purple/network/stun_server"));
26261
ffabb135a4b6 Added support to generate relayed candidates (TURN).
Marcus Lundblad <malu@pidgin.im>
parents: 26256
diff changeset
1293 purple_network_set_turn_server(
ffabb135a4b6 Added support to generate relayed candidates (TURN).
Marcus Lundblad <malu@pidgin.im>
parents: 26256
diff changeset
1294 purple_prefs_get_string("/purple/network/turn_server"));
27332
8240ab259385 Add a function to remove a port mapping (UPnP or NAT-PMP) given a file
Marcus Lundblad <malu@pidgin.im>
parents: 27116
diff changeset
1295
31191
163f03d8d1d2 Cast back and forth between int and pointer instead of putting pointers
Mark Doliner <markdoliner@pidgin.im>
parents: 30792
diff changeset
1296 upnp_port_mappings = g_hash_table_new(g_direct_hash, g_direct_equal);
163f03d8d1d2 Cast back and forth between int and pointer instead of putting pointers
Mark Doliner <markdoliner@pidgin.im>
parents: 30792
diff changeset
1297 nat_pmp_port_mappings = g_hash_table_new(g_direct_hash, g_direct_equal);
8231
347c8992c445 [gaim-migrate @ 8954]
Tim Ringenbach <marv@pidgin.im>
parents:
diff changeset
1298 }
14758
13b9adc9efd2 [gaim-migrate @ 17448]
Sean Egan <seanegan@pidgin.im>
parents: 14329
diff changeset
1299
27332
8240ab259385 Add a function to remove a port mapping (UPnP or NAT-PMP) given a file
Marcus Lundblad <malu@pidgin.im>
parents: 27116
diff changeset
1300
8240ab259385 Add a function to remove a port mapping (UPnP or NAT-PMP) given a file
Marcus Lundblad <malu@pidgin.im>
parents: 27116
diff changeset
1301
14758
13b9adc9efd2 [gaim-migrate @ 17448]
Sean Egan <seanegan@pidgin.im>
parents: 14329
diff changeset
1302 void
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15708
diff changeset
1303 purple_network_uninit(void)
14758
13b9adc9efd2 [gaim-migrate @ 17448]
Sean Egan <seanegan@pidgin.im>
parents: 14329
diff changeset
1304 {
23060
db9632a9b374 Use pkg-config to detect NetworkManager. Also, fail if it isn't present,
Richard Laager <rlaager@pidgin.im>
parents: 23054
diff changeset
1305 #ifdef HAVE_NETWORKMANAGER
23039
c9b53691fe42 A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@pidgin.im>
parents: 22735
diff changeset
1306 if (nm_proxy) {
23054
2dc4cdd54b28 Modify the NetworkManager support to use "StateChange" directly, instead of
Richard Laager <rlaager@pidgin.im>
parents: 23047
diff changeset
1307 dbus_g_proxy_disconnect_signal(nm_proxy, "StateChange", G_CALLBACK(nm_state_change_cb), NULL);
32077
09eab14835d9 *** Plucked rev 10ead4688e3af4132d454fa3bc241480500651c9 (dcbw@redhat.com):
Mark Doliner <markdoliner@pidgin.im>
parents: 31831
diff changeset
1308 dbus_g_proxy_disconnect_signal(nm_proxy, "StateChanged", G_CALLBACK(nm_state_change_cb), NULL);
23039
c9b53691fe42 A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@pidgin.im>
parents: 22735
diff changeset
1309 g_object_unref(G_OBJECT(nm_proxy));
c9b53691fe42 A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@pidgin.im>
parents: 22735
diff changeset
1310 }
c9b53691fe42 A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@pidgin.im>
parents: 22735
diff changeset
1311 if (dbus_proxy) {
c9b53691fe42 A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@pidgin.im>
parents: 22735
diff changeset
1312 dbus_g_proxy_disconnect_signal(dbus_proxy, "NameOwnerChanged", G_CALLBACK(nm_dbus_name_owner_changed_cb), NULL);
c9b53691fe42 A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@pidgin.im>
parents: 22735
diff changeset
1313 g_object_unref(G_OBJECT(dbus_proxy));
c9b53691fe42 A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@pidgin.im>
parents: 22735
diff changeset
1314 }
c9b53691fe42 A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@pidgin.im>
parents: 22735
diff changeset
1315 if (nm_conn)
c9b53691fe42 A patch from QuLogic to replace the libnm_glib calls with straight DBus
Richard Laager <rlaager@pidgin.im>
parents: 22735
diff changeset
1316 dbus_g_connection_unref(nm_conn);
14758
13b9adc9efd2 [gaim-migrate @ 17448]
Sean Egan <seanegan@pidgin.im>
parents: 14329
diff changeset
1317 #endif
21143
239b2f43bef5 Make purple_xfers_uninit, purple_network_uninit, and purple_plugins_uninit
Etan Reisner <deryni@pidgin.im>
parents: 20239
diff changeset
1318
25326
c4f4b222dbac Adjust the NLA code to prevent hang on exit for Windows XP and Windows Vista.
Paul Aurich <darkrain42@pidgin.im>
parents: 24519
diff changeset
1319 #ifdef _WIN32
c4f4b222dbac Adjust the NLA code to prevent hang on exit for Windows XP and Windows Vista.
Paul Aurich <darkrain42@pidgin.im>
parents: 24519
diff changeset
1320 g_static_mutex_lock(&mutex);
c4f4b222dbac Adjust the NLA code to prevent hang on exit for Windows XP and Windows Vista.
Paul Aurich <darkrain42@pidgin.im>
parents: 24519
diff changeset
1321 network_initialized = FALSE;
c4f4b222dbac Adjust the NLA code to prevent hang on exit for Windows XP and Windows Vista.
Paul Aurich <darkrain42@pidgin.im>
parents: 24519
diff changeset
1322 if (network_change_handle != NULL) {
c4f4b222dbac Adjust the NLA code to prevent hang on exit for Windows XP and Windows Vista.
Paul Aurich <darkrain42@pidgin.im>
parents: 24519
diff changeset
1323 int retval;
c4f4b222dbac Adjust the NLA code to prevent hang on exit for Windows XP and Windows Vista.
Paul Aurich <darkrain42@pidgin.im>
parents: 24519
diff changeset
1324 /* Trigger the NLA thread to stop waiting for network changes. Not
c4f4b222dbac Adjust the NLA code to prevent hang on exit for Windows XP and Windows Vista.
Paul Aurich <darkrain42@pidgin.im>
parents: 24519
diff changeset
1325 * doing this can cause hangs on WSACleanup. */
c4f4b222dbac Adjust the NLA code to prevent hang on exit for Windows XP and Windows Vista.
Paul Aurich <darkrain42@pidgin.im>
parents: 24519
diff changeset
1326 purple_debug_warning("network", "Terminating the NLA thread\n");
c4f4b222dbac Adjust the NLA code to prevent hang on exit for Windows XP and Windows Vista.
Paul Aurich <darkrain42@pidgin.im>
parents: 24519
diff changeset
1327 if ((retval = WSALookupServiceEnd(network_change_handle)) == SOCKET_ERROR) {
c4f4b222dbac Adjust the NLA code to prevent hang on exit for Windows XP and Windows Vista.
Paul Aurich <darkrain42@pidgin.im>
parents: 24519
diff changeset
1328 int errorid = WSAGetLastError();
c4f4b222dbac Adjust the NLA code to prevent hang on exit for Windows XP and Windows Vista.
Paul Aurich <darkrain42@pidgin.im>
parents: 24519
diff changeset
1329 gchar *msg = g_win32_error_message(errorid);
c4f4b222dbac Adjust the NLA code to prevent hang on exit for Windows XP and Windows Vista.
Paul Aurich <darkrain42@pidgin.im>
parents: 24519
diff changeset
1330 purple_debug_warning("network", "Unable to kill NLA thread. Message: %s (%d).\n",
c4f4b222dbac Adjust the NLA code to prevent hang on exit for Windows XP and Windows Vista.
Paul Aurich <darkrain42@pidgin.im>
parents: 24519
diff changeset
1331 msg, errorid);
c4f4b222dbac Adjust the NLA code to prevent hang on exit for Windows XP and Windows Vista.
Paul Aurich <darkrain42@pidgin.im>
parents: 24519
diff changeset
1332 g_free(msg);
c4f4b222dbac Adjust the NLA code to prevent hang on exit for Windows XP and Windows Vista.
Paul Aurich <darkrain42@pidgin.im>
parents: 24519
diff changeset
1333 }
25541
1b82a0195ff5 Fix 3 different race conditions in the win32 network management functionality.
Daniel Atallah <datallah@pidgin.im>
parents: 25326
diff changeset
1334 network_change_handle = NULL;
1b82a0195ff5 Fix 3 different race conditions in the win32 network management functionality.
Daniel Atallah <datallah@pidgin.im>
parents: 25326
diff changeset
1335
25326
c4f4b222dbac Adjust the NLA code to prevent hang on exit for Windows XP and Windows Vista.
Paul Aurich <darkrain42@pidgin.im>
parents: 24519
diff changeset
1336 }
c4f4b222dbac Adjust the NLA code to prevent hang on exit for Windows XP and Windows Vista.
Paul Aurich <darkrain42@pidgin.im>
parents: 24519
diff changeset
1337 g_static_mutex_unlock(&mutex);
c4f4b222dbac Adjust the NLA code to prevent hang on exit for Windows XP and Windows Vista.
Paul Aurich <darkrain42@pidgin.im>
parents: 24519
diff changeset
1338
c4f4b222dbac Adjust the NLA code to prevent hang on exit for Windows XP and Windows Vista.
Paul Aurich <darkrain42@pidgin.im>
parents: 24519
diff changeset
1339 #endif
21143
239b2f43bef5 Make purple_xfers_uninit, purple_network_uninit, and purple_plugins_uninit
Etan Reisner <deryni@pidgin.im>
parents: 20239
diff changeset
1340 purple_signal_unregister(purple_network_get_handle(),
25541
1b82a0195ff5 Fix 3 different race conditions in the win32 network management functionality.
Daniel Atallah <datallah@pidgin.im>
parents: 25326
diff changeset
1341 "network-configuration-changed");
31191
163f03d8d1d2 Cast back and forth between int and pointer instead of putting pointers
Mark Doliner <markdoliner@pidgin.im>
parents: 30792
diff changeset
1342
26256
d2673c935184 Run an asynchronous DNS lookup for the STUN server IP (to set as a property
Marcus Lundblad <malu@pidgin.im>
parents: 25326
diff changeset
1343 if (stun_ip)
d2673c935184 Run an asynchronous DNS lookup for the STUN server IP (to set as a property
Marcus Lundblad <malu@pidgin.im>
parents: 25326
diff changeset
1344 g_free(stun_ip);
27332
8240ab259385 Add a function to remove a port mapping (UPnP or NAT-PMP) given a file
Marcus Lundblad <malu@pidgin.im>
parents: 27116
diff changeset
1345
8240ab259385 Add a function to remove a port mapping (UPnP or NAT-PMP) given a file
Marcus Lundblad <malu@pidgin.im>
parents: 27116
diff changeset
1346 g_hash_table_destroy(upnp_port_mappings);
8240ab259385 Add a function to remove a port mapping (UPnP or NAT-PMP) given a file
Marcus Lundblad <malu@pidgin.im>
parents: 27116
diff changeset
1347 g_hash_table_destroy(nat_pmp_port_mappings);
8240ab259385 Add a function to remove a port mapping (UPnP or NAT-PMP) given a file
Marcus Lundblad <malu@pidgin.im>
parents: 27116
diff changeset
1348
31191
163f03d8d1d2 Cast back and forth between int and pointer instead of putting pointers
Mark Doliner <markdoliner@pidgin.im>
parents: 30792
diff changeset
1349 /* TODO: clean up remaining port mappings, note calling
27332
8240ab259385 Add a function to remove a port mapping (UPnP or NAT-PMP) given a file
Marcus Lundblad <malu@pidgin.im>
parents: 27116
diff changeset
1350 purple_upnp_remove_port_mapping from here doesn't quite work... */
14758
13b9adc9efd2 [gaim-migrate @ 17448]
Sean Egan <seanegan@pidgin.im>
parents: 14329
diff changeset
1351 }

mercurial