libpurple/protocols/jabber/jingle/rtp.c

Thu, 04 Jul 2019 13:29:30 +0200

author
Fabrice Bellet <fabrice@bellet.info>
date
Thu, 04 Jul 2019 13:29:30 +0200
branch
release-2.x.y
changeset 39727
7a40ca5585ca
parent 39725
29aec83e0e44
child 39729
a0f60d9c5c48
permissions
-rw-r--r--

jingle: build transport with udp candidates only

26147
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
1 /**
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
2 * @file rtp.c
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
3 *
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
4 * purple
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
5 *
28322
ac8fec1d2234 Remove specific copyright lines from the XMPP prpl.
Paul Aurich <darkrain42@pidgin.im>
parents: 28161
diff changeset
6 * Purple is the legal property of its developers, whose names are too numerous
ac8fec1d2234 Remove specific copyright lines from the XMPP prpl.
Paul Aurich <darkrain42@pidgin.im>
parents: 28161
diff changeset
7 * to list here. Please refer to the COPYRIGHT file distributed with this
ac8fec1d2234 Remove specific copyright lines from the XMPP prpl.
Paul Aurich <darkrain42@pidgin.im>
parents: 28161
diff changeset
8 * source distribution.
ac8fec1d2234 Remove specific copyright lines from the XMPP prpl.
Paul Aurich <darkrain42@pidgin.im>
parents: 28161
diff changeset
9 *
26147
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
10 * This program is free software; you can redistribute it and/or modify
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
11 * it under the terms of the GNU General Public License as published by
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
12 * the Free Software Foundation; either version 2 of the License, or
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
13 * (at your option) any later version.
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
14 *
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
15 * This program is distributed in the hope that it will be useful,
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
16 * but WITHOUT ANY WARRANTY; without even the implied warranty of
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
17 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
18 * GNU General Public License for more details.
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
19 *
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
20 * You should have received a copy of the GNU General Public License
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
21 * along with this program; if not, write to the Free Software
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
22 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
23 */
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
24
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
25 #include "config.h"
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
26
26215
9ecaa256d77b Fix compiling with --disable-vv.
Michael Ruprecht <maiku@pidgin.im>
parents: 26198
diff changeset
27 #ifdef USE_VV
9ecaa256d77b Fix compiling with --disable-vv.
Michael Ruprecht <maiku@pidgin.im>
parents: 26198
diff changeset
28
26147
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
29 #include "jabber.h"
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
30 #include "jingle.h"
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
31 #include "media.h"
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
32 #include "mediamanager.h"
26166
ad7d09fef256 Added a Jingle ice-udp transmitter.
Michael Ruprecht <maiku@pidgin.im>
parents: 26161
diff changeset
33 #include "iceudp.h"
26147
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
34 #include "rawudp.h"
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
35 #include "rtp.h"
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
36 #include "session.h"
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
37 #include "debug.h"
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
38
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
39 #include <string.h>
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
40
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
41 struct _JingleRtpPrivate
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
42 {
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
43 gchar *media_type;
26405
4cf4d5dcc183 Add ssrc property to JingleRtp.
Michael Ruprecht <maiku@pidgin.im>
parents: 26404
diff changeset
44 gchar *ssrc;
26147
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
45 };
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
46
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
47 #define JINGLE_RTP_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), JINGLE_TYPE_RTP, JingleRtpPrivate))
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
48
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
49 static void jingle_rtp_class_init (JingleRtpClass *klass);
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
50 static void jingle_rtp_init (JingleRtp *rtp);
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
51 static void jingle_rtp_finalize (GObject *object);
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
52 static void jingle_rtp_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec);
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
53 static void jingle_rtp_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec);
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
54 static JingleContent *jingle_rtp_parse_internal(xmlnode *rtp);
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
55 static xmlnode *jingle_rtp_to_xml_internal(JingleContent *rtp, xmlnode *content, JingleActionType action);
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
56 static void jingle_rtp_handle_action_internal(JingleContent *content, xmlnode *jingle, JingleActionType action);
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
57
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
58 static PurpleMedia *jingle_rtp_get_media(JingleSession *session);
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
59
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
60 static JingleContentClass *parent_class = NULL;
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
61 #if 0
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
62 enum {
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
63 LAST_SIGNAL
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
64 };
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
65 static guint jingle_rtp_signals[LAST_SIGNAL] = {0};
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
66 #endif
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
67
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
68 enum {
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
69 PROP_0,
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
70 PROP_MEDIA_TYPE,
26405
4cf4d5dcc183 Add ssrc property to JingleRtp.
Michael Ruprecht <maiku@pidgin.im>
parents: 26404
diff changeset
71 PROP_SSRC,
26147
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
72 };
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
73
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
74 GType
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
75 jingle_rtp_get_type()
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
76 {
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
77 static GType type = 0;
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
78
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
79 if (type == 0) {
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
80 static const GTypeInfo info = {
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
81 sizeof(JingleRtpClass),
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
82 NULL,
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
83 NULL,
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
84 (GClassInitFunc) jingle_rtp_class_init,
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
85 NULL,
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
86 NULL,
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
87 sizeof(JingleRtp),
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
88 0,
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
89 (GInstanceInitFunc) jingle_rtp_init,
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
90 NULL
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
91 };
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
92 type = g_type_register_static(JINGLE_TYPE_CONTENT, "JingleRtp", &info, 0);
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
93 }
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
94 return type;
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
95 }
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
96
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
97 static void
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
98 jingle_rtp_class_init (JingleRtpClass *klass)
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
99 {
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
100 GObjectClass *gobject_class = (GObjectClass*)klass;
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
101 parent_class = g_type_class_peek_parent(klass);
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
102
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
103 gobject_class->finalize = jingle_rtp_finalize;
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
104 gobject_class->set_property = jingle_rtp_set_property;
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
105 gobject_class->get_property = jingle_rtp_get_property;
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
106 klass->parent_class.to_xml = jingle_rtp_to_xml_internal;
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
107 klass->parent_class.parse = jingle_rtp_parse_internal;
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
108 klass->parent_class.description_type = JINGLE_APP_RTP;
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
109 klass->parent_class.handle_action = jingle_rtp_handle_action_internal;
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
110
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
111 g_object_class_install_property(gobject_class, PROP_MEDIA_TYPE,
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
112 g_param_spec_string("media-type",
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
113 "Media Type",
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
114 "The media type (\"audio\" or \"video\") for this rtp session.",
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
115 NULL,
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
116 G_PARAM_READWRITE));
26405
4cf4d5dcc183 Add ssrc property to JingleRtp.
Michael Ruprecht <maiku@pidgin.im>
parents: 26404
diff changeset
117 g_object_class_install_property(gobject_class, PROP_SSRC,
4cf4d5dcc183 Add ssrc property to JingleRtp.
Michael Ruprecht <maiku@pidgin.im>
parents: 26404
diff changeset
118 g_param_spec_string("ssrc",
4cf4d5dcc183 Add ssrc property to JingleRtp.
Michael Ruprecht <maiku@pidgin.im>
parents: 26404
diff changeset
119 "ssrc",
4cf4d5dcc183 Add ssrc property to JingleRtp.
Michael Ruprecht <maiku@pidgin.im>
parents: 26404
diff changeset
120 "The ssrc for this rtp session.",
4cf4d5dcc183 Add ssrc property to JingleRtp.
Michael Ruprecht <maiku@pidgin.im>
parents: 26404
diff changeset
121 NULL,
4cf4d5dcc183 Add ssrc property to JingleRtp.
Michael Ruprecht <maiku@pidgin.im>
parents: 26404
diff changeset
122 G_PARAM_READWRITE));
4cf4d5dcc183 Add ssrc property to JingleRtp.
Michael Ruprecht <maiku@pidgin.im>
parents: 26404
diff changeset
123
26147
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
124 g_type_class_add_private(klass, sizeof(JingleRtpPrivate));
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
125 }
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
126
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
127 static void
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
128 jingle_rtp_init (JingleRtp *rtp)
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
129 {
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
130 rtp->priv = JINGLE_RTP_GET_PRIVATE(rtp);
26405
4cf4d5dcc183 Add ssrc property to JingleRtp.
Michael Ruprecht <maiku@pidgin.im>
parents: 26404
diff changeset
131 memset(rtp->priv, 0, sizeof(*rtp->priv));
26147
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
132 }
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
133
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
134 static void
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
135 jingle_rtp_finalize (GObject *rtp)
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
136 {
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
137 JingleRtpPrivate *priv = JINGLE_RTP_GET_PRIVATE(rtp);
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
138 purple_debug_info("jingle-rtp","jingle_rtp_finalize\n");
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
139
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
140 g_free(priv->media_type);
26405
4cf4d5dcc183 Add ssrc property to JingleRtp.
Michael Ruprecht <maiku@pidgin.im>
parents: 26404
diff changeset
141 g_free(priv->ssrc);
26410
5952dcb9ce6c Plug some memory leaks related to transports.
Michael Ruprecht <maiku@pidgin.im>
parents: 26407
diff changeset
142
5952dcb9ce6c Plug some memory leaks related to transports.
Michael Ruprecht <maiku@pidgin.im>
parents: 26407
diff changeset
143 G_OBJECT_CLASS(parent_class)->finalize(rtp);
26147
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
144 }
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
145
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
146 static void
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
147 jingle_rtp_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec)
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
148 {
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
149 JingleRtp *rtp;
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
150 g_return_if_fail(JINGLE_IS_RTP(object));
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
151
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
152 rtp = JINGLE_RTP(object);
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
153
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
154 switch (prop_id) {
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
155 case PROP_MEDIA_TYPE:
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
156 g_free(rtp->priv->media_type);
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
157 rtp->priv->media_type = g_value_dup_string(value);
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
158 break;
26405
4cf4d5dcc183 Add ssrc property to JingleRtp.
Michael Ruprecht <maiku@pidgin.im>
parents: 26404
diff changeset
159 case PROP_SSRC:
4cf4d5dcc183 Add ssrc property to JingleRtp.
Michael Ruprecht <maiku@pidgin.im>
parents: 26404
diff changeset
160 g_free(rtp->priv->ssrc);
4cf4d5dcc183 Add ssrc property to JingleRtp.
Michael Ruprecht <maiku@pidgin.im>
parents: 26404
diff changeset
161 rtp->priv->ssrc = g_value_dup_string(value);
4cf4d5dcc183 Add ssrc property to JingleRtp.
Michael Ruprecht <maiku@pidgin.im>
parents: 26404
diff changeset
162 break;
31294
73607ab89c6f Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents: 30764
diff changeset
163 default:
26147
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
164 G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
165 break;
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
166 }
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
167 }
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
168
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
169 static void
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
170 jingle_rtp_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec)
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
171 {
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
172 JingleRtp *rtp;
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
173 g_return_if_fail(JINGLE_IS_RTP(object));
31294
73607ab89c6f Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents: 30764
diff changeset
174
26147
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
175 rtp = JINGLE_RTP(object);
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
176
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
177 switch (prop_id) {
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
178 case PROP_MEDIA_TYPE:
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
179 g_value_set_string(value, rtp->priv->media_type);
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
180 break;
26405
4cf4d5dcc183 Add ssrc property to JingleRtp.
Michael Ruprecht <maiku@pidgin.im>
parents: 26404
diff changeset
181 case PROP_SSRC:
4cf4d5dcc183 Add ssrc property to JingleRtp.
Michael Ruprecht <maiku@pidgin.im>
parents: 26404
diff changeset
182 g_value_set_string(value, rtp->priv->ssrc);
4cf4d5dcc183 Add ssrc property to JingleRtp.
Michael Ruprecht <maiku@pidgin.im>
parents: 26404
diff changeset
183 break;
31294
73607ab89c6f Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents: 30764
diff changeset
184 default:
73607ab89c6f Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents: 30764
diff changeset
185 G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
26147
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
186 break;
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
187 }
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
188 }
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
189
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
190 gchar *
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
191 jingle_rtp_get_media_type(JingleContent *content)
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
192 {
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
193 gchar *media_type;
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
194 g_object_get(content, "media-type", &media_type, NULL);
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
195 return media_type;
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
196 }
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
197
26405
4cf4d5dcc183 Add ssrc property to JingleRtp.
Michael Ruprecht <maiku@pidgin.im>
parents: 26404
diff changeset
198 gchar *
4cf4d5dcc183 Add ssrc property to JingleRtp.
Michael Ruprecht <maiku@pidgin.im>
parents: 26404
diff changeset
199 jingle_rtp_get_ssrc(JingleContent *content)
4cf4d5dcc183 Add ssrc property to JingleRtp.
Michael Ruprecht <maiku@pidgin.im>
parents: 26404
diff changeset
200 {
4cf4d5dcc183 Add ssrc property to JingleRtp.
Michael Ruprecht <maiku@pidgin.im>
parents: 26404
diff changeset
201 gchar *ssrc;
4cf4d5dcc183 Add ssrc property to JingleRtp.
Michael Ruprecht <maiku@pidgin.im>
parents: 26404
diff changeset
202 g_object_get(content, "ssrc", &ssrc, NULL);
4cf4d5dcc183 Add ssrc property to JingleRtp.
Michael Ruprecht <maiku@pidgin.im>
parents: 26404
diff changeset
203 return ssrc;
4cf4d5dcc183 Add ssrc property to JingleRtp.
Michael Ruprecht <maiku@pidgin.im>
parents: 26404
diff changeset
204 }
4cf4d5dcc183 Add ssrc property to JingleRtp.
Michael Ruprecht <maiku@pidgin.im>
parents: 26404
diff changeset
205
26147
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
206 static PurpleMedia *
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
207 jingle_rtp_get_media(JingleSession *session)
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
208 {
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
209 JabberStream *js = jingle_session_get_js(session);
26330
9d627ae05002 Get rid of the medias variable in JabberStream.
Michael Ruprecht <maiku@pidgin.im>
parents: 26325
diff changeset
210 PurpleMedia *media = NULL;
26746
2a2d45ac9774 Switch media to store accounts rather than connections.
Michael Ruprecht <maiku@pidgin.im>
parents: 26696
diff changeset
211 GList *iter = purple_media_manager_get_media_by_account(
2a2d45ac9774 Switch media to store accounts rather than connections.
Michael Ruprecht <maiku@pidgin.im>
parents: 26696
diff changeset
212 purple_media_manager_get(),
2a2d45ac9774 Switch media to store accounts rather than connections.
Michael Ruprecht <maiku@pidgin.im>
parents: 26696
diff changeset
213 purple_connection_get_account(js->gc));
26147
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
214
26330
9d627ae05002 Get rid of the medias variable in JabberStream.
Michael Ruprecht <maiku@pidgin.im>
parents: 26325
diff changeset
215 for (; iter; iter = g_list_delete_link(iter, iter)) {
9d627ae05002 Get rid of the medias variable in JabberStream.
Michael Ruprecht <maiku@pidgin.im>
parents: 26325
diff changeset
216 JingleSession *media_session =
9d627ae05002 Get rid of the medias variable in JabberStream.
Michael Ruprecht <maiku@pidgin.im>
parents: 26325
diff changeset
217 purple_media_get_prpl_data(iter->data);
9d627ae05002 Get rid of the medias variable in JabberStream.
Michael Ruprecht <maiku@pidgin.im>
parents: 26325
diff changeset
218 if (media_session == session) {
9d627ae05002 Get rid of the medias variable in JabberStream.
Michael Ruprecht <maiku@pidgin.im>
parents: 26325
diff changeset
219 media = iter->data;
9d627ae05002 Get rid of the medias variable in JabberStream.
Michael Ruprecht <maiku@pidgin.im>
parents: 26325
diff changeset
220 break;
9d627ae05002 Get rid of the medias variable in JabberStream.
Michael Ruprecht <maiku@pidgin.im>
parents: 26325
diff changeset
221 }
9d627ae05002 Get rid of the medias variable in JabberStream.
Michael Ruprecht <maiku@pidgin.im>
parents: 26325
diff changeset
222 }
9d627ae05002 Get rid of the medias variable in JabberStream.
Michael Ruprecht <maiku@pidgin.im>
parents: 26325
diff changeset
223 if (iter != NULL)
9d627ae05002 Get rid of the medias variable in JabberStream.
Michael Ruprecht <maiku@pidgin.im>
parents: 26325
diff changeset
224 g_list_free(iter);
26147
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
225
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
226 return media;
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
227 }
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
228
26416
1536df3f6fc7 Send any additional candidates found after session-initiate or
Michael Ruprecht <maiku@pidgin.im>
parents: 26410
diff changeset
229 static JingleRawUdpCandidate *
1536df3f6fc7 Send any additional candidates found after session-initiate or
Michael Ruprecht <maiku@pidgin.im>
parents: 26410
diff changeset
230 jingle_rtp_candidate_to_rawudp(JingleSession *session, guint generation,
1536df3f6fc7 Send any additional candidates found after session-initiate or
Michael Ruprecht <maiku@pidgin.im>
parents: 26410
diff changeset
231 PurpleMediaCandidate *candidate)
1536df3f6fc7 Send any additional candidates found after session-initiate or
Michael Ruprecht <maiku@pidgin.im>
parents: 26410
diff changeset
232 {
1536df3f6fc7 Send any additional candidates found after session-initiate or
Michael Ruprecht <maiku@pidgin.im>
parents: 26410
diff changeset
233 gchar *id = jabber_get_next_id(jingle_session_get_js(session));
26620
a34fb2386da5 Hide and GObjectify PurpleMediaCandidate.
Michael Ruprecht <maiku@pidgin.im>
parents: 26618
diff changeset
234 gchar *ip = purple_media_candidate_get_ip(candidate);
26416
1536df3f6fc7 Send any additional candidates found after session-initiate or
Michael Ruprecht <maiku@pidgin.im>
parents: 26410
diff changeset
235 JingleRawUdpCandidate *rawudp_candidate =
26620
a34fb2386da5 Hide and GObjectify PurpleMediaCandidate.
Michael Ruprecht <maiku@pidgin.im>
parents: 26618
diff changeset
236 jingle_rawudp_candidate_new(id, generation,
a34fb2386da5 Hide and GObjectify PurpleMediaCandidate.
Michael Ruprecht <maiku@pidgin.im>
parents: 26618
diff changeset
237 purple_media_candidate_get_component_id(candidate),
a34fb2386da5 Hide and GObjectify PurpleMediaCandidate.
Michael Ruprecht <maiku@pidgin.im>
parents: 26618
diff changeset
238 ip, purple_media_candidate_get_port(candidate));
a34fb2386da5 Hide and GObjectify PurpleMediaCandidate.
Michael Ruprecht <maiku@pidgin.im>
parents: 26618
diff changeset
239 g_free(ip);
26416
1536df3f6fc7 Send any additional candidates found after session-initiate or
Michael Ruprecht <maiku@pidgin.im>
parents: 26410
diff changeset
240 g_free(id);
1536df3f6fc7 Send any additional candidates found after session-initiate or
Michael Ruprecht <maiku@pidgin.im>
parents: 26410
diff changeset
241 return rawudp_candidate;
1536df3f6fc7 Send any additional candidates found after session-initiate or
Michael Ruprecht <maiku@pidgin.im>
parents: 26410
diff changeset
242 }
1536df3f6fc7 Send any additional candidates found after session-initiate or
Michael Ruprecht <maiku@pidgin.im>
parents: 26410
diff changeset
243
1536df3f6fc7 Send any additional candidates found after session-initiate or
Michael Ruprecht <maiku@pidgin.im>
parents: 26410
diff changeset
244 static JingleIceUdpCandidate *
1536df3f6fc7 Send any additional candidates found after session-initiate or
Michael Ruprecht <maiku@pidgin.im>
parents: 26410
diff changeset
245 jingle_rtp_candidate_to_iceudp(JingleSession *session, guint generation,
1536df3f6fc7 Send any additional candidates found after session-initiate or
Michael Ruprecht <maiku@pidgin.im>
parents: 26410
diff changeset
246 PurpleMediaCandidate *candidate)
1536df3f6fc7 Send any additional candidates found after session-initiate or
Michael Ruprecht <maiku@pidgin.im>
parents: 26410
diff changeset
247 {
1536df3f6fc7 Send any additional candidates found after session-initiate or
Michael Ruprecht <maiku@pidgin.im>
parents: 26410
diff changeset
248 gchar *id = jabber_get_next_id(jingle_session_get_js(session));
26620
a34fb2386da5 Hide and GObjectify PurpleMediaCandidate.
Michael Ruprecht <maiku@pidgin.im>
parents: 26618
diff changeset
249 gchar *ip = purple_media_candidate_get_ip(candidate);
a34fb2386da5 Hide and GObjectify PurpleMediaCandidate.
Michael Ruprecht <maiku@pidgin.im>
parents: 26618
diff changeset
250 gchar *username = purple_media_candidate_get_username(candidate);
a34fb2386da5 Hide and GObjectify PurpleMediaCandidate.
Michael Ruprecht <maiku@pidgin.im>
parents: 26618
diff changeset
251 gchar *password = purple_media_candidate_get_password(candidate);
a34fb2386da5 Hide and GObjectify PurpleMediaCandidate.
Michael Ruprecht <maiku@pidgin.im>
parents: 26618
diff changeset
252 PurpleMediaCandidateType type =
a34fb2386da5 Hide and GObjectify PurpleMediaCandidate.
Michael Ruprecht <maiku@pidgin.im>
parents: 26618
diff changeset
253 purple_media_candidate_get_candidate_type(candidate);
39724
72a35ff95941 Fix more memory leaks
Fabrice Bellet <fabrice@bellet.info>
parents: 38693
diff changeset
254 gchar *foundation = purple_media_candidate_get_foundation(candidate);
31294
73607ab89c6f Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents: 30764
diff changeset
255
26416
1536df3f6fc7 Send any additional candidates found after session-initiate or
Michael Ruprecht <maiku@pidgin.im>
parents: 26410
diff changeset
256 JingleIceUdpCandidate *iceudp_candidate = jingle_iceudp_candidate_new(
26620
a34fb2386da5 Hide and GObjectify PurpleMediaCandidate.
Michael Ruprecht <maiku@pidgin.im>
parents: 26618
diff changeset
257 purple_media_candidate_get_component_id(candidate),
39724
72a35ff95941 Fix more memory leaks
Fabrice Bellet <fabrice@bellet.info>
parents: 38693
diff changeset
258 foundation, generation, id, ip, 0,
26620
a34fb2386da5 Hide and GObjectify PurpleMediaCandidate.
Michael Ruprecht <maiku@pidgin.im>
parents: 26618
diff changeset
259 purple_media_candidate_get_port(candidate),
a34fb2386da5 Hide and GObjectify PurpleMediaCandidate.
Michael Ruprecht <maiku@pidgin.im>
parents: 26618
diff changeset
260 purple_media_candidate_get_priority(candidate), "udp",
a34fb2386da5 Hide and GObjectify PurpleMediaCandidate.
Michael Ruprecht <maiku@pidgin.im>
parents: 26618
diff changeset
261 type == PURPLE_MEDIA_CANDIDATE_TYPE_HOST ? "host" :
a34fb2386da5 Hide and GObjectify PurpleMediaCandidate.
Michael Ruprecht <maiku@pidgin.im>
parents: 26618
diff changeset
262 type == PURPLE_MEDIA_CANDIDATE_TYPE_SRFLX ? "srflx" :
a34fb2386da5 Hide and GObjectify PurpleMediaCandidate.
Michael Ruprecht <maiku@pidgin.im>
parents: 26618
diff changeset
263 type == PURPLE_MEDIA_CANDIDATE_TYPE_PRFLX ? "prflx" :
a34fb2386da5 Hide and GObjectify PurpleMediaCandidate.
Michael Ruprecht <maiku@pidgin.im>
parents: 26618
diff changeset
264 type == PURPLE_MEDIA_CANDIDATE_TYPE_RELAY ? "relay" :
a34fb2386da5 Hide and GObjectify PurpleMediaCandidate.
Michael Ruprecht <maiku@pidgin.im>
parents: 26618
diff changeset
265 "", username, password);
a34fb2386da5 Hide and GObjectify PurpleMediaCandidate.
Michael Ruprecht <maiku@pidgin.im>
parents: 26618
diff changeset
266 iceudp_candidate->reladdr =
a34fb2386da5 Hide and GObjectify PurpleMediaCandidate.
Michael Ruprecht <maiku@pidgin.im>
parents: 26618
diff changeset
267 purple_media_candidate_get_base_ip(candidate);
a34fb2386da5 Hide and GObjectify PurpleMediaCandidate.
Michael Ruprecht <maiku@pidgin.im>
parents: 26618
diff changeset
268 iceudp_candidate->relport =
a34fb2386da5 Hide and GObjectify PurpleMediaCandidate.
Michael Ruprecht <maiku@pidgin.im>
parents: 26618
diff changeset
269 purple_media_candidate_get_base_port(candidate);
a34fb2386da5 Hide and GObjectify PurpleMediaCandidate.
Michael Ruprecht <maiku@pidgin.im>
parents: 26618
diff changeset
270 g_free(password);
a34fb2386da5 Hide and GObjectify PurpleMediaCandidate.
Michael Ruprecht <maiku@pidgin.im>
parents: 26618
diff changeset
271 g_free(username);
39724
72a35ff95941 Fix more memory leaks
Fabrice Bellet <fabrice@bellet.info>
parents: 38693
diff changeset
272 g_free(foundation);
26620
a34fb2386da5 Hide and GObjectify PurpleMediaCandidate.
Michael Ruprecht <maiku@pidgin.im>
parents: 26618
diff changeset
273 g_free(ip);
26416
1536df3f6fc7 Send any additional candidates found after session-initiate or
Michael Ruprecht <maiku@pidgin.im>
parents: 26410
diff changeset
274 g_free(id);
1536df3f6fc7 Send any additional candidates found after session-initiate or
Michael Ruprecht <maiku@pidgin.im>
parents: 26410
diff changeset
275 return iceudp_candidate;
1536df3f6fc7 Send any additional candidates found after session-initiate or
Michael Ruprecht <maiku@pidgin.im>
parents: 26410
diff changeset
276 }
1536df3f6fc7 Send any additional candidates found after session-initiate or
Michael Ruprecht <maiku@pidgin.im>
parents: 26410
diff changeset
277
26147
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
278 static JingleTransport *
26154
78fa18d44718 Update Jingle raw-udp to latest spec version.
Michael Ruprecht <maiku@pidgin.im>
parents: 26149
diff changeset
279 jingle_rtp_candidates_to_transport(JingleSession *session, GType type, guint generation, GList *candidates)
26147
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
280 {
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
281 if (type == JINGLE_TYPE_RAWUDP) {
26154
78fa18d44718 Update Jingle raw-udp to latest spec version.
Michael Ruprecht <maiku@pidgin.im>
parents: 26149
diff changeset
282 JingleTransport *transport = jingle_transport_create(JINGLE_TRANSPORT_RAWUDP);
78fa18d44718 Update Jingle raw-udp to latest spec version.
Michael Ruprecht <maiku@pidgin.im>
parents: 26149
diff changeset
283 JingleRawUdpCandidate *rawudp_candidate;
78fa18d44718 Update Jingle raw-udp to latest spec version.
Michael Ruprecht <maiku@pidgin.im>
parents: 26149
diff changeset
284 for (; candidates; candidates = g_list_next(candidates)) {
26229
3e786c9ebb62 Duplicate FsCandidate to remove it from the public interface.
Michael Ruprecht <maiku@pidgin.im>
parents: 26226
diff changeset
285 PurpleMediaCandidate *candidate = candidates->data;
39727
7a40ca5585ca jingle: build transport with udp candidates only
Fabrice Bellet <fabrice@bellet.info>
parents: 39725
diff changeset
286 if (purple_media_candidate_get_protocol(candidate) ==
7a40ca5585ca jingle: build transport with udp candidates only
Fabrice Bellet <fabrice@bellet.info>
parents: 39725
diff changeset
287 PURPLE_MEDIA_NETWORK_PROTOCOL_UDP) {
7a40ca5585ca jingle: build transport with udp candidates only
Fabrice Bellet <fabrice@bellet.info>
parents: 39725
diff changeset
288 rawudp_candidate = jingle_rtp_candidate_to_rawudp(
7a40ca5585ca jingle: build transport with udp candidates only
Fabrice Bellet <fabrice@bellet.info>
parents: 39725
diff changeset
289 session, generation, candidate);
7a40ca5585ca jingle: build transport with udp candidates only
Fabrice Bellet <fabrice@bellet.info>
parents: 39725
diff changeset
290 jingle_rawudp_add_local_candidate(
7a40ca5585ca jingle: build transport with udp candidates only
Fabrice Bellet <fabrice@bellet.info>
parents: 39725
diff changeset
291 JINGLE_RAWUDP(transport),
7a40ca5585ca jingle: build transport with udp candidates only
Fabrice Bellet <fabrice@bellet.info>
parents: 39725
diff changeset
292 rawudp_candidate);
7a40ca5585ca jingle: build transport with udp candidates only
Fabrice Bellet <fabrice@bellet.info>
parents: 39725
diff changeset
293 }
26154
78fa18d44718 Update Jingle raw-udp to latest spec version.
Michael Ruprecht <maiku@pidgin.im>
parents: 26149
diff changeset
294 }
78fa18d44718 Update Jingle raw-udp to latest spec version.
Michael Ruprecht <maiku@pidgin.im>
parents: 26149
diff changeset
295 return transport;
26147
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
296 } else if (type == JINGLE_TYPE_ICEUDP) {
26166
ad7d09fef256 Added a Jingle ice-udp transmitter.
Michael Ruprecht <maiku@pidgin.im>
parents: 26161
diff changeset
297 JingleTransport *transport = jingle_transport_create(JINGLE_TRANSPORT_ICEUDP);
ad7d09fef256 Added a Jingle ice-udp transmitter.
Michael Ruprecht <maiku@pidgin.im>
parents: 26161
diff changeset
298 JingleIceUdpCandidate *iceudp_candidate;
ad7d09fef256 Added a Jingle ice-udp transmitter.
Michael Ruprecht <maiku@pidgin.im>
parents: 26161
diff changeset
299 for (; candidates; candidates = g_list_next(candidates)) {
26229
3e786c9ebb62 Duplicate FsCandidate to remove it from the public interface.
Michael Ruprecht <maiku@pidgin.im>
parents: 26226
diff changeset
300 PurpleMediaCandidate *candidate = candidates->data;
39727
7a40ca5585ca jingle: build transport with udp candidates only
Fabrice Bellet <fabrice@bellet.info>
parents: 39725
diff changeset
301 if (purple_media_candidate_get_protocol(candidate) ==
7a40ca5585ca jingle: build transport with udp candidates only
Fabrice Bellet <fabrice@bellet.info>
parents: 39725
diff changeset
302 PURPLE_MEDIA_NETWORK_PROTOCOL_UDP) {
7a40ca5585ca jingle: build transport with udp candidates only
Fabrice Bellet <fabrice@bellet.info>
parents: 39725
diff changeset
303 iceudp_candidate = jingle_rtp_candidate_to_iceudp(
7a40ca5585ca jingle: build transport with udp candidates only
Fabrice Bellet <fabrice@bellet.info>
parents: 39725
diff changeset
304 session, generation, candidate);
7a40ca5585ca jingle: build transport with udp candidates only
Fabrice Bellet <fabrice@bellet.info>
parents: 39725
diff changeset
305 jingle_iceudp_add_local_candidate(
7a40ca5585ca jingle: build transport with udp candidates only
Fabrice Bellet <fabrice@bellet.info>
parents: 39725
diff changeset
306 JINGLE_ICEUDP(transport),
7a40ca5585ca jingle: build transport with udp candidates only
Fabrice Bellet <fabrice@bellet.info>
parents: 39725
diff changeset
307 iceudp_candidate);
7a40ca5585ca jingle: build transport with udp candidates only
Fabrice Bellet <fabrice@bellet.info>
parents: 39725
diff changeset
308 }
26166
ad7d09fef256 Added a Jingle ice-udp transmitter.
Michael Ruprecht <maiku@pidgin.im>
parents: 26161
diff changeset
309 }
ad7d09fef256 Added a Jingle ice-udp transmitter.
Michael Ruprecht <maiku@pidgin.im>
parents: 26161
diff changeset
310 return transport;
26147
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
311 } else {
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
312 return NULL;
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
313 }
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
314 }
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
315
26154
78fa18d44718 Update Jingle raw-udp to latest spec version.
Michael Ruprecht <maiku@pidgin.im>
parents: 26149
diff changeset
316 static GList *
78fa18d44718 Update Jingle raw-udp to latest spec version.
Michael Ruprecht <maiku@pidgin.im>
parents: 26149
diff changeset
317 jingle_rtp_transport_to_candidates(JingleTransport *transport)
26147
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
318 {
26154
78fa18d44718 Update Jingle raw-udp to latest spec version.
Michael Ruprecht <maiku@pidgin.im>
parents: 26149
diff changeset
319 const gchar *type = jingle_transport_get_transport_type(transport);
78fa18d44718 Update Jingle raw-udp to latest spec version.
Michael Ruprecht <maiku@pidgin.im>
parents: 26149
diff changeset
320 GList *ret = NULL;
38258
9a6551eba09c Replace !strcmp() with purple_strequal()
qarkai <qarkai@gmail.com>
parents: 38256
diff changeset
321 if (purple_strequal(type, JINGLE_TRANSPORT_RAWUDP)) {
26154
78fa18d44718 Update Jingle raw-udp to latest spec version.
Michael Ruprecht <maiku@pidgin.im>
parents: 26149
diff changeset
322 GList *candidates = jingle_rawudp_get_remote_candidates(JINGLE_RAWUDP(transport));
78fa18d44718 Update Jingle raw-udp to latest spec version.
Michael Ruprecht <maiku@pidgin.im>
parents: 26149
diff changeset
323
78fa18d44718 Update Jingle raw-udp to latest spec version.
Michael Ruprecht <maiku@pidgin.im>
parents: 26149
diff changeset
324 for (; candidates; candidates = g_list_delete_link(candidates, candidates)) {
78fa18d44718 Update Jingle raw-udp to latest spec version.
Michael Ruprecht <maiku@pidgin.im>
parents: 26149
diff changeset
325 JingleRawUdpCandidate *candidate = candidates->data;
26229
3e786c9ebb62 Duplicate FsCandidate to remove it from the public interface.
Michael Ruprecht <maiku@pidgin.im>
parents: 26226
diff changeset
326 ret = g_list_append(ret, purple_media_candidate_new(
3e786c9ebb62 Duplicate FsCandidate to remove it from the public interface.
Michael Ruprecht <maiku@pidgin.im>
parents: 26226
diff changeset
327 "", candidate->component,
3e786c9ebb62 Duplicate FsCandidate to remove it from the public interface.
Michael Ruprecht <maiku@pidgin.im>
parents: 26226
diff changeset
328 PURPLE_MEDIA_CANDIDATE_TYPE_SRFLX,
3e786c9ebb62 Duplicate FsCandidate to remove it from the public interface.
Michael Ruprecht <maiku@pidgin.im>
parents: 26226
diff changeset
329 PURPLE_MEDIA_NETWORK_PROTOCOL_UDP,
26154
78fa18d44718 Update Jingle raw-udp to latest spec version.
Michael Ruprecht <maiku@pidgin.im>
parents: 26149
diff changeset
330 candidate->ip, candidate->port));
78fa18d44718 Update Jingle raw-udp to latest spec version.
Michael Ruprecht <maiku@pidgin.im>
parents: 26149
diff changeset
331 }
78fa18d44718 Update Jingle raw-udp to latest spec version.
Michael Ruprecht <maiku@pidgin.im>
parents: 26149
diff changeset
332
78fa18d44718 Update Jingle raw-udp to latest spec version.
Michael Ruprecht <maiku@pidgin.im>
parents: 26149
diff changeset
333 return ret;
38258
9a6551eba09c Replace !strcmp() with purple_strequal()
qarkai <qarkai@gmail.com>
parents: 38256
diff changeset
334 } else if (purple_strequal(type, JINGLE_TRANSPORT_ICEUDP)) {
26166
ad7d09fef256 Added a Jingle ice-udp transmitter.
Michael Ruprecht <maiku@pidgin.im>
parents: 26161
diff changeset
335 GList *candidates = jingle_iceudp_get_remote_candidates(JINGLE_ICEUDP(transport));
ad7d09fef256 Added a Jingle ice-udp transmitter.
Michael Ruprecht <maiku@pidgin.im>
parents: 26161
diff changeset
336
ad7d09fef256 Added a Jingle ice-udp transmitter.
Michael Ruprecht <maiku@pidgin.im>
parents: 26161
diff changeset
337 for (; candidates; candidates = g_list_delete_link(candidates, candidates)) {
ad7d09fef256 Added a Jingle ice-udp transmitter.
Michael Ruprecht <maiku@pidgin.im>
parents: 26161
diff changeset
338 JingleIceUdpCandidate *candidate = candidates->data;
26229
3e786c9ebb62 Duplicate FsCandidate to remove it from the public interface.
Michael Ruprecht <maiku@pidgin.im>
parents: 26226
diff changeset
339 PurpleMediaCandidate *new_candidate = purple_media_candidate_new(
26166
ad7d09fef256 Added a Jingle ice-udp transmitter.
Michael Ruprecht <maiku@pidgin.im>
parents: 26161
diff changeset
340 candidate->foundation, candidate->component,
38258
9a6551eba09c Replace !strcmp() with purple_strequal()
qarkai <qarkai@gmail.com>
parents: 38256
diff changeset
341 purple_strequal(candidate->type, "host") ?
26229
3e786c9ebb62 Duplicate FsCandidate to remove it from the public interface.
Michael Ruprecht <maiku@pidgin.im>
parents: 26226
diff changeset
342 PURPLE_MEDIA_CANDIDATE_TYPE_HOST :
38258
9a6551eba09c Replace !strcmp() with purple_strequal()
qarkai <qarkai@gmail.com>
parents: 38256
diff changeset
343 purple_strequal(candidate->type, "srflx") ?
26229
3e786c9ebb62 Duplicate FsCandidate to remove it from the public interface.
Michael Ruprecht <maiku@pidgin.im>
parents: 26226
diff changeset
344 PURPLE_MEDIA_CANDIDATE_TYPE_SRFLX :
38258
9a6551eba09c Replace !strcmp() with purple_strequal()
qarkai <qarkai@gmail.com>
parents: 38256
diff changeset
345 purple_strequal(candidate->type, "prflx") ?
26229
3e786c9ebb62 Duplicate FsCandidate to remove it from the public interface.
Michael Ruprecht <maiku@pidgin.im>
parents: 26226
diff changeset
346 PURPLE_MEDIA_CANDIDATE_TYPE_PRFLX :
38258
9a6551eba09c Replace !strcmp() with purple_strequal()
qarkai <qarkai@gmail.com>
parents: 38256
diff changeset
347 purple_strequal(candidate->type, "relay") ?
26229
3e786c9ebb62 Duplicate FsCandidate to remove it from the public interface.
Michael Ruprecht <maiku@pidgin.im>
parents: 26226
diff changeset
348 PURPLE_MEDIA_CANDIDATE_TYPE_RELAY : 0,
3e786c9ebb62 Duplicate FsCandidate to remove it from the public interface.
Michael Ruprecht <maiku@pidgin.im>
parents: 26226
diff changeset
349 PURPLE_MEDIA_NETWORK_PROTOCOL_UDP,
3e786c9ebb62 Duplicate FsCandidate to remove it from the public interface.
Michael Ruprecht <maiku@pidgin.im>
parents: 26226
diff changeset
350 candidate->ip, candidate->port);
26620
a34fb2386da5 Hide and GObjectify PurpleMediaCandidate.
Michael Ruprecht <maiku@pidgin.im>
parents: 26618
diff changeset
351 g_object_set(new_candidate,
a34fb2386da5 Hide and GObjectify PurpleMediaCandidate.
Michael Ruprecht <maiku@pidgin.im>
parents: 26618
diff changeset
352 "base-ip", candidate->reladdr,
a34fb2386da5 Hide and GObjectify PurpleMediaCandidate.
Michael Ruprecht <maiku@pidgin.im>
parents: 26618
diff changeset
353 "base-port", candidate->relport,
a34fb2386da5 Hide and GObjectify PurpleMediaCandidate.
Michael Ruprecht <maiku@pidgin.im>
parents: 26618
diff changeset
354 "username", candidate->username,
a34fb2386da5 Hide and GObjectify PurpleMediaCandidate.
Michael Ruprecht <maiku@pidgin.im>
parents: 26618
diff changeset
355 "password", candidate->password,
a34fb2386da5 Hide and GObjectify PurpleMediaCandidate.
Michael Ruprecht <maiku@pidgin.im>
parents: 26618
diff changeset
356 "priority", candidate->priority, NULL);
26229
3e786c9ebb62 Duplicate FsCandidate to remove it from the public interface.
Michael Ruprecht <maiku@pidgin.im>
parents: 26226
diff changeset
357 ret = g_list_append(ret, new_candidate);
26166
ad7d09fef256 Added a Jingle ice-udp transmitter.
Michael Ruprecht <maiku@pidgin.im>
parents: 26161
diff changeset
358 }
ad7d09fef256 Added a Jingle ice-udp transmitter.
Michael Ruprecht <maiku@pidgin.im>
parents: 26161
diff changeset
359
ad7d09fef256 Added a Jingle ice-udp transmitter.
Michael Ruprecht <maiku@pidgin.im>
parents: 26161
diff changeset
360 return ret;
26147
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
361 } else {
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
362 return NULL;
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
363 }
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
364 }
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
365
26437
02b645aac6ee Stop sending multiple session-initiate packets.
Michael Ruprecht <maiku@pidgin.im>
parents: 26433
diff changeset
366 static void jingle_rtp_ready(JingleSession *session);
26431
993517d98857 Move sending session-initiate out of the ready-new callback.
Michael Ruprecht <maiku@pidgin.im>
parents: 26428
diff changeset
367
26147
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
368 static void
26418
58d9b79f7af6 Implement jingle_rtp_candidates_prepared_cb.
Michael Ruprecht <maiku@pidgin.im>
parents: 26417
diff changeset
369 jingle_rtp_candidates_prepared_cb(PurpleMedia *media,
58d9b79f7af6 Implement jingle_rtp_candidates_prepared_cb.
Michael Ruprecht <maiku@pidgin.im>
parents: 26417
diff changeset
370 gchar *sid, gchar *name, JingleSession *session)
26417
b73b6e73abe6 Add candidates-prepared signal to PurpleMedia.
Michael Ruprecht <maiku@pidgin.im>
parents: 26416
diff changeset
371 {
26418
58d9b79f7af6 Implement jingle_rtp_candidates_prepared_cb.
Michael Ruprecht <maiku@pidgin.im>
parents: 26417
diff changeset
372 JingleContent *content = jingle_session_find_content(
26422
457d5f0223b4 Use new find_content wildcard.
Michael Ruprecht <maiku@pidgin.im>
parents: 26420
diff changeset
373 session, sid, NULL);
26418
58d9b79f7af6 Implement jingle_rtp_candidates_prepared_cb.
Michael Ruprecht <maiku@pidgin.im>
parents: 26417
diff changeset
374 JingleTransport *oldtransport, *transport;
58d9b79f7af6 Implement jingle_rtp_candidates_prepared_cb.
Michael Ruprecht <maiku@pidgin.im>
parents: 26417
diff changeset
375 GList *candidates;
58d9b79f7af6 Implement jingle_rtp_candidates_prepared_cb.
Michael Ruprecht <maiku@pidgin.im>
parents: 26417
diff changeset
376
26417
b73b6e73abe6 Add candidates-prepared signal to PurpleMedia.
Michael Ruprecht <maiku@pidgin.im>
parents: 26416
diff changeset
377 purple_debug_info("jingle-rtp", "jingle_rtp_candidates_prepared_cb\n");
26418
58d9b79f7af6 Implement jingle_rtp_candidates_prepared_cb.
Michael Ruprecht <maiku@pidgin.im>
parents: 26417
diff changeset
378
58d9b79f7af6 Implement jingle_rtp_candidates_prepared_cb.
Michael Ruprecht <maiku@pidgin.im>
parents: 26417
diff changeset
379 if (content == NULL) {
58d9b79f7af6 Implement jingle_rtp_candidates_prepared_cb.
Michael Ruprecht <maiku@pidgin.im>
parents: 26417
diff changeset
380 purple_debug_error("jingle-rtp",
58d9b79f7af6 Implement jingle_rtp_candidates_prepared_cb.
Michael Ruprecht <maiku@pidgin.im>
parents: 26417
diff changeset
381 "jingle_rtp_candidates_prepared_cb: "
58d9b79f7af6 Implement jingle_rtp_candidates_prepared_cb.
Michael Ruprecht <maiku@pidgin.im>
parents: 26417
diff changeset
382 "Can't find session %s\n", sid);
58d9b79f7af6 Implement jingle_rtp_candidates_prepared_cb.
Michael Ruprecht <maiku@pidgin.im>
parents: 26417
diff changeset
383 return;
58d9b79f7af6 Implement jingle_rtp_candidates_prepared_cb.
Michael Ruprecht <maiku@pidgin.im>
parents: 26417
diff changeset
384 }
58d9b79f7af6 Implement jingle_rtp_candidates_prepared_cb.
Michael Ruprecht <maiku@pidgin.im>
parents: 26417
diff changeset
385
58d9b79f7af6 Implement jingle_rtp_candidates_prepared_cb.
Michael Ruprecht <maiku@pidgin.im>
parents: 26417
diff changeset
386 oldtransport = jingle_content_get_transport(content);
58d9b79f7af6 Implement jingle_rtp_candidates_prepared_cb.
Michael Ruprecht <maiku@pidgin.im>
parents: 26417
diff changeset
387 candidates = purple_media_get_local_candidates(media, sid, name);
58d9b79f7af6 Implement jingle_rtp_candidates_prepared_cb.
Michael Ruprecht <maiku@pidgin.im>
parents: 26417
diff changeset
388 transport = JINGLE_TRANSPORT(jingle_rtp_candidates_to_transport(
58d9b79f7af6 Implement jingle_rtp_candidates_prepared_cb.
Michael Ruprecht <maiku@pidgin.im>
parents: 26417
diff changeset
389 session, JINGLE_IS_RAWUDP(oldtransport) ?
58d9b79f7af6 Implement jingle_rtp_candidates_prepared_cb.
Michael Ruprecht <maiku@pidgin.im>
parents: 26417
diff changeset
390 JINGLE_TYPE_RAWUDP : JINGLE_TYPE_ICEUDP,
58d9b79f7af6 Implement jingle_rtp_candidates_prepared_cb.
Michael Ruprecht <maiku@pidgin.im>
parents: 26417
diff changeset
391 0, candidates));
58d9b79f7af6 Implement jingle_rtp_candidates_prepared_cb.
Michael Ruprecht <maiku@pidgin.im>
parents: 26417
diff changeset
392
39724
72a35ff95941 Fix more memory leaks
Fabrice Bellet <fabrice@bellet.info>
parents: 38693
diff changeset
393 purple_media_candidate_list_free(candidates);
26418
58d9b79f7af6 Implement jingle_rtp_candidates_prepared_cb.
Michael Ruprecht <maiku@pidgin.im>
parents: 26417
diff changeset
394 g_object_unref(oldtransport);
58d9b79f7af6 Implement jingle_rtp_candidates_prepared_cb.
Michael Ruprecht <maiku@pidgin.im>
parents: 26417
diff changeset
395
58d9b79f7af6 Implement jingle_rtp_candidates_prepared_cb.
Michael Ruprecht <maiku@pidgin.im>
parents: 26417
diff changeset
396 jingle_content_set_pending_transport(content, transport);
58d9b79f7af6 Implement jingle_rtp_candidates_prepared_cb.
Michael Ruprecht <maiku@pidgin.im>
parents: 26417
diff changeset
397 jingle_content_accept_transport(content);
26431
993517d98857 Move sending session-initiate out of the ready-new callback.
Michael Ruprecht <maiku@pidgin.im>
parents: 26428
diff changeset
398
26437
02b645aac6ee Stop sending multiple session-initiate packets.
Michael Ruprecht <maiku@pidgin.im>
parents: 26433
diff changeset
399 jingle_rtp_ready(session);
26417
b73b6e73abe6 Add candidates-prepared signal to PurpleMedia.
Michael Ruprecht <maiku@pidgin.im>
parents: 26416
diff changeset
400 }
b73b6e73abe6 Add candidates-prepared signal to PurpleMedia.
Michael Ruprecht <maiku@pidgin.im>
parents: 26416
diff changeset
401
b73b6e73abe6 Add candidates-prepared signal to PurpleMedia.
Michael Ruprecht <maiku@pidgin.im>
parents: 26416
diff changeset
402 static void
26265
66aee93241e2 Added codecs-changed signal.
Michael Ruprecht <maiku@pidgin.im>
parents: 26264
diff changeset
403 jingle_rtp_codecs_changed_cb(PurpleMedia *media, gchar *sid,
66aee93241e2 Added codecs-changed signal.
Michael Ruprecht <maiku@pidgin.im>
parents: 26264
diff changeset
404 JingleSession *session)
66aee93241e2 Added codecs-changed signal.
Michael Ruprecht <maiku@pidgin.im>
parents: 26264
diff changeset
405 {
66aee93241e2 Added codecs-changed signal.
Michael Ruprecht <maiku@pidgin.im>
parents: 26264
diff changeset
406 purple_debug_info("jingle-rtp", "jingle_rtp_codecs_changed_cb: "
66aee93241e2 Added codecs-changed signal.
Michael Ruprecht <maiku@pidgin.im>
parents: 26264
diff changeset
407 "session_id: %s jingle_session: %p\n", sid, session);
26437
02b645aac6ee Stop sending multiple session-initiate packets.
Michael Ruprecht <maiku@pidgin.im>
parents: 26433
diff changeset
408 jingle_rtp_ready(session);
26265
66aee93241e2 Added codecs-changed signal.
Michael Ruprecht <maiku@pidgin.im>
parents: 26264
diff changeset
409 }
66aee93241e2 Added codecs-changed signal.
Michael Ruprecht <maiku@pidgin.im>
parents: 26264
diff changeset
410
66aee93241e2 Added codecs-changed signal.
Michael Ruprecht <maiku@pidgin.im>
parents: 26264
diff changeset
411 static void
26229
3e786c9ebb62 Duplicate FsCandidate to remove it from the public interface.
Michael Ruprecht <maiku@pidgin.im>
parents: 26226
diff changeset
412 jingle_rtp_new_candidate_cb(PurpleMedia *media, gchar *sid, gchar *name, PurpleMediaCandidate *candidate, JingleSession *session)
26147
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
413 {
26416
1536df3f6fc7 Send any additional candidates found after session-initiate or
Michael Ruprecht <maiku@pidgin.im>
parents: 26410
diff changeset
414 JingleContent *content = jingle_session_find_content(
26422
457d5f0223b4 Use new find_content wildcard.
Michael Ruprecht <maiku@pidgin.im>
parents: 26420
diff changeset
415 session, sid, NULL);
26416
1536df3f6fc7 Send any additional candidates found after session-initiate or
Michael Ruprecht <maiku@pidgin.im>
parents: 26410
diff changeset
416 JingleTransport *transport;
1536df3f6fc7 Send any additional candidates found after session-initiate or
Michael Ruprecht <maiku@pidgin.im>
parents: 26410
diff changeset
417
26147
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
418 purple_debug_info("jingle-rtp", "jingle_rtp_new_candidate_cb\n");
26416
1536df3f6fc7 Send any additional candidates found after session-initiate or
Michael Ruprecht <maiku@pidgin.im>
parents: 26410
diff changeset
419
1536df3f6fc7 Send any additional candidates found after session-initiate or
Michael Ruprecht <maiku@pidgin.im>
parents: 26410
diff changeset
420 if (content == NULL) {
1536df3f6fc7 Send any additional candidates found after session-initiate or
Michael Ruprecht <maiku@pidgin.im>
parents: 26410
diff changeset
421 purple_debug_error("jingle-rtp",
1536df3f6fc7 Send any additional candidates found after session-initiate or
Michael Ruprecht <maiku@pidgin.im>
parents: 26410
diff changeset
422 "jingle_rtp_new_candidate_cb: "
1536df3f6fc7 Send any additional candidates found after session-initiate or
Michael Ruprecht <maiku@pidgin.im>
parents: 26410
diff changeset
423 "Can't find session %s\n", sid);
1536df3f6fc7 Send any additional candidates found after session-initiate or
Michael Ruprecht <maiku@pidgin.im>
parents: 26410
diff changeset
424 return;
1536df3f6fc7 Send any additional candidates found after session-initiate or
Michael Ruprecht <maiku@pidgin.im>
parents: 26410
diff changeset
425 }
1536df3f6fc7 Send any additional candidates found after session-initiate or
Michael Ruprecht <maiku@pidgin.im>
parents: 26410
diff changeset
426
1536df3f6fc7 Send any additional candidates found after session-initiate or
Michael Ruprecht <maiku@pidgin.im>
parents: 26410
diff changeset
427 transport = jingle_content_get_transport(content);
1536df3f6fc7 Send any additional candidates found after session-initiate or
Michael Ruprecht <maiku@pidgin.im>
parents: 26410
diff changeset
428
1536df3f6fc7 Send any additional candidates found after session-initiate or
Michael Ruprecht <maiku@pidgin.im>
parents: 26410
diff changeset
429 if (JINGLE_IS_ICEUDP(transport))
26419
1fcdbc14e4cb Silence two warnings.
Michael Ruprecht <maiku@pidgin.im>
parents: 26416
diff changeset
430 jingle_iceudp_add_local_candidate(JINGLE_ICEUDP(transport),
26416
1536df3f6fc7 Send any additional candidates found after session-initiate or
Michael Ruprecht <maiku@pidgin.im>
parents: 26410
diff changeset
431 jingle_rtp_candidate_to_iceudp(
1536df3f6fc7 Send any additional candidates found after session-initiate or
Michael Ruprecht <maiku@pidgin.im>
parents: 26410
diff changeset
432 session, 1, candidate));
1536df3f6fc7 Send any additional candidates found after session-initiate or
Michael Ruprecht <maiku@pidgin.im>
parents: 26410
diff changeset
433 else if (JINGLE_IS_RAWUDP(transport))
26419
1fcdbc14e4cb Silence two warnings.
Michael Ruprecht <maiku@pidgin.im>
parents: 26416
diff changeset
434 jingle_rawudp_add_local_candidate(JINGLE_RAWUDP(transport),
26416
1536df3f6fc7 Send any additional candidates found after session-initiate or
Michael Ruprecht <maiku@pidgin.im>
parents: 26410
diff changeset
435 jingle_rtp_candidate_to_rawudp(
1536df3f6fc7 Send any additional candidates found after session-initiate or
Michael Ruprecht <maiku@pidgin.im>
parents: 26410
diff changeset
436 session, 1, candidate));
1536df3f6fc7 Send any additional candidates found after session-initiate or
Michael Ruprecht <maiku@pidgin.im>
parents: 26410
diff changeset
437
1536df3f6fc7 Send any additional candidates found after session-initiate or
Michael Ruprecht <maiku@pidgin.im>
parents: 26410
diff changeset
438 g_object_unref(transport);
1536df3f6fc7 Send any additional candidates found after session-initiate or
Michael Ruprecht <maiku@pidgin.im>
parents: 26410
diff changeset
439
1536df3f6fc7 Send any additional candidates found after session-initiate or
Michael Ruprecht <maiku@pidgin.im>
parents: 26410
diff changeset
440 jabber_iq_send(jingle_session_to_packet(session,
1536df3f6fc7 Send any additional candidates found after session-initiate or
Michael Ruprecht <maiku@pidgin.im>
parents: 26410
diff changeset
441 JINGLE_TRANSPORT_INFO));
26147
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
442 }
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
443
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
444 static void
26694
3d9ac30490ab Fix merge for ./jingle/
Paul Aurich <darkrain42@pidgin.im>
parents: 26620
diff changeset
445 jingle_rtp_initiate_ack_cb(JabberStream *js, const char *from,
3d9ac30490ab Fix merge for ./jingle/
Paul Aurich <darkrain42@pidgin.im>
parents: 26620
diff changeset
446 JabberIqType type, const char *id,
3d9ac30490ab Fix merge for ./jingle/
Paul Aurich <darkrain42@pidgin.im>
parents: 26620
diff changeset
447 xmlnode *packet, gpointer data)
26311
0baf4bc1b441 Wait to send transport-info until the session-initiate ack is received.
Michael Ruprecht <maiku@pidgin.im>
parents: 26303
diff changeset
448 {
0baf4bc1b441 Wait to send transport-info until the session-initiate ack is received.
Michael Ruprecht <maiku@pidgin.im>
parents: 26303
diff changeset
449 JingleSession *session = data;
0baf4bc1b441 Wait to send transport-info until the session-initiate ack is received.
Michael Ruprecht <maiku@pidgin.im>
parents: 26303
diff changeset
450
26694
3d9ac30490ab Fix merge for ./jingle/
Paul Aurich <darkrain42@pidgin.im>
parents: 26620
diff changeset
451 if (type == JABBER_IQ_ERROR || xmlnode_get_child(packet, "error")) {
26311
0baf4bc1b441 Wait to send transport-info until the session-initiate ack is received.
Michael Ruprecht <maiku@pidgin.im>
parents: 26303
diff changeset
452 purple_media_end(jingle_rtp_get_media(session), NULL, NULL);
26312
dcbb96abceae Free the session as well on error.
Michael Ruprecht <maiku@pidgin.im>
parents: 26311
diff changeset
453 g_object_unref(session);
26311
0baf4bc1b441 Wait to send transport-info until the session-initiate ack is received.
Michael Ruprecht <maiku@pidgin.im>
parents: 26303
diff changeset
454 return;
0baf4bc1b441 Wait to send transport-info until the session-initiate ack is received.
Michael Ruprecht <maiku@pidgin.im>
parents: 26303
diff changeset
455 }
0baf4bc1b441 Wait to send transport-info until the session-initiate ack is received.
Michael Ruprecht <maiku@pidgin.im>
parents: 26303
diff changeset
456 }
0baf4bc1b441 Wait to send transport-info until the session-initiate ack is received.
Michael Ruprecht <maiku@pidgin.im>
parents: 26303
diff changeset
457
0baf4bc1b441 Wait to send transport-info until the session-initiate ack is received.
Michael Ruprecht <maiku@pidgin.im>
parents: 26303
diff changeset
458 static void
26449
9e381dc6ed24 Rename state-changed enum and values.
Michael Ruprecht <maiku@pidgin.im>
parents: 26441
diff changeset
459 jingle_rtp_state_changed_cb(PurpleMedia *media, PurpleMediaState state,
26193
101122f0f3dd Add state-changed signal to PurpleMedia.
Michael Ruprecht <maiku@pidgin.im>
parents: 26192
diff changeset
460 gchar *sid, gchar *name, JingleSession *session)
101122f0f3dd Add state-changed signal to PurpleMedia.
Michael Ruprecht <maiku@pidgin.im>
parents: 26192
diff changeset
461 {
26449
9e381dc6ed24 Rename state-changed enum and values.
Michael Ruprecht <maiku@pidgin.im>
parents: 26441
diff changeset
462 purple_debug_info("jingle-rtp", "state-changed: state %d "
27974
2021706e911d Fixes for some potential printf("%s", NULL) type of problems from Maiku
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 26746
diff changeset
463 "id: %s name: %s\n", state, sid ? sid : "(null)",
2021706e911d Fixes for some potential printf("%s", NULL) type of problems from Maiku
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 26746
diff changeset
464 name ? name : "(null)");
26441
46a5bb7783e7 Use stream-info instead of state-changed for hangup and reject.
Michael Ruprecht <maiku@pidgin.im>
parents: 26437
diff changeset
465 }
26194
b8aab50491f4 Use the state-changed signal.
Michael Ruprecht <maiku@pidgin.im>
parents: 26193
diff changeset
466
26441
46a5bb7783e7 Use stream-info instead of state-changed for hangup and reject.
Michael Ruprecht <maiku@pidgin.im>
parents: 26437
diff changeset
467 static void
46a5bb7783e7 Use stream-info instead of state-changed for hangup and reject.
Michael Ruprecht <maiku@pidgin.im>
parents: 26437
diff changeset
468 jingle_rtp_stream_info_cb(PurpleMedia *media, PurpleMediaInfoType type,
26496
11e1e5221460 Create purple_media_stream_info. Add local parameter to stream-info signal.
Michael Ruprecht <maiku@pidgin.im>
parents: 26495
diff changeset
469 gchar *sid, gchar *name, gboolean local,
11e1e5221460 Create purple_media_stream_info. Add local parameter to stream-info signal.
Michael Ruprecht <maiku@pidgin.im>
parents: 26495
diff changeset
470 JingleSession *session)
26441
46a5bb7783e7 Use stream-info instead of state-changed for hangup and reject.
Michael Ruprecht <maiku@pidgin.im>
parents: 26437
diff changeset
471 {
46a5bb7783e7 Use stream-info instead of state-changed for hangup and reject.
Michael Ruprecht <maiku@pidgin.im>
parents: 26437
diff changeset
472 purple_debug_info("jingle-rtp", "stream-info: type %d "
27974
2021706e911d Fixes for some potential printf("%s", NULL) type of problems from Maiku
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 26746
diff changeset
473 "id: %s name: %s\n", type, sid ? sid : "(null)",
2021706e911d Fixes for some potential printf("%s", NULL) type of problems from Maiku
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 26746
diff changeset
474 name ? name : "(null)");
26746
2a2d45ac9774 Switch media to store accounts rather than connections.
Michael Ruprecht <maiku@pidgin.im>
parents: 26696
diff changeset
475
2a2d45ac9774 Switch media to store accounts rather than connections.
Michael Ruprecht <maiku@pidgin.im>
parents: 26696
diff changeset
476 g_return_if_fail(JINGLE_IS_SESSION(session));
2a2d45ac9774 Switch media to store accounts rather than connections.
Michael Ruprecht <maiku@pidgin.im>
parents: 26696
diff changeset
477
29614
35ca95d87e11 Fix so emitting more HANGUP signals doesn't cause an assertion.
Michael Ruprecht <maiku@pidgin.im>
parents: 28333
diff changeset
478 if (type == PURPLE_MEDIA_INFO_HANGUP ||
35ca95d87e11 Fix so emitting more HANGUP signals doesn't cause an assertion.
Michael Ruprecht <maiku@pidgin.im>
parents: 28333
diff changeset
479 type == PURPLE_MEDIA_INFO_REJECT) {
26404
3947a428b87d Add functions for more easily creating session-terminate packets.
Michael Ruprecht <maiku@pidgin.im>
parents: 26330
diff changeset
480 jabber_iq_send(jingle_session_terminate_packet(
29614
35ca95d87e11 Fix so emitting more HANGUP signals doesn't cause an assertion.
Michael Ruprecht <maiku@pidgin.im>
parents: 28333
diff changeset
481 session, type == PURPLE_MEDIA_INFO_HANGUP ?
35ca95d87e11 Fix so emitting more HANGUP signals doesn't cause an assertion.
Michael Ruprecht <maiku@pidgin.im>
parents: 28333
diff changeset
482 "success" : "decline"));
35ca95d87e11 Fix so emitting more HANGUP signals doesn't cause an assertion.
Michael Ruprecht <maiku@pidgin.im>
parents: 28333
diff changeset
483
35ca95d87e11 Fix so emitting more HANGUP signals doesn't cause an assertion.
Michael Ruprecht <maiku@pidgin.im>
parents: 28333
diff changeset
484 g_signal_handlers_disconnect_by_func(G_OBJECT(media),
35ca95d87e11 Fix so emitting more HANGUP signals doesn't cause an assertion.
Michael Ruprecht <maiku@pidgin.im>
parents: 28333
diff changeset
485 G_CALLBACK(jingle_rtp_state_changed_cb),
35ca95d87e11 Fix so emitting more HANGUP signals doesn't cause an assertion.
Michael Ruprecht <maiku@pidgin.im>
parents: 28333
diff changeset
486 session);
35ca95d87e11 Fix so emitting more HANGUP signals doesn't cause an assertion.
Michael Ruprecht <maiku@pidgin.im>
parents: 28333
diff changeset
487 g_signal_handlers_disconnect_by_func(G_OBJECT(media),
35ca95d87e11 Fix so emitting more HANGUP signals doesn't cause an assertion.
Michael Ruprecht <maiku@pidgin.im>
parents: 28333
diff changeset
488 G_CALLBACK(jingle_rtp_stream_info_cb),
35ca95d87e11 Fix so emitting more HANGUP signals doesn't cause an assertion.
Michael Ruprecht <maiku@pidgin.im>
parents: 28333
diff changeset
489 session);
35ca95d87e11 Fix so emitting more HANGUP signals doesn't cause an assertion.
Michael Ruprecht <maiku@pidgin.im>
parents: 28333
diff changeset
490 g_signal_handlers_disconnect_by_func(G_OBJECT(media),
35ca95d87e11 Fix so emitting more HANGUP signals doesn't cause an assertion.
Michael Ruprecht <maiku@pidgin.im>
parents: 28333
diff changeset
491 G_CALLBACK(jingle_rtp_new_candidate_cb),
35ca95d87e11 Fix so emitting more HANGUP signals doesn't cause an assertion.
Michael Ruprecht <maiku@pidgin.im>
parents: 28333
diff changeset
492 session);
35ca95d87e11 Fix so emitting more HANGUP signals doesn't cause an assertion.
Michael Ruprecht <maiku@pidgin.im>
parents: 28333
diff changeset
493
26441
46a5bb7783e7 Use stream-info instead of state-changed for hangup and reject.
Michael Ruprecht <maiku@pidgin.im>
parents: 26437
diff changeset
494 g_object_unref(session);
39725
29aec83e0e44 React only to the first stream info signal
Fabrice Bellet <fabrice@bellet.info>
parents: 39724
diff changeset
495 /* The same signal is emited *four* times in case of acceptance
29aec83e0e44 React only to the first stream info signal
Fabrice Bellet <fabrice@bellet.info>
parents: 39724
diff changeset
496 * by purple_media_stream_info() (stream acceptance, session
29aec83e0e44 React only to the first stream info signal
Fabrice Bellet <fabrice@bellet.info>
parents: 39724
diff changeset
497 * acceptance, participant acceptance, and conference acceptance).
29aec83e0e44 React only to the first stream info signal
Fabrice Bellet <fabrice@bellet.info>
parents: 39724
diff changeset
498 * We only react to the first one, where sid and name are given
29aec83e0e44 React only to the first stream info signal
Fabrice Bellet <fabrice@bellet.info>
parents: 39724
diff changeset
499 * non-null values.
29aec83e0e44 React only to the first stream info signal
Fabrice Bellet <fabrice@bellet.info>
parents: 39724
diff changeset
500 */
29aec83e0e44 React only to the first stream info signal
Fabrice Bellet <fabrice@bellet.info>
parents: 39724
diff changeset
501 } else if (type == PURPLE_MEDIA_INFO_ACCEPT && sid && name &&
28111
61de2e173be9 Remove the "accepted" signal from PurpleMedia as it was redundant.
Michael Ruprecht <maiku@pidgin.im>
parents: 27974
diff changeset
502 jingle_session_is_initiator(session) == FALSE) {
39725
29aec83e0e44 React only to the first stream info signal
Fabrice Bellet <fabrice@bellet.info>
parents: 39724
diff changeset
503
28111
61de2e173be9 Remove the "accepted" signal from PurpleMedia as it was redundant.
Michael Ruprecht <maiku@pidgin.im>
parents: 27974
diff changeset
504 jingle_rtp_ready(session);
26194
b8aab50491f4 Use the state-changed signal.
Michael Ruprecht <maiku@pidgin.im>
parents: 26193
diff changeset
505 }
26193
101122f0f3dd Add state-changed signal to PurpleMedia.
Michael Ruprecht <maiku@pidgin.im>
parents: 26192
diff changeset
506 }
101122f0f3dd Add state-changed signal to PurpleMedia.
Michael Ruprecht <maiku@pidgin.im>
parents: 26192
diff changeset
507
26431
993517d98857 Move sending session-initiate out of the ready-new callback.
Michael Ruprecht <maiku@pidgin.im>
parents: 26428
diff changeset
508 static void
26437
02b645aac6ee Stop sending multiple session-initiate packets.
Michael Ruprecht <maiku@pidgin.im>
parents: 26433
diff changeset
509 jingle_rtp_ready(JingleSession *session)
26431
993517d98857 Move sending session-initiate out of the ready-new callback.
Michael Ruprecht <maiku@pidgin.im>
parents: 26428
diff changeset
510 {
993517d98857 Move sending session-initiate out of the ready-new callback.
Michael Ruprecht <maiku@pidgin.im>
parents: 26428
diff changeset
511 PurpleMedia *media = jingle_rtp_get_media(session);
993517d98857 Move sending session-initiate out of the ready-new callback.
Michael Ruprecht <maiku@pidgin.im>
parents: 26428
diff changeset
512
26437
02b645aac6ee Stop sending multiple session-initiate packets.
Michael Ruprecht <maiku@pidgin.im>
parents: 26433
diff changeset
513 if (purple_media_candidates_prepared(media, NULL, NULL) &&
26431
993517d98857 Move sending session-initiate out of the ready-new callback.
Michael Ruprecht <maiku@pidgin.im>
parents: 26428
diff changeset
514 purple_media_codecs_ready(media, NULL) &&
26437
02b645aac6ee Stop sending multiple session-initiate packets.
Michael Ruprecht <maiku@pidgin.im>
parents: 26433
diff changeset
515 (jingle_session_is_initiator(session) == TRUE ||
02b645aac6ee Stop sending multiple session-initiate packets.
Michael Ruprecht <maiku@pidgin.im>
parents: 26433
diff changeset
516 purple_media_accepted(media, NULL, NULL))) {
02b645aac6ee Stop sending multiple session-initiate packets.
Michael Ruprecht <maiku@pidgin.im>
parents: 26433
diff changeset
517 if (jingle_session_is_initiator(session)) {
02b645aac6ee Stop sending multiple session-initiate packets.
Michael Ruprecht <maiku@pidgin.im>
parents: 26433
diff changeset
518 JabberIq *iq = jingle_session_to_packet(
02b645aac6ee Stop sending multiple session-initiate packets.
Michael Ruprecht <maiku@pidgin.im>
parents: 26433
diff changeset
519 session, JINGLE_SESSION_INITIATE);
02b645aac6ee Stop sending multiple session-initiate packets.
Michael Ruprecht <maiku@pidgin.im>
parents: 26433
diff changeset
520 jabber_iq_set_callback(iq,
02b645aac6ee Stop sending multiple session-initiate packets.
Michael Ruprecht <maiku@pidgin.im>
parents: 26433
diff changeset
521 jingle_rtp_initiate_ack_cb, session);
02b645aac6ee Stop sending multiple session-initiate packets.
Michael Ruprecht <maiku@pidgin.im>
parents: 26433
diff changeset
522 jabber_iq_send(iq);
02b645aac6ee Stop sending multiple session-initiate packets.
Michael Ruprecht <maiku@pidgin.im>
parents: 26433
diff changeset
523 } else {
02b645aac6ee Stop sending multiple session-initiate packets.
Michael Ruprecht <maiku@pidgin.im>
parents: 26433
diff changeset
524 jabber_iq_send(jingle_session_to_packet(session,
02b645aac6ee Stop sending multiple session-initiate packets.
Michael Ruprecht <maiku@pidgin.im>
parents: 26433
diff changeset
525 JINGLE_SESSION_ACCEPT));
02b645aac6ee Stop sending multiple session-initiate packets.
Michael Ruprecht <maiku@pidgin.im>
parents: 26433
diff changeset
526 }
02b645aac6ee Stop sending multiple session-initiate packets.
Michael Ruprecht <maiku@pidgin.im>
parents: 26433
diff changeset
527
02b645aac6ee Stop sending multiple session-initiate packets.
Michael Ruprecht <maiku@pidgin.im>
parents: 26433
diff changeset
528 g_signal_handlers_disconnect_by_func(G_OBJECT(media),
02b645aac6ee Stop sending multiple session-initiate packets.
Michael Ruprecht <maiku@pidgin.im>
parents: 26433
diff changeset
529 G_CALLBACK(jingle_rtp_candidates_prepared_cb),
26431
993517d98857 Move sending session-initiate out of the ready-new callback.
Michael Ruprecht <maiku@pidgin.im>
parents: 26428
diff changeset
530 session);
26437
02b645aac6ee Stop sending multiple session-initiate packets.
Michael Ruprecht <maiku@pidgin.im>
parents: 26433
diff changeset
531 g_signal_handlers_disconnect_by_func(G_OBJECT(media),
02b645aac6ee Stop sending multiple session-initiate packets.
Michael Ruprecht <maiku@pidgin.im>
parents: 26433
diff changeset
532 G_CALLBACK(jingle_rtp_codecs_changed_cb),
02b645aac6ee Stop sending multiple session-initiate packets.
Michael Ruprecht <maiku@pidgin.im>
parents: 26433
diff changeset
533 session);
26433
3213aeff8bdb Move sending session-accept out of the ready-new signal.
Michael Ruprecht <maiku@pidgin.im>
parents: 26431
diff changeset
534 g_signal_connect(G_OBJECT(media), "new-candidate",
3213aeff8bdb Move sending session-accept out of the ready-new signal.
Michael Ruprecht <maiku@pidgin.im>
parents: 26431
diff changeset
535 G_CALLBACK(jingle_rtp_new_candidate_cb),
3213aeff8bdb Move sending session-accept out of the ready-new signal.
Michael Ruprecht <maiku@pidgin.im>
parents: 26431
diff changeset
536 session);
3213aeff8bdb Move sending session-accept out of the ready-new signal.
Michael Ruprecht <maiku@pidgin.im>
parents: 26431
diff changeset
537 }
3213aeff8bdb Move sending session-accept out of the ready-new signal.
Michael Ruprecht <maiku@pidgin.im>
parents: 26431
diff changeset
538 }
3213aeff8bdb Move sending session-accept out of the ready-new signal.
Michael Ruprecht <maiku@pidgin.im>
parents: 26431
diff changeset
539
26147
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
540 static PurpleMedia *
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
541 jingle_rtp_create_media(JingleContent *content)
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
542 {
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
543 JingleSession *session = jingle_content_get_session(content);
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
544 JabberStream *js = jingle_session_get_js(session);
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
545 gchar *remote_jid = jingle_session_get_remote_jid(session);
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
546
26746
2a2d45ac9774 Switch media to store accounts rather than connections.
Michael Ruprecht <maiku@pidgin.im>
parents: 26696
diff changeset
547 PurpleMedia *media = purple_media_manager_create_media(
31294
73607ab89c6f Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents: 30764
diff changeset
548 purple_media_manager_get(),
26746
2a2d45ac9774 Switch media to store accounts rather than connections.
Michael Ruprecht <maiku@pidgin.im>
parents: 26696
diff changeset
549 purple_connection_get_account(js->gc),
2a2d45ac9774 Switch media to store accounts rather than connections.
Michael Ruprecht <maiku@pidgin.im>
parents: 26696
diff changeset
550 "fsrtpconference", remote_jid,
2a2d45ac9774 Switch media to store accounts rather than connections.
Michael Ruprecht <maiku@pidgin.im>
parents: 26696
diff changeset
551 jingle_session_is_initiator(session));
26147
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
552 g_free(remote_jid);
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
553
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
554 if (!media) {
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
555 purple_debug_error("jingle-rtp", "Couldn't create media session\n");
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
556 return NULL;
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
557 }
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
558
26330
9d627ae05002 Get rid of the medias variable in JabberStream.
Michael Ruprecht <maiku@pidgin.im>
parents: 26325
diff changeset
559 purple_media_set_prpl_data(media, session);
26147
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
560
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
561 /* connect callbacks */
26417
b73b6e73abe6 Add candidates-prepared signal to PurpleMedia.
Michael Ruprecht <maiku@pidgin.im>
parents: 26416
diff changeset
562 g_signal_connect(G_OBJECT(media), "candidates-prepared",
b73b6e73abe6 Add candidates-prepared signal to PurpleMedia.
Michael Ruprecht <maiku@pidgin.im>
parents: 26416
diff changeset
563 G_CALLBACK(jingle_rtp_candidates_prepared_cb), session);
26265
66aee93241e2 Added codecs-changed signal.
Michael Ruprecht <maiku@pidgin.im>
parents: 26264
diff changeset
564 g_signal_connect(G_OBJECT(media), "codecs-changed",
66aee93241e2 Added codecs-changed signal.
Michael Ruprecht <maiku@pidgin.im>
parents: 26264
diff changeset
565 G_CALLBACK(jingle_rtp_codecs_changed_cb), session);
26193
101122f0f3dd Add state-changed signal to PurpleMedia.
Michael Ruprecht <maiku@pidgin.im>
parents: 26192
diff changeset
566 g_signal_connect(G_OBJECT(media), "state-changed",
101122f0f3dd Add state-changed signal to PurpleMedia.
Michael Ruprecht <maiku@pidgin.im>
parents: 26192
diff changeset
567 G_CALLBACK(jingle_rtp_state_changed_cb), session);
26441
46a5bb7783e7 Use stream-info instead of state-changed for hangup and reject.
Michael Ruprecht <maiku@pidgin.im>
parents: 26437
diff changeset
568 g_signal_connect(G_OBJECT(media), "stream-info",
46a5bb7783e7 Use stream-info instead of state-changed for hangup and reject.
Michael Ruprecht <maiku@pidgin.im>
parents: 26437
diff changeset
569 G_CALLBACK(jingle_rtp_stream_info_cb), session);
26147
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
570
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
571 g_object_unref(session);
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
572 return media;
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
573 }
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
574
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
575 static gboolean
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
576 jingle_rtp_init_media(JingleContent *content)
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
577 {
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
578 JingleSession *session = jingle_content_get_session(content);
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
579 PurpleMedia *media = jingle_rtp_get_media(session);
26514
058053cffc0e Add purple_media_is_initiator.
Michael Ruprecht <maiku@pidgin.im>
parents: 26501
diff changeset
580 gchar *creator;
26147
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
581 gchar *media_type;
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
582 gchar *remote_jid;
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
583 gchar *senders;
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
584 gchar *name;
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
585 const gchar *transmitter;
26226
dcb05990f479 Make FsStreamDirection and FsMediaType conversion functions static.
Michael Ruprecht <maiku@pidgin.im>
parents: 26215
diff changeset
586 gboolean is_audio;
26514
058053cffc0e Add purple_media_is_initiator.
Michael Ruprecht <maiku@pidgin.im>
parents: 26501
diff changeset
587 gboolean is_creator;
26226
dcb05990f479 Make FsStreamDirection and FsMediaType conversion functions static.
Michael Ruprecht <maiku@pidgin.im>
parents: 26215
diff changeset
588 PurpleMediaSessionType type;
26147
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
589 JingleTransport *transport;
26286
443041606e32 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <malu@pidgin.im>
parents: 26266
diff changeset
590 GParameter *params = NULL;
443041606e32 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <malu@pidgin.im>
parents: 26266
diff changeset
591 guint num_params;
26147
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
592
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
593 /* maybe this create ought to just be in initiate and handle initiate */
32064
883a1b407408 Minor optimization
Mark Doliner <markdoliner@pidgin.im>
parents: 31294
diff changeset
594 if (media == NULL) {
26147
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
595 media = jingle_rtp_create_media(content);
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
596
32064
883a1b407408 Minor optimization
Mark Doliner <markdoliner@pidgin.im>
parents: 31294
diff changeset
597 if (media == NULL)
883a1b407408 Minor optimization
Mark Doliner <markdoliner@pidgin.im>
parents: 31294
diff changeset
598 return FALSE;
883a1b407408 Minor optimization
Mark Doliner <markdoliner@pidgin.im>
parents: 31294
diff changeset
599 }
26147
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
600
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
601 name = jingle_content_get_name(content);
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
602 media_type = jingle_rtp_get_media_type(content);
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
603 remote_jid = jingle_session_get_remote_jid(session);
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
604 senders = jingle_content_get_senders(content);
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
605 transport = jingle_content_get_transport(content);
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
606
32065
15eb0e242206 Fix crashes and memory leaks when receiving malformed voice
Mark Doliner <markdoliner@pidgin.im>
parents: 32064
diff changeset
607 if (media_type == NULL) {
15eb0e242206 Fix crashes and memory leaks when receiving malformed voice
Mark Doliner <markdoliner@pidgin.im>
parents: 32064
diff changeset
608 g_free(name);
15eb0e242206 Fix crashes and memory leaks when receiving malformed voice
Mark Doliner <markdoliner@pidgin.im>
parents: 32064
diff changeset
609 g_free(remote_jid);
15eb0e242206 Fix crashes and memory leaks when receiving malformed voice
Mark Doliner <markdoliner@pidgin.im>
parents: 32064
diff changeset
610 g_free(senders);
15eb0e242206 Fix crashes and memory leaks when receiving malformed voice
Mark Doliner <markdoliner@pidgin.im>
parents: 32064
diff changeset
611 g_free(params);
15eb0e242206 Fix crashes and memory leaks when receiving malformed voice
Mark Doliner <markdoliner@pidgin.im>
parents: 32064
diff changeset
612 g_object_unref(transport);
15eb0e242206 Fix crashes and memory leaks when receiving malformed voice
Mark Doliner <markdoliner@pidgin.im>
parents: 32064
diff changeset
613 g_object_unref(session);
15eb0e242206 Fix crashes and memory leaks when receiving malformed voice
Mark Doliner <markdoliner@pidgin.im>
parents: 32064
diff changeset
614 return FALSE;
15eb0e242206 Fix crashes and memory leaks when receiving malformed voice
Mark Doliner <markdoliner@pidgin.im>
parents: 32064
diff changeset
615 }
15eb0e242206 Fix crashes and memory leaks when receiving malformed voice
Mark Doliner <markdoliner@pidgin.im>
parents: 32064
diff changeset
616
26147
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
617 if (JINGLE_IS_RAWUDP(transport))
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
618 transmitter = "rawudp";
26166
ad7d09fef256 Added a Jingle ice-udp transmitter.
Michael Ruprecht <maiku@pidgin.im>
parents: 26161
diff changeset
619 else if (JINGLE_IS_ICEUDP(transport))
ad7d09fef256 Added a Jingle ice-udp transmitter.
Michael Ruprecht <maiku@pidgin.im>
parents: 26161
diff changeset
620 transmitter = "nice";
26147
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
621 else
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
622 transmitter = "notransmitter";
26410
5952dcb9ce6c Plug some memory leaks related to transports.
Michael Ruprecht <maiku@pidgin.im>
parents: 26407
diff changeset
623 g_object_unref(transport);
26147
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
624
38256
035f00c4fd87 Replace misused g_str_equal() with purple_strequal()
qarkai <qarkai@gmail.com>
parents: 33789
diff changeset
625 is_audio = purple_strequal(media_type, "audio");
26147
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
626
32065
15eb0e242206 Fix crashes and memory leaks when receiving malformed voice
Mark Doliner <markdoliner@pidgin.im>
parents: 32064
diff changeset
627 if (purple_strequal(senders, "both"))
15eb0e242206 Fix crashes and memory leaks when receiving malformed voice
Mark Doliner <markdoliner@pidgin.im>
parents: 32064
diff changeset
628 type = is_audio ? PURPLE_MEDIA_AUDIO
26226
dcb05990f479 Make FsStreamDirection and FsMediaType conversion functions static.
Michael Ruprecht <maiku@pidgin.im>
parents: 26215
diff changeset
629 : PURPLE_MEDIA_VIDEO;
32065
15eb0e242206 Fix crashes and memory leaks when receiving malformed voice
Mark Doliner <markdoliner@pidgin.im>
parents: 32064
diff changeset
630 else if (purple_strequal(senders, "initiator") ==
28161
4368c139d67f Fix unidirectional media sessions and add a colorspace before the video sink.
Michael Ruprecht <maiku@pidgin.im>
parents: 28111
diff changeset
631 jingle_session_is_initiator(session))
32065
15eb0e242206 Fix crashes and memory leaks when receiving malformed voice
Mark Doliner <markdoliner@pidgin.im>
parents: 32064
diff changeset
632 type = is_audio ? PURPLE_MEDIA_SEND_AUDIO
26226
dcb05990f479 Make FsStreamDirection and FsMediaType conversion functions static.
Michael Ruprecht <maiku@pidgin.im>
parents: 26215
diff changeset
633 : PURPLE_MEDIA_SEND_VIDEO;
26147
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
634 else
32065
15eb0e242206 Fix crashes and memory leaks when receiving malformed voice
Mark Doliner <markdoliner@pidgin.im>
parents: 32064
diff changeset
635 type = is_audio ? PURPLE_MEDIA_RECV_AUDIO
26226
dcb05990f479 Make FsStreamDirection and FsMediaType conversion functions static.
Michael Ruprecht <maiku@pidgin.im>
parents: 26215
diff changeset
636 : PURPLE_MEDIA_RECV_VIDEO;
26147
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
637
31294
73607ab89c6f Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents: 30764
diff changeset
638 params =
28567
b5ea98ed9e32 Can now generate a relayed candidate for the initiator
Marcus Lundblad <malu@pidgin.im>
parents: 28333
diff changeset
639 jingle_get_params(jingle_session_get_js(session), NULL, 0, 0, 0,
b5ea98ed9e32 Can now generate a relayed candidate for the initiator
Marcus Lundblad <malu@pidgin.im>
parents: 28333
diff changeset
640 NULL, NULL, &num_params);
26514
058053cffc0e Add purple_media_is_initiator.
Michael Ruprecht <maiku@pidgin.im>
parents: 26501
diff changeset
641
058053cffc0e Add purple_media_is_initiator.
Michael Ruprecht <maiku@pidgin.im>
parents: 26501
diff changeset
642 creator = jingle_content_get_creator(content);
32065
15eb0e242206 Fix crashes and memory leaks when receiving malformed voice
Mark Doliner <markdoliner@pidgin.im>
parents: 32064
diff changeset
643 if (creator == NULL) {
15eb0e242206 Fix crashes and memory leaks when receiving malformed voice
Mark Doliner <markdoliner@pidgin.im>
parents: 32064
diff changeset
644 g_free(name);
15eb0e242206 Fix crashes and memory leaks when receiving malformed voice
Mark Doliner <markdoliner@pidgin.im>
parents: 32064
diff changeset
645 g_free(media_type);
15eb0e242206 Fix crashes and memory leaks when receiving malformed voice
Mark Doliner <markdoliner@pidgin.im>
parents: 32064
diff changeset
646 g_free(remote_jid);
15eb0e242206 Fix crashes and memory leaks when receiving malformed voice
Mark Doliner <markdoliner@pidgin.im>
parents: 32064
diff changeset
647 g_free(senders);
15eb0e242206 Fix crashes and memory leaks when receiving malformed voice
Mark Doliner <markdoliner@pidgin.im>
parents: 32064
diff changeset
648 g_free(params);
15eb0e242206 Fix crashes and memory leaks when receiving malformed voice
Mark Doliner <markdoliner@pidgin.im>
parents: 32064
diff changeset
649 g_object_unref(session);
15eb0e242206 Fix crashes and memory leaks when receiving malformed voice
Mark Doliner <markdoliner@pidgin.im>
parents: 32064
diff changeset
650 return FALSE;
15eb0e242206 Fix crashes and memory leaks when receiving malformed voice
Mark Doliner <markdoliner@pidgin.im>
parents: 32064
diff changeset
651 }
15eb0e242206 Fix crashes and memory leaks when receiving malformed voice
Mark Doliner <markdoliner@pidgin.im>
parents: 32064
diff changeset
652
38256
035f00c4fd87 Replace misused g_str_equal() with purple_strequal()
qarkai <qarkai@gmail.com>
parents: 33789
diff changeset
653 if (purple_strequal(creator, "initiator"))
26514
058053cffc0e Add purple_media_is_initiator.
Michael Ruprecht <maiku@pidgin.im>
parents: 26501
diff changeset
654 is_creator = jingle_session_is_initiator(session);
058053cffc0e Add purple_media_is_initiator.
Michael Ruprecht <maiku@pidgin.im>
parents: 26501
diff changeset
655 else
058053cffc0e Add purple_media_is_initiator.
Michael Ruprecht <maiku@pidgin.im>
parents: 26501
diff changeset
656 is_creator = !jingle_session_is_initiator(session);
058053cffc0e Add purple_media_is_initiator.
Michael Ruprecht <maiku@pidgin.im>
parents: 26501
diff changeset
657 g_free(creator);
058053cffc0e Add purple_media_is_initiator.
Michael Ruprecht <maiku@pidgin.im>
parents: 26501
diff changeset
658
28330
07902a9634f9 More gracefully handle stream creation errors with Jingle calls.
Michael Ruprecht <maiku@pidgin.im>
parents: 28161
diff changeset
659 if(!purple_media_add_stream(media, name, remote_jid,
07902a9634f9 More gracefully handle stream creation errors with Jingle calls.
Michael Ruprecht <maiku@pidgin.im>
parents: 28161
diff changeset
660 type, is_creator, transmitter, num_params, params)) {
07902a9634f9 More gracefully handle stream creation errors with Jingle calls.
Michael Ruprecht <maiku@pidgin.im>
parents: 28161
diff changeset
661 purple_media_end(media, NULL, NULL);
32065
15eb0e242206 Fix crashes and memory leaks when receiving malformed voice
Mark Doliner <markdoliner@pidgin.im>
parents: 32064
diff changeset
662 /* TODO: How much clean-up is necessary here? (does calling
15eb0e242206 Fix crashes and memory leaks when receiving malformed voice
Mark Doliner <markdoliner@pidgin.im>
parents: 32064
diff changeset
663 purple_media_end lead to cleaning up Jingle structs?) */
28330
07902a9634f9 More gracefully handle stream creation errors with Jingle calls.
Michael Ruprecht <maiku@pidgin.im>
parents: 28161
diff changeset
664 return FALSE;
07902a9634f9 More gracefully handle stream creation errors with Jingle calls.
Michael Ruprecht <maiku@pidgin.im>
parents: 28161
diff changeset
665 }
26147
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
666
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
667 g_free(name);
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
668 g_free(media_type);
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
669 g_free(remote_jid);
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
670 g_free(senders);
26286
443041606e32 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <malu@pidgin.im>
parents: 26266
diff changeset
671 g_free(params);
26147
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
672 g_object_unref(session);
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
673
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
674 return TRUE;
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
675 }
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
676
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
677 static GList *
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
678 jingle_rtp_parse_codecs(xmlnode *description)
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
679 {
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
680 GList *codecs = NULL;
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
681 xmlnode *codec_element = NULL;
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
682 const char *encoding_name,*id, *clock_rate;
26232
f91c96072586 Wrap FsCodec and remove the Farsight2 include from media.h.
Michael Ruprecht <maiku@pidgin.im>
parents: 26229
diff changeset
683 PurpleMediaCodec *codec;
26147
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
684 const gchar *media = xmlnode_get_attrib(description, "media");
32065
15eb0e242206 Fix crashes and memory leaks when receiving malformed voice
Mark Doliner <markdoliner@pidgin.im>
parents: 32064
diff changeset
685 PurpleMediaSessionType type;
15eb0e242206 Fix crashes and memory leaks when receiving malformed voice
Mark Doliner <markdoliner@pidgin.im>
parents: 32064
diff changeset
686
15eb0e242206 Fix crashes and memory leaks when receiving malformed voice
Mark Doliner <markdoliner@pidgin.im>
parents: 32064
diff changeset
687 if (media == NULL) {
15eb0e242206 Fix crashes and memory leaks when receiving malformed voice
Mark Doliner <markdoliner@pidgin.im>
parents: 32064
diff changeset
688 purple_debug_warning("jingle-rtp", "missing media type\n");
15eb0e242206 Fix crashes and memory leaks when receiving malformed voice
Mark Doliner <markdoliner@pidgin.im>
parents: 32064
diff changeset
689 return NULL;
15eb0e242206 Fix crashes and memory leaks when receiving malformed voice
Mark Doliner <markdoliner@pidgin.im>
parents: 32064
diff changeset
690 }
15eb0e242206 Fix crashes and memory leaks when receiving malformed voice
Mark Doliner <markdoliner@pidgin.im>
parents: 32064
diff changeset
691
38256
035f00c4fd87 Replace misused g_str_equal() with purple_strequal()
qarkai <qarkai@gmail.com>
parents: 33789
diff changeset
692 if (purple_strequal(media, "video")) {
32065
15eb0e242206 Fix crashes and memory leaks when receiving malformed voice
Mark Doliner <markdoliner@pidgin.im>
parents: 32064
diff changeset
693 type = PURPLE_MEDIA_VIDEO;
38256
035f00c4fd87 Replace misused g_str_equal() with purple_strequal()
qarkai <qarkai@gmail.com>
parents: 33789
diff changeset
694 } else if (purple_strequal(media, "audio")) {
32065
15eb0e242206 Fix crashes and memory leaks when receiving malformed voice
Mark Doliner <markdoliner@pidgin.im>
parents: 32064
diff changeset
695 type = PURPLE_MEDIA_AUDIO;
15eb0e242206 Fix crashes and memory leaks when receiving malformed voice
Mark Doliner <markdoliner@pidgin.im>
parents: 32064
diff changeset
696 } else {
15eb0e242206 Fix crashes and memory leaks when receiving malformed voice
Mark Doliner <markdoliner@pidgin.im>
parents: 32064
diff changeset
697 purple_debug_warning("jingle-rtp", "unknown media type: %s\n",
15eb0e242206 Fix crashes and memory leaks when receiving malformed voice
Mark Doliner <markdoliner@pidgin.im>
parents: 32064
diff changeset
698 media);
15eb0e242206 Fix crashes and memory leaks when receiving malformed voice
Mark Doliner <markdoliner@pidgin.im>
parents: 32064
diff changeset
699 return NULL;
15eb0e242206 Fix crashes and memory leaks when receiving malformed voice
Mark Doliner <markdoliner@pidgin.im>
parents: 32064
diff changeset
700 }
26147
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
701
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
702 for (codec_element = xmlnode_get_child(description, "payload-type") ;
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
703 codec_element ;
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
704 codec_element = xmlnode_get_next_twin(codec_element)) {
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
705 xmlnode *param;
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
706 gchar *codec_str;
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
707 encoding_name = xmlnode_get_attrib(codec_element, "name");
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
708
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
709 id = xmlnode_get_attrib(codec_element, "id");
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
710 clock_rate = xmlnode_get_attrib(codec_element, "clockrate");
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
711
31294
73607ab89c6f Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents: 30764
diff changeset
712 codec = purple_media_codec_new(atoi(id), encoding_name,
73607ab89c6f Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents: 30764
diff changeset
713 type,
26147
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
714 clock_rate ? atoi(clock_rate) : 0);
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
715
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
716 for (param = xmlnode_get_child(codec_element, "parameter");
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
717 param; param = xmlnode_get_next_twin(param)) {
26232
f91c96072586 Wrap FsCodec and remove the Farsight2 include from media.h.
Michael Ruprecht <maiku@pidgin.im>
parents: 26229
diff changeset
718 purple_media_codec_add_optional_parameter(codec,
26147
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
719 xmlnode_get_attrib(param, "name"),
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
720 xmlnode_get_attrib(param, "value"));
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
721 }
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
722
26232
f91c96072586 Wrap FsCodec and remove the Farsight2 include from media.h.
Michael Ruprecht <maiku@pidgin.im>
parents: 26229
diff changeset
723 codec_str = purple_media_codec_to_string(codec);
26147
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
724 purple_debug_info("jingle-rtp", "received codec: %s\n", codec_str);
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
725 g_free(codec_str);
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
726
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
727 codecs = g_list_append(codecs, codec);
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
728 }
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
729 return codecs;
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
730 }
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
731
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
732 static JingleContent *
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
733 jingle_rtp_parse_internal(xmlnode *rtp)
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
734 {
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
735 JingleContent *content = parent_class->parse(rtp);
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
736 xmlnode *description = xmlnode_get_child(rtp, "description");
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
737 const gchar *media_type = xmlnode_get_attrib(description, "media");
26405
4cf4d5dcc183 Add ssrc property to JingleRtp.
Michael Ruprecht <maiku@pidgin.im>
parents: 26404
diff changeset
738 const gchar *ssrc = xmlnode_get_attrib(description, "ssrc");
26147
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
739 purple_debug_info("jingle-rtp", "rtp parse\n");
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
740 g_object_set(content, "media-type", media_type, NULL);
26405
4cf4d5dcc183 Add ssrc property to JingleRtp.
Michael Ruprecht <maiku@pidgin.im>
parents: 26404
diff changeset
741 if (ssrc != NULL)
4cf4d5dcc183 Add ssrc property to JingleRtp.
Michael Ruprecht <maiku@pidgin.im>
parents: 26404
diff changeset
742 g_object_set(content, "ssrc", ssrc, NULL);
26147
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
743 return content;
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
744 }
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
745
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
746 static void
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
747 jingle_rtp_add_payloads(xmlnode *description, GList *codecs)
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
748 {
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
749 for (; codecs ; codecs = codecs->next) {
26232
f91c96072586 Wrap FsCodec and remove the Farsight2 include from media.h.
Michael Ruprecht <maiku@pidgin.im>
parents: 26229
diff changeset
750 PurpleMediaCodec *codec = (PurpleMediaCodec*)codecs->data;
26618
9e9e610ca1a1 Hide and gobjectify PurpleMediaCodec.
Michael Ruprecht <maiku@pidgin.im>
parents: 26617
diff changeset
751 GList *iter = purple_media_codec_get_optional_parameters(codec);
9e9e610ca1a1 Hide and gobjectify PurpleMediaCodec.
Michael Ruprecht <maiku@pidgin.im>
parents: 26617
diff changeset
752 gchar *id, *name, *clockrate, *channels;
26147
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
753 gchar *codec_str;
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
754 xmlnode *payload = xmlnode_new_child(description, "payload-type");
31294
73607ab89c6f Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents: 30764
diff changeset
755
26618
9e9e610ca1a1 Hide and gobjectify PurpleMediaCodec.
Michael Ruprecht <maiku@pidgin.im>
parents: 26617
diff changeset
756 id = g_strdup_printf("%d",
9e9e610ca1a1 Hide and gobjectify PurpleMediaCodec.
Michael Ruprecht <maiku@pidgin.im>
parents: 26617
diff changeset
757 purple_media_codec_get_id(codec));
9e9e610ca1a1 Hide and gobjectify PurpleMediaCodec.
Michael Ruprecht <maiku@pidgin.im>
parents: 26617
diff changeset
758 name = purple_media_codec_get_encoding_name(codec);
9e9e610ca1a1 Hide and gobjectify PurpleMediaCodec.
Michael Ruprecht <maiku@pidgin.im>
parents: 26617
diff changeset
759 clockrate = g_strdup_printf("%d",
9e9e610ca1a1 Hide and gobjectify PurpleMediaCodec.
Michael Ruprecht <maiku@pidgin.im>
parents: 26617
diff changeset
760 purple_media_codec_get_clock_rate(codec));
9e9e610ca1a1 Hide and gobjectify PurpleMediaCodec.
Michael Ruprecht <maiku@pidgin.im>
parents: 26617
diff changeset
761 channels = g_strdup_printf("%d",
9e9e610ca1a1 Hide and gobjectify PurpleMediaCodec.
Michael Ruprecht <maiku@pidgin.im>
parents: 26617
diff changeset
762 purple_media_codec_get_channels(codec));
9e9e610ca1a1 Hide and gobjectify PurpleMediaCodec.
Michael Ruprecht <maiku@pidgin.im>
parents: 26617
diff changeset
763
9e9e610ca1a1 Hide and gobjectify PurpleMediaCodec.
Michael Ruprecht <maiku@pidgin.im>
parents: 26617
diff changeset
764 xmlnode_set_attrib(payload, "name", name);
26147
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
765 xmlnode_set_attrib(payload, "id", id);
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
766 xmlnode_set_attrib(payload, "clockrate", clockrate);
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
767 xmlnode_set_attrib(payload, "channels", channels);
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
768
26618
9e9e610ca1a1 Hide and gobjectify PurpleMediaCodec.
Michael Ruprecht <maiku@pidgin.im>
parents: 26617
diff changeset
769 g_free(channels);
9e9e610ca1a1 Hide and gobjectify PurpleMediaCodec.
Michael Ruprecht <maiku@pidgin.im>
parents: 26617
diff changeset
770 g_free(clockrate);
9e9e610ca1a1 Hide and gobjectify PurpleMediaCodec.
Michael Ruprecht <maiku@pidgin.im>
parents: 26617
diff changeset
771 g_free(name);
9e9e610ca1a1 Hide and gobjectify PurpleMediaCodec.
Michael Ruprecht <maiku@pidgin.im>
parents: 26617
diff changeset
772 g_free(id);
9e9e610ca1a1 Hide and gobjectify PurpleMediaCodec.
Michael Ruprecht <maiku@pidgin.im>
parents: 26617
diff changeset
773
26147
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
774 for (; iter; iter = g_list_next(iter)) {
26617
514bdfc137d5 Use PurpleMediaKeyPair. Remove PurpleMediaCodecParameter.
Michael Ruprecht <maiku@pidgin.im>
parents: 26514
diff changeset
775 PurpleKeyValuePair *mparam = iter->data;
26147
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
776 xmlnode *param = xmlnode_new_child(payload, "parameter");
26617
514bdfc137d5 Use PurpleMediaKeyPair. Remove PurpleMediaCodecParameter.
Michael Ruprecht <maiku@pidgin.im>
parents: 26514
diff changeset
777 xmlnode_set_attrib(param, "name", mparam->key);
26232
f91c96072586 Wrap FsCodec and remove the Farsight2 include from media.h.
Michael Ruprecht <maiku@pidgin.im>
parents: 26229
diff changeset
778 xmlnode_set_attrib(param, "value", mparam->value);
26147
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
779 }
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
780
26232
f91c96072586 Wrap FsCodec and remove the Farsight2 include from media.h.
Michael Ruprecht <maiku@pidgin.im>
parents: 26229
diff changeset
781 codec_str = purple_media_codec_to_string(codec);
26147
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
782 purple_debug_info("jingle", "adding codec: %s\n", codec_str);
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
783 g_free(codec_str);
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
784 }
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
785 }
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
786
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
787 static xmlnode *
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
788 jingle_rtp_to_xml_internal(JingleContent *rtp, xmlnode *content, JingleActionType action)
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
789 {
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
790 xmlnode *node = parent_class->to_xml(rtp, content, action);
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
791 xmlnode *description = xmlnode_get_child(node, "description");
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
792 if (description != NULL) {
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
793 JingleSession *session = jingle_content_get_session(rtp);
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
794 PurpleMedia *media = jingle_rtp_get_media(session);
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
795 gchar *media_type = jingle_rtp_get_media_type(rtp);
26405
4cf4d5dcc183 Add ssrc property to JingleRtp.
Michael Ruprecht <maiku@pidgin.im>
parents: 26404
diff changeset
796 gchar *ssrc = jingle_rtp_get_ssrc(rtp);
26147
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
797 gchar *name = jingle_content_get_name(rtp);
26160
46bc5e18d59c Combine get_*_codecs functions to mirror Farsight 2.
Michael Ruprecht <maiku@pidgin.im>
parents: 26156
diff changeset
798 GList *codecs = purple_media_get_codecs(media, name);
26147
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
799
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
800 xmlnode_set_attrib(description, "media", media_type);
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
801
26405
4cf4d5dcc183 Add ssrc property to JingleRtp.
Michael Ruprecht <maiku@pidgin.im>
parents: 26404
diff changeset
802 if (ssrc != NULL)
4cf4d5dcc183 Add ssrc property to JingleRtp.
Michael Ruprecht <maiku@pidgin.im>
parents: 26404
diff changeset
803 xmlnode_set_attrib(description, "ssrc", ssrc);
4cf4d5dcc183 Add ssrc property to JingleRtp.
Michael Ruprecht <maiku@pidgin.im>
parents: 26404
diff changeset
804
26147
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
805 g_free(media_type);
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
806 g_free(name);
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
807 g_object_unref(session);
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
808
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
809 jingle_rtp_add_payloads(description, codecs);
26428
77d845d3e0c3 Plug memory leak.
Michael Ruprecht <maiku@pidgin.im>
parents: 26422
diff changeset
810 purple_media_codec_list_free(codecs);
26147
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
811 }
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
812 return node;
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
813 }
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
814
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
815 static void
26149
92b095c37277 Fix support for audio and video (at the same time) sessions.
Michael Ruprecht <maiku@pidgin.im>
parents: 26147
diff changeset
816 jingle_rtp_handle_action_internal(JingleContent *content, xmlnode *xmlcontent, JingleActionType action)
26147
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
817 {
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
818 switch (action) {
26407
48782a6424e0 Update Jingle Ice-Udp according to the XEP.
Michael Ruprecht <maiku@pidgin.im>
parents: 26405
diff changeset
819 case JINGLE_SESSION_ACCEPT:
26147
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
820 case JINGLE_SESSION_INITIATE: {
32065
15eb0e242206 Fix crashes and memory leaks when receiving malformed voice
Mark Doliner <markdoliner@pidgin.im>
parents: 32064
diff changeset
821 JingleSession *session;
15eb0e242206 Fix crashes and memory leaks when receiving malformed voice
Mark Doliner <markdoliner@pidgin.im>
parents: 32064
diff changeset
822 JingleTransport *transport;
15eb0e242206 Fix crashes and memory leaks when receiving malformed voice
Mark Doliner <markdoliner@pidgin.im>
parents: 32064
diff changeset
823 xmlnode *description;
15eb0e242206 Fix crashes and memory leaks when receiving malformed voice
Mark Doliner <markdoliner@pidgin.im>
parents: 32064
diff changeset
824 GList *candidates;
15eb0e242206 Fix crashes and memory leaks when receiving malformed voice
Mark Doliner <markdoliner@pidgin.im>
parents: 32064
diff changeset
825 GList *codecs;
15eb0e242206 Fix crashes and memory leaks when receiving malformed voice
Mark Doliner <markdoliner@pidgin.im>
parents: 32064
diff changeset
826 gchar *name;
15eb0e242206 Fix crashes and memory leaks when receiving malformed voice
Mark Doliner <markdoliner@pidgin.im>
parents: 32064
diff changeset
827 gchar *remote_jid;
26407
48782a6424e0 Update Jingle Ice-Udp according to the XEP.
Michael Ruprecht <maiku@pidgin.im>
parents: 26405
diff changeset
828 PurpleMedia *media;
26147
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
829
32065
15eb0e242206 Fix crashes and memory leaks when receiving malformed voice
Mark Doliner <markdoliner@pidgin.im>
parents: 32064
diff changeset
830 session = jingle_content_get_session(content);
15eb0e242206 Fix crashes and memory leaks when receiving malformed voice
Mark Doliner <markdoliner@pidgin.im>
parents: 32064
diff changeset
831
26407
48782a6424e0 Update Jingle Ice-Udp according to the XEP.
Michael Ruprecht <maiku@pidgin.im>
parents: 26405
diff changeset
832 if (action == JINGLE_SESSION_INITIATE &&
32065
15eb0e242206 Fix crashes and memory leaks when receiving malformed voice
Mark Doliner <markdoliner@pidgin.im>
parents: 32064
diff changeset
833 !jingle_rtp_init_media(content)) {
26156
1ba69535986d Fix crash when remote client reconnects and tries to restart the media session.
Michael Ruprecht <maiku@pidgin.im>
parents: 26154
diff changeset
834 /* XXX: send error */
26404
3947a428b87d Add functions for more easily creating session-terminate packets.
Michael Ruprecht <maiku@pidgin.im>
parents: 26330
diff changeset
835 jabber_iq_send(jingle_session_terminate_packet(
3947a428b87d Add functions for more easily creating session-terminate packets.
Michael Ruprecht <maiku@pidgin.im>
parents: 26330
diff changeset
836 session, "general-error"));
26156
1ba69535986d Fix crash when remote client reconnects and tries to restart the media session.
Michael Ruprecht <maiku@pidgin.im>
parents: 26154
diff changeset
837 g_object_unref(session);
1ba69535986d Fix crash when remote client reconnects and tries to restart the media session.
Michael Ruprecht <maiku@pidgin.im>
parents: 26154
diff changeset
838 break;
1ba69535986d Fix crash when remote client reconnects and tries to restart the media session.
Michael Ruprecht <maiku@pidgin.im>
parents: 26154
diff changeset
839 }
26147
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
840
32065
15eb0e242206 Fix crashes and memory leaks when receiving malformed voice
Mark Doliner <markdoliner@pidgin.im>
parents: 32064
diff changeset
841 transport = jingle_transport_parse(
15eb0e242206 Fix crashes and memory leaks when receiving malformed voice
Mark Doliner <markdoliner@pidgin.im>
parents: 32064
diff changeset
842 xmlnode_get_child(xmlcontent, "transport"));
15eb0e242206 Fix crashes and memory leaks when receiving malformed voice
Mark Doliner <markdoliner@pidgin.im>
parents: 32064
diff changeset
843 description = xmlnode_get_child(xmlcontent, "description");
15eb0e242206 Fix crashes and memory leaks when receiving malformed voice
Mark Doliner <markdoliner@pidgin.im>
parents: 32064
diff changeset
844 candidates = jingle_rtp_transport_to_candidates(transport);
15eb0e242206 Fix crashes and memory leaks when receiving malformed voice
Mark Doliner <markdoliner@pidgin.im>
parents: 32064
diff changeset
845 codecs = jingle_rtp_parse_codecs(description);
15eb0e242206 Fix crashes and memory leaks when receiving malformed voice
Mark Doliner <markdoliner@pidgin.im>
parents: 32064
diff changeset
846 name = jingle_content_get_name(content);
15eb0e242206 Fix crashes and memory leaks when receiving malformed voice
Mark Doliner <markdoliner@pidgin.im>
parents: 32064
diff changeset
847 remote_jid = jingle_session_get_remote_jid(session);
15eb0e242206 Fix crashes and memory leaks when receiving malformed voice
Mark Doliner <markdoliner@pidgin.im>
parents: 32064
diff changeset
848
26407
48782a6424e0 Update Jingle Ice-Udp according to the XEP.
Michael Ruprecht <maiku@pidgin.im>
parents: 26405
diff changeset
849 media = jingle_rtp_get_media(session);
48782a6424e0 Update Jingle Ice-Udp according to the XEP.
Michael Ruprecht <maiku@pidgin.im>
parents: 26405
diff changeset
850 purple_media_set_remote_codecs(media,
48782a6424e0 Update Jingle Ice-Udp according to the XEP.
Michael Ruprecht <maiku@pidgin.im>
parents: 26405
diff changeset
851 name, remote_jid, codecs);
48782a6424e0 Update Jingle Ice-Udp according to the XEP.
Michael Ruprecht <maiku@pidgin.im>
parents: 26405
diff changeset
852 purple_media_add_remote_candidates(media,
48782a6424e0 Update Jingle Ice-Udp according to the XEP.
Michael Ruprecht <maiku@pidgin.im>
parents: 26405
diff changeset
853 name, remote_jid, candidates);
26147
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
854
26501
c186275f46aa Remove purple_media_accept.
Michael Ruprecht <maiku@pidgin.im>
parents: 26499
diff changeset
855 if (action == JINGLE_SESSION_ACCEPT)
c186275f46aa Remove purple_media_accept.
Michael Ruprecht <maiku@pidgin.im>
parents: 26499
diff changeset
856 purple_media_stream_info(media,
c186275f46aa Remove purple_media_accept.
Michael Ruprecht <maiku@pidgin.im>
parents: 26499
diff changeset
857 PURPLE_MEDIA_INFO_ACCEPT,
c186275f46aa Remove purple_media_accept.
Michael Ruprecht <maiku@pidgin.im>
parents: 26499
diff changeset
858 name, remote_jid, FALSE);
26147
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
859
26407
48782a6424e0 Update Jingle Ice-Udp according to the XEP.
Michael Ruprecht <maiku@pidgin.im>
parents: 26405
diff changeset
860 g_free(remote_jid);
48782a6424e0 Update Jingle Ice-Udp according to the XEP.
Michael Ruprecht <maiku@pidgin.im>
parents: 26405
diff changeset
861 g_free(name);
26147
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
862 g_object_unref(session);
39724
72a35ff95941 Fix more memory leaks
Fabrice Bellet <fabrice@bellet.info>
parents: 38693
diff changeset
863 g_object_unref(transport);
72a35ff95941 Fix more memory leaks
Fabrice Bellet <fabrice@bellet.info>
parents: 38693
diff changeset
864 purple_media_codec_list_free(codecs);
72a35ff95941 Fix more memory leaks
Fabrice Bellet <fabrice@bellet.info>
parents: 38693
diff changeset
865 purple_media_candidate_list_free(candidates);
26147
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
866 break;
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
867 }
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
868 case JINGLE_SESSION_TERMINATE: {
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
869 JingleSession *session = jingle_content_get_session(content);
26192
ca6d9f19c4b6 Remove PurpleMedias from JabberStream's list when a media session ends.
Michael Ruprecht <maiku@pidgin.im>
parents: 26191
diff changeset
870 PurpleMedia *media = jingle_rtp_get_media(session);
ca6d9f19c4b6 Remove PurpleMedias from JabberStream's list when a media session ends.
Michael Ruprecht <maiku@pidgin.im>
parents: 26191
diff changeset
871
ca6d9f19c4b6 Remove PurpleMedias from JabberStream's list when a media session ends.
Michael Ruprecht <maiku@pidgin.im>
parents: 26191
diff changeset
872 if (media != NULL) {
26264
c062fc1f212f Added purple_media_end and removed the purple_media_got_hangup.
Michael Ruprecht <maiku@pidgin.im>
parents: 26248
diff changeset
873 purple_media_end(media, NULL, NULL);
26192
ca6d9f19c4b6 Remove PurpleMedias from JabberStream's list when a media session ends.
Michael Ruprecht <maiku@pidgin.im>
parents: 26191
diff changeset
874 }
ca6d9f19c4b6 Remove PurpleMedias from JabberStream's list when a media session ends.
Michael Ruprecht <maiku@pidgin.im>
parents: 26191
diff changeset
875
26147
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
876 g_object_unref(session);
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
877 break;
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
878 }
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
879 case JINGLE_TRANSPORT_INFO: {
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
880 JingleSession *session = jingle_content_get_session(content);
26154
78fa18d44718 Update Jingle raw-udp to latest spec version.
Michael Ruprecht <maiku@pidgin.im>
parents: 26149
diff changeset
881 JingleTransport *transport = jingle_transport_parse(
78fa18d44718 Update Jingle raw-udp to latest spec version.
Michael Ruprecht <maiku@pidgin.im>
parents: 26149
diff changeset
882 xmlnode_get_child(xmlcontent, "transport"));
78fa18d44718 Update Jingle raw-udp to latest spec version.
Michael Ruprecht <maiku@pidgin.im>
parents: 26149
diff changeset
883 GList *candidates = jingle_rtp_transport_to_candidates(transport);
26407
48782a6424e0 Update Jingle Ice-Udp according to the XEP.
Michael Ruprecht <maiku@pidgin.im>
parents: 26405
diff changeset
884 gchar *name = jingle_content_get_name(content);
48782a6424e0 Update Jingle Ice-Udp according to the XEP.
Michael Ruprecht <maiku@pidgin.im>
parents: 26405
diff changeset
885 gchar *remote_jid =
48782a6424e0 Update Jingle Ice-Udp according to the XEP.
Michael Ruprecht <maiku@pidgin.im>
parents: 26405
diff changeset
886 jingle_session_get_remote_jid(session);
26147
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
887
26407
48782a6424e0 Update Jingle Ice-Udp according to the XEP.
Michael Ruprecht <maiku@pidgin.im>
parents: 26405
diff changeset
888 purple_media_add_remote_candidates(
48782a6424e0 Update Jingle Ice-Udp according to the XEP.
Michael Ruprecht <maiku@pidgin.im>
parents: 26405
diff changeset
889 jingle_rtp_get_media(session),
48782a6424e0 Update Jingle Ice-Udp according to the XEP.
Michael Ruprecht <maiku@pidgin.im>
parents: 26405
diff changeset
890 name, remote_jid, candidates);
48782a6424e0 Update Jingle Ice-Udp according to the XEP.
Michael Ruprecht <maiku@pidgin.im>
parents: 26405
diff changeset
891
48782a6424e0 Update Jingle Ice-Udp according to the XEP.
Michael Ruprecht <maiku@pidgin.im>
parents: 26405
diff changeset
892 g_free(remote_jid);
48782a6424e0 Update Jingle Ice-Udp according to the XEP.
Michael Ruprecht <maiku@pidgin.im>
parents: 26405
diff changeset
893 g_free(name);
26147
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
894 g_object_unref(session);
39724
72a35ff95941 Fix more memory leaks
Fabrice Bellet <fabrice@bellet.info>
parents: 38693
diff changeset
895 g_object_unref(transport);
72a35ff95941 Fix more memory leaks
Fabrice Bellet <fabrice@bellet.info>
parents: 38693
diff changeset
896 purple_media_candidate_list_free(candidates);
26147
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
897 break;
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
898 }
28869
c18c0ba16b64 Handle Jingle's description-info method.
Michael Ruprecht <maiku@pidgin.im>
parents: 28333
diff changeset
899 case JINGLE_DESCRIPTION_INFO: {
c18c0ba16b64 Handle Jingle's description-info method.
Michael Ruprecht <maiku@pidgin.im>
parents: 28333
diff changeset
900 JingleSession *session =
c18c0ba16b64 Handle Jingle's description-info method.
Michael Ruprecht <maiku@pidgin.im>
parents: 28333
diff changeset
901 jingle_content_get_session(content);
c18c0ba16b64 Handle Jingle's description-info method.
Michael Ruprecht <maiku@pidgin.im>
parents: 28333
diff changeset
902 xmlnode *description = xmlnode_get_child(
c18c0ba16b64 Handle Jingle's description-info method.
Michael Ruprecht <maiku@pidgin.im>
parents: 28333
diff changeset
903 xmlcontent, "description");
c18c0ba16b64 Handle Jingle's description-info method.
Michael Ruprecht <maiku@pidgin.im>
parents: 28333
diff changeset
904 GList *codecs, *iter, *iter2, *remote_codecs =
c18c0ba16b64 Handle Jingle's description-info method.
Michael Ruprecht <maiku@pidgin.im>
parents: 28333
diff changeset
905 jingle_rtp_parse_codecs(description);
c18c0ba16b64 Handle Jingle's description-info method.
Michael Ruprecht <maiku@pidgin.im>
parents: 28333
diff changeset
906 gchar *name = jingle_content_get_name(content);
c18c0ba16b64 Handle Jingle's description-info method.
Michael Ruprecht <maiku@pidgin.im>
parents: 28333
diff changeset
907 gchar *remote_jid =
c18c0ba16b64 Handle Jingle's description-info method.
Michael Ruprecht <maiku@pidgin.im>
parents: 28333
diff changeset
908 jingle_session_get_remote_jid(session);
c18c0ba16b64 Handle Jingle's description-info method.
Michael Ruprecht <maiku@pidgin.im>
parents: 28333
diff changeset
909 PurpleMedia *media;
c18c0ba16b64 Handle Jingle's description-info method.
Michael Ruprecht <maiku@pidgin.im>
parents: 28333
diff changeset
910
c18c0ba16b64 Handle Jingle's description-info method.
Michael Ruprecht <maiku@pidgin.im>
parents: 28333
diff changeset
911 media = jingle_rtp_get_media(session);
c18c0ba16b64 Handle Jingle's description-info method.
Michael Ruprecht <maiku@pidgin.im>
parents: 28333
diff changeset
912
c18c0ba16b64 Handle Jingle's description-info method.
Michael Ruprecht <maiku@pidgin.im>
parents: 28333
diff changeset
913 /*
c18c0ba16b64 Handle Jingle's description-info method.
Michael Ruprecht <maiku@pidgin.im>
parents: 28333
diff changeset
914 * This may have problems if description-info is
c18c0ba16b64 Handle Jingle's description-info method.
Michael Ruprecht <maiku@pidgin.im>
parents: 28333
diff changeset
915 * received without the optional parameters for a
c18c0ba16b64 Handle Jingle's description-info method.
Michael Ruprecht <maiku@pidgin.im>
parents: 28333
diff changeset
916 * codec with configuration info (such as THEORA
c18c0ba16b64 Handle Jingle's description-info method.
Michael Ruprecht <maiku@pidgin.im>
parents: 28333
diff changeset
917 * or H264). The local configuration info may be
c18c0ba16b64 Handle Jingle's description-info method.
Michael Ruprecht <maiku@pidgin.im>
parents: 28333
diff changeset
918 * set for the remote codec.
c18c0ba16b64 Handle Jingle's description-info method.
Michael Ruprecht <maiku@pidgin.im>
parents: 28333
diff changeset
919 *
c18c0ba16b64 Handle Jingle's description-info method.
Michael Ruprecht <maiku@pidgin.im>
parents: 28333
diff changeset
920 * As of 2.6.3 there's no API to support getting
c18c0ba16b64 Handle Jingle's description-info method.
Michael Ruprecht <maiku@pidgin.im>
parents: 28333
diff changeset
921 * the remote codecs specifically, just the
c18c0ba16b64 Handle Jingle's description-info method.
Michael Ruprecht <maiku@pidgin.im>
parents: 28333
diff changeset
922 * intersection. Another option may be to cache
c18c0ba16b64 Handle Jingle's description-info method.
Michael Ruprecht <maiku@pidgin.im>
parents: 28333
diff changeset
923 * the remote codecs received in initiate/accept.
c18c0ba16b64 Handle Jingle's description-info method.
Michael Ruprecht <maiku@pidgin.im>
parents: 28333
diff changeset
924 */
c18c0ba16b64 Handle Jingle's description-info method.
Michael Ruprecht <maiku@pidgin.im>
parents: 28333
diff changeset
925 codecs = purple_media_get_codecs(media, name);
c18c0ba16b64 Handle Jingle's description-info method.
Michael Ruprecht <maiku@pidgin.im>
parents: 28333
diff changeset
926
c18c0ba16b64 Handle Jingle's description-info method.
Michael Ruprecht <maiku@pidgin.im>
parents: 28333
diff changeset
927 for (iter = codecs; iter; iter = g_list_next(iter)) {
c18c0ba16b64 Handle Jingle's description-info method.
Michael Ruprecht <maiku@pidgin.im>
parents: 28333
diff changeset
928 guint id;
c18c0ba16b64 Handle Jingle's description-info method.
Michael Ruprecht <maiku@pidgin.im>
parents: 28333
diff changeset
929
c18c0ba16b64 Handle Jingle's description-info method.
Michael Ruprecht <maiku@pidgin.im>
parents: 28333
diff changeset
930 id = purple_media_codec_get_id(iter->data);
c18c0ba16b64 Handle Jingle's description-info method.
Michael Ruprecht <maiku@pidgin.im>
parents: 28333
diff changeset
931 iter2 = remote_codecs;
c18c0ba16b64 Handle Jingle's description-info method.
Michael Ruprecht <maiku@pidgin.im>
parents: 28333
diff changeset
932
c18c0ba16b64 Handle Jingle's description-info method.
Michael Ruprecht <maiku@pidgin.im>
parents: 28333
diff changeset
933 for (; iter2; iter2 = g_list_next(iter2)) {
c18c0ba16b64 Handle Jingle's description-info method.
Michael Ruprecht <maiku@pidgin.im>
parents: 28333
diff changeset
934 if (purple_media_codec_get_id(
c18c0ba16b64 Handle Jingle's description-info method.
Michael Ruprecht <maiku@pidgin.im>
parents: 28333
diff changeset
935 iter2->data) != id)
c18c0ba16b64 Handle Jingle's description-info method.
Michael Ruprecht <maiku@pidgin.im>
parents: 28333
diff changeset
936 continue;
c18c0ba16b64 Handle Jingle's description-info method.
Michael Ruprecht <maiku@pidgin.im>
parents: 28333
diff changeset
937
c18c0ba16b64 Handle Jingle's description-info method.
Michael Ruprecht <maiku@pidgin.im>
parents: 28333
diff changeset
938 g_object_unref(iter->data);
c18c0ba16b64 Handle Jingle's description-info method.
Michael Ruprecht <maiku@pidgin.im>
parents: 28333
diff changeset
939 iter->data = iter2->data;
c18c0ba16b64 Handle Jingle's description-info method.
Michael Ruprecht <maiku@pidgin.im>
parents: 28333
diff changeset
940 remote_codecs = g_list_delete_link(
c18c0ba16b64 Handle Jingle's description-info method.
Michael Ruprecht <maiku@pidgin.im>
parents: 28333
diff changeset
941 remote_codecs, iter2);
c18c0ba16b64 Handle Jingle's description-info method.
Michael Ruprecht <maiku@pidgin.im>
parents: 28333
diff changeset
942 break;
c18c0ba16b64 Handle Jingle's description-info method.
Michael Ruprecht <maiku@pidgin.im>
parents: 28333
diff changeset
943 }
c18c0ba16b64 Handle Jingle's description-info method.
Michael Ruprecht <maiku@pidgin.im>
parents: 28333
diff changeset
944 }
c18c0ba16b64 Handle Jingle's description-info method.
Michael Ruprecht <maiku@pidgin.im>
parents: 28333
diff changeset
945
c18c0ba16b64 Handle Jingle's description-info method.
Michael Ruprecht <maiku@pidgin.im>
parents: 28333
diff changeset
946 codecs = g_list_concat(codecs, remote_codecs);
c18c0ba16b64 Handle Jingle's description-info method.
Michael Ruprecht <maiku@pidgin.im>
parents: 28333
diff changeset
947
c18c0ba16b64 Handle Jingle's description-info method.
Michael Ruprecht <maiku@pidgin.im>
parents: 28333
diff changeset
948 purple_media_set_remote_codecs(media,
c18c0ba16b64 Handle Jingle's description-info method.
Michael Ruprecht <maiku@pidgin.im>
parents: 28333
diff changeset
949 name, remote_jid, codecs);
c18c0ba16b64 Handle Jingle's description-info method.
Michael Ruprecht <maiku@pidgin.im>
parents: 28333
diff changeset
950
c18c0ba16b64 Handle Jingle's description-info method.
Michael Ruprecht <maiku@pidgin.im>
parents: 28333
diff changeset
951 purple_media_codec_list_free (codecs);
c18c0ba16b64 Handle Jingle's description-info method.
Michael Ruprecht <maiku@pidgin.im>
parents: 28333
diff changeset
952 g_free(remote_jid);
c18c0ba16b64 Handle Jingle's description-info method.
Michael Ruprecht <maiku@pidgin.im>
parents: 28333
diff changeset
953 g_free(name);
c18c0ba16b64 Handle Jingle's description-info method.
Michael Ruprecht <maiku@pidgin.im>
parents: 28333
diff changeset
954 g_object_unref(session);
c18c0ba16b64 Handle Jingle's description-info method.
Michael Ruprecht <maiku@pidgin.im>
parents: 28333
diff changeset
955 break;
c18c0ba16b64 Handle Jingle's description-info method.
Michael Ruprecht <maiku@pidgin.im>
parents: 28333
diff changeset
956 }
26147
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
957 default:
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
958 break;
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
959 }
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
960 }
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
961
26495
52846ebe1c7d Don't assume a PurpleMedia instance will be created immediately.
Michael Ruprecht <maiku@pidgin.im>
parents: 26449
diff changeset
962 gboolean
31294
73607ab89c6f Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents: 30764
diff changeset
963 jingle_rtp_initiate_media(JabberStream *js, const gchar *who,
26147
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
964 PurpleMediaSessionType type)
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
965 {
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
966 /* create content negotiation */
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
967 JingleSession *session;
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
968 JingleContent *content;
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
969 JingleTransport *transport;
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
970 JabberBuddy *jb;
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
971 JabberBuddyResource *jbr;
38693
12476654da77 jabber: Avoid a use-after-free in an error path
Debarshi Ray <rishi@gnu.org>
parents: 38258
diff changeset
972 gboolean ret = FALSE;
26170
829055c78478 Choose the transport type according to the responder's caps.
Michael Ruprecht <maiku@pidgin.im>
parents: 26166
diff changeset
973 const gchar *transport_type;
31294
73607ab89c6f Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents: 30764
diff changeset
974
26643
401d7a92ecb1 Add a resource selector when initiating media.
Michael Ruprecht <maiku@pidgin.im>
parents: 26620
diff changeset
975 gchar *resource = NULL, *me = NULL, *sid = NULL;
26147
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
976
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
977 /* construct JID to send to */
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
978 jb = jabber_buddy_find(js, who, FALSE);
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
979 if (!jb) {
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
980 purple_debug_error("jingle-rtp", "Could not find Jabber buddy\n");
38693
12476654da77 jabber: Avoid a use-after-free in an error path
Debarshi Ray <rishi@gnu.org>
parents: 38258
diff changeset
981 goto out;
26147
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
982 }
26643
401d7a92ecb1 Add a resource selector when initiating media.
Michael Ruprecht <maiku@pidgin.im>
parents: 26620
diff changeset
983
401d7a92ecb1 Add a resource selector when initiating media.
Michael Ruprecht <maiku@pidgin.im>
parents: 26620
diff changeset
984 resource = jabber_get_resource(who);
401d7a92ecb1 Add a resource selector when initiating media.
Michael Ruprecht <maiku@pidgin.im>
parents: 26620
diff changeset
985 jbr = jabber_buddy_find_resource(jb, resource);
401d7a92ecb1 Add a resource selector when initiating media.
Michael Ruprecht <maiku@pidgin.im>
parents: 26620
diff changeset
986
26147
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
987 if (!jbr) {
33789
48af26131376 Prevent NULL pointer deref when initating a rtp session with an unrecognized resource
Daniel Atallah <datallah@pidgin.im>
parents: 32065
diff changeset
988 purple_debug_error("jingle-rtp", "Could not find buddy's resource - %s\n", resource);
38693
12476654da77 jabber: Avoid a use-after-free in an error path
Debarshi Ray <rishi@gnu.org>
parents: 38258
diff changeset
989 goto out;
26147
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
990 }
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
991
26170
829055c78478 Choose the transport type according to the responder's caps.
Michael Ruprecht <maiku@pidgin.im>
parents: 26166
diff changeset
992 if (jabber_resource_has_capability(jbr, JINGLE_TRANSPORT_ICEUDP)) {
829055c78478 Choose the transport type according to the responder's caps.
Michael Ruprecht <maiku@pidgin.im>
parents: 26166
diff changeset
993 transport_type = JINGLE_TRANSPORT_ICEUDP;
829055c78478 Choose the transport type according to the responder's caps.
Michael Ruprecht <maiku@pidgin.im>
parents: 26166
diff changeset
994 } else if (jabber_resource_has_capability(jbr, JINGLE_TRANSPORT_RAWUDP)) {
829055c78478 Choose the transport type according to the responder's caps.
Michael Ruprecht <maiku@pidgin.im>
parents: 26166
diff changeset
995 transport_type = JINGLE_TRANSPORT_RAWUDP;
829055c78478 Choose the transport type according to the responder's caps.
Michael Ruprecht <maiku@pidgin.im>
parents: 26166
diff changeset
996 } else {
829055c78478 Choose the transport type according to the responder's caps.
Michael Ruprecht <maiku@pidgin.im>
parents: 26166
diff changeset
997 purple_debug_error("jingle-rtp", "Resource doesn't support "
829055c78478 Choose the transport type according to the responder's caps.
Michael Ruprecht <maiku@pidgin.im>
parents: 26166
diff changeset
998 "the same transport types\n");
38693
12476654da77 jabber: Avoid a use-after-free in an error path
Debarshi Ray <rishi@gnu.org>
parents: 38258
diff changeset
999 goto out;
26170
829055c78478 Choose the transport type according to the responder's caps.
Michael Ruprecht <maiku@pidgin.im>
parents: 26166
diff changeset
1000 }
829055c78478 Choose the transport type according to the responder's caps.
Michael Ruprecht <maiku@pidgin.im>
parents: 26166
diff changeset
1001
26147
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
1002 /* set ourselves as initiator */
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
1003 me = g_strdup_printf("%s@%s/%s", js->user->node, js->user->domain, js->user->resource);
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
1004
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
1005 sid = jabber_get_next_id(js);
26643
401d7a92ecb1 Add a resource selector when initiating media.
Michael Ruprecht <maiku@pidgin.im>
parents: 26620
diff changeset
1006 session = jingle_session_create(js, sid, me, who, TRUE);
26147
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
1007
26149
92b095c37277 Fix support for audio and video (at the same time) sessions.
Michael Ruprecht <maiku@pidgin.im>
parents: 26147
diff changeset
1008
92b095c37277 Fix support for audio and video (at the same time) sessions.
Michael Ruprecht <maiku@pidgin.im>
parents: 26147
diff changeset
1009 if (type & PURPLE_MEDIA_AUDIO) {
26170
829055c78478 Choose the transport type according to the responder's caps.
Michael Ruprecht <maiku@pidgin.im>
parents: 26166
diff changeset
1010 transport = jingle_transport_create(transport_type);
26149
92b095c37277 Fix support for audio and video (at the same time) sessions.
Michael Ruprecht <maiku@pidgin.im>
parents: 26147
diff changeset
1011 content = jingle_content_create(JINGLE_APP_RTP, "initiator",
92b095c37277 Fix support for audio and video (at the same time) sessions.
Michael Ruprecht <maiku@pidgin.im>
parents: 26147
diff changeset
1012 "session", "audio-session", "both", transport);
92b095c37277 Fix support for audio and video (at the same time) sessions.
Michael Ruprecht <maiku@pidgin.im>
parents: 26147
diff changeset
1013 jingle_session_add_content(session, content);
26147
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
1014 JINGLE_RTP(content)->priv->media_type = g_strdup("audio");
26149
92b095c37277 Fix support for audio and video (at the same time) sessions.
Michael Ruprecht <maiku@pidgin.im>
parents: 26147
diff changeset
1015 jingle_rtp_init_media(content);
92b095c37277 Fix support for audio and video (at the same time) sessions.
Michael Ruprecht <maiku@pidgin.im>
parents: 26147
diff changeset
1016 }
92b095c37277 Fix support for audio and video (at the same time) sessions.
Michael Ruprecht <maiku@pidgin.im>
parents: 26147
diff changeset
1017 if (type & PURPLE_MEDIA_VIDEO) {
26170
829055c78478 Choose the transport type according to the responder's caps.
Michael Ruprecht <maiku@pidgin.im>
parents: 26166
diff changeset
1018 transport = jingle_transport_create(transport_type);
26149
92b095c37277 Fix support for audio and video (at the same time) sessions.
Michael Ruprecht <maiku@pidgin.im>
parents: 26147
diff changeset
1019 content = jingle_content_create(JINGLE_APP_RTP, "initiator",
92b095c37277 Fix support for audio and video (at the same time) sessions.
Michael Ruprecht <maiku@pidgin.im>
parents: 26147
diff changeset
1020 "session", "video-session", "both", transport);
92b095c37277 Fix support for audio and video (at the same time) sessions.
Michael Ruprecht <maiku@pidgin.im>
parents: 26147
diff changeset
1021 jingle_session_add_content(session, content);
26147
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
1022 JINGLE_RTP(content)->priv->media_type = g_strdup("video");
26149
92b095c37277 Fix support for audio and video (at the same time) sessions.
Michael Ruprecht <maiku@pidgin.im>
parents: 26147
diff changeset
1023 jingle_rtp_init_media(content);
92b095c37277 Fix support for audio and video (at the same time) sessions.
Michael Ruprecht <maiku@pidgin.im>
parents: 26147
diff changeset
1024 }
26147
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
1025
26495
52846ebe1c7d Don't assume a PurpleMedia instance will be created immediately.
Michael Ruprecht <maiku@pidgin.im>
parents: 26449
diff changeset
1026 if (jingle_rtp_get_media(session) == NULL) {
38693
12476654da77 jabber: Avoid a use-after-free in an error path
Debarshi Ray <rishi@gnu.org>
parents: 38258
diff changeset
1027 goto out;
26495
52846ebe1c7d Don't assume a PurpleMedia instance will be created immediately.
Michael Ruprecht <maiku@pidgin.im>
parents: 26449
diff changeset
1028 }
52846ebe1c7d Don't assume a PurpleMedia instance will be created immediately.
Michael Ruprecht <maiku@pidgin.im>
parents: 26449
diff changeset
1029
38693
12476654da77 jabber: Avoid a use-after-free in an error path
Debarshi Ray <rishi@gnu.org>
parents: 38258
diff changeset
1030 ret = TRUE;
12476654da77 jabber: Avoid a use-after-free in an error path
Debarshi Ray <rishi@gnu.org>
parents: 38258
diff changeset
1031
12476654da77 jabber: Avoid a use-after-free in an error path
Debarshi Ray <rishi@gnu.org>
parents: 38258
diff changeset
1032 out:
12476654da77 jabber: Avoid a use-after-free in an error path
Debarshi Ray <rishi@gnu.org>
parents: 38258
diff changeset
1033 g_free(me);
12476654da77 jabber: Avoid a use-after-free in an error path
Debarshi Ray <rishi@gnu.org>
parents: 38258
diff changeset
1034 g_free(resource);
12476654da77 jabber: Avoid a use-after-free in an error path
Debarshi Ray <rishi@gnu.org>
parents: 38258
diff changeset
1035 g_free(sid);
12476654da77 jabber: Avoid a use-after-free in an error path
Debarshi Ray <rishi@gnu.org>
parents: 38258
diff changeset
1036 return ret;
26147
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
1037 }
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
1038
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
1039 void
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
1040 jingle_rtp_terminate_session(JabberStream *js, const gchar *who)
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
1041 {
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
1042 JingleSession *session;
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
1043 /* XXX: This may cause file transfers and xml sessions to stop as well */
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
1044 session = jingle_session_find_by_jid(js, who);
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
1045
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
1046 if (session) {
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
1047 PurpleMedia *media = jingle_rtp_get_media(session);
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
1048 if (media) {
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
1049 purple_debug_info("jingle-rtp", "hanging up media\n");
26499
759bf410db86 Remove purple_media_hangup.
Michael Ruprecht <maiku@pidgin.im>
parents: 26496
diff changeset
1050 purple_media_stream_info(media,
759bf410db86 Remove purple_media_hangup.
Michael Ruprecht <maiku@pidgin.im>
parents: 26496
diff changeset
1051 PURPLE_MEDIA_INFO_HANGUP,
759bf410db86 Remove purple_media_hangup.
Michael Ruprecht <maiku@pidgin.im>
parents: 26496
diff changeset
1052 NULL, NULL, TRUE);
26147
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
1053 }
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
1054 }
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
1055 }
791ee9c9a75e Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff changeset
1056
26215
9ecaa256d77b Fix compiling with --disable-vv.
Michael Ruprecht <maiku@pidgin.im>
parents: 26198
diff changeset
1057 #endif /* USE_VV */
9ecaa256d77b Fix compiling with --disable-vv.
Michael Ruprecht <maiku@pidgin.im>
parents: 26198
diff changeset
1058

mercurial