Mon, 10 Oct 2005 17:59:48 +0000
[gaim-migrate @ 13914]
Some bits'n'pieces:
A bunch of memory leak fixes
Fix newly created accounts to connect in the currently active global
status
Fix the modify account dialog to only show relevant user options etc.
Update sametime to use some more of the new status stuff, it still
needs more love though.
Some s/online/available/ for consistency across prpls
Fix a racyness in disconnecting connections that want to die (fixes
the Yahoo crash when signing on somewhere else)
Sorry if I caused any conflicts!
|
11225
e888c207b994
[gaim-migrate @ 13361]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
1 | /** |
|
e888c207b994
[gaim-migrate @ 13361]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
2 | * @file stun.c STUN (RFC3489) Implementation |
|
e888c207b994
[gaim-migrate @ 13361]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
3 | * @ingroup core |
|
e888c207b994
[gaim-migrate @ 13361]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
4 | * |
|
e888c207b994
[gaim-migrate @ 13361]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
5 | * gaim |
|
e888c207b994
[gaim-migrate @ 13361]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
6 | * |
|
11336
d2033b2756e2
[gaim-migrate @ 13549]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11300
diff
changeset
|
7 | * STUN implementation inspired by jstun [http://jstun.javawi.de/] |
|
d2033b2756e2
[gaim-migrate @ 13549]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11300
diff
changeset
|
8 | * |
|
11225
e888c207b994
[gaim-migrate @ 13361]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
9 | * Gaim is the legal property of its developers, whose names are too numerous |
|
e888c207b994
[gaim-migrate @ 13361]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
10 | * 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
|
11 | * source distribution. |
|
e888c207b994
[gaim-migrate @ 13361]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
12 | * |
|
e888c207b994
[gaim-migrate @ 13361]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
13 | * 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
|
14 | * 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
|
15 | * the Free Software Foundation; either version 2 of the License, or |
|
e888c207b994
[gaim-migrate @ 13361]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
16 | * (at your option) any later version. |
|
e888c207b994
[gaim-migrate @ 13361]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
17 | * |
|
e888c207b994
[gaim-migrate @ 13361]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
18 | * 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
|
19 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
e888c207b994
[gaim-migrate @ 13361]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
20 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
e888c207b994
[gaim-migrate @ 13361]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
21 | * GNU General Public License for more details. |
|
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 | * 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
|
24 | * along with this program; if not, write to the Free Software |
|
e888c207b994
[gaim-migrate @ 13361]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
25 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
|
e888c207b994
[gaim-migrate @ 13361]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
26 | * |
|
e888c207b994
[gaim-migrate @ 13361]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
27 | */ |
|
e888c207b994
[gaim-migrate @ 13361]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
28 | |
|
11364
d754cf40ec4b
[gaim-migrate @ 13588]
Daniel Atallah <datallah@pidgin.im>
parents:
11354
diff
changeset
|
29 | #ifndef _WIN32 |
|
11225
e888c207b994
[gaim-migrate @ 13361]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
30 | #include <net/if.h> |
|
e888c207b994
[gaim-migrate @ 13361]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
31 | #include <sys/ioctl.h> |
|
11364
d754cf40ec4b
[gaim-migrate @ 13588]
Daniel Atallah <datallah@pidgin.im>
parents:
11354
diff
changeset
|
32 | #else |
|
d754cf40ec4b
[gaim-migrate @ 13588]
Daniel Atallah <datallah@pidgin.im>
parents:
11354
diff
changeset
|
33 | #include "libc_interface.h" |
|
d754cf40ec4b
[gaim-migrate @ 13588]
Daniel Atallah <datallah@pidgin.im>
parents:
11354
diff
changeset
|
34 | #endif |
|
11225
e888c207b994
[gaim-migrate @ 13361]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
35 | |
|
e888c207b994
[gaim-migrate @ 13361]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
36 | #include "internal.h" |
|
e888c207b994
[gaim-migrate @ 13361]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
37 | |
|
e888c207b994
[gaim-migrate @ 13361]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
38 | #include "debug.h" |
|
e888c207b994
[gaim-migrate @ 13361]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
39 | #include "account.h" |
|
11424
b0f8535daa74
[gaim-migrate @ 13661]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11371
diff
changeset
|
40 | #include "dnssrv.h" |
|
11429
3f7f01e88e77
[gaim-migrate @ 13666]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11425
diff
changeset
|
41 | #include "proxy.h" |
|
11225
e888c207b994
[gaim-migrate @ 13361]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
42 | #include "stun.h" |
|
e888c207b994
[gaim-migrate @ 13361]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
43 | #include "prefs.h" |
|
e888c207b994
[gaim-migrate @ 13361]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
44 | |
|
e888c207b994
[gaim-migrate @ 13361]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
45 | struct stun_nattype nattype = {-1, 0, "\0"}; |
|
e888c207b994
[gaim-migrate @ 13361]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
46 | |
|
e888c207b994
[gaim-migrate @ 13361]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
47 | static GSList *callbacks = 0; |
|
e888c207b994
[gaim-migrate @ 13361]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
48 | static int fd = -1; |
|
11354
265f44ed44bc
[gaim-migrate @ 13573]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11336
diff
changeset
|
49 | static gint incb = -1; |
|
265f44ed44bc
[gaim-migrate @ 13573]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11336
diff
changeset
|
50 | static gint timeout = -1; |
|
265f44ed44bc
[gaim-migrate @ 13573]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11336
diff
changeset
|
51 | static struct stun_header *packet; |
|
265f44ed44bc
[gaim-migrate @ 13573]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11336
diff
changeset
|
52 | static int packetsize = 0; |
|
265f44ed44bc
[gaim-migrate @ 13573]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11336
diff
changeset
|
53 | static int test = 0; |
|
265f44ed44bc
[gaim-migrate @ 13573]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11336
diff
changeset
|
54 | static int retry = 0; |
|
265f44ed44bc
[gaim-migrate @ 13573]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11336
diff
changeset
|
55 | static struct sockaddr_in addr; |
|
11225
e888c207b994
[gaim-migrate @ 13361]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
56 | |
|
e888c207b994
[gaim-migrate @ 13361]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
57 | static void do_callbacks() { |
|
e888c207b994
[gaim-migrate @ 13361]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
58 | while(callbacks) { |
|
e888c207b994
[gaim-migrate @ 13361]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
59 | StunCallback cb = callbacks->data; |
|
11336
d2033b2756e2
[gaim-migrate @ 13549]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11300
diff
changeset
|
60 | if(cb) |
|
d2033b2756e2
[gaim-migrate @ 13549]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11300
diff
changeset
|
61 | cb(&nattype); |
|
11225
e888c207b994
[gaim-migrate @ 13361]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
62 | callbacks = g_slist_remove(callbacks, cb); |
|
e888c207b994
[gaim-migrate @ 13361]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
63 | } |
|
e888c207b994
[gaim-migrate @ 13361]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
64 | } |
|
e888c207b994
[gaim-migrate @ 13361]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
65 | |
|
11354
265f44ed44bc
[gaim-migrate @ 13573]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11336
diff
changeset
|
66 | static gboolean timeoutfunc(void *blah) { |
|
265f44ed44bc
[gaim-migrate @ 13573]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11336
diff
changeset
|
67 | if(retry > 2) { |
|
265f44ed44bc
[gaim-migrate @ 13573]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11336
diff
changeset
|
68 | if(test == 2) nattype.type = 5; |
|
265f44ed44bc
[gaim-migrate @ 13573]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11336
diff
changeset
|
69 | /* remove input */ |
|
265f44ed44bc
[gaim-migrate @ 13573]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11336
diff
changeset
|
70 | gaim_input_remove(incb); |
|
11431
60971f504319
[gaim-migrate @ 13668]
Daniel Atallah <datallah@pidgin.im>
parents:
11429
diff
changeset
|
71 | |
|
11354
265f44ed44bc
[gaim-migrate @ 13573]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11336
diff
changeset
|
72 | /* set unknown */ |
|
265f44ed44bc
[gaim-migrate @ 13573]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11336
diff
changeset
|
73 | nattype.status = 0; |
|
265f44ed44bc
[gaim-migrate @ 13573]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11336
diff
changeset
|
74 | |
|
265f44ed44bc
[gaim-migrate @ 13573]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11336
diff
changeset
|
75 | /* callbacks */ |
|
265f44ed44bc
[gaim-migrate @ 13573]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11336
diff
changeset
|
76 | do_callbacks(); |
|
265f44ed44bc
[gaim-migrate @ 13573]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11336
diff
changeset
|
77 | |
|
265f44ed44bc
[gaim-migrate @ 13573]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11336
diff
changeset
|
78 | return FALSE; |
|
265f44ed44bc
[gaim-migrate @ 13573]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11336
diff
changeset
|
79 | } |
|
265f44ed44bc
[gaim-migrate @ 13573]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11336
diff
changeset
|
80 | retry++; |
|
265f44ed44bc
[gaim-migrate @ 13573]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11336
diff
changeset
|
81 | sendto(fd, packet, packetsize, 0, (struct sockaddr *)&addr, sizeof(struct sockaddr_in)); |
|
265f44ed44bc
[gaim-migrate @ 13573]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11336
diff
changeset
|
82 | return TRUE; |
|
265f44ed44bc
[gaim-migrate @ 13573]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11336
diff
changeset
|
83 | } |
|
265f44ed44bc
[gaim-migrate @ 13573]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11336
diff
changeset
|
84 | |
|
265f44ed44bc
[gaim-migrate @ 13573]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11336
diff
changeset
|
85 | #ifdef NOTYET |
|
265f44ed44bc
[gaim-migrate @ 13573]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11336
diff
changeset
|
86 | static void do_test2() { |
|
265f44ed44bc
[gaim-migrate @ 13573]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11336
diff
changeset
|
87 | struct stun_change data; |
|
11431
60971f504319
[gaim-migrate @ 13668]
Daniel Atallah <datallah@pidgin.im>
parents:
11429
diff
changeset
|
88 | data.hdr.type = htons(0x0001); |
|
60971f504319
[gaim-migrate @ 13668]
Daniel Atallah <datallah@pidgin.im>
parents:
11429
diff
changeset
|
89 | data.hdr.len = 0; |
|
60971f504319
[gaim-migrate @ 13668]
Daniel Atallah <datallah@pidgin.im>
parents:
11429
diff
changeset
|
90 | data.hdr.transid[0] = rand(); |
|
60971f504319
[gaim-migrate @ 13668]
Daniel Atallah <datallah@pidgin.im>
parents:
11429
diff
changeset
|
91 | 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
|
92 | data.hdr.transid[2] = rand(); |
|
60971f504319
[gaim-migrate @ 13668]
Daniel Atallah <datallah@pidgin.im>
parents:
11429
diff
changeset
|
93 | data.hdr.transid[3] = rand(); |
|
60971f504319
[gaim-migrate @ 13668]
Daniel Atallah <datallah@pidgin.im>
parents:
11429
diff
changeset
|
94 | data.attrib.type = htons(0x003); |
|
11354
265f44ed44bc
[gaim-migrate @ 13573]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11336
diff
changeset
|
95 | data.attrib.len = htons(4); |
|
265f44ed44bc
[gaim-migrate @ 13573]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11336
diff
changeset
|
96 | data.value[3] = 6; |
|
265f44ed44bc
[gaim-migrate @ 13573]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11336
diff
changeset
|
97 | packet = (struct stun_header*)&data; |
|
265f44ed44bc
[gaim-migrate @ 13573]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11336
diff
changeset
|
98 | packetsize = sizeof(struct stun_change); |
|
265f44ed44bc
[gaim-migrate @ 13573]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11336
diff
changeset
|
99 | retry = 0; |
|
265f44ed44bc
[gaim-migrate @ 13573]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11336
diff
changeset
|
100 | test = 2; |
|
265f44ed44bc
[gaim-migrate @ 13573]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11336
diff
changeset
|
101 | sendto(fd, packet, packetsize, 0, (struct sockaddr *)&addr, sizeof(struct sockaddr_in)); |
|
11431
60971f504319
[gaim-migrate @ 13668]
Daniel Atallah <datallah@pidgin.im>
parents:
11429
diff
changeset
|
102 | timeout = gaim_timeout_add(500, (GSourceFunc)timeoutfunc, NULL); |
|
11354
265f44ed44bc
[gaim-migrate @ 13573]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11336
diff
changeset
|
103 | } |
|
265f44ed44bc
[gaim-migrate @ 13573]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11336
diff
changeset
|
104 | #endif |
|
265f44ed44bc
[gaim-migrate @ 13573]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11336
diff
changeset
|
105 | |
|
11225
e888c207b994
[gaim-migrate @ 13361]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
106 | static void reply_cb(gpointer data, gint source, GaimInputCondition cond) { |
|
11336
d2033b2756e2
[gaim-migrate @ 13549]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11300
diff
changeset
|
107 | char buffer[1024]; |
|
11225
e888c207b994
[gaim-migrate @ 13361]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
108 | char *tmp; |
|
e888c207b994
[gaim-migrate @ 13361]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
109 | int len; |
|
e888c207b994
[gaim-migrate @ 13361]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
110 | struct in_addr in; |
|
e888c207b994
[gaim-migrate @ 13361]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
111 | struct stun_attrib *attrib; |
|
e888c207b994
[gaim-migrate @ 13361]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
112 | struct stun_header *hdr; |
|
11300
11bc6db394e6
[gaim-migrate @ 13500]
Richard Laager <rlaager@pidgin.im>
parents:
11229
diff
changeset
|
113 | struct ifconf ifc; |
|
11bc6db394e6
[gaim-migrate @ 13500]
Richard Laager <rlaager@pidgin.im>
parents:
11229
diff
changeset
|
114 | struct ifreq *ifr; |
|
11bc6db394e6
[gaim-migrate @ 13500]
Richard Laager <rlaager@pidgin.im>
parents:
11229
diff
changeset
|
115 | struct sockaddr_in *sinptr; |
|
11431
60971f504319
[gaim-migrate @ 13668]
Daniel Atallah <datallah@pidgin.im>
parents:
11429
diff
changeset
|
116 | |
|
11336
d2033b2756e2
[gaim-migrate @ 13549]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11300
diff
changeset
|
117 | len = recv(source, buffer, 1024, 0); |
|
11225
e888c207b994
[gaim-migrate @ 13361]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
118 | |
|
e888c207b994
[gaim-migrate @ 13361]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
119 | hdr = (struct stun_header*)buffer; |
|
11371
363713bfd3d1
[gaim-migrate @ 13596]
Richard Laager <rlaager@pidgin.im>
parents:
11364
diff
changeset
|
120 | if(hdr->transid[0]!=packet->transid[0] || hdr->transid[1]!=packet->transid[1] || hdr->transid[2]!=packet->transid[2] || hdr->transid[3]!=packet->transid[3]) { /* wrong transaction */ |
|
363713bfd3d1
[gaim-migrate @ 13596]
Richard Laager <rlaager@pidgin.im>
parents:
11364
diff
changeset
|
121 | gaim_debug_info("stun", "got wrong transid\n"); |
|
11225
e888c207b994
[gaim-migrate @ 13361]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
122 | return; |
|
e888c207b994
[gaim-migrate @ 13361]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
123 | } |
|
11431
60971f504319
[gaim-migrate @ 13668]
Daniel Atallah <datallah@pidgin.im>
parents:
11429
diff
changeset
|
124 | if(test==1) { |
|
11354
265f44ed44bc
[gaim-migrate @ 13573]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11336
diff
changeset
|
125 | tmp = buffer + sizeof(struct stun_header); |
|
265f44ed44bc
[gaim-migrate @ 13573]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11336
diff
changeset
|
126 | while(buffer+len > tmp) { |
|
11225
e888c207b994
[gaim-migrate @ 13361]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
127 | |
|
11354
265f44ed44bc
[gaim-migrate @ 13573]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11336
diff
changeset
|
128 | attrib = (struct stun_attrib*) tmp; |
|
265f44ed44bc
[gaim-migrate @ 13573]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11336
diff
changeset
|
129 | if(attrib->type == htons(0x0001) && attrib->len == htons(8)) { |
|
265f44ed44bc
[gaim-migrate @ 13573]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11336
diff
changeset
|
130 | memcpy(&in.s_addr, tmp+sizeof(struct stun_attrib)+2+2, 4); |
|
265f44ed44bc
[gaim-migrate @ 13573]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11336
diff
changeset
|
131 | strcpy(nattype.publicip, inet_ntoa(in)); |
|
265f44ed44bc
[gaim-migrate @ 13573]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11336
diff
changeset
|
132 | } |
|
265f44ed44bc
[gaim-migrate @ 13573]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11336
diff
changeset
|
133 | tmp += sizeof(struct stun_attrib) + attrib->len; |
|
11225
e888c207b994
[gaim-migrate @ 13361]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
134 | } |
|
11371
363713bfd3d1
[gaim-migrate @ 13596]
Richard Laager <rlaager@pidgin.im>
parents:
11364
diff
changeset
|
135 | gaim_debug_info("stun", "got public ip %s\n", nattype.publicip); |
|
11354
265f44ed44bc
[gaim-migrate @ 13573]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11336
diff
changeset
|
136 | nattype.status = 2; |
|
265f44ed44bc
[gaim-migrate @ 13573]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11336
diff
changeset
|
137 | nattype.type = 1; |
|
265f44ed44bc
[gaim-migrate @ 13573]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11336
diff
changeset
|
138 | |
|
11371
363713bfd3d1
[gaim-migrate @ 13596]
Richard Laager <rlaager@pidgin.im>
parents:
11364
diff
changeset
|
139 | /* is it a NAT? */ |
|
11225
e888c207b994
[gaim-migrate @ 13361]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
140 | |
|
11354
265f44ed44bc
[gaim-migrate @ 13573]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11336
diff
changeset
|
141 | ifc.ifc_len = sizeof(buffer); |
|
265f44ed44bc
[gaim-migrate @ 13573]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11336
diff
changeset
|
142 | ifc.ifc_req = (struct ifreq *) buffer; |
|
265f44ed44bc
[gaim-migrate @ 13573]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11336
diff
changeset
|
143 | ioctl(source, SIOCGIFCONF, &ifc); |
|
11225
e888c207b994
[gaim-migrate @ 13361]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
144 | |
|
11354
265f44ed44bc
[gaim-migrate @ 13573]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11336
diff
changeset
|
145 | tmp = buffer; |
|
265f44ed44bc
[gaim-migrate @ 13573]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11336
diff
changeset
|
146 | while(tmp < buffer + ifc.ifc_len) { |
|
265f44ed44bc
[gaim-migrate @ 13573]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11336
diff
changeset
|
147 | ifr = (struct ifreq *) tmp; |
|
11225
e888c207b994
[gaim-migrate @ 13361]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
148 | |
|
11364
d754cf40ec4b
[gaim-migrate @ 13588]
Daniel Atallah <datallah@pidgin.im>
parents:
11354
diff
changeset
|
149 | tmp += sizeof(struct ifreq); |
|
11225
e888c207b994
[gaim-migrate @ 13361]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
150 | |
|
11354
265f44ed44bc
[gaim-migrate @ 13573]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11336
diff
changeset
|
151 | if(ifr->ifr_addr.sa_family == AF_INET) { |
|
11371
363713bfd3d1
[gaim-migrate @ 13596]
Richard Laager <rlaager@pidgin.im>
parents:
11364
diff
changeset
|
152 | /* we only care about ipv4 interfaces */ |
|
11354
265f44ed44bc
[gaim-migrate @ 13573]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11336
diff
changeset
|
153 | sinptr = (struct sockaddr_in *) &ifr->ifr_addr; |
|
265f44ed44bc
[gaim-migrate @ 13573]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11336
diff
changeset
|
154 | if(sinptr->sin_addr.s_addr == in.s_addr) { |
|
11371
363713bfd3d1
[gaim-migrate @ 13596]
Richard Laager <rlaager@pidgin.im>
parents:
11364
diff
changeset
|
155 | /* no NAT */ |
|
363713bfd3d1
[gaim-migrate @ 13596]
Richard Laager <rlaager@pidgin.im>
parents:
11364
diff
changeset
|
156 | gaim_debug_info("stun", "no nat"); |
|
11354
265f44ed44bc
[gaim-migrate @ 13573]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11336
diff
changeset
|
157 | nattype.type = 0; |
|
265f44ed44bc
[gaim-migrate @ 13573]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11336
diff
changeset
|
158 | } |
|
11225
e888c207b994
[gaim-migrate @ 13361]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
159 | } |
|
e888c207b994
[gaim-migrate @ 13361]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
160 | } |
|
11354
265f44ed44bc
[gaim-migrate @ 13573]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11336
diff
changeset
|
161 | gaim_timeout_remove(timeout); |
|
11225
e888c207b994
[gaim-migrate @ 13361]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
162 | |
|
11354
265f44ed44bc
[gaim-migrate @ 13573]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11336
diff
changeset
|
163 | #ifdef NOTYET |
|
265f44ed44bc
[gaim-migrate @ 13573]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11336
diff
changeset
|
164 | do_test2(); |
|
265f44ed44bc
[gaim-migrate @ 13573]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11336
diff
changeset
|
165 | #endif |
|
265f44ed44bc
[gaim-migrate @ 13573]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11336
diff
changeset
|
166 | return; |
|
265f44ed44bc
[gaim-migrate @ 13573]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11336
diff
changeset
|
167 | } else if(test == 2) { |
|
265f44ed44bc
[gaim-migrate @ 13573]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11336
diff
changeset
|
168 | do_callbacks(); |
|
265f44ed44bc
[gaim-migrate @ 13573]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11336
diff
changeset
|
169 | gaim_input_remove(incb); |
|
265f44ed44bc
[gaim-migrate @ 13573]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11336
diff
changeset
|
170 | gaim_timeout_remove(timeout); |
|
265f44ed44bc
[gaim-migrate @ 13573]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11336
diff
changeset
|
171 | nattype.type = 2; |
|
265f44ed44bc
[gaim-migrate @ 13573]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11336
diff
changeset
|
172 | } |
|
11336
d2033b2756e2
[gaim-migrate @ 13549]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11300
diff
changeset
|
173 | } |
|
11424
b0f8535daa74
[gaim-migrate @ 13661]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11371
diff
changeset
|
174 | |
|
11429
3f7f01e88e77
[gaim-migrate @ 13666]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11425
diff
changeset
|
175 | static void hbn_cb(GSList *hosts, gpointer edata, const char *error_message) { |
|
11354
265f44ed44bc
[gaim-migrate @ 13573]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11336
diff
changeset
|
176 | static struct stun_header data; |
|
11424
b0f8535daa74
[gaim-migrate @ 13661]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11371
diff
changeset
|
177 | int ret; |
|
11425
668f93d8c3a2
[gaim-migrate @ 13662]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11424
diff
changeset
|
178 | |
|
11429
3f7f01e88e77
[gaim-migrate @ 13666]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11425
diff
changeset
|
179 | if(!hosts) return; |
|
3f7f01e88e77
[gaim-migrate @ 13666]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11425
diff
changeset
|
180 | if(!hosts->data) return; |
|
11425
668f93d8c3a2
[gaim-migrate @ 13662]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11424
diff
changeset
|
181 | |
|
11225
e888c207b994
[gaim-migrate @ 13361]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
182 | if((fd = socket(AF_INET, SOCK_DGRAM, 0)) < 0) { |
|
e888c207b994
[gaim-migrate @ 13361]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
183 | nattype.status = 0; |
|
11424
b0f8535daa74
[gaim-migrate @ 13661]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11371
diff
changeset
|
184 | do_callbacks(); |
|
b0f8535daa74
[gaim-migrate @ 13661]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11371
diff
changeset
|
185 | return; |
|
11225
e888c207b994
[gaim-migrate @ 13361]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
186 | } |
|
e888c207b994
[gaim-migrate @ 13361]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
187 | |
|
e888c207b994
[gaim-migrate @ 13361]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
188 | addr.sin_family = AF_INET; |
|
e888c207b994
[gaim-migrate @ 13361]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
189 | addr.sin_port = htons(12108); |
|
e888c207b994
[gaim-migrate @ 13361]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
190 | addr.sin_addr.s_addr = INADDR_ANY; |
|
e888c207b994
[gaim-migrate @ 13361]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
191 | while( ((ret = bind(fd, (struct sockaddr *)&addr, sizeof(struct sockaddr_in))) < 0 ) && ntohs(addr.sin_port) < 12208) { |
|
e888c207b994
[gaim-migrate @ 13361]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
192 | addr.sin_port = htons(ntohs(addr.sin_port)+1); |
|
e888c207b994
[gaim-migrate @ 13361]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
193 | } |
|
e888c207b994
[gaim-migrate @ 13361]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
194 | if( ret < 0 ) { |
|
e888c207b994
[gaim-migrate @ 13361]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
195 | nattype.status = 0; |
|
11431
60971f504319
[gaim-migrate @ 13668]
Daniel Atallah <datallah@pidgin.im>
parents:
11429
diff
changeset
|
196 | do_callbacks(); |
|
11424
b0f8535daa74
[gaim-migrate @ 13661]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11371
diff
changeset
|
197 | return; |
|
11225
e888c207b994
[gaim-migrate @ 13361]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
198 | } |
|
e888c207b994
[gaim-migrate @ 13361]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
199 | incb = gaim_input_add(fd, GAIM_INPUT_READ, reply_cb, NULL); |
|
e888c207b994
[gaim-migrate @ 13361]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
200 | |
|
11429
3f7f01e88e77
[gaim-migrate @ 13666]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11425
diff
changeset
|
201 | ret = GPOINTER_TO_INT(hosts->data); |
|
3f7f01e88e77
[gaim-migrate @ 13666]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11425
diff
changeset
|
202 | hosts = g_slist_remove(hosts, hosts->data); |
|
3f7f01e88e77
[gaim-migrate @ 13666]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11425
diff
changeset
|
203 | memcpy(&addr, hosts->data, sizeof(struct sockaddr_in)); |
|
3f7f01e88e77
[gaim-migrate @ 13666]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11425
diff
changeset
|
204 | g_free(hosts->data); |
|
3f7f01e88e77
[gaim-migrate @ 13666]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11425
diff
changeset
|
205 | hosts = g_slist_remove(hosts, hosts->data); |
|
3f7f01e88e77
[gaim-migrate @ 13666]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11425
diff
changeset
|
206 | while(hosts) { |
|
3f7f01e88e77
[gaim-migrate @ 13666]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11425
diff
changeset
|
207 | hosts = g_slist_remove(hosts, hosts->data); |
|
3f7f01e88e77
[gaim-migrate @ 13666]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11425
diff
changeset
|
208 | g_free(hosts->data); |
|
3f7f01e88e77
[gaim-migrate @ 13666]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11425
diff
changeset
|
209 | hosts = g_slist_remove(hosts, hosts->data); |
|
3f7f01e88e77
[gaim-migrate @ 13666]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11425
diff
changeset
|
210 | } |
|
11431
60971f504319
[gaim-migrate @ 13668]
Daniel Atallah <datallah@pidgin.im>
parents:
11429
diff
changeset
|
211 | |
|
11225
e888c207b994
[gaim-migrate @ 13361]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
212 | data.type = htons(0x0001); |
|
e888c207b994
[gaim-migrate @ 13361]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
213 | data.len = 0; |
|
11354
265f44ed44bc
[gaim-migrate @ 13573]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11336
diff
changeset
|
214 | data.transid[0] = rand(); |
|
265f44ed44bc
[gaim-migrate @ 13573]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11336
diff
changeset
|
215 | data.transid[1] = ntohl(((int)'g' << 24) + ((int)'a' << 16) + ((int)'i' << 8) + (int)'m'); |
|
265f44ed44bc
[gaim-migrate @ 13573]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11336
diff
changeset
|
216 | data.transid[2] = rand(); |
|
265f44ed44bc
[gaim-migrate @ 13573]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11336
diff
changeset
|
217 | data.transid[3] = rand(); |
|
11431
60971f504319
[gaim-migrate @ 13668]
Daniel Atallah <datallah@pidgin.im>
parents:
11429
diff
changeset
|
218 | |
|
11225
e888c207b994
[gaim-migrate @ 13361]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
219 | if( sendto(fd, &data, sizeof(struct stun_header), 0, (struct sockaddr *)&addr, sizeof(struct sockaddr_in)) < sizeof(struct stun_header)) { |
|
11431
60971f504319
[gaim-migrate @ 13668]
Daniel Atallah <datallah@pidgin.im>
parents:
11429
diff
changeset
|
220 | nattype.status = 0; |
|
60971f504319
[gaim-migrate @ 13668]
Daniel Atallah <datallah@pidgin.im>
parents:
11429
diff
changeset
|
221 | do_callbacks(); |
|
60971f504319
[gaim-migrate @ 13668]
Daniel Atallah <datallah@pidgin.im>
parents:
11429
diff
changeset
|
222 | return; |
|
11225
e888c207b994
[gaim-migrate @ 13361]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
223 | } |
|
11354
265f44ed44bc
[gaim-migrate @ 13573]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11336
diff
changeset
|
224 | test = 1; |
|
265f44ed44bc
[gaim-migrate @ 13573]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11336
diff
changeset
|
225 | packet = &data; |
|
265f44ed44bc
[gaim-migrate @ 13573]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11336
diff
changeset
|
226 | packetsize = sizeof(struct stun_header); |
|
265f44ed44bc
[gaim-migrate @ 13573]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11336
diff
changeset
|
227 | timeout = gaim_timeout_add(500, (GSourceFunc)timeoutfunc, NULL); |
|
11429
3f7f01e88e77
[gaim-migrate @ 13666]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11425
diff
changeset
|
228 | } |
|
3f7f01e88e77
[gaim-migrate @ 13666]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11425
diff
changeset
|
229 | |
|
3f7f01e88e77
[gaim-migrate @ 13666]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11425
diff
changeset
|
230 | static void do_test1(struct srv_response *resp, int results, gpointer sdata) { |
|
11431
60971f504319
[gaim-migrate @ 13668]
Daniel Atallah <datallah@pidgin.im>
parents:
11429
diff
changeset
|
231 | const char *servername = sdata; |
|
11429
3f7f01e88e77
[gaim-migrate @ 13666]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11425
diff
changeset
|
232 | int port = 3478; |
|
11431
60971f504319
[gaim-migrate @ 13668]
Daniel Atallah <datallah@pidgin.im>
parents:
11429
diff
changeset
|
233 | |
|
11429
3f7f01e88e77
[gaim-migrate @ 13666]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11425
diff
changeset
|
234 | if(results) { |
|
3f7f01e88e77
[gaim-migrate @ 13666]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11425
diff
changeset
|
235 | servername = resp[0].hostname; |
|
3f7f01e88e77
[gaim-migrate @ 13666]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11425
diff
changeset
|
236 | port = resp[0].port; |
|
3f7f01e88e77
[gaim-migrate @ 13666]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11425
diff
changeset
|
237 | } |
|
3f7f01e88e77
[gaim-migrate @ 13666]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11425
diff
changeset
|
238 | gaim_debug_info("stun", "got %d SRV responses, server: %s, port: %d\n", results, servername, port); |
|
3f7f01e88e77
[gaim-migrate @ 13666]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11425
diff
changeset
|
239 | |
|
3f7f01e88e77
[gaim-migrate @ 13666]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11425
diff
changeset
|
240 | gaim_gethostbyname_async(servername, port, hbn_cb, NULL); |
|
11424
b0f8535daa74
[gaim-migrate @ 13661]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11371
diff
changeset
|
241 | g_free(resp); |
|
11225
e888c207b994
[gaim-migrate @ 13361]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff
changeset
|
242 | } |
|
11424
b0f8535daa74
[gaim-migrate @ 13661]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11371
diff
changeset
|
243 | |
|
b0f8535daa74
[gaim-migrate @ 13661]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11371
diff
changeset
|
244 | struct stun_nattype *gaim_stun_discover(StunCallback cb) { |
|
11431
60971f504319
[gaim-migrate @ 13668]
Daniel Atallah <datallah@pidgin.im>
parents:
11429
diff
changeset
|
245 | const char *servername = gaim_prefs_get_string("/core/network/stun_server"); |
|
11424
b0f8535daa74
[gaim-migrate @ 13661]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11371
diff
changeset
|
246 | |
|
b0f8535daa74
[gaim-migrate @ 13661]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11371
diff
changeset
|
247 | gaim_debug_info("stun", "using server %s\n", servername); |
|
b0f8535daa74
[gaim-migrate @ 13661]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11371
diff
changeset
|
248 | if(nattype.status == 1) { /* currently discovering */ |
|
b0f8535daa74
[gaim-migrate @ 13661]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11371
diff
changeset
|
249 | if(cb) callbacks = g_slist_append(callbacks, cb); |
|
b0f8535daa74
[gaim-migrate @ 13661]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11371
diff
changeset
|
250 | return NULL; |
|
b0f8535daa74
[gaim-migrate @ 13661]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11371
diff
changeset
|
251 | } |
|
b0f8535daa74
[gaim-migrate @ 13661]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11371
diff
changeset
|
252 | if(nattype.status != -1) { /* already discovered */ |
|
b0f8535daa74
[gaim-migrate @ 13661]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11371
diff
changeset
|
253 | if(cb) cb(&nattype); |
|
b0f8535daa74
[gaim-migrate @ 13661]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11371
diff
changeset
|
254 | return &nattype; |
|
b0f8535daa74
[gaim-migrate @ 13661]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11371
diff
changeset
|
255 | } |
|
b0f8535daa74
[gaim-migrate @ 13661]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11371
diff
changeset
|
256 | |
|
b0f8535daa74
[gaim-migrate @ 13661]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11371
diff
changeset
|
257 | if(!servername || (strlen(servername)<2)) { |
|
b0f8535daa74
[gaim-migrate @ 13661]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11371
diff
changeset
|
258 | nattype.status = 0; |
|
b0f8535daa74
[gaim-migrate @ 13661]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11371
diff
changeset
|
259 | if(cb) cb(&nattype); |
|
b0f8535daa74
[gaim-migrate @ 13661]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11371
diff
changeset
|
260 | return &nattype; |
|
b0f8535daa74
[gaim-migrate @ 13661]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11371
diff
changeset
|
261 | } |
|
b0f8535daa74
[gaim-migrate @ 13661]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11371
diff
changeset
|
262 | callbacks = g_slist_append(callbacks, cb); |
|
11431
60971f504319
[gaim-migrate @ 13668]
Daniel Atallah <datallah@pidgin.im>
parents:
11429
diff
changeset
|
263 | gaim_srv_resolve("stun","udp",servername, do_test1, |
|
60971f504319
[gaim-migrate @ 13668]
Daniel Atallah <datallah@pidgin.im>
parents:
11429
diff
changeset
|
264 | (gpointer) servername); |
|
11424
b0f8535daa74
[gaim-migrate @ 13661]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11371
diff
changeset
|
265 | return &nattype; |
|
b0f8535daa74
[gaim-migrate @ 13661]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11371
diff
changeset
|
266 | } |
|
b0f8535daa74
[gaim-migrate @ 13661]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11371
diff
changeset
|
267 | |
|
b0f8535daa74
[gaim-migrate @ 13661]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11371
diff
changeset
|
268 | void gaim_stun_init() { |
|
b0f8535daa74
[gaim-migrate @ 13661]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11371
diff
changeset
|
269 | gaim_prefs_add_string("/core/network/stun_server", ""); |
|
b0f8535daa74
[gaim-migrate @ 13661]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
11371
diff
changeset
|
270 | } |