annotate libpurple/protocols/jabber/jingle/rtp.c @ 26384:95794e9acf71

Use new find_content wildcard.
author Mike Ruprecht <maiku@soc.pidgin.im>
date Thu, 19 Mar 2009 10:24:10 +0000
parents 7fe896a5f4db
children f34fd86de085
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
26023
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
1 /**
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
2 * @file rtp.c
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
3 *
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
4 * purple
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
5 *
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
6 * This program is free software; you can redistribute it and/or modify
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
7 * it under the terms of the GNU General Public License as published by
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
8 * the Free Software Foundation; either version 2 of the License, or
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
9 * (at your option) any later version.
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
10 *
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
11 * This program is distributed in the hope that it will be useful,
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
12 * but WITHOUT ANY WARRANTY; without even the implied warranty of
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
14 * GNU General Public License for more details.
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
15 *
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
16 * You should have received a copy of the GNU General Public License
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
17 * along with this program; if not, write to the Free Software
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
18 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
19 */
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
20
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
21 #include "config.h"
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
22
26091
59188d904773 Fix compiling with --disable-vv.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26074
diff changeset
23 #ifdef USE_VV
59188d904773 Fix compiling with --disable-vv.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26074
diff changeset
24
26023
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
25 #include "jabber.h"
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
26 #include "jingle.h"
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
27 #include "media.h"
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
28 #include "mediamanager.h"
26042
bee5ab815291 Added a Jingle ice-udp transmitter.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26037
diff changeset
29 #include "iceudp.h"
26023
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
30 #include "rawudp.h"
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
31 #include "rtp.h"
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
32 #include "session.h"
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
33 #include "debug.h"
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
34
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
35 #include <string.h>
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
36
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
37 struct _JingleRtpPrivate
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
38 {
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
39 gchar *media_type;
26367
b1c4fcc5b814 Add ssrc property to JingleRtp.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26366
diff changeset
40 gchar *ssrc;
26023
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
41 };
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
42
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
43 #define JINGLE_RTP_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), JINGLE_TYPE_RTP, JingleRtpPrivate))
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
44
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
45 static void jingle_rtp_class_init (JingleRtpClass *klass);
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
46 static void jingle_rtp_init (JingleRtp *rtp);
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
47 static void jingle_rtp_finalize (GObject *object);
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
48 static void jingle_rtp_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec);
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
49 static void jingle_rtp_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec);
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
50 static JingleContent *jingle_rtp_parse_internal(xmlnode *rtp);
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
51 static xmlnode *jingle_rtp_to_xml_internal(JingleContent *rtp, xmlnode *content, JingleActionType action);
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
52 static void jingle_rtp_handle_action_internal(JingleContent *content, xmlnode *jingle, JingleActionType action);
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
53
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
54 static PurpleMedia *jingle_rtp_get_media(JingleSession *session);
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
55
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
56 static JingleContentClass *parent_class = NULL;
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
57 #if 0
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
58 enum {
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
59 LAST_SIGNAL
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
60 };
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
61 static guint jingle_rtp_signals[LAST_SIGNAL] = {0};
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
62 #endif
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
63
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
64 enum {
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
65 PROP_0,
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
66 PROP_MEDIA_TYPE,
26367
b1c4fcc5b814 Add ssrc property to JingleRtp.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26366
diff changeset
67 PROP_SSRC,
26023
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
68 };
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
69
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
70 GType
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
71 jingle_rtp_get_type()
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
72 {
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
73 static GType type = 0;
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
74
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
75 if (type == 0) {
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
76 static const GTypeInfo info = {
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
77 sizeof(JingleRtpClass),
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
78 NULL,
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
79 NULL,
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
80 (GClassInitFunc) jingle_rtp_class_init,
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
81 NULL,
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
82 NULL,
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
83 sizeof(JingleRtp),
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
84 0,
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
85 (GInstanceInitFunc) jingle_rtp_init,
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
86 NULL
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
87 };
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
88 type = g_type_register_static(JINGLE_TYPE_CONTENT, "JingleRtp", &info, 0);
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
89 }
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
90 return type;
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
91 }
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
92
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
93 static void
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
94 jingle_rtp_class_init (JingleRtpClass *klass)
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
95 {
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
96 GObjectClass *gobject_class = (GObjectClass*)klass;
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
97 parent_class = g_type_class_peek_parent(klass);
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
98
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
99 gobject_class->finalize = jingle_rtp_finalize;
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
100 gobject_class->set_property = jingle_rtp_set_property;
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
101 gobject_class->get_property = jingle_rtp_get_property;
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
102 klass->parent_class.to_xml = jingle_rtp_to_xml_internal;
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
103 klass->parent_class.parse = jingle_rtp_parse_internal;
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
104 klass->parent_class.description_type = JINGLE_APP_RTP;
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
105 klass->parent_class.handle_action = jingle_rtp_handle_action_internal;
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
106
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
107 g_object_class_install_property(gobject_class, PROP_MEDIA_TYPE,
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
108 g_param_spec_string("media-type",
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
109 "Media Type",
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
110 "The media type (\"audio\" or \"video\") for this rtp session.",
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
111 NULL,
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
112 G_PARAM_READWRITE));
26367
b1c4fcc5b814 Add ssrc property to JingleRtp.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26366
diff changeset
113 g_object_class_install_property(gobject_class, PROP_SSRC,
b1c4fcc5b814 Add ssrc property to JingleRtp.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26366
diff changeset
114 g_param_spec_string("ssrc",
b1c4fcc5b814 Add ssrc property to JingleRtp.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26366
diff changeset
115 "ssrc",
b1c4fcc5b814 Add ssrc property to JingleRtp.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26366
diff changeset
116 "The ssrc for this rtp session.",
b1c4fcc5b814 Add ssrc property to JingleRtp.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26366
diff changeset
117 NULL,
b1c4fcc5b814 Add ssrc property to JingleRtp.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26366
diff changeset
118 G_PARAM_READWRITE));
b1c4fcc5b814 Add ssrc property to JingleRtp.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26366
diff changeset
119
26023
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
120 g_type_class_add_private(klass, sizeof(JingleRtpPrivate));
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
121 }
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
122
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
123 static void
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
124 jingle_rtp_init (JingleRtp *rtp)
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
125 {
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
126 rtp->priv = JINGLE_RTP_GET_PRIVATE(rtp);
26367
b1c4fcc5b814 Add ssrc property to JingleRtp.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26366
diff changeset
127 memset(rtp->priv, 0, sizeof(*rtp->priv));
26023
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
128 }
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
129
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
130 static void
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
131 jingle_rtp_finalize (GObject *rtp)
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
132 {
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
133 JingleRtpPrivate *priv = JINGLE_RTP_GET_PRIVATE(rtp);
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
134 purple_debug_info("jingle-rtp","jingle_rtp_finalize\n");
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
135
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
136 g_free(priv->media_type);
26367
b1c4fcc5b814 Add ssrc property to JingleRtp.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26366
diff changeset
137 g_free(priv->ssrc);
26372
44684f0d2e42 Plug some memory leaks related to transports.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26369
diff changeset
138
44684f0d2e42 Plug some memory leaks related to transports.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26369
diff changeset
139 G_OBJECT_CLASS(parent_class)->finalize(rtp);
26023
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
140 }
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
141
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
142 static void
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
143 jingle_rtp_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec)
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
144 {
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
145 JingleRtp *rtp;
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
146 g_return_if_fail(JINGLE_IS_RTP(object));
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
147
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
148 rtp = JINGLE_RTP(object);
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
149
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
150 switch (prop_id) {
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
151 case PROP_MEDIA_TYPE:
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
152 g_free(rtp->priv->media_type);
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
153 rtp->priv->media_type = g_value_dup_string(value);
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
154 break;
26367
b1c4fcc5b814 Add ssrc property to JingleRtp.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26366
diff changeset
155 case PROP_SSRC:
b1c4fcc5b814 Add ssrc property to JingleRtp.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26366
diff changeset
156 g_free(rtp->priv->ssrc);
b1c4fcc5b814 Add ssrc property to JingleRtp.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26366
diff changeset
157 rtp->priv->ssrc = g_value_dup_string(value);
b1c4fcc5b814 Add ssrc property to JingleRtp.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26366
diff changeset
158 break;
26023
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
159 default:
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
160 G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
161 break;
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
162 }
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
163 }
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
164
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
165 static void
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
166 jingle_rtp_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec)
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
167 {
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
168 JingleRtp *rtp;
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
169 g_return_if_fail(JINGLE_IS_RTP(object));
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
170
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
171 rtp = JINGLE_RTP(object);
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
172
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
173 switch (prop_id) {
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
174 case PROP_MEDIA_TYPE:
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
175 g_value_set_string(value, rtp->priv->media_type);
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
176 break;
26367
b1c4fcc5b814 Add ssrc property to JingleRtp.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26366
diff changeset
177 case PROP_SSRC:
b1c4fcc5b814 Add ssrc property to JingleRtp.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26366
diff changeset
178 g_value_set_string(value, rtp->priv->ssrc);
b1c4fcc5b814 Add ssrc property to JingleRtp.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26366
diff changeset
179 break;
26023
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
180 default:
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
181 G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
182 break;
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
183 }
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
184 }
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
185
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
186 gchar *
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
187 jingle_rtp_get_media_type(JingleContent *content)
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
188 {
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
189 gchar *media_type;
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
190 g_object_get(content, "media-type", &media_type, NULL);
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
191 return media_type;
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
192 }
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
193
26367
b1c4fcc5b814 Add ssrc property to JingleRtp.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26366
diff changeset
194 gchar *
b1c4fcc5b814 Add ssrc property to JingleRtp.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26366
diff changeset
195 jingle_rtp_get_ssrc(JingleContent *content)
b1c4fcc5b814 Add ssrc property to JingleRtp.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26366
diff changeset
196 {
b1c4fcc5b814 Add ssrc property to JingleRtp.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26366
diff changeset
197 gchar *ssrc;
b1c4fcc5b814 Add ssrc property to JingleRtp.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26366
diff changeset
198 g_object_get(content, "ssrc", &ssrc, NULL);
b1c4fcc5b814 Add ssrc property to JingleRtp.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26366
diff changeset
199 return ssrc;
b1c4fcc5b814 Add ssrc property to JingleRtp.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26366
diff changeset
200 }
b1c4fcc5b814 Add ssrc property to JingleRtp.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26366
diff changeset
201
26023
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
202 static PurpleMedia *
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
203 jingle_rtp_get_media(JingleSession *session)
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
204 {
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
205 JabberStream *js = jingle_session_get_js(session);
26206
f10034e0321b Get rid of the medias variable in JabberStream.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26201
diff changeset
206 PurpleMedia *media = NULL;
f10034e0321b Get rid of the medias variable in JabberStream.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26201
diff changeset
207 GList *iter = purple_media_manager_get_media_by_connection(
f10034e0321b Get rid of the medias variable in JabberStream.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26201
diff changeset
208 purple_media_manager_get(), js->gc);
26023
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
209
26206
f10034e0321b Get rid of the medias variable in JabberStream.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26201
diff changeset
210 for (; iter; iter = g_list_delete_link(iter, iter)) {
f10034e0321b Get rid of the medias variable in JabberStream.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26201
diff changeset
211 JingleSession *media_session =
f10034e0321b Get rid of the medias variable in JabberStream.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26201
diff changeset
212 purple_media_get_prpl_data(iter->data);
f10034e0321b Get rid of the medias variable in JabberStream.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26201
diff changeset
213 if (media_session == session) {
f10034e0321b Get rid of the medias variable in JabberStream.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26201
diff changeset
214 media = iter->data;
f10034e0321b Get rid of the medias variable in JabberStream.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26201
diff changeset
215 break;
f10034e0321b Get rid of the medias variable in JabberStream.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26201
diff changeset
216 }
f10034e0321b Get rid of the medias variable in JabberStream.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26201
diff changeset
217 }
f10034e0321b Get rid of the medias variable in JabberStream.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26201
diff changeset
218 if (iter != NULL)
f10034e0321b Get rid of the medias variable in JabberStream.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26201
diff changeset
219 g_list_free(iter);
26023
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
220
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
221 return media;
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
222 }
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
223
26378
55c77c8e75cf Send any additional candidates found after session-initiate or
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26372
diff changeset
224 static JingleRawUdpCandidate *
55c77c8e75cf Send any additional candidates found after session-initiate or
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26372
diff changeset
225 jingle_rtp_candidate_to_rawudp(JingleSession *session, guint generation,
55c77c8e75cf Send any additional candidates found after session-initiate or
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26372
diff changeset
226 PurpleMediaCandidate *candidate)
55c77c8e75cf Send any additional candidates found after session-initiate or
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26372
diff changeset
227 {
55c77c8e75cf Send any additional candidates found after session-initiate or
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26372
diff changeset
228 gchar *id = jabber_get_next_id(jingle_session_get_js(session));
55c77c8e75cf Send any additional candidates found after session-initiate or
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26372
diff changeset
229 JingleRawUdpCandidate *rawudp_candidate =
55c77c8e75cf Send any additional candidates found after session-initiate or
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26372
diff changeset
230 jingle_rawudp_candidate_new(id,
55c77c8e75cf Send any additional candidates found after session-initiate or
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26372
diff changeset
231 generation, candidate->component_id,
55c77c8e75cf Send any additional candidates found after session-initiate or
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26372
diff changeset
232 candidate->ip, candidate->port);
55c77c8e75cf Send any additional candidates found after session-initiate or
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26372
diff changeset
233 g_free(id);
55c77c8e75cf Send any additional candidates found after session-initiate or
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26372
diff changeset
234 return rawudp_candidate;
55c77c8e75cf Send any additional candidates found after session-initiate or
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26372
diff changeset
235 }
55c77c8e75cf Send any additional candidates found after session-initiate or
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26372
diff changeset
236
55c77c8e75cf Send any additional candidates found after session-initiate or
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26372
diff changeset
237 static JingleIceUdpCandidate *
55c77c8e75cf Send any additional candidates found after session-initiate or
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26372
diff changeset
238 jingle_rtp_candidate_to_iceudp(JingleSession *session, guint generation,
55c77c8e75cf Send any additional candidates found after session-initiate or
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26372
diff changeset
239 PurpleMediaCandidate *candidate)
55c77c8e75cf Send any additional candidates found after session-initiate or
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26372
diff changeset
240 {
55c77c8e75cf Send any additional candidates found after session-initiate or
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26372
diff changeset
241 gchar *id = jabber_get_next_id(jingle_session_get_js(session));
55c77c8e75cf Send any additional candidates found after session-initiate or
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26372
diff changeset
242 JingleIceUdpCandidate *iceudp_candidate = jingle_iceudp_candidate_new(
55c77c8e75cf Send any additional candidates found after session-initiate or
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26372
diff changeset
243 candidate->component_id, candidate->foundation,
55c77c8e75cf Send any additional candidates found after session-initiate or
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26372
diff changeset
244 generation, id, candidate->ip, 0,
55c77c8e75cf Send any additional candidates found after session-initiate or
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26372
diff changeset
245 candidate->port, candidate->priority, "udp",
55c77c8e75cf Send any additional candidates found after session-initiate or
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26372
diff changeset
246 candidate->type == PURPLE_MEDIA_CANDIDATE_TYPE_HOST ? "host" :
55c77c8e75cf Send any additional candidates found after session-initiate or
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26372
diff changeset
247 candidate->type == PURPLE_MEDIA_CANDIDATE_TYPE_SRFLX ? "srflx" :
55c77c8e75cf Send any additional candidates found after session-initiate or
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26372
diff changeset
248 candidate->type == PURPLE_MEDIA_CANDIDATE_TYPE_PRFLX ? "prflx" :
55c77c8e75cf Send any additional candidates found after session-initiate or
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26372
diff changeset
249 candidate->type == PURPLE_MEDIA_CANDIDATE_TYPE_RELAY ? "relay" : "",
55c77c8e75cf Send any additional candidates found after session-initiate or
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26372
diff changeset
250 candidate->username, candidate->password);
55c77c8e75cf Send any additional candidates found after session-initiate or
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26372
diff changeset
251 iceudp_candidate->reladdr = g_strdup(candidate->base_ip);
55c77c8e75cf Send any additional candidates found after session-initiate or
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26372
diff changeset
252 iceudp_candidate->relport = candidate->base_port;
55c77c8e75cf Send any additional candidates found after session-initiate or
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26372
diff changeset
253 g_free(id);
55c77c8e75cf Send any additional candidates found after session-initiate or
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26372
diff changeset
254 return iceudp_candidate;
55c77c8e75cf Send any additional candidates found after session-initiate or
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26372
diff changeset
255 }
55c77c8e75cf Send any additional candidates found after session-initiate or
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26372
diff changeset
256
26023
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
257 static JingleTransport *
26030
365eb0b68d5f Update Jingle raw-udp to latest spec version.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26025
diff changeset
258 jingle_rtp_candidates_to_transport(JingleSession *session, GType type, guint generation, GList *candidates)
26023
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
259 {
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
260 if (type == JINGLE_TYPE_RAWUDP) {
26030
365eb0b68d5f Update Jingle raw-udp to latest spec version.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26025
diff changeset
261 JingleTransport *transport = jingle_transport_create(JINGLE_TRANSPORT_RAWUDP);
365eb0b68d5f Update Jingle raw-udp to latest spec version.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26025
diff changeset
262 JingleRawUdpCandidate *rawudp_candidate;
365eb0b68d5f Update Jingle raw-udp to latest spec version.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26025
diff changeset
263 for (; candidates; candidates = g_list_next(candidates)) {
26103
f7cf50180e1d Duplicate FsCandidate to remove it from the public interface.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26099
diff changeset
264 PurpleMediaCandidate *candidate = candidates->data;
26378
55c77c8e75cf Send any additional candidates found after session-initiate or
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26372
diff changeset
265 rawudp_candidate = jingle_rtp_candidate_to_rawudp(
55c77c8e75cf Send any additional candidates found after session-initiate or
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26372
diff changeset
266 session, generation, candidate);
55c77c8e75cf Send any additional candidates found after session-initiate or
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26372
diff changeset
267 jingle_rawudp_add_local_candidate(
55c77c8e75cf Send any additional candidates found after session-initiate or
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26372
diff changeset
268 JINGLE_RAWUDP(transport),
55c77c8e75cf Send any additional candidates found after session-initiate or
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26372
diff changeset
269 rawudp_candidate);
26030
365eb0b68d5f Update Jingle raw-udp to latest spec version.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26025
diff changeset
270 }
365eb0b68d5f Update Jingle raw-udp to latest spec version.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26025
diff changeset
271 return transport;
26023
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
272 } else if (type == JINGLE_TYPE_ICEUDP) {
26042
bee5ab815291 Added a Jingle ice-udp transmitter.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26037
diff changeset
273 JingleTransport *transport = jingle_transport_create(JINGLE_TRANSPORT_ICEUDP);
bee5ab815291 Added a Jingle ice-udp transmitter.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26037
diff changeset
274 JingleIceUdpCandidate *iceudp_candidate;
bee5ab815291 Added a Jingle ice-udp transmitter.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26037
diff changeset
275 for (; candidates; candidates = g_list_next(candidates)) {
26103
f7cf50180e1d Duplicate FsCandidate to remove it from the public interface.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26099
diff changeset
276 PurpleMediaCandidate *candidate = candidates->data;
26378
55c77c8e75cf Send any additional candidates found after session-initiate or
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26372
diff changeset
277 iceudp_candidate = jingle_rtp_candidate_to_iceudp(
55c77c8e75cf Send any additional candidates found after session-initiate or
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26372
diff changeset
278 session, generation, candidate);
55c77c8e75cf Send any additional candidates found after session-initiate or
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26372
diff changeset
279 jingle_iceudp_add_local_candidate(
55c77c8e75cf Send any additional candidates found after session-initiate or
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26372
diff changeset
280 JINGLE_ICEUDP(transport),
55c77c8e75cf Send any additional candidates found after session-initiate or
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26372
diff changeset
281 iceudp_candidate);
26042
bee5ab815291 Added a Jingle ice-udp transmitter.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26037
diff changeset
282 }
bee5ab815291 Added a Jingle ice-udp transmitter.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26037
diff changeset
283 return transport;
26023
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
284 } else {
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
285 return NULL;
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
286 }
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
287 }
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
288
26030
365eb0b68d5f Update Jingle raw-udp to latest spec version.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26025
diff changeset
289 static GList *
365eb0b68d5f Update Jingle raw-udp to latest spec version.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26025
diff changeset
290 jingle_rtp_transport_to_candidates(JingleTransport *transport)
26023
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
291 {
26030
365eb0b68d5f Update Jingle raw-udp to latest spec version.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26025
diff changeset
292 const gchar *type = jingle_transport_get_transport_type(transport);
365eb0b68d5f Update Jingle raw-udp to latest spec version.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26025
diff changeset
293 GList *ret = NULL;
26023
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
294 if (!strcmp(type, JINGLE_TRANSPORT_RAWUDP)) {
26030
365eb0b68d5f Update Jingle raw-udp to latest spec version.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26025
diff changeset
295 GList *candidates = jingle_rawudp_get_remote_candidates(JINGLE_RAWUDP(transport));
365eb0b68d5f Update Jingle raw-udp to latest spec version.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26025
diff changeset
296
365eb0b68d5f Update Jingle raw-udp to latest spec version.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26025
diff changeset
297 for (; candidates; candidates = g_list_delete_link(candidates, candidates)) {
365eb0b68d5f Update Jingle raw-udp to latest spec version.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26025
diff changeset
298 JingleRawUdpCandidate *candidate = candidates->data;
26103
f7cf50180e1d Duplicate FsCandidate to remove it from the public interface.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26099
diff changeset
299 ret = g_list_append(ret, purple_media_candidate_new(
f7cf50180e1d Duplicate FsCandidate to remove it from the public interface.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26099
diff changeset
300 "", candidate->component,
f7cf50180e1d Duplicate FsCandidate to remove it from the public interface.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26099
diff changeset
301 PURPLE_MEDIA_CANDIDATE_TYPE_SRFLX,
f7cf50180e1d Duplicate FsCandidate to remove it from the public interface.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26099
diff changeset
302 PURPLE_MEDIA_NETWORK_PROTOCOL_UDP,
26030
365eb0b68d5f Update Jingle raw-udp to latest spec version.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26025
diff changeset
303 candidate->ip, candidate->port));
365eb0b68d5f Update Jingle raw-udp to latest spec version.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26025
diff changeset
304 }
365eb0b68d5f Update Jingle raw-udp to latest spec version.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26025
diff changeset
305
365eb0b68d5f Update Jingle raw-udp to latest spec version.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26025
diff changeset
306 return ret;
26042
bee5ab815291 Added a Jingle ice-udp transmitter.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26037
diff changeset
307 } else if (!strcmp(type, JINGLE_TRANSPORT_ICEUDP)) {
bee5ab815291 Added a Jingle ice-udp transmitter.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26037
diff changeset
308 GList *candidates = jingle_iceudp_get_remote_candidates(JINGLE_ICEUDP(transport));
bee5ab815291 Added a Jingle ice-udp transmitter.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26037
diff changeset
309
bee5ab815291 Added a Jingle ice-udp transmitter.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26037
diff changeset
310 for (; candidates; candidates = g_list_delete_link(candidates, candidates)) {
bee5ab815291 Added a Jingle ice-udp transmitter.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26037
diff changeset
311 JingleIceUdpCandidate *candidate = candidates->data;
26103
f7cf50180e1d Duplicate FsCandidate to remove it from the public interface.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26099
diff changeset
312 PurpleMediaCandidate *new_candidate = purple_media_candidate_new(
26042
bee5ab815291 Added a Jingle ice-udp transmitter.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26037
diff changeset
313 candidate->foundation, candidate->component,
26103
f7cf50180e1d Duplicate FsCandidate to remove it from the public interface.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26099
diff changeset
314 !strcmp(candidate->type, "host") ?
f7cf50180e1d Duplicate FsCandidate to remove it from the public interface.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26099
diff changeset
315 PURPLE_MEDIA_CANDIDATE_TYPE_HOST :
f7cf50180e1d Duplicate FsCandidate to remove it from the public interface.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26099
diff changeset
316 !strcmp(candidate->type, "srflx") ?
f7cf50180e1d Duplicate FsCandidate to remove it from the public interface.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26099
diff changeset
317 PURPLE_MEDIA_CANDIDATE_TYPE_SRFLX :
f7cf50180e1d Duplicate FsCandidate to remove it from the public interface.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26099
diff changeset
318 !strcmp(candidate->type, "prflx") ?
f7cf50180e1d Duplicate FsCandidate to remove it from the public interface.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26099
diff changeset
319 PURPLE_MEDIA_CANDIDATE_TYPE_PRFLX :
f7cf50180e1d Duplicate FsCandidate to remove it from the public interface.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26099
diff changeset
320 !strcmp(candidate->type, "relay") ?
f7cf50180e1d Duplicate FsCandidate to remove it from the public interface.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26099
diff changeset
321 PURPLE_MEDIA_CANDIDATE_TYPE_RELAY : 0,
f7cf50180e1d Duplicate FsCandidate to remove it from the public interface.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26099
diff changeset
322 PURPLE_MEDIA_NETWORK_PROTOCOL_UDP,
f7cf50180e1d Duplicate FsCandidate to remove it from the public interface.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26099
diff changeset
323 candidate->ip, candidate->port);
26201
36c7efb85220 Use the correct values for Jingle Ice-Udp's rel-addr and rel-port.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26188
diff changeset
324 new_candidate->base_ip = g_strdup(candidate->reladdr);
36c7efb85220 Use the correct values for Jingle Ice-Udp's rel-addr and rel-port.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26188
diff changeset
325 new_candidate->base_port = candidate->relport;
26103
f7cf50180e1d Duplicate FsCandidate to remove it from the public interface.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26099
diff changeset
326 new_candidate->username = g_strdup(candidate->username);
f7cf50180e1d Duplicate FsCandidate to remove it from the public interface.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26099
diff changeset
327 new_candidate->password = g_strdup(candidate->password);
f7cf50180e1d Duplicate FsCandidate to remove it from the public interface.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26099
diff changeset
328 new_candidate->priority = candidate->priority;
f7cf50180e1d Duplicate FsCandidate to remove it from the public interface.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26099
diff changeset
329 ret = g_list_append(ret, new_candidate);
26042
bee5ab815291 Added a Jingle ice-udp transmitter.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26037
diff changeset
330 }
bee5ab815291 Added a Jingle ice-udp transmitter.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26037
diff changeset
331
bee5ab815291 Added a Jingle ice-udp transmitter.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26037
diff changeset
332 return ret;
26023
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
333 } else {
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
334 return NULL;
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
335 }
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
336 }
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
337
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
338 static void
26142
5b64b7d8da39 Added the accepted signal.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26141
diff changeset
339 jingle_rtp_accepted_cb(PurpleMedia *media, gchar *sid, gchar *name,
5b64b7d8da39 Added the accepted signal.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26141
diff changeset
340 JingleSession *session)
5b64b7d8da39 Added the accepted signal.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26141
diff changeset
341 {
5b64b7d8da39 Added the accepted signal.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26141
diff changeset
342 purple_debug_info("jingle-rtp", "jingle_rtp_accepted_cb\n");
5b64b7d8da39 Added the accepted signal.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26141
diff changeset
343 }
5b64b7d8da39 Added the accepted signal.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26141
diff changeset
344
5b64b7d8da39 Added the accepted signal.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26141
diff changeset
345 static void
26381
d784e9ea7f50 Implement jingle_rtp_candidates_prepared_cb.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26380
diff changeset
346 jingle_rtp_candidates_prepared_cb(PurpleMedia *media,
d784e9ea7f50 Implement jingle_rtp_candidates_prepared_cb.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26380
diff changeset
347 gchar *sid, gchar *name, JingleSession *session)
26380
b892b3cb9dbc Add candidates-prepared signal to PurpleMedia.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26378
diff changeset
348 {
26381
d784e9ea7f50 Implement jingle_rtp_candidates_prepared_cb.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26380
diff changeset
349 JingleContent *content = jingle_session_find_content(
26384
95794e9acf71 Use new find_content wildcard.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26382
diff changeset
350 session, sid, NULL);
26381
d784e9ea7f50 Implement jingle_rtp_candidates_prepared_cb.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26380
diff changeset
351 JingleTransport *oldtransport, *transport;
d784e9ea7f50 Implement jingle_rtp_candidates_prepared_cb.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26380
diff changeset
352 GList *candidates;
d784e9ea7f50 Implement jingle_rtp_candidates_prepared_cb.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26380
diff changeset
353
26380
b892b3cb9dbc Add candidates-prepared signal to PurpleMedia.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26378
diff changeset
354 purple_debug_info("jingle-rtp", "jingle_rtp_candidates_prepared_cb\n");
26381
d784e9ea7f50 Implement jingle_rtp_candidates_prepared_cb.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26380
diff changeset
355
d784e9ea7f50 Implement jingle_rtp_candidates_prepared_cb.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26380
diff changeset
356 if (content == NULL) {
d784e9ea7f50 Implement jingle_rtp_candidates_prepared_cb.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26380
diff changeset
357 purple_debug_error("jingle-rtp",
d784e9ea7f50 Implement jingle_rtp_candidates_prepared_cb.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26380
diff changeset
358 "jingle_rtp_candidates_prepared_cb: "
d784e9ea7f50 Implement jingle_rtp_candidates_prepared_cb.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26380
diff changeset
359 "Can't find session %s\n", sid);
d784e9ea7f50 Implement jingle_rtp_candidates_prepared_cb.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26380
diff changeset
360 return;
d784e9ea7f50 Implement jingle_rtp_candidates_prepared_cb.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26380
diff changeset
361 }
d784e9ea7f50 Implement jingle_rtp_candidates_prepared_cb.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26380
diff changeset
362
d784e9ea7f50 Implement jingle_rtp_candidates_prepared_cb.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26380
diff changeset
363 oldtransport = jingle_content_get_transport(content);
d784e9ea7f50 Implement jingle_rtp_candidates_prepared_cb.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26380
diff changeset
364 candidates = purple_media_get_local_candidates(media, sid, name);
d784e9ea7f50 Implement jingle_rtp_candidates_prepared_cb.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26380
diff changeset
365 transport = JINGLE_TRANSPORT(jingle_rtp_candidates_to_transport(
d784e9ea7f50 Implement jingle_rtp_candidates_prepared_cb.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26380
diff changeset
366 session, JINGLE_IS_RAWUDP(oldtransport) ?
d784e9ea7f50 Implement jingle_rtp_candidates_prepared_cb.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26380
diff changeset
367 JINGLE_TYPE_RAWUDP : JINGLE_TYPE_ICEUDP,
d784e9ea7f50 Implement jingle_rtp_candidates_prepared_cb.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26380
diff changeset
368 0, candidates));
d784e9ea7f50 Implement jingle_rtp_candidates_prepared_cb.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26380
diff changeset
369
d784e9ea7f50 Implement jingle_rtp_candidates_prepared_cb.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26380
diff changeset
370 g_list_free(candidates);
d784e9ea7f50 Implement jingle_rtp_candidates_prepared_cb.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26380
diff changeset
371 g_object_unref(oldtransport);
d784e9ea7f50 Implement jingle_rtp_candidates_prepared_cb.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26380
diff changeset
372
d784e9ea7f50 Implement jingle_rtp_candidates_prepared_cb.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26380
diff changeset
373 jingle_content_set_pending_transport(content, transport);
d784e9ea7f50 Implement jingle_rtp_candidates_prepared_cb.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26380
diff changeset
374 jingle_content_accept_transport(content);
26380
b892b3cb9dbc Add candidates-prepared signal to PurpleMedia.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26378
diff changeset
375 }
b892b3cb9dbc Add candidates-prepared signal to PurpleMedia.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26378
diff changeset
376
b892b3cb9dbc Add candidates-prepared signal to PurpleMedia.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26378
diff changeset
377 static void
26141
1ff5304f6e9d Added codecs-changed signal.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26140
diff changeset
378 jingle_rtp_codecs_changed_cb(PurpleMedia *media, gchar *sid,
1ff5304f6e9d Added codecs-changed signal.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26140
diff changeset
379 JingleSession *session)
1ff5304f6e9d Added codecs-changed signal.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26140
diff changeset
380 {
1ff5304f6e9d Added codecs-changed signal.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26140
diff changeset
381 purple_debug_info("jingle-rtp", "jingle_rtp_codecs_changed_cb: "
1ff5304f6e9d Added codecs-changed signal.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26140
diff changeset
382 "session_id: %s jingle_session: %p\n", sid, session);
1ff5304f6e9d Added codecs-changed signal.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26140
diff changeset
383 }
1ff5304f6e9d Added codecs-changed signal.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26140
diff changeset
384
1ff5304f6e9d Added codecs-changed signal.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26140
diff changeset
385 static void
26103
f7cf50180e1d Duplicate FsCandidate to remove it from the public interface.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26099
diff changeset
386 jingle_rtp_new_candidate_cb(PurpleMedia *media, gchar *sid, gchar *name, PurpleMediaCandidate *candidate, JingleSession *session)
26023
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
387 {
26378
55c77c8e75cf Send any additional candidates found after session-initiate or
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26372
diff changeset
388 JingleContent *content = jingle_session_find_content(
26384
95794e9acf71 Use new find_content wildcard.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26382
diff changeset
389 session, sid, NULL);
26378
55c77c8e75cf Send any additional candidates found after session-initiate or
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26372
diff changeset
390 JingleTransport *transport;
55c77c8e75cf Send any additional candidates found after session-initiate or
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26372
diff changeset
391
26023
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
392 purple_debug_info("jingle-rtp", "jingle_rtp_new_candidate_cb\n");
26378
55c77c8e75cf Send any additional candidates found after session-initiate or
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26372
diff changeset
393
55c77c8e75cf Send any additional candidates found after session-initiate or
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26372
diff changeset
394 if (content == NULL) {
55c77c8e75cf Send any additional candidates found after session-initiate or
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26372
diff changeset
395 purple_debug_error("jingle-rtp",
55c77c8e75cf Send any additional candidates found after session-initiate or
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26372
diff changeset
396 "jingle_rtp_new_candidate_cb: "
55c77c8e75cf Send any additional candidates found after session-initiate or
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26372
diff changeset
397 "Can't find session %s\n", sid);
55c77c8e75cf Send any additional candidates found after session-initiate or
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26372
diff changeset
398 return;
55c77c8e75cf Send any additional candidates found after session-initiate or
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26372
diff changeset
399 }
55c77c8e75cf Send any additional candidates found after session-initiate or
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26372
diff changeset
400
55c77c8e75cf Send any additional candidates found after session-initiate or
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26372
diff changeset
401 transport = jingle_content_get_transport(content);
55c77c8e75cf Send any additional candidates found after session-initiate or
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26372
diff changeset
402
55c77c8e75cf Send any additional candidates found after session-initiate or
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26372
diff changeset
403 if (JINGLE_IS_ICEUDP(transport))
26379
045be0c868a6 Silence two warnings.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26378
diff changeset
404 jingle_iceudp_add_local_candidate(JINGLE_ICEUDP(transport),
26378
55c77c8e75cf Send any additional candidates found after session-initiate or
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26372
diff changeset
405 jingle_rtp_candidate_to_iceudp(
55c77c8e75cf Send any additional candidates found after session-initiate or
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26372
diff changeset
406 session, 1, candidate));
55c77c8e75cf Send any additional candidates found after session-initiate or
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26372
diff changeset
407 else if (JINGLE_IS_RAWUDP(transport))
26379
045be0c868a6 Silence two warnings.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26378
diff changeset
408 jingle_rawudp_add_local_candidate(JINGLE_RAWUDP(transport),
26378
55c77c8e75cf Send any additional candidates found after session-initiate or
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26372
diff changeset
409 jingle_rtp_candidate_to_rawudp(
55c77c8e75cf Send any additional candidates found after session-initiate or
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26372
diff changeset
410 session, 1, candidate));
55c77c8e75cf Send any additional candidates found after session-initiate or
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26372
diff changeset
411
55c77c8e75cf Send any additional candidates found after session-initiate or
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26372
diff changeset
412 g_object_unref(transport);
55c77c8e75cf Send any additional candidates found after session-initiate or
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26372
diff changeset
413
55c77c8e75cf Send any additional candidates found after session-initiate or
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26372
diff changeset
414 jabber_iq_send(jingle_session_to_packet(session,
55c77c8e75cf Send any additional candidates found after session-initiate or
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26372
diff changeset
415 JINGLE_TRANSPORT_INFO));
26023
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
416 }
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
417
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
418 static void
26187
836f2e0b3b22 Wait to send transport-info until the session-initiate ack is received.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26180
diff changeset
419 jingle_rtp_initiate_ack_cb(JabberStream *js, xmlnode *packet, gpointer data)
836f2e0b3b22 Wait to send transport-info until the session-initiate ack is received.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26180
diff changeset
420 {
836f2e0b3b22 Wait to send transport-info until the session-initiate ack is received.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26180
diff changeset
421 JingleSession *session = data;
836f2e0b3b22 Wait to send transport-info until the session-initiate ack is received.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26180
diff changeset
422
836f2e0b3b22 Wait to send transport-info until the session-initiate ack is received.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26180
diff changeset
423 if (!strcmp(xmlnode_get_attrib(packet, "type"), "error") ||
836f2e0b3b22 Wait to send transport-info until the session-initiate ack is received.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26180
diff changeset
424 xmlnode_get_child(packet, "error")) {
836f2e0b3b22 Wait to send transport-info until the session-initiate ack is received.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26180
diff changeset
425 purple_media_end(jingle_rtp_get_media(session), NULL, NULL);
26188
9cda61a15698 Free the session as well on error.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26187
diff changeset
426 g_object_unref(session);
26187
836f2e0b3b22 Wait to send transport-info until the session-initiate ack is received.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26180
diff changeset
427 return;
836f2e0b3b22 Wait to send transport-info until the session-initiate ack is received.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26180
diff changeset
428 }
836f2e0b3b22 Wait to send transport-info until the session-initiate ack is received.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26180
diff changeset
429 }
836f2e0b3b22 Wait to send transport-info until the session-initiate ack is received.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26180
diff changeset
430
836f2e0b3b22 Wait to send transport-info until the session-initiate ack is received.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26180
diff changeset
431 static void
26066
607d82dce00e Have XMPP use the new ready signal.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26065
diff changeset
432 jingle_rtp_ready_cb(PurpleMedia *media, gchar *sid, gchar *name, JingleSession *session)
26023
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
433 {
26066
607d82dce00e Have XMPP use the new ready signal.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26065
diff changeset
434 purple_debug_info("rtp", "ready-new: session: %s name: %s\n", sid, name);
26023
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
435
26067
b0e6a64cbf2e Use the new ready signal instead of accept to send a session-accept.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26066
diff changeset
436 if (sid == NULL && name == NULL) {
b0e6a64cbf2e Use the new ready signal instead of accept to send a session-accept.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26066
diff changeset
437 if (jingle_session_is_initiator(session) == TRUE) {
26187
836f2e0b3b22 Wait to send transport-info until the session-initiate ack is received.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26180
diff changeset
438 JabberIq *iq = jingle_session_to_packet(
836f2e0b3b22 Wait to send transport-info until the session-initiate ack is received.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26180
diff changeset
439 session, JINGLE_SESSION_INITIATE);
26369
26cf297796a5 Update Jingle Ice-Udp according to the XEP.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26367
diff changeset
440 jabber_iq_set_callback(iq,
26cf297796a5 Update Jingle Ice-Udp according to the XEP.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26367
diff changeset
441 jingle_rtp_initiate_ack_cb, session);
26187
836f2e0b3b22 Wait to send transport-info until the session-initiate ack is received.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26180
diff changeset
442 jabber_iq_send(iq);
26378
55c77c8e75cf Send any additional candidates found after session-initiate or
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26372
diff changeset
443 g_signal_connect(G_OBJECT(media), "new-candidate",
55c77c8e75cf Send any additional candidates found after session-initiate or
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26372
diff changeset
444 G_CALLBACK(jingle_rtp_new_candidate_cb), session);
26067
b0e6a64cbf2e Use the new ready signal instead of accept to send a session-accept.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26066
diff changeset
445 } else {
b0e6a64cbf2e Use the new ready signal instead of accept to send a session-accept.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26066
diff changeset
446 jabber_iq_send(jingle_session_to_packet(session, JINGLE_SESSION_ACCEPT));
26378
55c77c8e75cf Send any additional candidates found after session-initiate or
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26372
diff changeset
447 g_signal_connect(G_OBJECT(media), "new-candidate",
55c77c8e75cf Send any additional candidates found after session-initiate or
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26372
diff changeset
448 G_CALLBACK(jingle_rtp_new_candidate_cb), session);
26042
bee5ab815291 Added a Jingle ice-udp transmitter.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26037
diff changeset
449 }
26023
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
450 }
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
451 }
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
452
26069
7d2e06b29f88 Add state-changed signal to PurpleMedia.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26068
diff changeset
453 static void
7d2e06b29f88 Add state-changed signal to PurpleMedia.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26068
diff changeset
454 jingle_rtp_state_changed_cb(PurpleMedia *media, PurpleMediaStateChangedType type,
7d2e06b29f88 Add state-changed signal to PurpleMedia.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26068
diff changeset
455 gchar *sid, gchar *name, JingleSession *session)
7d2e06b29f88 Add state-changed signal to PurpleMedia.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26068
diff changeset
456 {
7d2e06b29f88 Add state-changed signal to PurpleMedia.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26068
diff changeset
457 purple_debug_info("jingle-rtp", "state-changed: type %d id: %s name: %s\n", type, sid, name);
26070
50309309bc4d Use the state-changed signal.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26069
diff changeset
458
26111
8b16e5fcaa32 Added reject and hangup states to the state-changed signal.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26106
diff changeset
459 if ((type == PURPLE_MEDIA_STATE_CHANGED_REJECTED ||
8b16e5fcaa32 Added reject and hangup states to the state-changed signal.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26106
diff changeset
460 type == PURPLE_MEDIA_STATE_CHANGED_HANGUP) &&
26071
8dba34f5f21a Temporarily fix an oversight.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26070
diff changeset
461 sid == NULL && name == NULL) {
26366
4f47eeaa1414 Add functions for more easily creating session-terminate packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26206
diff changeset
462 jabber_iq_send(jingle_session_terminate_packet(
4f47eeaa1414 Add functions for more easily creating session-terminate packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26206
diff changeset
463 session, "success"));
26070
50309309bc4d Use the state-changed signal.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26069
diff changeset
464 g_object_unref(session);
50309309bc4d Use the state-changed signal.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26069
diff changeset
465 }
26069
7d2e06b29f88 Add state-changed signal to PurpleMedia.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26068
diff changeset
466 }
7d2e06b29f88 Add state-changed signal to PurpleMedia.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26068
diff changeset
467
26023
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
468 static PurpleMedia *
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
469 jingle_rtp_create_media(JingleContent *content)
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
470 {
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
471 JingleSession *session = jingle_content_get_session(content);
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
472 JabberStream *js = jingle_session_get_js(session);
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
473 gchar *remote_jid = jingle_session_get_remote_jid(session);
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
474
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
475 PurpleMedia *media = purple_media_manager_create_media(purple_media_manager_get(),
26063
c7d4b67b3332 Add initiator property to PurpleMedia.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26046
diff changeset
476 js->gc, "fsrtpconference", remote_jid,
c7d4b67b3332 Add initiator property to PurpleMedia.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26046
diff changeset
477 jingle_session_is_initiator(session));
26023
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
478 g_free(remote_jid);
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
479
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
480 if (!media) {
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
481 purple_debug_error("jingle-rtp", "Couldn't create media session\n");
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
482 return NULL;
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
483 }
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
484
26206
f10034e0321b Get rid of the medias variable in JabberStream.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26201
diff changeset
485 purple_media_set_prpl_data(media, session);
26023
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
486
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
487 /* connect callbacks */
26142
5b64b7d8da39 Added the accepted signal.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26141
diff changeset
488 g_signal_connect(G_OBJECT(media), "accepted",
5b64b7d8da39 Added the accepted signal.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26141
diff changeset
489 G_CALLBACK(jingle_rtp_accepted_cb), session);
26380
b892b3cb9dbc Add candidates-prepared signal to PurpleMedia.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26378
diff changeset
490 g_signal_connect(G_OBJECT(media), "candidates-prepared",
b892b3cb9dbc Add candidates-prepared signal to PurpleMedia.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26378
diff changeset
491 G_CALLBACK(jingle_rtp_candidates_prepared_cb), session);
26141
1ff5304f6e9d Added codecs-changed signal.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26140
diff changeset
492 g_signal_connect(G_OBJECT(media), "codecs-changed",
1ff5304f6e9d Added codecs-changed signal.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26140
diff changeset
493 G_CALLBACK(jingle_rtp_codecs_changed_cb), session);
26065
7caa7e2ce870 Implement a new ready signal.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26063
diff changeset
494 g_signal_connect(G_OBJECT(media), "ready-new",
26066
607d82dce00e Have XMPP use the new ready signal.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26065
diff changeset
495 G_CALLBACK(jingle_rtp_ready_cb), session);
26069
7d2e06b29f88 Add state-changed signal to PurpleMedia.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26068
diff changeset
496 g_signal_connect(G_OBJECT(media), "state-changed",
7d2e06b29f88 Add state-changed signal to PurpleMedia.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26068
diff changeset
497 G_CALLBACK(jingle_rtp_state_changed_cb), session);
26023
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
498
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
499 g_object_unref(session);
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
500 return media;
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
501 }
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
502
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
503 static gboolean
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
504 jingle_rtp_init_media(JingleContent *content)
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
505 {
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
506 JingleSession *session = jingle_content_get_session(content);
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
507 PurpleMedia *media = jingle_rtp_get_media(session);
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
508 gchar *media_type;
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
509 gchar *remote_jid;
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
510 gchar *senders;
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
511 gchar *name;
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
512 const gchar *transmitter;
26099
b6457b2a8e14 Make FsStreamDirection and FsMediaType conversion functions static.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26091
diff changeset
513 gboolean is_audio;
b6457b2a8e14 Make FsStreamDirection and FsMediaType conversion functions static.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26091
diff changeset
514 PurpleMediaSessionType type;
26023
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
515 JingleTransport *transport;
26162
88f183f7dfc7 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <ml@update.uu.se>
parents: 26142
diff changeset
516 GParameter *params = NULL;
88f183f7dfc7 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <ml@update.uu.se>
parents: 26142
diff changeset
517 guint num_params;
26023
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
518
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
519 /* maybe this create ought to just be in initiate and handle initiate */
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
520 if (media == NULL)
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
521 media = jingle_rtp_create_media(content);
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
522
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
523 if (media == NULL)
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
524 return FALSE;
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
525
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
526 name = jingle_content_get_name(content);
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
527 media_type = jingle_rtp_get_media_type(content);
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
528 remote_jid = jingle_session_get_remote_jid(session);
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
529 senders = jingle_content_get_senders(content);
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
530 transport = jingle_content_get_transport(content);
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
531
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
532 if (JINGLE_IS_RAWUDP(transport))
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
533 transmitter = "rawudp";
26042
bee5ab815291 Added a Jingle ice-udp transmitter.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26037
diff changeset
534 else if (JINGLE_IS_ICEUDP(transport))
bee5ab815291 Added a Jingle ice-udp transmitter.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26037
diff changeset
535 transmitter = "nice";
26023
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
536 else
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
537 transmitter = "notransmitter";
26372
44684f0d2e42 Plug some memory leaks related to transports.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26369
diff changeset
538 g_object_unref(transport);
26023
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
539
26099
b6457b2a8e14 Make FsStreamDirection and FsMediaType conversion functions static.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26091
diff changeset
540 is_audio = !strcmp(media_type, "audio");
26023
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
541
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
542 if (!strcmp(senders, "both"))
26099
b6457b2a8e14 Make FsStreamDirection and FsMediaType conversion functions static.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26091
diff changeset
543 type = is_audio == TRUE ? PURPLE_MEDIA_AUDIO
b6457b2a8e14 Make FsStreamDirection and FsMediaType conversion functions static.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26091
diff changeset
544 : PURPLE_MEDIA_VIDEO;
26023
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
545 else if (!strcmp(senders, "initiator")
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
546 && jingle_session_is_initiator(session))
26099
b6457b2a8e14 Make FsStreamDirection and FsMediaType conversion functions static.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26091
diff changeset
547 type = is_audio == TRUE ? PURPLE_MEDIA_SEND_AUDIO
b6457b2a8e14 Make FsStreamDirection and FsMediaType conversion functions static.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26091
diff changeset
548 : PURPLE_MEDIA_SEND_VIDEO;
26023
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
549 else
26099
b6457b2a8e14 Make FsStreamDirection and FsMediaType conversion functions static.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26091
diff changeset
550 type = is_audio == TRUE ? PURPLE_MEDIA_RECV_AUDIO
b6457b2a8e14 Make FsStreamDirection and FsMediaType conversion functions static.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26091
diff changeset
551 : PURPLE_MEDIA_RECV_VIDEO;
26023
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
552
26162
88f183f7dfc7 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <ml@update.uu.se>
parents: 26142
diff changeset
553 params =
88f183f7dfc7 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <ml@update.uu.se>
parents: 26142
diff changeset
554 jingle_get_params(jingle_session_get_js(session), &num_params);
26023
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
555 purple_media_add_stream(media, name, remote_jid,
26162
88f183f7dfc7 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <ml@update.uu.se>
parents: 26142
diff changeset
556 type, transmitter, num_params, params);
26023
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
557
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
558 g_free(name);
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
559 g_free(media_type);
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
560 g_free(remote_jid);
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
561 g_free(senders);
26162
88f183f7dfc7 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <ml@update.uu.se>
parents: 26142
diff changeset
562 g_free(params);
26023
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
563 g_object_unref(session);
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
564
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
565 return TRUE;
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
566 }
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
567
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
568 static GList *
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
569 jingle_rtp_parse_codecs(xmlnode *description)
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
570 {
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
571 GList *codecs = NULL;
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
572 xmlnode *codec_element = NULL;
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
573 const char *encoding_name,*id, *clock_rate;
26106
ac4d7695dbc7 Wrap FsCodec and remove the Farsight2 include from media.h.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26103
diff changeset
574 PurpleMediaCodec *codec;
26023
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
575 const gchar *media = xmlnode_get_attrib(description, "media");
26106
ac4d7695dbc7 Wrap FsCodec and remove the Farsight2 include from media.h.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26103
diff changeset
576 PurpleMediaSessionType type =
ac4d7695dbc7 Wrap FsCodec and remove the Farsight2 include from media.h.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26103
diff changeset
577 !strcmp(media, "video") ? PURPLE_MEDIA_VIDEO :
ac4d7695dbc7 Wrap FsCodec and remove the Farsight2 include from media.h.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26103
diff changeset
578 !strcmp(media, "audio") ? PURPLE_MEDIA_AUDIO : 0;
26023
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
579
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
580 for (codec_element = xmlnode_get_child(description, "payload-type") ;
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
581 codec_element ;
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
582 codec_element = xmlnode_get_next_twin(codec_element)) {
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
583 xmlnode *param;
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
584 gchar *codec_str;
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
585 encoding_name = xmlnode_get_attrib(codec_element, "name");
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
586
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
587 id = xmlnode_get_attrib(codec_element, "id");
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
588 clock_rate = xmlnode_get_attrib(codec_element, "clockrate");
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
589
26106
ac4d7695dbc7 Wrap FsCodec and remove the Farsight2 include from media.h.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26103
diff changeset
590 codec = purple_media_codec_new(atoi(id), encoding_name,
26023
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
591 type,
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
592 clock_rate ? atoi(clock_rate) : 0);
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
593
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
594 for (param = xmlnode_get_child(codec_element, "parameter");
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
595 param; param = xmlnode_get_next_twin(param)) {
26106
ac4d7695dbc7 Wrap FsCodec and remove the Farsight2 include from media.h.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26103
diff changeset
596 purple_media_codec_add_optional_parameter(codec,
26023
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
597 xmlnode_get_attrib(param, "name"),
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
598 xmlnode_get_attrib(param, "value"));
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
599 }
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
600
26106
ac4d7695dbc7 Wrap FsCodec and remove the Farsight2 include from media.h.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26103
diff changeset
601 codec_str = purple_media_codec_to_string(codec);
26023
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
602 purple_debug_info("jingle-rtp", "received codec: %s\n", codec_str);
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
603 g_free(codec_str);
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
604
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
605 codecs = g_list_append(codecs, codec);
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
606 }
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
607 return codecs;
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
608 }
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
609
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
610 static JingleContent *
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
611 jingle_rtp_parse_internal(xmlnode *rtp)
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
612 {
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
613 JingleContent *content = parent_class->parse(rtp);
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
614 xmlnode *description = xmlnode_get_child(rtp, "description");
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
615 const gchar *media_type = xmlnode_get_attrib(description, "media");
26367
b1c4fcc5b814 Add ssrc property to JingleRtp.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26366
diff changeset
616 const gchar *ssrc = xmlnode_get_attrib(description, "ssrc");
26023
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
617 purple_debug_info("jingle-rtp", "rtp parse\n");
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
618 g_object_set(content, "media-type", media_type, NULL);
26367
b1c4fcc5b814 Add ssrc property to JingleRtp.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26366
diff changeset
619 if (ssrc != NULL)
b1c4fcc5b814 Add ssrc property to JingleRtp.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26366
diff changeset
620 g_object_set(content, "ssrc", ssrc, NULL);
26023
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
621 return content;
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
622 }
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
623
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
624 static void
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
625 jingle_rtp_add_payloads(xmlnode *description, GList *codecs)
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
626 {
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
627 for (; codecs ; codecs = codecs->next) {
26106
ac4d7695dbc7 Wrap FsCodec and remove the Farsight2 include from media.h.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26103
diff changeset
628 PurpleMediaCodec *codec = (PurpleMediaCodec*)codecs->data;
26023
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
629 GList *iter = codec->optional_params;
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
630 char id[8], clockrate[10], channels[10];
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
631 gchar *codec_str;
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
632 xmlnode *payload = xmlnode_new_child(description, "payload-type");
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
633
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
634 g_snprintf(id, sizeof(id), "%d", codec->id);
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
635 g_snprintf(clockrate, sizeof(clockrate), "%d", codec->clock_rate);
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
636 g_snprintf(channels, sizeof(channels), "%d", codec->channels);
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
637
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
638 xmlnode_set_attrib(payload, "name", codec->encoding_name);
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
639 xmlnode_set_attrib(payload, "id", id);
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
640 xmlnode_set_attrib(payload, "clockrate", clockrate);
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
641 xmlnode_set_attrib(payload, "channels", channels);
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
642
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
643 for (; iter; iter = g_list_next(iter)) {
26106
ac4d7695dbc7 Wrap FsCodec and remove the Farsight2 include from media.h.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26103
diff changeset
644 PurpleMediaCodecParameter *mparam = iter->data;
26023
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
645 xmlnode *param = xmlnode_new_child(payload, "parameter");
26106
ac4d7695dbc7 Wrap FsCodec and remove the Farsight2 include from media.h.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26103
diff changeset
646 xmlnode_set_attrib(param, "name", mparam->name);
ac4d7695dbc7 Wrap FsCodec and remove the Farsight2 include from media.h.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26103
diff changeset
647 xmlnode_set_attrib(param, "value", mparam->value);
26023
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
648 }
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
649
26106
ac4d7695dbc7 Wrap FsCodec and remove the Farsight2 include from media.h.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26103
diff changeset
650 codec_str = purple_media_codec_to_string(codec);
26023
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
651 purple_debug_info("jingle", "adding codec: %s\n", codec_str);
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
652 g_free(codec_str);
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
653 }
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
654 }
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
655
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
656 static xmlnode *
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
657 jingle_rtp_to_xml_internal(JingleContent *rtp, xmlnode *content, JingleActionType action)
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
658 {
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
659 xmlnode *node = parent_class->to_xml(rtp, content, action);
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
660 xmlnode *description = xmlnode_get_child(node, "description");
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
661 if (description != NULL) {
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
662 JingleSession *session = jingle_content_get_session(rtp);
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
663 PurpleMedia *media = jingle_rtp_get_media(session);
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
664 gchar *media_type = jingle_rtp_get_media_type(rtp);
26367
b1c4fcc5b814 Add ssrc property to JingleRtp.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26366
diff changeset
665 gchar *ssrc = jingle_rtp_get_ssrc(rtp);
26023
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
666 gchar *name = jingle_content_get_name(rtp);
26036
a5f1804fcb4b Combine get_*_codecs functions to mirror Farsight 2.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26032
diff changeset
667 GList *codecs = purple_media_get_codecs(media, name);
26023
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
668
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
669 xmlnode_set_attrib(description, "media", media_type);
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
670
26367
b1c4fcc5b814 Add ssrc property to JingleRtp.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26366
diff changeset
671 if (ssrc != NULL)
b1c4fcc5b814 Add ssrc property to JingleRtp.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26366
diff changeset
672 xmlnode_set_attrib(description, "ssrc", ssrc);
b1c4fcc5b814 Add ssrc property to JingleRtp.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26366
diff changeset
673
26023
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
674 g_free(media_type);
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
675 g_free(name);
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
676 g_object_unref(session);
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
677
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
678 jingle_rtp_add_payloads(description, codecs);
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
679 }
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
680 return node;
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
681 }
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
682
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
683 static void
26025
1a2d446cb8a0 Fix support for audio and video (at the same time) sessions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26023
diff changeset
684 jingle_rtp_handle_action_internal(JingleContent *content, xmlnode *xmlcontent, JingleActionType action)
26023
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
685 {
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
686 switch (action) {
26369
26cf297796a5 Update Jingle Ice-Udp according to the XEP.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26367
diff changeset
687 case JINGLE_SESSION_ACCEPT:
26023
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
688 case JINGLE_SESSION_INITIATE: {
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
689 JingleSession *session = jingle_content_get_session(content);
26030
365eb0b68d5f Update Jingle raw-udp to latest spec version.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26025
diff changeset
690 JingleTransport *transport = jingle_transport_parse(
365eb0b68d5f Update Jingle raw-udp to latest spec version.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26025
diff changeset
691 xmlnode_get_child(xmlcontent, "transport"));
26025
1a2d446cb8a0 Fix support for audio and video (at the same time) sessions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26023
diff changeset
692 xmlnode *description = xmlnode_get_child(xmlcontent, "description");
26030
365eb0b68d5f Update Jingle raw-udp to latest spec version.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26025
diff changeset
693 GList *candidates = jingle_rtp_transport_to_candidates(transport);
26023
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
694 GList *codecs = jingle_rtp_parse_codecs(description);
26369
26cf297796a5 Update Jingle Ice-Udp according to the XEP.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26367
diff changeset
695 gchar *name = jingle_content_get_name(content);
26cf297796a5 Update Jingle Ice-Udp according to the XEP.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26367
diff changeset
696 gchar *remote_jid =
26cf297796a5 Update Jingle Ice-Udp according to the XEP.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26367
diff changeset
697 jingle_session_get_remote_jid(session);
26cf297796a5 Update Jingle Ice-Udp according to the XEP.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26367
diff changeset
698 PurpleMedia *media;
26023
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
699
26369
26cf297796a5 Update Jingle Ice-Udp according to the XEP.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26367
diff changeset
700 if (action == JINGLE_SESSION_INITIATE &&
26cf297796a5 Update Jingle Ice-Udp according to the XEP.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26367
diff changeset
701 jingle_rtp_init_media(content) == FALSE) {
26032
b83c83143a69 Fix crash when remote client reconnects and tries to restart the media session.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26030
diff changeset
702 /* XXX: send error */
26366
4f47eeaa1414 Add functions for more easily creating session-terminate packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26206
diff changeset
703 jabber_iq_send(jingle_session_terminate_packet(
4f47eeaa1414 Add functions for more easily creating session-terminate packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26206
diff changeset
704 session, "general-error"));
26032
b83c83143a69 Fix crash when remote client reconnects and tries to restart the media session.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26030
diff changeset
705 g_object_unref(session);
b83c83143a69 Fix crash when remote client reconnects and tries to restart the media session.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26030
diff changeset
706 break;
b83c83143a69 Fix crash when remote client reconnects and tries to restart the media session.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26030
diff changeset
707 }
26023
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
708
26369
26cf297796a5 Update Jingle Ice-Udp according to the XEP.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26367
diff changeset
709 media = jingle_rtp_get_media(session);
26cf297796a5 Update Jingle Ice-Udp according to the XEP.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26367
diff changeset
710 purple_media_set_remote_codecs(media,
26cf297796a5 Update Jingle Ice-Udp according to the XEP.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26367
diff changeset
711 name, remote_jid, codecs);
26cf297796a5 Update Jingle Ice-Udp according to the XEP.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26367
diff changeset
712 purple_media_add_remote_candidates(media,
26cf297796a5 Update Jingle Ice-Udp according to the XEP.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26367
diff changeset
713 name, remote_jid, candidates);
26023
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
714
26369
26cf297796a5 Update Jingle Ice-Udp according to the XEP.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26367
diff changeset
715 /* This needs to be for the entire session, not a single content */
26cf297796a5 Update Jingle Ice-Udp according to the XEP.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26367
diff changeset
716 /* very hacky */
26cf297796a5 Update Jingle Ice-Udp according to the XEP.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26367
diff changeset
717 if (action == JINGLE_SESSION_ACCEPT &&
26cf297796a5 Update Jingle Ice-Udp according to the XEP.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26367
diff changeset
718 xmlnode_get_next_twin(xmlcontent) == NULL)
26cf297796a5 Update Jingle Ice-Udp according to the XEP.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26367
diff changeset
719 purple_media_accept(media);
26023
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
720
26369
26cf297796a5 Update Jingle Ice-Udp according to the XEP.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26367
diff changeset
721 g_free(remote_jid);
26cf297796a5 Update Jingle Ice-Udp according to the XEP.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26367
diff changeset
722 g_free(name);
26023
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
723 g_object_unref(session);
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
724 break;
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
725 }
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
726 case JINGLE_SESSION_TERMINATE: {
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
727 JingleSession *session = jingle_content_get_session(content);
26068
d881fc5d907f Remove PurpleMedias from JabberStream's list when a media session ends.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26067
diff changeset
728 PurpleMedia *media = jingle_rtp_get_media(session);
d881fc5d907f Remove PurpleMedias from JabberStream's list when a media session ends.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26067
diff changeset
729
d881fc5d907f Remove PurpleMedias from JabberStream's list when a media session ends.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26067
diff changeset
730 if (media != NULL) {
26140
ac56e5707a72 Added purple_media_end and removed the purple_media_got_hangup.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26122
diff changeset
731 purple_media_end(media, NULL, NULL);
26068
d881fc5d907f Remove PurpleMedias from JabberStream's list when a media session ends.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26067
diff changeset
732 }
d881fc5d907f Remove PurpleMedias from JabberStream's list when a media session ends.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26067
diff changeset
733
26023
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
734 g_object_unref(session);
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
735 break;
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
736 }
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
737 case JINGLE_TRANSPORT_INFO: {
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
738 JingleSession *session = jingle_content_get_session(content);
26030
365eb0b68d5f Update Jingle raw-udp to latest spec version.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26025
diff changeset
739 JingleTransport *transport = jingle_transport_parse(
365eb0b68d5f Update Jingle raw-udp to latest spec version.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26025
diff changeset
740 xmlnode_get_child(xmlcontent, "transport"));
365eb0b68d5f Update Jingle raw-udp to latest spec version.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26025
diff changeset
741 GList *candidates = jingle_rtp_transport_to_candidates(transport);
26369
26cf297796a5 Update Jingle Ice-Udp according to the XEP.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26367
diff changeset
742 gchar *name = jingle_content_get_name(content);
26cf297796a5 Update Jingle Ice-Udp according to the XEP.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26367
diff changeset
743 gchar *remote_jid =
26cf297796a5 Update Jingle Ice-Udp according to the XEP.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26367
diff changeset
744 jingle_session_get_remote_jid(session);
26023
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
745
26369
26cf297796a5 Update Jingle Ice-Udp according to the XEP.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26367
diff changeset
746 purple_media_add_remote_candidates(
26cf297796a5 Update Jingle Ice-Udp according to the XEP.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26367
diff changeset
747 jingle_rtp_get_media(session),
26cf297796a5 Update Jingle Ice-Udp according to the XEP.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26367
diff changeset
748 name, remote_jid, candidates);
26cf297796a5 Update Jingle Ice-Udp according to the XEP.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26367
diff changeset
749
26cf297796a5 Update Jingle Ice-Udp according to the XEP.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26367
diff changeset
750 g_free(remote_jid);
26cf297796a5 Update Jingle Ice-Udp according to the XEP.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26367
diff changeset
751 g_free(name);
26023
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
752 g_object_unref(session);
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
753 break;
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
754 }
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
755 default:
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
756 break;
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
757 }
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
758 }
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
759
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
760 PurpleMedia *
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
761 jingle_rtp_initiate_media(JabberStream *js, const gchar *who,
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
762 PurpleMediaSessionType type)
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
763 {
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
764 /* create content negotiation */
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
765 JingleSession *session;
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
766 JingleContent *content;
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
767 JingleTransport *transport;
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
768 JabberBuddy *jb;
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
769 JabberBuddyResource *jbr;
26037
403453f8b643 Fix a few GLib warnings when trying to start a second media session.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26036
diff changeset
770 PurpleMedia *media;
26046
99055b8db16b Choose the transport type according to the responder's caps.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26042
diff changeset
771 const gchar *transport_type;
26023
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
772
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
773 gchar *jid = NULL, *me = NULL, *sid = NULL;
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
774
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
775 /* construct JID to send to */
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
776 jb = jabber_buddy_find(js, who, FALSE);
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
777 if (!jb) {
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
778 purple_debug_error("jingle-rtp", "Could not find Jabber buddy\n");
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
779 return NULL;
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
780 }
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
781 jbr = jabber_buddy_find_resource(jb, NULL);
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
782 if (!jbr) {
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
783 purple_debug_error("jingle-rtp", "Could not find buddy's resource\n");
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
784 }
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
785
26046
99055b8db16b Choose the transport type according to the responder's caps.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26042
diff changeset
786 if (jabber_resource_has_capability(jbr, JINGLE_TRANSPORT_ICEUDP)) {
99055b8db16b Choose the transport type according to the responder's caps.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26042
diff changeset
787 transport_type = JINGLE_TRANSPORT_ICEUDP;
99055b8db16b Choose the transport type according to the responder's caps.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26042
diff changeset
788 } else if (jabber_resource_has_capability(jbr, JINGLE_TRANSPORT_RAWUDP)) {
99055b8db16b Choose the transport type according to the responder's caps.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26042
diff changeset
789 transport_type = JINGLE_TRANSPORT_RAWUDP;
99055b8db16b Choose the transport type according to the responder's caps.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26042
diff changeset
790 } else {
99055b8db16b Choose the transport type according to the responder's caps.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26042
diff changeset
791 purple_debug_error("jingle-rtp", "Resource doesn't support "
99055b8db16b Choose the transport type according to the responder's caps.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26042
diff changeset
792 "the same transport types\n");
99055b8db16b Choose the transport type according to the responder's caps.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26042
diff changeset
793 return NULL;
99055b8db16b Choose the transport type according to the responder's caps.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26042
diff changeset
794 }
99055b8db16b Choose the transport type according to the responder's caps.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26042
diff changeset
795
26023
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
796 if ((strchr(who, '/') == NULL) && jbr && (jbr->name != NULL)) {
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
797 jid = g_strdup_printf("%s/%s", who, jbr->name);
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
798 } else {
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
799 jid = g_strdup(who);
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
800 }
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
801
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
802 /* set ourselves as initiator */
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
803 me = g_strdup_printf("%s@%s/%s", js->user->node, js->user->domain, js->user->resource);
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
804
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
805 sid = jabber_get_next_id(js);
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
806 session = jingle_session_create(js, sid, me, jid, TRUE);
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
807 g_free(sid);
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
808
26025
1a2d446cb8a0 Fix support for audio and video (at the same time) sessions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26023
diff changeset
809
1a2d446cb8a0 Fix support for audio and video (at the same time) sessions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26023
diff changeset
810 if (type & PURPLE_MEDIA_AUDIO) {
26046
99055b8db16b Choose the transport type according to the responder's caps.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26042
diff changeset
811 transport = jingle_transport_create(transport_type);
26025
1a2d446cb8a0 Fix support for audio and video (at the same time) sessions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26023
diff changeset
812 content = jingle_content_create(JINGLE_APP_RTP, "initiator",
1a2d446cb8a0 Fix support for audio and video (at the same time) sessions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26023
diff changeset
813 "session", "audio-session", "both", transport);
1a2d446cb8a0 Fix support for audio and video (at the same time) sessions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26023
diff changeset
814 jingle_session_add_content(session, content);
26023
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
815 JINGLE_RTP(content)->priv->media_type = g_strdup("audio");
26025
1a2d446cb8a0 Fix support for audio and video (at the same time) sessions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26023
diff changeset
816 jingle_rtp_init_media(content);
1a2d446cb8a0 Fix support for audio and video (at the same time) sessions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26023
diff changeset
817 }
1a2d446cb8a0 Fix support for audio and video (at the same time) sessions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26023
diff changeset
818 if (type & PURPLE_MEDIA_VIDEO) {
26046
99055b8db16b Choose the transport type according to the responder's caps.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26042
diff changeset
819 transport = jingle_transport_create(transport_type);
26025
1a2d446cb8a0 Fix support for audio and video (at the same time) sessions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26023
diff changeset
820 content = jingle_content_create(JINGLE_APP_RTP, "initiator",
1a2d446cb8a0 Fix support for audio and video (at the same time) sessions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26023
diff changeset
821 "session", "video-session", "both", transport);
1a2d446cb8a0 Fix support for audio and video (at the same time) sessions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26023
diff changeset
822 jingle_session_add_content(session, content);
26023
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
823 JINGLE_RTP(content)->priv->media_type = g_strdup("video");
26025
1a2d446cb8a0 Fix support for audio and video (at the same time) sessions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26023
diff changeset
824 jingle_rtp_init_media(content);
1a2d446cb8a0 Fix support for audio and video (at the same time) sessions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26023
diff changeset
825 }
26023
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
826
26037
403453f8b643 Fix a few GLib warnings when trying to start a second media session.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26036
diff changeset
827 if ((media = jingle_rtp_get_media(session)) == NULL) {
403453f8b643 Fix a few GLib warnings when trying to start a second media session.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26036
diff changeset
828 return NULL;
403453f8b643 Fix a few GLib warnings when trying to start a second media session.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26036
diff changeset
829 }
403453f8b643 Fix a few GLib warnings when trying to start a second media session.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26036
diff changeset
830
26023
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
831 g_free(jid);
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
832 g_free(me);
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
833
26037
403453f8b643 Fix a few GLib warnings when trying to start a second media session.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26036
diff changeset
834 return media;
26023
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
835 }
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
836
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
837 void
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
838 jingle_rtp_terminate_session(JabberStream *js, const gchar *who)
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
839 {
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
840 JingleSession *session;
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
841 /* XXX: This may cause file transfers and xml sessions to stop as well */
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
842 session = jingle_session_find_by_jid(js, who);
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
843
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
844 if (session) {
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
845 PurpleMedia *media = jingle_rtp_get_media(session);
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
846 if (media) {
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
847 purple_debug_info("jingle-rtp", "hanging up media\n");
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
848 purple_media_hangup(media);
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
849 }
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
850 }
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
851 }
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
852
26091
59188d904773 Fix compiling with --disable-vv.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26074
diff changeset
853 #endif /* USE_VV */
59188d904773 Fix compiling with --disable-vv.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26074
diff changeset
854