annotate libpurple/protocols/jabber/jingle/jingle.c @ 30517:105437d8253f

propagate from branch 'im.pidgin.pidgin' (head d5a2e2287440ac7134c201e66921754bd4187ba9) to branch 'im.pidgin.cpw.malu.xmpp.google_relay' (head 6d5f3264173d13362030c57e5372ffbbfbdef53d)
author Marcus Lundblad <ml@update.uu.se>
date Fri, 08 Jan 2010 23:22:19 +0000
parents 0712ce23901e 5e4fc3ab19dc
children d873eeaccfc2
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
24938
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
1 /*
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
2 * @file jingle.c
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
3 *
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
4 * purple - Jabber Protocol Plugin
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
5 *
28048
c585572e80dd Remove specific copyright lines from the XMPP prpl.
Paul Aurich <paul@darkrain42.org>
parents: 26472
diff changeset
6 * Purple is the legal property of its developers, whose names are too numerous
c585572e80dd Remove specific copyright lines from the XMPP prpl.
Paul Aurich <paul@darkrain42.org>
parents: 26472
diff changeset
7 * to list here. Please refer to the COPYRIGHT file distributed with this
c585572e80dd Remove specific copyright lines from the XMPP prpl.
Paul Aurich <paul@darkrain42.org>
parents: 26472
diff changeset
8 * source distribution.
c585572e80dd Remove specific copyright lines from the XMPP prpl.
Paul Aurich <paul@darkrain42.org>
parents: 26472
diff changeset
9 *
24938
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
10 * This program is free software; you can redistribute it and/or modify
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
11 * it under the terms of the GNU General Public License as published by
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
12 * the Free Software Foundation; either version 2 of the License, or
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
13 * (at your option) any later version.
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
14 *
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
15 * This program is distributed in the hope that it will be useful,
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
16 * but WITHOUT ANY WARRANTY; without even the implied warranty of
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
17 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
18 * GNU General Public License for more details.
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
19 *
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
20 * You should have received a copy of the GNU General Public License
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
21 * along with this program; if not, write to the Free Software
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
22 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
23 *
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
24 */
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
25
26010
db517c55c508 Make it compile in Windows with the equivalent of --disable-vv.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26009
diff changeset
26 #include "internal.h"
26080
88f183f7dfc7 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <ml@update.uu.se>
parents: 26010
diff changeset
27 #include "network.h"
26010
db517c55c508 Make it compile in Windows with the equivalent of --disable-vv.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26009
diff changeset
28
24938
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
29 #include "content.h"
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
30 #include "debug.h"
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
31 #include "jingle.h"
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
32 #include <string.h>
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
33 #include "session.h"
24966
bee5ab815291 Added a Jingle ice-udp transmitter.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24949
diff changeset
34 #include "iceudp.h"
24938
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
35 #include "rawudp.h"
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
36 #include "rtp.h"
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
37
30499
f858b53dfbf0 Can now generate a relayed candidate for the initiator
Marcus Lundblad <ml@update.uu.se>
parents: 28048
diff changeset
38 #ifdef USE_VV
f858b53dfbf0 Can now generate a relayed candidate for the initiator
Marcus Lundblad <ml@update.uu.se>
parents: 28048
diff changeset
39 #include <gst/farsight/fs-conference-iface.h>
f858b53dfbf0 Can now generate a relayed candidate for the initiator
Marcus Lundblad <ml@update.uu.se>
parents: 28048
diff changeset
40 #include <gst/farsight/fs-element-added-notifier.h>
f858b53dfbf0 Can now generate a relayed candidate for the initiator
Marcus Lundblad <ml@update.uu.se>
parents: 28048
diff changeset
41 #endif
28782
5e4fc3ab19dc Rearrange includes a bit to be consistent with the other files in the same dir
Marcus Lundblad <ml@update.uu.se>
parents: 28493
diff changeset
42
24938
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
43 GType
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
44 jingle_get_type(const gchar *type)
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
45 {
26009
59188d904773 Fix compiling with --disable-vv.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24966
diff changeset
46 if (!strcmp(type, JINGLE_TRANSPORT_RAWUDP))
24938
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
47 return JINGLE_TYPE_RAWUDP;
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
48 else if (!strcmp(type, JINGLE_TRANSPORT_ICEUDP))
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
49 return JINGLE_TYPE_ICEUDP;
24966
bee5ab815291 Added a Jingle ice-udp transmitter.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24949
diff changeset
50 #if 0
24938
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
51 else if (!strcmp(type, JINGLE_TRANSPORT_SOCKS))
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
52 return JINGLE_TYPE_SOCKS;
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
53 else if (!strcmp(type, JINGLE_TRANSPORT_IBB))
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
54 return JINGLE_TYPE_IBB;
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
55 #endif
26009
59188d904773 Fix compiling with --disable-vv.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24966
diff changeset
56 #ifdef USE_VV
59188d904773 Fix compiling with --disable-vv.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24966
diff changeset
57 else if (!strcmp(type, JINGLE_APP_RTP))
59188d904773 Fix compiling with --disable-vv.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24966
diff changeset
58 return JINGLE_TYPE_RTP;
59188d904773 Fix compiling with --disable-vv.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24966
diff changeset
59 #endif
59188d904773 Fix compiling with --disable-vv.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24966
diff changeset
60 #if 0
59188d904773 Fix compiling with --disable-vv.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24966
diff changeset
61 else if (!strcmp(type, JINGLE_APP_FT))
59188d904773 Fix compiling with --disable-vv.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24966
diff changeset
62 return JINGLE_TYPE_FT;
59188d904773 Fix compiling with --disable-vv.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24966
diff changeset
63 else if (!strcmp(type, JINGLE_APP_XML))
59188d904773 Fix compiling with --disable-vv.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24966
diff changeset
64 return JINGLE_TYPE_XML;
59188d904773 Fix compiling with --disable-vv.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24966
diff changeset
65 #endif
24938
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
66 else
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
67 return G_TYPE_NONE;
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
68 }
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
69
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
70 static void
26281
925af7142249 Restructure Jingle action handlers to only require modification in one place.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26087
diff changeset
71 jingle_handle_unknown_type(JingleSession *session, xmlnode *jingle)
925af7142249 Restructure Jingle action handlers to only require modification in one place.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26087
diff changeset
72 {
925af7142249 Restructure Jingle action handlers to only require modification in one place.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26087
diff changeset
73 /* Send error */
925af7142249 Restructure Jingle action handlers to only require modification in one place.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26087
diff changeset
74 }
925af7142249 Restructure Jingle action handlers to only require modification in one place.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26087
diff changeset
75
925af7142249 Restructure Jingle action handlers to only require modification in one place.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26087
diff changeset
76 static void
24938
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
77 jingle_handle_content_accept(JingleSession *session, xmlnode *jingle)
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
78 {
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
79 xmlnode *content = xmlnode_get_child(jingle, "content");
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
80 jabber_iq_send(jingle_session_create_ack(session, jingle));
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
81
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
82 for (; content; content = xmlnode_get_next_twin(content)) {
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
83 const gchar *name = xmlnode_get_attrib(content, "name");
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
84 const gchar *creator = xmlnode_get_attrib(content, "creator");
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
85 jingle_session_accept_content(session, name, creator);
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
86 /* signal here */
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
87 }
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
88 }
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
89
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
90 static void
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
91 jingle_handle_content_add(JingleSession *session, xmlnode *jingle)
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
92 {
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
93 xmlnode *content = xmlnode_get_child(jingle, "content");
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
94 jabber_iq_send(jingle_session_create_ack(session, jingle));
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
95
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
96 for (; content; content = xmlnode_get_next_twin(content)) {
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
97 JingleContent *pending_content =
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
98 jingle_content_parse(content);
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
99 if (pending_content == NULL) {
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
100 purple_debug_error("jingle",
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
101 "Error parsing \"content-add\" content.\n");
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
102 /* XXX: send error here */
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
103 } else {
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
104 jingle_session_add_pending_content(session,
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
105 pending_content);
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
106 }
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
107 }
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
108
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
109 /* XXX: signal here */
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
110 }
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
111
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
112 static void
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
113 jingle_handle_content_modify(JingleSession *session, xmlnode *jingle)
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
114 {
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
115 xmlnode *content = xmlnode_get_child(jingle, "content");
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
116 jabber_iq_send(jingle_session_create_ack(session, jingle));
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
117
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
118 for (; content; content = xmlnode_get_next_twin(content)) {
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
119 const gchar *name = xmlnode_get_attrib(content, "name");
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
120 const gchar *creator = xmlnode_get_attrib(content, "creator");
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
121 JingleContent *local_content = jingle_session_find_content(session, name, creator);
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
122
28287
e0a9b3e18c9d Fix a crash when content modify contains unknown content.
maiku@pidgin.im
parents: 28048
diff changeset
123 if (local_content != NULL) {
24938
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
124 const gchar *senders = xmlnode_get_attrib(content, "senders");
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
125 gchar *local_senders = jingle_content_get_senders(local_content);
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
126 if (strcmp(senders, local_senders))
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
127 jingle_content_modify(local_content, senders);
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
128 g_free(local_senders);
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
129 } else {
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
130 purple_debug_error("jingle", "content_modify: unknown content\n");
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
131 /* XXX: send error */
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
132 }
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
133 }
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
134 }
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
135
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
136 static void
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
137 jingle_handle_content_reject(JingleSession *session, xmlnode *jingle)
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
138 {
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
139 xmlnode *content = xmlnode_get_child(jingle, "content");
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
140 jabber_iq_send(jingle_session_create_ack(session, jingle));
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
141
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
142 for (; content; content = xmlnode_get_next_twin(content)) {
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
143 const gchar *name = xmlnode_get_attrib(content, "name");
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
144 const gchar *creator = xmlnode_get_attrib(content, "creator");
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
145 jingle_session_remove_pending_content(session, name, creator);
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
146 /* signal here */
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
147 }
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
148 }
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
149
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
150 static void
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
151 jingle_handle_content_remove(JingleSession *session, xmlnode *jingle)
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
152 {
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
153 xmlnode *content = xmlnode_get_child(jingle, "content");
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
154
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
155 jabber_iq_send(jingle_session_create_ack(session, jingle));
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
156
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
157 for (; content; content = xmlnode_get_next_twin(content)) {
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
158 const gchar *name = xmlnode_get_attrib(content, "name");
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
159 const gchar *creator = xmlnode_get_attrib(content, "creator");
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
160 jingle_session_remove_content(session, name, creator);
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
161 }
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
162 }
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
163
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
164 static void
26087
0a5737e1e969 Update to newest XEP-0166 Jingle spec.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26080
diff changeset
165 jingle_handle_description_info(JingleSession *session, xmlnode *jingle)
0a5737e1e969 Update to newest XEP-0166 Jingle spec.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26080
diff changeset
166 {
0a5737e1e969 Update to newest XEP-0166 Jingle spec.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26080
diff changeset
167 xmlnode *content = xmlnode_get_child(jingle, "content");
0a5737e1e969 Update to newest XEP-0166 Jingle spec.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26080
diff changeset
168
0a5737e1e969 Update to newest XEP-0166 Jingle spec.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26080
diff changeset
169 jabber_iq_send(jingle_session_create_ack(session, jingle));
0a5737e1e969 Update to newest XEP-0166 Jingle spec.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26080
diff changeset
170
0a5737e1e969 Update to newest XEP-0166 Jingle spec.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26080
diff changeset
171 jingle_session_accept_session(session);
0a5737e1e969 Update to newest XEP-0166 Jingle spec.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26080
diff changeset
172
0a5737e1e969 Update to newest XEP-0166 Jingle spec.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26080
diff changeset
173 for (; content; content = xmlnode_get_next_twin(content)) {
0a5737e1e969 Update to newest XEP-0166 Jingle spec.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26080
diff changeset
174 const gchar *name = xmlnode_get_attrib(content, "name");
0a5737e1e969 Update to newest XEP-0166 Jingle spec.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26080
diff changeset
175 const gchar *creator = xmlnode_get_attrib(content, "creator");
0a5737e1e969 Update to newest XEP-0166 Jingle spec.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26080
diff changeset
176 JingleContent *parsed_content =
0a5737e1e969 Update to newest XEP-0166 Jingle spec.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26080
diff changeset
177 jingle_session_find_content(session, name, creator);
0a5737e1e969 Update to newest XEP-0166 Jingle spec.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26080
diff changeset
178 if (parsed_content == NULL) {
0a5737e1e969 Update to newest XEP-0166 Jingle spec.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26080
diff changeset
179 purple_debug_error("jingle", "Error parsing content\n");
0a5737e1e969 Update to newest XEP-0166 Jingle spec.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26080
diff changeset
180 /* XXX: send error */
0a5737e1e969 Update to newest XEP-0166 Jingle spec.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26080
diff changeset
181 } else {
0a5737e1e969 Update to newest XEP-0166 Jingle spec.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26080
diff changeset
182 jingle_content_handle_action(parsed_content, content,
0a5737e1e969 Update to newest XEP-0166 Jingle spec.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26080
diff changeset
183 JINGLE_DESCRIPTION_INFO);
0a5737e1e969 Update to newest XEP-0166 Jingle spec.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26080
diff changeset
184 }
0a5737e1e969 Update to newest XEP-0166 Jingle spec.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26080
diff changeset
185 }
0a5737e1e969 Update to newest XEP-0166 Jingle spec.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26080
diff changeset
186 }
0a5737e1e969 Update to newest XEP-0166 Jingle spec.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26080
diff changeset
187
0a5737e1e969 Update to newest XEP-0166 Jingle spec.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26080
diff changeset
188 static void
26283
abcc94ace5ea Update to be closer to the current Jingle XEP.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26282
diff changeset
189 jingle_handle_security_info(JingleSession *session, xmlnode *jingle)
abcc94ace5ea Update to be closer to the current Jingle XEP.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26282
diff changeset
190 {
abcc94ace5ea Update to be closer to the current Jingle XEP.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26282
diff changeset
191 jabber_iq_send(jingle_session_create_ack(session, jingle));
abcc94ace5ea Update to be closer to the current Jingle XEP.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26282
diff changeset
192 }
abcc94ace5ea Update to be closer to the current Jingle XEP.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26282
diff changeset
193
abcc94ace5ea Update to be closer to the current Jingle XEP.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26282
diff changeset
194 static void
24938
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
195 jingle_handle_session_accept(JingleSession *session, xmlnode *jingle)
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
196 {
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
197 xmlnode *content = xmlnode_get_child(jingle, "content");
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
198
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
199 jabber_iq_send(jingle_session_create_ack(session, jingle));
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
200
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
201 jingle_session_accept_session(session);
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
202
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
203 for (; content; content = xmlnode_get_next_twin(content)) {
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
204 const gchar *name = xmlnode_get_attrib(content, "name");
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
205 const gchar *creator = xmlnode_get_attrib(content, "creator");
24949
1a2d446cb8a0 Fix support for audio and video (at the same time) sessions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24938
diff changeset
206 JingleContent *parsed_content =
1a2d446cb8a0 Fix support for audio and video (at the same time) sessions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24938
diff changeset
207 jingle_session_find_content(session, name, creator);
1a2d446cb8a0 Fix support for audio and video (at the same time) sessions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24938
diff changeset
208 if (parsed_content == NULL) {
24938
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
209 purple_debug_error("jingle", "Error parsing content\n");
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
210 /* XXX: send error */
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
211 } else {
24949
1a2d446cb8a0 Fix support for audio and video (at the same time) sessions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24938
diff changeset
212 jingle_content_handle_action(parsed_content, content,
24938
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
213 JINGLE_SESSION_ACCEPT);
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
214 }
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
215 }
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
216 }
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
217
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
218 static void
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
219 jingle_handle_session_info(JingleSession *session, xmlnode *jingle)
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
220 {
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
221 jabber_iq_send(jingle_session_create_ack(session, jingle));
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
222 /* XXX: call signal */
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
223 }
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
224
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
225 static void
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
226 jingle_handle_session_initiate(JingleSession *session, xmlnode *jingle)
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
227 {
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
228 xmlnode *content = xmlnode_get_child(jingle, "content");
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
229
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
230 for (; content; content = xmlnode_get_next_twin(content)) {
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
231 JingleContent *parsed_content = jingle_content_parse(content);
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
232 if (parsed_content == NULL) {
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
233 purple_debug_error("jingle", "Error parsing content\n");
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
234 /* XXX: send error */
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
235 } else {
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
236 jingle_session_add_content(session, parsed_content);
24949
1a2d446cb8a0 Fix support for audio and video (at the same time) sessions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24938
diff changeset
237 jingle_content_handle_action(parsed_content, content,
24938
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
238 JINGLE_SESSION_INITIATE);
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
239 }
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
240 }
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
241
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
242 jabber_iq_send(jingle_session_create_ack(session, jingle));
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
243 }
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
244
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
245 static void
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
246 jingle_handle_session_terminate(JingleSession *session, xmlnode *jingle)
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
247 {
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
248 jabber_iq_send(jingle_session_create_ack(session, jingle));
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
249
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
250 jingle_session_handle_action(session, jingle,
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
251 JINGLE_SESSION_TERMINATE);
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
252 /* display reason? */
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
253 g_object_unref(session);
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
254 }
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
255
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
256 static void
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
257 jingle_handle_transport_accept(JingleSession *session, xmlnode *jingle)
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
258 {
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
259 xmlnode *content = xmlnode_get_child(jingle, "content");
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
260
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
261 jabber_iq_send(jingle_session_create_ack(session, jingle));
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
262
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
263 for (; content; content = xmlnode_get_next_twin(content)) {
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
264 const gchar *name = xmlnode_get_attrib(content, "name");
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
265 const gchar *creator = xmlnode_get_attrib(content, "creator");
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
266 JingleContent *content = jingle_session_find_content(session, name, creator);
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
267 jingle_content_accept_transport(content);
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
268 }
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
269 }
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
270
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
271 static void
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
272 jingle_handle_transport_info(JingleSession *session, xmlnode *jingle)
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
273 {
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
274 xmlnode *content = xmlnode_get_child(jingle, "content");
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
275
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
276 jabber_iq_send(jingle_session_create_ack(session, jingle));
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
277
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
278 for (; content; content = xmlnode_get_next_twin(content)) {
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
279 const gchar *name = xmlnode_get_attrib(content, "name");
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
280 const gchar *creator = xmlnode_get_attrib(content, "creator");
24949
1a2d446cb8a0 Fix support for audio and video (at the same time) sessions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24938
diff changeset
281 JingleContent *parsed_content =
1a2d446cb8a0 Fix support for audio and video (at the same time) sessions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24938
diff changeset
282 jingle_session_find_content(session, name, creator);
1a2d446cb8a0 Fix support for audio and video (at the same time) sessions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24938
diff changeset
283 if (parsed_content == NULL) {
24938
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
284 purple_debug_error("jingle", "Error parsing content\n");
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
285 /* XXX: send error */
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
286 } else {
24949
1a2d446cb8a0 Fix support for audio and video (at the same time) sessions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24938
diff changeset
287 jingle_content_handle_action(parsed_content, content,
24938
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
288 JINGLE_TRANSPORT_INFO);
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
289 }
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
290 }
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
291 }
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
292
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
293 static void
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
294 jingle_handle_transport_reject(JingleSession *session, xmlnode *jingle)
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
295 {
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
296 xmlnode *content = xmlnode_get_child(jingle, "content");
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
297
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
298 jabber_iq_send(jingle_session_create_ack(session, jingle));
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
299
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
300 for (; content; content = xmlnode_get_next_twin(content)) {
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
301 const gchar *name = xmlnode_get_attrib(content, "name");
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
302 const gchar *creator = xmlnode_get_attrib(content, "creator");
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
303 JingleContent *content = jingle_session_find_content(session, name, creator);
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
304 jingle_content_remove_pending_transport(content);
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
305 }
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
306 }
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
307
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
308 static void
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
309 jingle_handle_transport_replace(JingleSession *session, xmlnode *jingle)
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
310 {
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
311 xmlnode *content = xmlnode_get_child(jingle, "content");
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
312
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
313 jabber_iq_send(jingle_session_create_ack(session, jingle));
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
314
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
315 for (; content; content = xmlnode_get_next_twin(content)) {
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
316 const gchar *name = xmlnode_get_attrib(content, "name");
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
317 const gchar *creator = xmlnode_get_attrib(content, "creator");
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
318 xmlnode *xmltransport = xmlnode_get_child(content, "transport");
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
319 JingleTransport *transport = jingle_transport_parse(xmltransport);
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
320 JingleContent *content = jingle_session_find_content(session, name, creator);
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
321
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
322 jingle_content_set_pending_transport(content, transport);
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
323 }
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
324 }
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
325
26281
925af7142249 Restructure Jingle action handlers to only require modification in one place.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26087
diff changeset
326 typedef struct {
925af7142249 Restructure Jingle action handlers to only require modification in one place.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26087
diff changeset
327 const char *name;
925af7142249 Restructure Jingle action handlers to only require modification in one place.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26087
diff changeset
328 void (*handler)(JingleSession*, xmlnode*);
925af7142249 Restructure Jingle action handlers to only require modification in one place.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26087
diff changeset
329 } JingleAction;
925af7142249 Restructure Jingle action handlers to only require modification in one place.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26087
diff changeset
330
925af7142249 Restructure Jingle action handlers to only require modification in one place.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26087
diff changeset
331 static const JingleAction jingle_actions[] = {
925af7142249 Restructure Jingle action handlers to only require modification in one place.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26087
diff changeset
332 {"unknown-type", jingle_handle_unknown_type},
925af7142249 Restructure Jingle action handlers to only require modification in one place.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26087
diff changeset
333 {"content-accept", jingle_handle_content_accept},
925af7142249 Restructure Jingle action handlers to only require modification in one place.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26087
diff changeset
334 {"content-add", jingle_handle_content_add},
925af7142249 Restructure Jingle action handlers to only require modification in one place.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26087
diff changeset
335 {"content-modify", jingle_handle_content_modify},
925af7142249 Restructure Jingle action handlers to only require modification in one place.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26087
diff changeset
336 {"content-reject", jingle_handle_content_reject},
925af7142249 Restructure Jingle action handlers to only require modification in one place.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26087
diff changeset
337 {"content-remove", jingle_handle_content_remove},
925af7142249 Restructure Jingle action handlers to only require modification in one place.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26087
diff changeset
338 {"description-info", jingle_handle_description_info},
26283
abcc94ace5ea Update to be closer to the current Jingle XEP.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26282
diff changeset
339 {"security-info", jingle_handle_security_info},
26281
925af7142249 Restructure Jingle action handlers to only require modification in one place.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26087
diff changeset
340 {"session-accept", jingle_handle_session_accept},
925af7142249 Restructure Jingle action handlers to only require modification in one place.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26087
diff changeset
341 {"session-info", jingle_handle_session_info},
925af7142249 Restructure Jingle action handlers to only require modification in one place.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26087
diff changeset
342 {"session-initiate", jingle_handle_session_initiate},
925af7142249 Restructure Jingle action handlers to only require modification in one place.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26087
diff changeset
343 {"session-terminate", jingle_handle_session_terminate},
925af7142249 Restructure Jingle action handlers to only require modification in one place.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26087
diff changeset
344 {"transport-accept", jingle_handle_transport_accept},
925af7142249 Restructure Jingle action handlers to only require modification in one place.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26087
diff changeset
345 {"transport-info", jingle_handle_transport_info},
925af7142249 Restructure Jingle action handlers to only require modification in one place.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26087
diff changeset
346 {"transport-reject", jingle_handle_transport_reject},
925af7142249 Restructure Jingle action handlers to only require modification in one place.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26087
diff changeset
347 {"transport-replace", jingle_handle_transport_replace},
925af7142249 Restructure Jingle action handlers to only require modification in one place.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26087
diff changeset
348 };
925af7142249 Restructure Jingle action handlers to only require modification in one place.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26087
diff changeset
349
925af7142249 Restructure Jingle action handlers to only require modification in one place.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26087
diff changeset
350 const gchar *
925af7142249 Restructure Jingle action handlers to only require modification in one place.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26087
diff changeset
351 jingle_get_action_name(JingleActionType action)
925af7142249 Restructure Jingle action handlers to only require modification in one place.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26087
diff changeset
352 {
925af7142249 Restructure Jingle action handlers to only require modification in one place.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26087
diff changeset
353 return jingle_actions[action].name;
925af7142249 Restructure Jingle action handlers to only require modification in one place.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26087
diff changeset
354 }
925af7142249 Restructure Jingle action handlers to only require modification in one place.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26087
diff changeset
355
925af7142249 Restructure Jingle action handlers to only require modification in one place.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26087
diff changeset
356 JingleActionType
925af7142249 Restructure Jingle action handlers to only require modification in one place.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26087
diff changeset
357 jingle_get_action_type(const gchar *action)
925af7142249 Restructure Jingle action handlers to only require modification in one place.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26087
diff changeset
358 {
925af7142249 Restructure Jingle action handlers to only require modification in one place.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26087
diff changeset
359 static const int num_actions =
925af7142249 Restructure Jingle action handlers to only require modification in one place.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26087
diff changeset
360 sizeof(jingle_actions)/sizeof(JingleAction);
925af7142249 Restructure Jingle action handlers to only require modification in one place.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26087
diff changeset
361 /* Start at 1 to skip the unknown-action type */
925af7142249 Restructure Jingle action handlers to only require modification in one place.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26087
diff changeset
362 int i = 1;
925af7142249 Restructure Jingle action handlers to only require modification in one place.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26087
diff changeset
363 for (; i < num_actions; ++i) {
925af7142249 Restructure Jingle action handlers to only require modification in one place.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26087
diff changeset
364 if (!strcmp(action, jingle_actions[i].name))
925af7142249 Restructure Jingle action handlers to only require modification in one place.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26087
diff changeset
365 return i;
925af7142249 Restructure Jingle action handlers to only require modification in one place.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26087
diff changeset
366 }
925af7142249 Restructure Jingle action handlers to only require modification in one place.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26087
diff changeset
367 return JINGLE_UNKNOWN_TYPE;
925af7142249 Restructure Jingle action handlers to only require modification in one place.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26087
diff changeset
368 }
24938
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
369
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
370 void
26472
3c684403ea10 Fix merge for ./jingle/
Paul Aurich <paul@darkrain42.org>
parents: 26283
diff changeset
371 jingle_parse(JabberStream *js, const char *from, JabberIqType type,
3c684403ea10 Fix merge for ./jingle/
Paul Aurich <paul@darkrain42.org>
parents: 26283
diff changeset
372 const char *id, xmlnode *jingle)
24938
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
373 {
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
374 const gchar *action;
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
375 const gchar *sid;
26281
925af7142249 Restructure Jingle action handlers to only require modification in one place.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26087
diff changeset
376 JingleActionType action_type;
24938
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
377 JingleSession *session;
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
378
26472
3c684403ea10 Fix merge for ./jingle/
Paul Aurich <paul@darkrain42.org>
parents: 26283
diff changeset
379 if (type != JABBER_IQ_SET) {
3c684403ea10 Fix merge for ./jingle/
Paul Aurich <paul@darkrain42.org>
parents: 26283
diff changeset
380 /* TODO: send iq error here */
24938
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
381 return;
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
382 }
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
383
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
384 if (!(action = xmlnode_get_attrib(jingle, "action"))) {
26472
3c684403ea10 Fix merge for ./jingle/
Paul Aurich <paul@darkrain42.org>
parents: 26283
diff changeset
385 /* TODO: send iq error here */
24938
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
386 return;
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
387 }
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
388
26281
925af7142249 Restructure Jingle action handlers to only require modification in one place.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26087
diff changeset
389 action_type = jingle_get_action_type(action);
925af7142249 Restructure Jingle action handlers to only require modification in one place.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26087
diff changeset
390
24938
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
391 purple_debug_info("jabber", "got Jingle package action = %s\n",
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
392 action);
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
393
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
394 if (!(sid = xmlnode_get_attrib(jingle, "sid"))) {
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
395 /* send iq error here */
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
396 return;
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
397 }
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
398
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
399 if (!(session = jingle_session_find_by_sid(js, sid))
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
400 && strcmp(action, "session-initiate")) {
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
401 purple_debug_error("jingle", "jabber_jingle_session_parse couldn't find session\n");
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
402 /* send iq error here */
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
403 return;
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
404 }
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
405
26281
925af7142249 Restructure Jingle action handlers to only require modification in one place.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26087
diff changeset
406 if (action_type == JINGLE_SESSION_INITIATE) {
24938
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
407 if (session) {
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
408 /* This should only happen if you start a session with yourself */
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
409 purple_debug_error("jingle", "Jingle session with "
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
410 "id={%s} already exists\n", sid);
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
411 /* send iq error */
26281
925af7142249 Restructure Jingle action handlers to only require modification in one place.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26087
diff changeset
412 return;
24938
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
413 } else {
26472
3c684403ea10 Fix merge for ./jingle/
Paul Aurich <paul@darkrain42.org>
parents: 26283
diff changeset
414 char *own_jid = g_strdup_printf("%s@%s/%s", js->user->node,
3c684403ea10 Fix merge for ./jingle/
Paul Aurich <paul@darkrain42.org>
parents: 26283
diff changeset
415 js->user->domain, js->user->resource);
3c684403ea10 Fix merge for ./jingle/
Paul Aurich <paul@darkrain42.org>
parents: 26283
diff changeset
416 session = jingle_session_create(js, sid, own_jid, from, FALSE);
3c684403ea10 Fix merge for ./jingle/
Paul Aurich <paul@darkrain42.org>
parents: 26283
diff changeset
417 g_free(own_jid);
24938
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
418 }
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
419 }
26281
925af7142249 Restructure Jingle action handlers to only require modification in one place.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26087
diff changeset
420
925af7142249 Restructure Jingle action handlers to only require modification in one place.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26087
diff changeset
421 jingle_actions[action_type].handler(session, jingle);
24938
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
422 }
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
423
26010
db517c55c508 Make it compile in Windows with the equivalent of --disable-vv.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26009
diff changeset
424 static void
db517c55c508 Make it compile in Windows with the equivalent of --disable-vv.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26009
diff changeset
425 jingle_terminate_sessions_gh(gpointer key, gpointer value, gpointer user_data)
db517c55c508 Make it compile in Windows with the equivalent of --disable-vv.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26009
diff changeset
426 {
db517c55c508 Make it compile in Windows with the equivalent of --disable-vv.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26009
diff changeset
427 g_object_unref(value);
db517c55c508 Make it compile in Windows with the equivalent of --disable-vv.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26009
diff changeset
428 }
db517c55c508 Make it compile in Windows with the equivalent of --disable-vv.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26009
diff changeset
429
24938
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
430 void
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
431 jingle_terminate_sessions(JabberStream *js)
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
432 {
26010
db517c55c508 Make it compile in Windows with the equivalent of --disable-vv.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26009
diff changeset
433 if (js->sessions)
db517c55c508 Make it compile in Windows with the equivalent of --disable-vv.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26009
diff changeset
434 g_hash_table_foreach(js->sessions,
db517c55c508 Make it compile in Windows with the equivalent of --disable-vv.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26009
diff changeset
435 jingle_terminate_sessions_gh, NULL);
24938
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
436 }
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
437
30499
f858b53dfbf0 Can now generate a relayed candidate for the initiator
Marcus Lundblad <ml@update.uu.se>
parents: 28048
diff changeset
438 #ifdef USE_VV
30504
5de3eccf4cf3 Rearranged some code to remove some duplication.
Marcus Lundblad <ml@update.uu.se>
parents: 30503
diff changeset
439 static GValueArray *
5de3eccf4cf3 Rearranged some code to remove some duplication.
Marcus Lundblad <ml@update.uu.se>
parents: 30503
diff changeset
440 jingle_create_relay_info(const gchar *ip, guint port, const gchar *username,
5de3eccf4cf3 Rearranged some code to remove some duplication.
Marcus Lundblad <ml@update.uu.se>
parents: 30503
diff changeset
441 const gchar *password, const gchar *relay_type, GValueArray *relay_info)
5de3eccf4cf3 Rearranged some code to remove some duplication.
Marcus Lundblad <ml@update.uu.se>
parents: 30503
diff changeset
442 {
5de3eccf4cf3 Rearranged some code to remove some duplication.
Marcus Lundblad <ml@update.uu.se>
parents: 30503
diff changeset
443 GValue value;
5de3eccf4cf3 Rearranged some code to remove some duplication.
Marcus Lundblad <ml@update.uu.se>
parents: 30503
diff changeset
444 GstStructure *turn_setup = gst_structure_new("relay-info",
5de3eccf4cf3 Rearranged some code to remove some duplication.
Marcus Lundblad <ml@update.uu.se>
parents: 30503
diff changeset
445 "ip", G_TYPE_STRING, ip,
5de3eccf4cf3 Rearranged some code to remove some duplication.
Marcus Lundblad <ml@update.uu.se>
parents: 30503
diff changeset
446 "port", G_TYPE_UINT, port,
5de3eccf4cf3 Rearranged some code to remove some duplication.
Marcus Lundblad <ml@update.uu.se>
parents: 30503
diff changeset
447 "username", G_TYPE_STRING, username,
5de3eccf4cf3 Rearranged some code to remove some duplication.
Marcus Lundblad <ml@update.uu.se>
parents: 30503
diff changeset
448 "password", G_TYPE_STRING, password,
5de3eccf4cf3 Rearranged some code to remove some duplication.
Marcus Lundblad <ml@update.uu.se>
parents: 30503
diff changeset
449 "relay-type", G_TYPE_STRING, relay_type,
5de3eccf4cf3 Rearranged some code to remove some duplication.
Marcus Lundblad <ml@update.uu.se>
parents: 30503
diff changeset
450 NULL);
5de3eccf4cf3 Rearranged some code to remove some duplication.
Marcus Lundblad <ml@update.uu.se>
parents: 30503
diff changeset
451 purple_debug_info("jabber", "created gst_structure %" GST_PTR_FORMAT "\n",
5de3eccf4cf3 Rearranged some code to remove some duplication.
Marcus Lundblad <ml@update.uu.se>
parents: 30503
diff changeset
452 turn_setup);
5de3eccf4cf3 Rearranged some code to remove some duplication.
Marcus Lundblad <ml@update.uu.se>
parents: 30503
diff changeset
453 if (turn_setup) {
5de3eccf4cf3 Rearranged some code to remove some duplication.
Marcus Lundblad <ml@update.uu.se>
parents: 30503
diff changeset
454 memset(&value, 0, sizeof(GValue));
5de3eccf4cf3 Rearranged some code to remove some duplication.
Marcus Lundblad <ml@update.uu.se>
parents: 30503
diff changeset
455 g_value_init(&value, GST_TYPE_STRUCTURE);
5de3eccf4cf3 Rearranged some code to remove some duplication.
Marcus Lundblad <ml@update.uu.se>
parents: 30503
diff changeset
456 gst_value_set_structure(&value, turn_setup);
5de3eccf4cf3 Rearranged some code to remove some duplication.
Marcus Lundblad <ml@update.uu.se>
parents: 30503
diff changeset
457 relay_info = g_value_array_append(relay_info, &value);
5de3eccf4cf3 Rearranged some code to remove some duplication.
Marcus Lundblad <ml@update.uu.se>
parents: 30503
diff changeset
458 gst_structure_free(turn_setup);
5de3eccf4cf3 Rearranged some code to remove some duplication.
Marcus Lundblad <ml@update.uu.se>
parents: 30503
diff changeset
459 }
5de3eccf4cf3 Rearranged some code to remove some duplication.
Marcus Lundblad <ml@update.uu.se>
parents: 30503
diff changeset
460 return relay_info;
5de3eccf4cf3 Rearranged some code to remove some duplication.
Marcus Lundblad <ml@update.uu.se>
parents: 30503
diff changeset
461 }
5de3eccf4cf3 Rearranged some code to remove some duplication.
Marcus Lundblad <ml@update.uu.se>
parents: 30503
diff changeset
462
26080
88f183f7dfc7 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <ml@update.uu.se>
parents: 26010
diff changeset
463 GParameter *
30499
f858b53dfbf0 Can now generate a relayed candidate for the initiator
Marcus Lundblad <ml@update.uu.se>
parents: 28048
diff changeset
464 jingle_get_params(JabberStream *js, const gchar *relay_ip, guint relay_udp,
f858b53dfbf0 Can now generate a relayed candidate for the initiator
Marcus Lundblad <ml@update.uu.se>
parents: 28048
diff changeset
465 guint relay_tcp, guint relay_ssltcp, const gchar *relay_username,
f858b53dfbf0 Can now generate a relayed candidate for the initiator
Marcus Lundblad <ml@update.uu.se>
parents: 28048
diff changeset
466 const gchar *relay_password, guint *num)
26080
88f183f7dfc7 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <ml@update.uu.se>
parents: 26010
diff changeset
467 {
88f183f7dfc7 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <ml@update.uu.se>
parents: 26010
diff changeset
468 /* don't set a STUN server if one is set globally in prefs, in that case
88f183f7dfc7 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <ml@update.uu.se>
parents: 26010
diff changeset
469 this will be handled in media.c */
88f183f7dfc7 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <ml@update.uu.se>
parents: 26010
diff changeset
470 gboolean has_account_stun = js->stun_ip && !purple_network_get_stun_ip();
30499
f858b53dfbf0 Can now generate a relayed candidate for the initiator
Marcus Lundblad <ml@update.uu.se>
parents: 28048
diff changeset
471 guint num_params = has_account_stun ?
f858b53dfbf0 Can now generate a relayed candidate for the initiator
Marcus Lundblad <ml@update.uu.se>
parents: 28048
diff changeset
472 (relay_ip ? 3 : 2) : (relay_ip ? 1 : 0);
26080
88f183f7dfc7 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <ml@update.uu.se>
parents: 26010
diff changeset
473 GParameter *params = NULL;
30499
f858b53dfbf0 Can now generate a relayed candidate for the initiator
Marcus Lundblad <ml@update.uu.se>
parents: 28048
diff changeset
474 int next_index = 0;
f858b53dfbf0 Can now generate a relayed candidate for the initiator
Marcus Lundblad <ml@update.uu.se>
parents: 28048
diff changeset
475
26080
88f183f7dfc7 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <ml@update.uu.se>
parents: 26010
diff changeset
476 if (num_params > 0) {
88f183f7dfc7 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <ml@update.uu.se>
parents: 26010
diff changeset
477 params = g_new0(GParameter, num_params);
88f183f7dfc7 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <ml@update.uu.se>
parents: 26010
diff changeset
478
30499
f858b53dfbf0 Can now generate a relayed candidate for the initiator
Marcus Lundblad <ml@update.uu.se>
parents: 28048
diff changeset
479 if (has_account_stun) {
f858b53dfbf0 Can now generate a relayed candidate for the initiator
Marcus Lundblad <ml@update.uu.se>
parents: 28048
diff changeset
480 purple_debug_info("jabber",
f858b53dfbf0 Can now generate a relayed candidate for the initiator
Marcus Lundblad <ml@update.uu.se>
parents: 28048
diff changeset
481 "setting param stun-ip for stream using Google auto-config: %s\n",
f858b53dfbf0 Can now generate a relayed candidate for the initiator
Marcus Lundblad <ml@update.uu.se>
parents: 28048
diff changeset
482 js->stun_ip);
f858b53dfbf0 Can now generate a relayed candidate for the initiator
Marcus Lundblad <ml@update.uu.se>
parents: 28048
diff changeset
483 params[next_index].name = "stun-ip";
f858b53dfbf0 Can now generate a relayed candidate for the initiator
Marcus Lundblad <ml@update.uu.se>
parents: 28048
diff changeset
484 g_value_init(&params[next_index].value, G_TYPE_STRING);
f858b53dfbf0 Can now generate a relayed candidate for the initiator
Marcus Lundblad <ml@update.uu.se>
parents: 28048
diff changeset
485 g_value_set_string(&params[next_index].value, js->stun_ip);
f858b53dfbf0 Can now generate a relayed candidate for the initiator
Marcus Lundblad <ml@update.uu.se>
parents: 28048
diff changeset
486 purple_debug_info("jabber",
f858b53dfbf0 Can now generate a relayed candidate for the initiator
Marcus Lundblad <ml@update.uu.se>
parents: 28048
diff changeset
487 "setting param stun-port for stream using Google auto-config: %d\n",
f858b53dfbf0 Can now generate a relayed candidate for the initiator
Marcus Lundblad <ml@update.uu.se>
parents: 28048
diff changeset
488 js->stun_port);
f858b53dfbf0 Can now generate a relayed candidate for the initiator
Marcus Lundblad <ml@update.uu.se>
parents: 28048
diff changeset
489 next_index++;
f858b53dfbf0 Can now generate a relayed candidate for the initiator
Marcus Lundblad <ml@update.uu.se>
parents: 28048
diff changeset
490 params[next_index].name = "stun-port";
f858b53dfbf0 Can now generate a relayed candidate for the initiator
Marcus Lundblad <ml@update.uu.se>
parents: 28048
diff changeset
491 g_value_init(&params[next_index].value, G_TYPE_UINT);
f858b53dfbf0 Can now generate a relayed candidate for the initiator
Marcus Lundblad <ml@update.uu.se>
parents: 28048
diff changeset
492 g_value_set_uint(&params[next_index].value, js->stun_port);
f858b53dfbf0 Can now generate a relayed candidate for the initiator
Marcus Lundblad <ml@update.uu.se>
parents: 28048
diff changeset
493 next_index++;
f858b53dfbf0 Can now generate a relayed candidate for the initiator
Marcus Lundblad <ml@update.uu.se>
parents: 28048
diff changeset
494 }
f858b53dfbf0 Can now generate a relayed candidate for the initiator
Marcus Lundblad <ml@update.uu.se>
parents: 28048
diff changeset
495
f858b53dfbf0 Can now generate a relayed candidate for the initiator
Marcus Lundblad <ml@update.uu.se>
parents: 28048
diff changeset
496 if (relay_ip) {
f858b53dfbf0 Can now generate a relayed candidate for the initiator
Marcus Lundblad <ml@update.uu.se>
parents: 28048
diff changeset
497 GValueArray *relay_info = g_value_array_new(0);
f858b53dfbf0 Can now generate a relayed candidate for the initiator
Marcus Lundblad <ml@update.uu.se>
parents: 28048
diff changeset
498
f858b53dfbf0 Can now generate a relayed candidate for the initiator
Marcus Lundblad <ml@update.uu.se>
parents: 28048
diff changeset
499 if (relay_udp) {
30504
5de3eccf4cf3 Rearranged some code to remove some duplication.
Marcus Lundblad <ml@update.uu.se>
parents: 30503
diff changeset
500 relay_info =
5de3eccf4cf3 Rearranged some code to remove some duplication.
Marcus Lundblad <ml@update.uu.se>
parents: 30503
diff changeset
501 jingle_create_relay_info(relay_ip, relay_udp, relay_username,
5de3eccf4cf3 Rearranged some code to remove some duplication.
Marcus Lundblad <ml@update.uu.se>
parents: 30503
diff changeset
502 relay_password, "udp", relay_info);
30499
f858b53dfbf0 Can now generate a relayed candidate for the initiator
Marcus Lundblad <ml@update.uu.se>
parents: 28048
diff changeset
503 }
f858b53dfbf0 Can now generate a relayed candidate for the initiator
Marcus Lundblad <ml@update.uu.se>
parents: 28048
diff changeset
504 if (relay_tcp) {
30504
5de3eccf4cf3 Rearranged some code to remove some duplication.
Marcus Lundblad <ml@update.uu.se>
parents: 30503
diff changeset
505 relay_info =
5de3eccf4cf3 Rearranged some code to remove some duplication.
Marcus Lundblad <ml@update.uu.se>
parents: 30503
diff changeset
506 jingle_create_relay_info(relay_ip, relay_tcp, relay_username,
5de3eccf4cf3 Rearranged some code to remove some duplication.
Marcus Lundblad <ml@update.uu.se>
parents: 30503
diff changeset
507 relay_password, "tcp", relay_info);
30499
f858b53dfbf0 Can now generate a relayed candidate for the initiator
Marcus Lundblad <ml@update.uu.se>
parents: 28048
diff changeset
508 }
f858b53dfbf0 Can now generate a relayed candidate for the initiator
Marcus Lundblad <ml@update.uu.se>
parents: 28048
diff changeset
509 if (relay_ssltcp) {
30504
5de3eccf4cf3 Rearranged some code to remove some duplication.
Marcus Lundblad <ml@update.uu.se>
parents: 30503
diff changeset
510 relay_info =
5de3eccf4cf3 Rearranged some code to remove some duplication.
Marcus Lundblad <ml@update.uu.se>
parents: 30503
diff changeset
511 jingle_create_relay_info(relay_ip, relay_ssltcp, relay_username,
5de3eccf4cf3 Rearranged some code to remove some duplication.
Marcus Lundblad <ml@update.uu.se>
parents: 30503
diff changeset
512 relay_password, "tls", relay_info);
30499
f858b53dfbf0 Can now generate a relayed candidate for the initiator
Marcus Lundblad <ml@update.uu.se>
parents: 28048
diff changeset
513 }
f858b53dfbf0 Can now generate a relayed candidate for the initiator
Marcus Lundblad <ml@update.uu.se>
parents: 28048
diff changeset
514 params[next_index].name = "relay-info";
f858b53dfbf0 Can now generate a relayed candidate for the initiator
Marcus Lundblad <ml@update.uu.se>
parents: 28048
diff changeset
515 g_value_init(&params[next_index].value, G_TYPE_VALUE_ARRAY);
f858b53dfbf0 Can now generate a relayed candidate for the initiator
Marcus Lundblad <ml@update.uu.se>
parents: 28048
diff changeset
516 g_value_set_boxed(&params[next_index].value, relay_info);
f858b53dfbf0 Can now generate a relayed candidate for the initiator
Marcus Lundblad <ml@update.uu.se>
parents: 28048
diff changeset
517 g_value_array_free(relay_info);
f858b53dfbf0 Can now generate a relayed candidate for the initiator
Marcus Lundblad <ml@update.uu.se>
parents: 28048
diff changeset
518 }
26080
88f183f7dfc7 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <ml@update.uu.se>
parents: 26010
diff changeset
519 }
88f183f7dfc7 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <ml@update.uu.se>
parents: 26010
diff changeset
520
88f183f7dfc7 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <ml@update.uu.se>
parents: 26010
diff changeset
521 *num = num_params;
88f183f7dfc7 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <ml@update.uu.se>
parents: 26010
diff changeset
522 return params;
88f183f7dfc7 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <ml@update.uu.se>
parents: 26010
diff changeset
523 }
30499
f858b53dfbf0 Can now generate a relayed candidate for the initiator
Marcus Lundblad <ml@update.uu.se>
parents: 28048
diff changeset
524 #endif
f858b53dfbf0 Can now generate a relayed candidate for the initiator
Marcus Lundblad <ml@update.uu.se>
parents: 28048
diff changeset
525