Wed, 02 Apr 2014 02:37:34 +0200
Custom smileys: simplify storage implementation
|
20147
66f05a854eee
applied changes from 8a731bbd0197fbcc91a705c2d8f528154216defa
Richard Laager <rlaager@pidgin.im>
parents:
19859
diff
changeset
|
1 | /* purple |
|
11225
e888c207b994
[gaim-migrate @ 13361]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
2 | * |
|
11336
d2033b2756e2
[gaim-migrate @ 13549]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11300
diff
changeset
|
3 | * STUN implementation inspired by jstun [http://jstun.javawi.de/] |
|
d2033b2756e2
[gaim-migrate @ 13549]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11300
diff
changeset
|
4 | * |
| 15884 | 5 | * Purple is the legal property of its developers, whose names are too numerous |
|
11225
e888c207b994
[gaim-migrate @ 13361]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
6 | * to list here. Please refer to the COPYRIGHT file distributed with this |
|
e888c207b994
[gaim-migrate @ 13361]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
7 | * source distribution. |
|
e888c207b994
[gaim-migrate @ 13361]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
8 | * |
|
e888c207b994
[gaim-migrate @ 13361]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
9 | * This program is free software; you can redistribute it and/or modify |
|
e888c207b994
[gaim-migrate @ 13361]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
10 | * it under the terms of the GNU General Public License as published by |
|
e888c207b994
[gaim-migrate @ 13361]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
11 | * the Free Software Foundation; either version 2 of the License, or |
|
e888c207b994
[gaim-migrate @ 13361]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
12 | * (at your option) any later version. |
|
e888c207b994
[gaim-migrate @ 13361]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
13 | * |
|
e888c207b994
[gaim-migrate @ 13361]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
14 | * This program is distributed in the hope that it will be useful, |
|
e888c207b994
[gaim-migrate @ 13361]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
15 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
e888c207b994
[gaim-migrate @ 13361]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
16 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
e888c207b994
[gaim-migrate @ 13361]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
17 | * GNU General Public License for more details. |
|
e888c207b994
[gaim-migrate @ 13361]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
18 | * |
|
e888c207b994
[gaim-migrate @ 13361]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
19 | * You should have received a copy of the GNU General Public License |
|
e888c207b994
[gaim-migrate @ 13361]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
20 | * 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:
19770
diff
changeset
|
21 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA |
|
11225
e888c207b994
[gaim-migrate @ 13361]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
22 | * |
|
e888c207b994
[gaim-migrate @ 13361]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
23 | */ |
|
e888c207b994
[gaim-migrate @ 13361]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
24 | |
|
11898
a40601f1aed2
[gaim-migrate @ 14189]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
11677
diff
changeset
|
25 | #include "internal.h" |
|
a40601f1aed2
[gaim-migrate @ 14189]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
11677
diff
changeset
|
26 | |
|
11364
d754cf40ec4b
[gaim-migrate @ 13588]
Daniel Atallah <datallah@pidgin.im>
parents:
11354
diff
changeset
|
27 | #ifndef _WIN32 |
|
11225
e888c207b994
[gaim-migrate @ 13361]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
28 | #include <net/if.h> |
|
e888c207b994
[gaim-migrate @ 13361]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
29 | #include <sys/ioctl.h> |
|
11364
d754cf40ec4b
[gaim-migrate @ 13588]
Daniel Atallah <datallah@pidgin.im>
parents:
11354
diff
changeset
|
30 | #endif |
|
11225
e888c207b994
[gaim-migrate @ 13361]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
31 | |
| 12700 | 32 | /* Solaris */ |
| 33 | #if defined (__SVR4) && defined (__sun) | |
| 34 | #include <sys/sockio.h> | |
| 35 | #endif | |
| 36 | ||
|
11225
e888c207b994
[gaim-migrate @ 13361]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
37 | #include "debug.h" |
|
e888c207b994
[gaim-migrate @ 13361]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
38 | #include "account.h" |
|
14243
0bda01972ff2
[gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents:
14226
diff
changeset
|
39 | #include "dnsquery.h" |
|
11424
b0f8535daa74
[gaim-migrate @ 13661]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11371
diff
changeset
|
40 | #include "dnssrv.h" |
|
12756
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
41 | #include "network.h" |
|
11429
3f7f01e88e77
[gaim-migrate @ 13666]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11425
diff
changeset
|
42 | #include "proxy.h" |
|
11225
e888c207b994
[gaim-migrate @ 13361]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
43 | #include "stun.h" |
|
e888c207b994
[gaim-migrate @ 13361]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
44 | #include "prefs.h" |
|
e888c207b994
[gaim-migrate @ 13361]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
45 | |
|
12756
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
46 | #define MSGTYPE_BINDINGREQUEST 0x0001 |
|
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
47 | #define MSGTYPE_BINDINGRESPONSE 0x0101 |
|
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
48 | |
|
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
49 | #define ATTRIB_MAPPEDADDRESS 0x0001 |
|
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
50 | |
|
12686
ec3e7c4ff045
[gaim-migrate @ 15029]
Richard Laager <rlaager@pidgin.im>
parents:
11898
diff
changeset
|
51 | struct stun_header { |
|
12756
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
52 | guint16 type; |
|
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
53 | guint16 len; |
|
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
54 | guint32 transid[4]; |
|
12686
ec3e7c4ff045
[gaim-migrate @ 15029]
Richard Laager <rlaager@pidgin.im>
parents:
11898
diff
changeset
|
55 | }; |
|
ec3e7c4ff045
[gaim-migrate @ 15029]
Richard Laager <rlaager@pidgin.im>
parents:
11898
diff
changeset
|
56 | |
|
ec3e7c4ff045
[gaim-migrate @ 15029]
Richard Laager <rlaager@pidgin.im>
parents:
11898
diff
changeset
|
57 | struct stun_attrib { |
|
12756
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
58 | guint16 type; |
|
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
59 | guint16 len; |
|
12686
ec3e7c4ff045
[gaim-migrate @ 15029]
Richard Laager <rlaager@pidgin.im>
parents:
11898
diff
changeset
|
60 | }; |
|
ec3e7c4ff045
[gaim-migrate @ 15029]
Richard Laager <rlaager@pidgin.im>
parents:
11898
diff
changeset
|
61 | |
|
12756
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
62 | #ifdef NOTYET |
|
12686
ec3e7c4ff045
[gaim-migrate @ 15029]
Richard Laager <rlaager@pidgin.im>
parents:
11898
diff
changeset
|
63 | struct stun_change { |
|
ec3e7c4ff045
[gaim-migrate @ 15029]
Richard Laager <rlaager@pidgin.im>
parents:
11898
diff
changeset
|
64 | struct stun_header hdr; |
|
ec3e7c4ff045
[gaim-migrate @ 15029]
Richard Laager <rlaager@pidgin.im>
parents:
11898
diff
changeset
|
65 | struct stun_attrib attrib; |
|
ec3e7c4ff045
[gaim-migrate @ 15029]
Richard Laager <rlaager@pidgin.im>
parents:
11898
diff
changeset
|
66 | char value[4]; |
|
ec3e7c4ff045
[gaim-migrate @ 15029]
Richard Laager <rlaager@pidgin.im>
parents:
11898
diff
changeset
|
67 | }; |
|
12756
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
68 | #endif |
|
12686
ec3e7c4ff045
[gaim-migrate @ 15029]
Richard Laager <rlaager@pidgin.im>
parents:
11898
diff
changeset
|
69 | |
|
12756
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
70 | struct stun_conn { |
|
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
71 | int fd; |
|
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
72 | struct sockaddr_in addr; |
|
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
73 | int test; |
|
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
74 | int retry; |
|
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
75 | guint incb; |
|
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
76 | guint timeout; |
|
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
77 | struct stun_header *packet; |
|
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
78 | size_t packetsize; |
|
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
79 | }; |
|
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
80 | |
| 15884 | 81 | static PurpleStunNatDiscovery nattype = { |
| 82 | PURPLE_STUN_STATUS_UNDISCOVERED, | |
| 83 | PURPLE_STUN_NAT_TYPE_PUBLIC_IP, | |
|
12877
aebd8924bc4b
[gaim-migrate @ 15229]
Daniel Atallah <datallah@pidgin.im>
parents:
12757
diff
changeset
|
84 | "\0", NULL, 0}; |
|
11225
e888c207b994
[gaim-migrate @ 13361]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
85 | |
|
12877
aebd8924bc4b
[gaim-migrate @ 15229]
Daniel Atallah <datallah@pidgin.im>
parents:
12757
diff
changeset
|
86 | static GSList *callbacks = NULL; |
|
12756
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
87 | |
|
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
88 | static void close_stun_conn(struct stun_conn *sc) { |
|
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
89 | |
|
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
90 | if (sc->incb) |
| 15884 | 91 | purple_input_remove(sc->incb); |
|
12756
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
92 | |
|
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
93 | if (sc->timeout) |
| 15884 | 94 | purple_timeout_remove(sc->timeout); |
|
12756
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
95 | |
|
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
96 | if (sc->fd) |
|
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
97 | close(sc->fd); |
|
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
98 | |
|
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
99 | g_free(sc); |
|
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
100 | } |
|
11225
e888c207b994
[gaim-migrate @ 13361]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
101 | |
|
22104
56970903b8e9
Probe for -Wstrict-prototypes to get some more warnings. I then cleaned up
Richard Laager <rlaager@pidgin.im>
parents:
20147
diff
changeset
|
102 | static void do_callbacks(void) { |
|
30704
a07bc8a6c401
Optimize just a teensy-tiny bit.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27497
diff
changeset
|
103 | while (callbacks) { |
|
35499
c4c5e0a670b1
Fix namespaces issues in libpurple.
Ankit Vani <a@nevitus.org>
parents:
35466
diff
changeset
|
104 | PurpleStunCallback cb = callbacks->data; |
|
30704
a07bc8a6c401
Optimize just a teensy-tiny bit.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27497
diff
changeset
|
105 | if (cb) |
|
11336
d2033b2756e2
[gaim-migrate @ 13549]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11300
diff
changeset
|
106 | cb(&nattype); |
|
30704
a07bc8a6c401
Optimize just a teensy-tiny bit.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27497
diff
changeset
|
107 | callbacks = g_slist_delete_link(callbacks, callbacks); |
|
11225
e888c207b994
[gaim-migrate @ 13361]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
108 | } |
|
e888c207b994
[gaim-migrate @ 13361]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
109 | } |
|
e888c207b994
[gaim-migrate @ 13361]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
110 | |
|
12756
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
111 | static gboolean timeoutfunc(gpointer data) { |
|
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
112 | struct stun_conn *sc = data; |
|
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
113 | if(sc->retry >= 2) { |
|
27497
2dc5a0e0c4c2
Increase the logging level of some debugging messages that seemed to be a
Mauro Brasil <mauro.brasil@tqi.com.br>
parents:
26782
diff
changeset
|
114 | purple_debug_warning("stun", "request timed out, giving up.\n"); |
|
12756
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
115 | if(sc->test == 2) |
| 15884 | 116 | nattype.type = PURPLE_STUN_NAT_TYPE_SYMMETRIC; |
|
12686
ec3e7c4ff045
[gaim-migrate @ 15029]
Richard Laager <rlaager@pidgin.im>
parents:
11898
diff
changeset
|
117 | |
|
11354
265f44ed44bc
[gaim-migrate @ 13573]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11336
diff
changeset
|
118 | /* set unknown */ |
| 15884 | 119 | nattype.status = PURPLE_STUN_STATUS_UNKNOWN; |
|
11354
265f44ed44bc
[gaim-migrate @ 13573]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11336
diff
changeset
|
120 | |
|
12756
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
121 | nattype.lookup_time = time(NULL); |
|
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
122 | |
|
11354
265f44ed44bc
[gaim-migrate @ 13573]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11336
diff
changeset
|
123 | /* callbacks */ |
|
265f44ed44bc
[gaim-migrate @ 13573]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11336
diff
changeset
|
124 | do_callbacks(); |
|
265f44ed44bc
[gaim-migrate @ 13573]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11336
diff
changeset
|
125 | |
|
12756
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
126 | /* we don't need to remove the timeout (returning FALSE) */ |
|
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
127 | sc->timeout = 0; |
|
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
128 | close_stun_conn(sc); |
|
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
129 | |
|
11354
265f44ed44bc
[gaim-migrate @ 13573]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11336
diff
changeset
|
130 | return FALSE; |
|
265f44ed44bc
[gaim-migrate @ 13573]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11336
diff
changeset
|
131 | } |
| 15884 | 132 | purple_debug_info("stun", "request timed out, retrying.\n"); |
|
12756
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
133 | sc->retry++; |
|
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
134 | sendto(sc->fd, sc->packet, sc->packetsize, 0, |
|
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
135 | (struct sockaddr *)&(sc->addr), sizeof(struct sockaddr_in)); |
|
11354
265f44ed44bc
[gaim-migrate @ 13573]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11336
diff
changeset
|
136 | return TRUE; |
|
265f44ed44bc
[gaim-migrate @ 13573]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11336
diff
changeset
|
137 | } |
|
265f44ed44bc
[gaim-migrate @ 13573]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11336
diff
changeset
|
138 | |
|
265f44ed44bc
[gaim-migrate @ 13573]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11336
diff
changeset
|
139 | #ifdef NOTYET |
|
12756
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
140 | static void do_test2(struct stun_conn *sc) { |
|
11354
265f44ed44bc
[gaim-migrate @ 13573]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11336
diff
changeset
|
141 | struct stun_change data; |
|
11431
60971f504319
[gaim-migrate @ 13668]
Daniel Atallah <datallah@pidgin.im>
parents:
11429
diff
changeset
|
142 | data.hdr.type = htons(0x0001); |
|
60971f504319
[gaim-migrate @ 13668]
Daniel Atallah <datallah@pidgin.im>
parents:
11429
diff
changeset
|
143 | data.hdr.len = 0; |
|
60971f504319
[gaim-migrate @ 13668]
Daniel Atallah <datallah@pidgin.im>
parents:
11429
diff
changeset
|
144 | data.hdr.transid[0] = rand(); |
|
60971f504319
[gaim-migrate @ 13668]
Daniel Atallah <datallah@pidgin.im>
parents:
11429
diff
changeset
|
145 | data.hdr.transid[1] = ntohl(((int)'g' << 24) + ((int)'a' << 16) + ((int)'i' << 8) + (int)'m'); |
|
60971f504319
[gaim-migrate @ 13668]
Daniel Atallah <datallah@pidgin.im>
parents:
11429
diff
changeset
|
146 | data.hdr.transid[2] = rand(); |
|
60971f504319
[gaim-migrate @ 13668]
Daniel Atallah <datallah@pidgin.im>
parents:
11429
diff
changeset
|
147 | data.hdr.transid[3] = rand(); |
|
60971f504319
[gaim-migrate @ 13668]
Daniel Atallah <datallah@pidgin.im>
parents:
11429
diff
changeset
|
148 | data.attrib.type = htons(0x003); |
|
11354
265f44ed44bc
[gaim-migrate @ 13573]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11336
diff
changeset
|
149 | data.attrib.len = htons(4); |
|
265f44ed44bc
[gaim-migrate @ 13573]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11336
diff
changeset
|
150 | data.value[3] = 6; |
|
12756
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
151 | sc->packet = (struct stun_header*)&data; |
|
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
152 | sc->packetsize = sizeof(struct stun_change); |
|
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
153 | sc->retry = 0; |
|
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
154 | sc->test = 2; |
|
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
155 | sendto(sc->fd, sc->packet, sc->packetsize, 0, (struct sockaddr *)&(sc->addr), sizeof(struct sockaddr_in)); |
| 15884 | 156 | sc->timeout = purple_timeout_add(500, (GSourceFunc) timeoutfunc, sc); |
|
11354
265f44ed44bc
[gaim-migrate @ 13573]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11336
diff
changeset
|
157 | } |
|
265f44ed44bc
[gaim-migrate @ 13573]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11336
diff
changeset
|
158 | #endif |
|
265f44ed44bc
[gaim-migrate @ 13573]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11336
diff
changeset
|
159 | |
| 15884 | 160 | static void reply_cb(gpointer data, gint source, PurpleInputCondition cond) { |
|
12756
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
161 | struct stun_conn *sc = data; |
|
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
162 | char buffer[65536]; |
|
11225
e888c207b994
[gaim-migrate @ 13361]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
163 | char *tmp; |
|
34304
faf0414a8b51
Fix most of libpurple warnings about -Wsign-compare
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
32983
diff
changeset
|
164 | gssize len; |
|
11225
e888c207b994
[gaim-migrate @ 13361]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
165 | struct in_addr in; |
|
e888c207b994
[gaim-migrate @ 13361]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
166 | struct stun_attrib *attrib; |
|
e888c207b994
[gaim-migrate @ 13361]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
167 | struct stun_header *hdr; |
|
11300
11bc6db394e6
[gaim-migrate @ 13500]
Richard Laager <rlaager@pidgin.im>
parents:
11229
diff
changeset
|
168 | struct ifconf ifc; |
|
11bc6db394e6
[gaim-migrate @ 13500]
Richard Laager <rlaager@pidgin.im>
parents:
11229
diff
changeset
|
169 | struct ifreq *ifr; |
|
11bc6db394e6
[gaim-migrate @ 13500]
Richard Laager <rlaager@pidgin.im>
parents:
11229
diff
changeset
|
170 | struct sockaddr_in *sinptr; |
|
11431
60971f504319
[gaim-migrate @ 13668]
Daniel Atallah <datallah@pidgin.im>
parents:
11429
diff
changeset
|
171 | |
|
32983
b24f582761a4
stun: Initialize 'in', silence compiler.
Paul Aurich <darkrain42@pidgin.im>
parents:
32594
diff
changeset
|
172 | memset(&in, 0, sizeof(in)); |
|
b24f582761a4
stun: Initialize 'in', silence compiler.
Paul Aurich <darkrain42@pidgin.im>
parents:
32594
diff
changeset
|
173 | |
|
12756
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
174 | len = recv(source, buffer, sizeof(buffer) - 1, 0); |
|
34304
faf0414a8b51
Fix most of libpurple warnings about -Wsign-compare
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
32983
diff
changeset
|
175 | if (len <= 0) { |
|
27497
2dc5a0e0c4c2
Increase the logging level of some debugging messages that seemed to be a
Mauro Brasil <mauro.brasil@tqi.com.br>
parents:
26782
diff
changeset
|
176 | purple_debug_warning("stun", "unable to read stun response\n"); |
|
12756
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
177 | return; |
|
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
178 | } |
|
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
179 | buffer[len] = '\0'; |
|
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
180 | |
|
34304
faf0414a8b51
Fix most of libpurple warnings about -Wsign-compare
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
32983
diff
changeset
|
181 | if ((gsize)len < sizeof(struct stun_header)) { |
|
27497
2dc5a0e0c4c2
Increase the logging level of some debugging messages that seemed to be a
Mauro Brasil <mauro.brasil@tqi.com.br>
parents:
26782
diff
changeset
|
182 | purple_debug_warning("stun", "got invalid response\n"); |
|
12756
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
183 | return; |
|
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
184 | } |
|
11225
e888c207b994
[gaim-migrate @ 13361]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
185 | |
|
12756
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
186 | hdr = (struct stun_header*) buffer; |
|
34304
faf0414a8b51
Fix most of libpurple warnings about -Wsign-compare
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
32983
diff
changeset
|
187 | if ((gsize)len != (ntohs(hdr->len) + sizeof(struct stun_header))) { |
|
27497
2dc5a0e0c4c2
Increase the logging level of some debugging messages that seemed to be a
Mauro Brasil <mauro.brasil@tqi.com.br>
parents:
26782
diff
changeset
|
188 | purple_debug_warning("stun", "got incomplete response\n"); |
|
12756
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
189 | return; |
|
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
190 | } |
|
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
191 | |
|
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
192 | /* wrong transaction */ |
|
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
193 | if(hdr->transid[0] != sc->packet->transid[0] |
|
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
194 | || hdr->transid[1] != sc->packet->transid[1] |
|
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
195 | || hdr->transid[2] != sc->packet->transid[2] |
|
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
196 | || hdr->transid[3] != sc->packet->transid[3]) { |
|
27497
2dc5a0e0c4c2
Increase the logging level of some debugging messages that seemed to be a
Mauro Brasil <mauro.brasil@tqi.com.br>
parents:
26782
diff
changeset
|
197 | purple_debug_warning("stun", "got wrong transid\n"); |
|
11225
e888c207b994
[gaim-migrate @ 13361]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
198 | return; |
|
e888c207b994
[gaim-migrate @ 13361]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
199 | } |
|
12756
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
200 | |
|
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
201 | if(sc->test==1) { |
|
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
202 | if (hdr->type != MSGTYPE_BINDINGRESPONSE) { |
|
27497
2dc5a0e0c4c2
Increase the logging level of some debugging messages that seemed to be a
Mauro Brasil <mauro.brasil@tqi.com.br>
parents:
26782
diff
changeset
|
203 | purple_debug_warning("stun", |
|
12756
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
204 | "Expected Binding Response, got %d\n", |
|
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
205 | hdr->type); |
|
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
206 | return; |
|
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
207 | } |
|
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
208 | |
|
11354
265f44ed44bc
[gaim-migrate @ 13573]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11336
diff
changeset
|
209 | tmp = buffer + sizeof(struct stun_header); |
|
12756
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
210 | while((buffer + len) > (tmp + sizeof(struct stun_attrib))) { |
|
11354
265f44ed44bc
[gaim-migrate @ 13573]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11336
diff
changeset
|
211 | attrib = (struct stun_attrib*) tmp; |
|
12756
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
212 | tmp += sizeof(struct stun_attrib); |
|
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
213 | |
|
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
214 | if (!((buffer + len) > (tmp + ntohs(attrib->len)))) |
|
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
215 | break; |
|
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
216 | |
|
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
217 | if(attrib->type == htons(ATTRIB_MAPPEDADDRESS) |
|
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
218 | && ntohs(attrib->len) == 8) { |
|
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
219 | char *ip; |
|
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
220 | /* Skip the first unused byte, |
|
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
221 | * the family(1 byte), and the port(2 bytes); |
|
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
222 | * then read the 4 byte IPv4 address */ |
|
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
223 | memcpy(&in.s_addr, tmp + 4, 4); |
|
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
224 | ip = inet_ntoa(in); |
|
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
225 | if(ip) |
|
32002
a577544f30d7
Almost certainly not an issue, but bounds check a strcpy in stun.c (EFF)
Ethan Blanton <elb@pidgin.im>
parents:
31680
diff
changeset
|
226 | g_strlcpy(nattype.publicip, ip, sizeof(nattype.publicip)); |
|
11354
265f44ed44bc
[gaim-migrate @ 13573]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11336
diff
changeset
|
227 | } |
|
12756
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
228 | |
|
12757
ef403877ac2e
[gaim-migrate @ 15104]
Daniel Atallah <datallah@pidgin.im>
parents:
12756
diff
changeset
|
229 | tmp += ntohs(attrib->len); |
|
11225
e888c207b994
[gaim-migrate @ 13361]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
230 | } |
| 15884 | 231 | purple_debug_info("stun", "got public ip %s\n", nattype.publicip); |
| 232 | nattype.status = PURPLE_STUN_STATUS_DISCOVERED; | |
| 233 | nattype.type = PURPLE_STUN_NAT_TYPE_UNKNOWN_NAT; | |
|
12756
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
234 | nattype.lookup_time = time(NULL); |
|
11354
265f44ed44bc
[gaim-migrate @ 13573]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11336
diff
changeset
|
235 | |
|
11371
363713bfd3d1
[gaim-migrate @ 13596]
Richard Laager <rlaager@pidgin.im>
parents:
11364
diff
changeset
|
236 | /* is it a NAT? */ |
|
11225
e888c207b994
[gaim-migrate @ 13361]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
237 | |
|
11354
265f44ed44bc
[gaim-migrate @ 13573]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11336
diff
changeset
|
238 | ifc.ifc_len = sizeof(buffer); |
|
265f44ed44bc
[gaim-migrate @ 13573]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11336
diff
changeset
|
239 | ifc.ifc_req = (struct ifreq *) buffer; |
|
265f44ed44bc
[gaim-migrate @ 13573]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11336
diff
changeset
|
240 | ioctl(source, SIOCGIFCONF, &ifc); |
|
11225
e888c207b994
[gaim-migrate @ 13361]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
241 | |
|
11354
265f44ed44bc
[gaim-migrate @ 13573]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11336
diff
changeset
|
242 | tmp = buffer; |
|
265f44ed44bc
[gaim-migrate @ 13573]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11336
diff
changeset
|
243 | while(tmp < buffer + ifc.ifc_len) { |
|
265f44ed44bc
[gaim-migrate @ 13573]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11336
diff
changeset
|
244 | ifr = (struct ifreq *) tmp; |
|
11225
e888c207b994
[gaim-migrate @ 13361]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
245 | |
|
11364
d754cf40ec4b
[gaim-migrate @ 13588]
Daniel Atallah <datallah@pidgin.im>
parents:
11354
diff
changeset
|
246 | tmp += sizeof(struct ifreq); |
|
11225
e888c207b994
[gaim-migrate @ 13361]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
247 | |
|
11354
265f44ed44bc
[gaim-migrate @ 13573]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11336
diff
changeset
|
248 | if(ifr->ifr_addr.sa_family == AF_INET) { |
|
11371
363713bfd3d1
[gaim-migrate @ 13596]
Richard Laager <rlaager@pidgin.im>
parents:
11364
diff
changeset
|
249 | /* we only care about ipv4 interfaces */ |
|
11354
265f44ed44bc
[gaim-migrate @ 13573]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11336
diff
changeset
|
250 | sinptr = (struct sockaddr_in *) &ifr->ifr_addr; |
|
265f44ed44bc
[gaim-migrate @ 13573]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11336
diff
changeset
|
251 | if(sinptr->sin_addr.s_addr == in.s_addr) { |
|
11371
363713bfd3d1
[gaim-migrate @ 13596]
Richard Laager <rlaager@pidgin.im>
parents:
11364
diff
changeset
|
252 | /* no NAT */ |
|
19770
9184bfee0172
Add a missing newline to the end of a purple_debug_info call.
Richard Laager <rlaager@pidgin.im>
parents:
19048
diff
changeset
|
253 | purple_debug_info("stun", "no nat\n"); |
| 15884 | 254 | nattype.type = PURPLE_STUN_NAT_TYPE_PUBLIC_IP; |
|
11354
265f44ed44bc
[gaim-migrate @ 13573]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11336
diff
changeset
|
255 | } |
|
11225
e888c207b994
[gaim-migrate @ 13361]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
256 | } |
|
e888c207b994
[gaim-migrate @ 13361]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
257 | } |
|
e888c207b994
[gaim-migrate @ 13361]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
258 | |
|
12756
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
259 | #ifndef NOTYET |
|
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
260 | close_stun_conn(sc); |
|
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
261 | do_callbacks(); |
|
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
262 | #else |
| 15884 | 263 | purple_timeout_remove(sc->timeout); |
|
12756
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
264 | sc->timeout = 0; |
|
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
265 | |
|
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
266 | do_test2(sc); |
|
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
267 | } else if(sc->test == 2) { |
|
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
268 | close_stun_conn(sc); |
| 15884 | 269 | nattype.type = PURPLE_STUN_NAT_TYPE_FULL_CONE; |
|
12756
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
270 | do_callbacks(); |
|
11354
265f44ed44bc
[gaim-migrate @ 13573]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11336
diff
changeset
|
271 | #endif |
|
265f44ed44bc
[gaim-migrate @ 13573]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11336
diff
changeset
|
272 | } |
|
11336
d2033b2756e2
[gaim-migrate @ 13549]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11300
diff
changeset
|
273 | } |
|
11424
b0f8535daa74
[gaim-migrate @ 13661]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11371
diff
changeset
|
274 | |
|
12909
dfcf4df1dcd7
[gaim-migrate @ 15262]
Daniel Atallah <datallah@pidgin.im>
parents:
12877
diff
changeset
|
275 | |
|
dfcf4df1dcd7
[gaim-migrate @ 15262]
Daniel Atallah <datallah@pidgin.im>
parents:
12877
diff
changeset
|
276 | static void hbn_listen_cb(int fd, gpointer data) { |
|
dfcf4df1dcd7
[gaim-migrate @ 15262]
Daniel Atallah <datallah@pidgin.im>
parents:
12877
diff
changeset
|
277 | GSList *hosts = data; |
|
12756
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
278 | struct stun_conn *sc; |
|
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
279 | static struct stun_header hdr_data; |
|
11425
668f93d8c3a2
[gaim-migrate @ 13662]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11424
diff
changeset
|
280 | |
|
12909
dfcf4df1dcd7
[gaim-migrate @ 15262]
Daniel Atallah <datallah@pidgin.im>
parents:
12877
diff
changeset
|
281 | if(fd < 0) { |
| 15884 | 282 | nattype.status = PURPLE_STUN_STATUS_UNKNOWN; |
|
12756
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
283 | nattype.lookup_time = time(NULL); |
|
11431
60971f504319
[gaim-migrate @ 13668]
Daniel Atallah <datallah@pidgin.im>
parents:
11429
diff
changeset
|
284 | do_callbacks(); |
|
11424
b0f8535daa74
[gaim-migrate @ 13661]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11371
diff
changeset
|
285 | return; |
|
11225
e888c207b994
[gaim-migrate @ 13361]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
286 | } |
|
12756
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
287 | |
|
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
288 | sc = g_new0(struct stun_conn, 1); |
|
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
289 | sc->fd = fd; |
|
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
290 | |
|
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
291 | sc->addr.sin_family = AF_INET; |
| 15884 | 292 | sc->addr.sin_port = htons(purple_network_get_port_from_fd(fd)); |
|
12756
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
293 | sc->addr.sin_addr.s_addr = INADDR_ANY; |
|
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
294 | |
| 15884 | 295 | sc->incb = purple_input_add(fd, PURPLE_INPUT_READ, reply_cb, sc); |
|
11225
e888c207b994
[gaim-migrate @ 13361]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
296 | |
|
30704
a07bc8a6c401
Optimize just a teensy-tiny bit.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27497
diff
changeset
|
297 | hosts = g_slist_delete_link(hosts, hosts); |
|
12756
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
298 | memcpy(&(sc->addr), hosts->data, sizeof(struct sockaddr_in)); |
|
11429
3f7f01e88e77
[gaim-migrate @ 13666]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11425
diff
changeset
|
299 | g_free(hosts->data); |
|
30704
a07bc8a6c401
Optimize just a teensy-tiny bit.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27497
diff
changeset
|
300 | hosts = g_slist_delete_link(hosts, hosts); |
|
a07bc8a6c401
Optimize just a teensy-tiny bit.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27497
diff
changeset
|
301 | while (hosts) { |
|
a07bc8a6c401
Optimize just a teensy-tiny bit.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27497
diff
changeset
|
302 | hosts = g_slist_delete_link(hosts, hosts); |
|
11429
3f7f01e88e77
[gaim-migrate @ 13666]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11425
diff
changeset
|
303 | g_free(hosts->data); |
|
30704
a07bc8a6c401
Optimize just a teensy-tiny bit.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27497
diff
changeset
|
304 | hosts = g_slist_delete_link(hosts, hosts); |
|
11429
3f7f01e88e77
[gaim-migrate @ 13666]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11425
diff
changeset
|
305 | } |
|
11431
60971f504319
[gaim-migrate @ 13668]
Daniel Atallah <datallah@pidgin.im>
parents:
11429
diff
changeset
|
306 | |
|
12756
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
307 | hdr_data.type = htons(MSGTYPE_BINDINGREQUEST); |
|
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
308 | hdr_data.len = 0; |
|
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
309 | hdr_data.transid[0] = rand(); |
|
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
310 | hdr_data.transid[1] = ntohl(((int)'g' << 24) + ((int)'a' << 16) + ((int)'i' << 8) + (int)'m'); |
|
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
311 | hdr_data.transid[2] = rand(); |
|
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
312 | hdr_data.transid[3] = rand(); |
|
11431
60971f504319
[gaim-migrate @ 13668]
Daniel Atallah <datallah@pidgin.im>
parents:
11429
diff
changeset
|
313 | |
|
12756
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
314 | if(sendto(sc->fd, &hdr_data, sizeof(struct stun_header), 0, |
|
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
315 | (struct sockaddr *)&(sc->addr), |
|
34304
faf0414a8b51
Fix most of libpurple warnings about -Wsign-compare
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
32983
diff
changeset
|
316 | sizeof(struct sockaddr_in)) < (gssize)sizeof(struct stun_header)) { |
| 15884 | 317 | nattype.status = PURPLE_STUN_STATUS_UNKNOWN; |
|
12756
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
318 | nattype.lookup_time = time(NULL); |
|
11431
60971f504319
[gaim-migrate @ 13668]
Daniel Atallah <datallah@pidgin.im>
parents:
11429
diff
changeset
|
319 | do_callbacks(); |
|
12756
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
320 | close_stun_conn(sc); |
|
11431
60971f504319
[gaim-migrate @ 13668]
Daniel Atallah <datallah@pidgin.im>
parents:
11429
diff
changeset
|
321 | return; |
|
11225
e888c207b994
[gaim-migrate @ 13361]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
322 | } |
|
12756
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
323 | sc->test = 1; |
|
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
324 | sc->packet = &hdr_data; |
|
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
325 | sc->packetsize = sizeof(struct stun_header); |
| 15884 | 326 | sc->timeout = purple_timeout_add(500, (GSourceFunc) timeoutfunc, sc); |
|
11429
3f7f01e88e77
[gaim-migrate @ 13666]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11425
diff
changeset
|
327 | } |
|
3f7f01e88e77
[gaim-migrate @ 13666]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11425
diff
changeset
|
328 | |
|
12909
dfcf4df1dcd7
[gaim-migrate @ 15262]
Daniel Atallah <datallah@pidgin.im>
parents:
12877
diff
changeset
|
329 | static void hbn_cb(GSList *hosts, gpointer data, const char *error_message) { |
|
dfcf4df1dcd7
[gaim-migrate @ 15262]
Daniel Atallah <datallah@pidgin.im>
parents:
12877
diff
changeset
|
330 | |
|
dfcf4df1dcd7
[gaim-migrate @ 15262]
Daniel Atallah <datallah@pidgin.im>
parents:
12877
diff
changeset
|
331 | if(!hosts || !hosts->data) { |
| 15884 | 332 | nattype.status = PURPLE_STUN_STATUS_UNDISCOVERED; |
|
12909
dfcf4df1dcd7
[gaim-migrate @ 15262]
Daniel Atallah <datallah@pidgin.im>
parents:
12877
diff
changeset
|
333 | nattype.lookup_time = time(NULL); |
|
dfcf4df1dcd7
[gaim-migrate @ 15262]
Daniel Atallah <datallah@pidgin.im>
parents:
12877
diff
changeset
|
334 | do_callbacks(); |
|
dfcf4df1dcd7
[gaim-migrate @ 15262]
Daniel Atallah <datallah@pidgin.im>
parents:
12877
diff
changeset
|
335 | return; |
|
dfcf4df1dcd7
[gaim-migrate @ 15262]
Daniel Atallah <datallah@pidgin.im>
parents:
12877
diff
changeset
|
336 | } |
|
dfcf4df1dcd7
[gaim-migrate @ 15262]
Daniel Atallah <datallah@pidgin.im>
parents:
12877
diff
changeset
|
337 | |
|
32594
f2feea134fdb
Remove deprecated purple_network_listen_map_external().
Andrew Victor <andrew.victor@mxit.com>
parents:
32593
diff
changeset
|
338 | if (!purple_network_listen_range(12108, 12208, AF_UNSPEC, SOCK_DGRAM, TRUE, hbn_listen_cb, hosts)) { |
|
30704
a07bc8a6c401
Optimize just a teensy-tiny bit.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27497
diff
changeset
|
339 | while (hosts) { |
|
a07bc8a6c401
Optimize just a teensy-tiny bit.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27497
diff
changeset
|
340 | hosts = g_slist_delete_link(hosts, hosts); |
|
26782
0d61de90ae02
Don't leak the struct sockaddr* from purple_dnsquery_a.
Paul Aurich <darkrain42@pidgin.im>
parents:
25859
diff
changeset
|
341 | g_free(hosts->data); |
|
30704
a07bc8a6c401
Optimize just a teensy-tiny bit.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27497
diff
changeset
|
342 | hosts = g_slist_delete_link(hosts, hosts); |
|
26782
0d61de90ae02
Don't leak the struct sockaddr* from purple_dnsquery_a.
Paul Aurich <darkrain42@pidgin.im>
parents:
25859
diff
changeset
|
343 | } |
|
0d61de90ae02
Don't leak the struct sockaddr* from purple_dnsquery_a.
Paul Aurich <darkrain42@pidgin.im>
parents:
25859
diff
changeset
|
344 | |
| 15884 | 345 | nattype.status = PURPLE_STUN_STATUS_UNKNOWN; |
|
12909
dfcf4df1dcd7
[gaim-migrate @ 15262]
Daniel Atallah <datallah@pidgin.im>
parents:
12877
diff
changeset
|
346 | nattype.lookup_time = time(NULL); |
|
dfcf4df1dcd7
[gaim-migrate @ 15262]
Daniel Atallah <datallah@pidgin.im>
parents:
12877
diff
changeset
|
347 | do_callbacks(); |
|
dfcf4df1dcd7
[gaim-migrate @ 15262]
Daniel Atallah <datallah@pidgin.im>
parents:
12877
diff
changeset
|
348 | return; |
|
dfcf4df1dcd7
[gaim-migrate @ 15262]
Daniel Atallah <datallah@pidgin.im>
parents:
12877
diff
changeset
|
349 | } |
|
dfcf4df1dcd7
[gaim-migrate @ 15262]
Daniel Atallah <datallah@pidgin.im>
parents:
12877
diff
changeset
|
350 | |
|
dfcf4df1dcd7
[gaim-migrate @ 15262]
Daniel Atallah <datallah@pidgin.im>
parents:
12877
diff
changeset
|
351 | |
|
dfcf4df1dcd7
[gaim-migrate @ 15262]
Daniel Atallah <datallah@pidgin.im>
parents:
12877
diff
changeset
|
352 | } |
|
dfcf4df1dcd7
[gaim-migrate @ 15262]
Daniel Atallah <datallah@pidgin.im>
parents:
12877
diff
changeset
|
353 | |
| 15884 | 354 | static void do_test1(PurpleSrvResponse *resp, int results, gpointer sdata) { |
|
11431
60971f504319
[gaim-migrate @ 13668]
Daniel Atallah <datallah@pidgin.im>
parents:
11429
diff
changeset
|
355 | const char *servername = sdata; |
|
11429
3f7f01e88e77
[gaim-migrate @ 13666]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11425
diff
changeset
|
356 | int port = 3478; |
|
11431
60971f504319
[gaim-migrate @ 13668]
Daniel Atallah <datallah@pidgin.im>
parents:
11429
diff
changeset
|
357 | |
|
11429
3f7f01e88e77
[gaim-migrate @ 13666]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11425
diff
changeset
|
358 | if(results) { |
|
3f7f01e88e77
[gaim-migrate @ 13666]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11425
diff
changeset
|
359 | servername = resp[0].hostname; |
|
3f7f01e88e77
[gaim-migrate @ 13666]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11425
diff
changeset
|
360 | port = resp[0].port; |
|
3f7f01e88e77
[gaim-migrate @ 13666]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11425
diff
changeset
|
361 | } |
| 15884 | 362 | purple_debug_info("stun", "got %d SRV responses, server: %s, port: %d\n", |
|
12756
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
363 | results, servername, port); |
|
11429
3f7f01e88e77
[gaim-migrate @ 13666]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11425
diff
changeset
|
364 | |
|
32297
100ef65e9664
Replace purple_dnsquery_a_account with purple_dnsquery_a.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32002
diff
changeset
|
365 | purple_dnsquery_a(NULL, servername, port, hbn_cb, NULL); |
|
11424
b0f8535daa74
[gaim-migrate @ 13661]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11371
diff
changeset
|
366 | g_free(resp); |
|
11225
e888c207b994
[gaim-migrate @ 13361]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
367 | } |
|
11424
b0f8535daa74
[gaim-migrate @ 13661]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11371
diff
changeset
|
368 | |
|
12756
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
369 | static gboolean call_callback(gpointer data) { |
|
35499
c4c5e0a670b1
Fix namespaces issues in libpurple.
Ankit Vani <a@nevitus.org>
parents:
35466
diff
changeset
|
370 | PurpleStunCallback cb = data; |
|
12756
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
371 | cb(&nattype); |
|
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
372 | return FALSE; |
|
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
373 | } |
|
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
374 | |
|
35499
c4c5e0a670b1
Fix namespaces issues in libpurple.
Ankit Vani <a@nevitus.org>
parents:
35466
diff
changeset
|
375 | PurpleStunNatDiscovery *purple_stun_discover(PurpleStunCallback cb) { |
|
16478
19107605c565
Works for me! Renames prefs: /core to /purple, /gaim/gtk to /pidgin, /gaim/gnt to /finch
Sean Egan <seanegan@pidgin.im>
parents:
15884
diff
changeset
|
376 | const char *servername = purple_prefs_get_string("/purple/network/stun_server"); |
|
11424
b0f8535daa74
[gaim-migrate @ 13661]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11371
diff
changeset
|
377 | |
| 15884 | 378 | purple_debug_info("stun", "using server %s\n", servername); |
|
12686
ec3e7c4ff045
[gaim-migrate @ 15029]
Richard Laager <rlaager@pidgin.im>
parents:
11898
diff
changeset
|
379 | |
| 15884 | 380 | if(nattype.status == PURPLE_STUN_STATUS_DISCOVERING) { |
|
12686
ec3e7c4ff045
[gaim-migrate @ 15029]
Richard Laager <rlaager@pidgin.im>
parents:
11898
diff
changeset
|
381 | if(cb) |
|
ec3e7c4ff045
[gaim-migrate @ 15029]
Richard Laager <rlaager@pidgin.im>
parents:
11898
diff
changeset
|
382 | callbacks = g_slist_append(callbacks, cb); |
|
12756
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
383 | return &nattype; |
|
11424
b0f8535daa74
[gaim-migrate @ 13661]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11371
diff
changeset
|
384 | } |
|
12686
ec3e7c4ff045
[gaim-migrate @ 15029]
Richard Laager <rlaager@pidgin.im>
parents:
11898
diff
changeset
|
385 | |
| 15884 | 386 | if(nattype.status != PURPLE_STUN_STATUS_UNDISCOVERED) { |
|
12756
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
387 | gboolean use_cached_result = TRUE; |
|
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
388 | |
|
35466
e259e75f1c6f
Fix some gtk-doc warnings till xmlnode.h
Ankit Vani <a@nevitus.org>
parents:
35454
diff
changeset
|
389 | /* Deal with the server name having changed since we did the |
|
e259e75f1c6f
Fix some gtk-doc warnings till xmlnode.h
Ankit Vani <a@nevitus.org>
parents:
35454
diff
changeset
|
390 | lookup */ |
|
12756
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
391 | if (servername && strlen(servername) > 1 |
|
25859
b42be7bb9dac
Patch from Paul Aurich to add purple_strequal to help readability and simplicity of code. Ie, don't need to negate the value of strcmp, since this does a strcmp and does the negation for us
Paul Aurich <darkrain42@pidgin.im>
parents:
22104
diff
changeset
|
392 | && !purple_strequal(servername, nattype.servername)) { |
|
12756
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
393 | use_cached_result = FALSE; |
|
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
394 | } |
|
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
395 | |
|
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
396 | /* If we don't have a successful status and it has been 5 |
|
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
397 | minutes since we last did a lookup, redo the lookup */ |
| 15884 | 398 | if (nattype.status != PURPLE_STUN_STATUS_DISCOVERED |
|
12756
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
399 | && (time(NULL) - nattype.lookup_time) > 300) { |
|
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
400 | use_cached_result = FALSE; |
|
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
401 | } |
|
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
402 | |
|
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
403 | if (use_cached_result) { |
|
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
404 | if(cb) |
| 15884 | 405 | purple_timeout_add(10, call_callback, cb); |
|
12756
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
406 | return &nattype; |
|
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
407 | } |
|
11424
b0f8535daa74
[gaim-migrate @ 13661]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11371
diff
changeset
|
408 | } |
|
b0f8535daa74
[gaim-migrate @ 13661]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11371
diff
changeset
|
409 | |
|
12686
ec3e7c4ff045
[gaim-migrate @ 15029]
Richard Laager <rlaager@pidgin.im>
parents:
11898
diff
changeset
|
410 | if(!servername || (strlen(servername) < 2)) { |
| 15884 | 411 | nattype.status = PURPLE_STUN_STATUS_UNKNOWN; |
|
12756
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
412 | nattype.lookup_time = time(NULL); |
|
12686
ec3e7c4ff045
[gaim-migrate @ 15029]
Richard Laager <rlaager@pidgin.im>
parents:
11898
diff
changeset
|
413 | if(cb) |
| 15884 | 414 | purple_timeout_add(10, call_callback, cb); |
|
11424
b0f8535daa74
[gaim-migrate @ 13661]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11371
diff
changeset
|
415 | return &nattype; |
|
b0f8535daa74
[gaim-migrate @ 13661]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11371
diff
changeset
|
416 | } |
|
12756
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
417 | |
| 15884 | 418 | nattype.status = PURPLE_STUN_STATUS_DISCOVERING; |
|
12756
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
419 | nattype.publicip[0] = '\0'; |
|
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
420 | g_free(nattype.servername); |
|
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
421 | nattype.servername = g_strdup(servername); |
|
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
422 | |
|
11424
b0f8535daa74
[gaim-migrate @ 13661]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11371
diff
changeset
|
423 | callbacks = g_slist_append(callbacks, cb); |
|
32300
59a31f9f67fc
Clean up SRV/TXT query functions.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32297
diff
changeset
|
424 | purple_srv_resolve(NULL, "stun", "udp", servername, do_test1, |
|
11431
60971f504319
[gaim-migrate @ 13668]
Daniel Atallah <datallah@pidgin.im>
parents:
11429
diff
changeset
|
425 | (gpointer) servername); |
|
12756
b8df02e0c6e5
[gaim-migrate @ 15103]
Daniel Atallah <datallah@pidgin.im>
parents:
12700
diff
changeset
|
426 | |
|
11424
b0f8535daa74
[gaim-migrate @ 13661]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11371
diff
changeset
|
427 | return &nattype; |
|
b0f8535daa74
[gaim-migrate @ 13661]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11371
diff
changeset
|
428 | } |
|
b0f8535daa74
[gaim-migrate @ 13661]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11371
diff
changeset
|
429 | |
| 15884 | 430 | void purple_stun_init() { |
|
16478
19107605c565
Works for me! Renames prefs: /core to /purple, /gaim/gtk to /pidgin, /gaim/gnt to /finch
Sean Egan <seanegan@pidgin.im>
parents:
15884
diff
changeset
|
431 | purple_prefs_add_string("/purple/network/stun_server", ""); |
|
11424
b0f8535daa74
[gaim-migrate @ 13661]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11371
diff
changeset
|
432 | } |